From 2e47b9772f1532d942e54ea0641e54b4e756a183 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 22 Jul 2022 18:14:24 +0800 Subject: [PATCH] =?UTF-8?q?[140=20taxi/bus=20=E4=B9=98=E5=AE=A2=E5=B1=8F]?= =?UTF-8?q?=20=E5=B0=8F=E5=9C=B0=E5=9B=BE=E8=BD=A8=E8=BF=B9UI=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/BusPassengerModelLoopManager.java | 6 ++++ .../ui/BusPassengerMapDirectionView.java | 34 ++++++++---------- .../bus_p_map_arrow_arrived.png | Bin 0 -> 829 bytes .../bus_p_map_arrow_un_arrive.png | Bin 0 -> 879 bytes .../bus_p_map_arrow_arrived.png | Bin 0 -> 829 bytes .../bus_p_map_arrow_un_arrive.png | Bin 0 -> 879 bytes ...axiPassengerAutopilotPlanningCallback.java | 2 +- .../passenger/model/TaxiPassengerModel.java | 6 ++-- .../model/TaxiPassengerModelLoopManager.java | 5 ++- .../TaxiPassengerServingOrderPresenter.java | 6 ++-- .../ui/TaxiPassengerMapDirectionView.java | 33 +++++++++++++---- .../ui/TaxiPassengerServingOrderFragment.java | 8 ++--- .../taxi_p_map_arrow.png | Bin 588 -> 0 bytes .../taxi_p_map_arrow_arrived.png | Bin 0 -> 897 bytes .../taxi_p_map_arrow_un_arrive.png} | Bin .../res/drawable-xhdpi/taxi_p_map_arrow.png | Bin 588 -> 0 bytes .../taxi_p_map_arrow_arrived.png | Bin 0 -> 897 bytes .../taxi_p_map_arrow_un_arrive.png} | Bin 18 files changed, 62 insertions(+), 38 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow_arrived.png create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow_un_arrive.png create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_arrived.png create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_un_arrive.png delete mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_arrived.png rename OCH/{mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow.png => mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_un_arrive.png} (100%) delete mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png rename OCH/{mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow.png => mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png} (100%) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java index 488488804b..044f2e3f72 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java @@ -42,6 +42,9 @@ public class BusPassengerModelLoopManager { public void startOrStopRouteAndWipe() { CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startOrStopRouteWipe()"); + if (mRouteWipeDisposable == null){ + mRouteWipeDisposable = new CompositeDisposable(); + } Disposable disposable = startLoopRouteAndWipe() .doOnSubscribe(new Consumer() { @Override @@ -93,6 +96,9 @@ public class BusPassengerModelLoopManager { public void startCalculateRouteInfoLoop() { CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startCalculateRouteInfoLoop()"); + if (mCalculateRouteDisposable == null){ + mCalculateRouteDisposable = new CompositeDisposable(); + } Disposable disposable = startLoopCalculateRouteInfo() .doOnSubscribe(new Consumer() { @Override diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index a9ccbf6582..b4e780ef1c 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -64,9 +64,8 @@ public class BusPassengerMapDirectionView private CameraUpdate mCameraUpdate; private Context mContext; - private List colorList = new ArrayList<>(); -// List textureList = new ArrayList<>(); -// List texIndexList = new ArrayList<>(); + List textureList = new ArrayList<>(); + List texIndexList = new ArrayList<>(); private int mHaveArrivedIndex = 0; private List mLineMarkers = new ArrayList<>(); @@ -222,8 +221,6 @@ public class BusPassengerMapDirectionView } if (mAMap != null) { - addRouteColorList(); - if (mCoordinatesLatLng.size() > 2) { //设置线段纹理 @@ -232,9 +229,9 @@ public class BusPassengerMapDirectionView polylineOptions.useGradient(true); polylineOptions.width(10); //线段宽度 polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound); -// polylineOptions.setCustomTextureList(textureList); -// polylineOptions.setCustomTextureIndex(texIndexList); - polylineOptions.colorValues(colorList); + polylineOptions.setCustomTextureList(textureList); + polylineOptions.setCustomTextureIndex(texIndexList); +// polylineOptions.colorValues(colorList); // polylineOptions.setCustomTexture(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow)); // 绘制线 @@ -248,17 +245,15 @@ public class BusPassengerMapDirectionView * 添加画线颜色值 */ private void addRouteColorList() { -// for (int i = 0 ; i < mHaveArrivedIndex; i++){ -// textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow)); -// texIndexList.add(i); -// } -// -// for (int i = mHaveArrivedIndex; i < mCoordinatesLatLng.size(); i++){ -// textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow)); -// texIndexList.add(i); -// } - for (int i = 0; i < mCoordinatesLatLng.size(); i++) { - colorList.add(Color.argb(255, 70, 147, 253));//路线颜色 + textureList.clear(); + texIndexList.clear(); + for (int i = 0; i < mCoordinatesLatLng.size(); i++){ + if (i <= mHaveArrivedIndex){ + textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_arrived)); + }else { + textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_un_arrive)); + } + texIndexList.add(i); } } @@ -335,6 +330,7 @@ public class BusPassengerMapDirectionView mCoordinatesLatLng.clear(); mCoordinatesLatLng.addAll(latLngs); mHaveArrivedIndex = haveArrivedIndex; + addRouteColorList(); } public void clearLineMarkers(){ diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow_arrived.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow_arrived.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf83bccffeb37202db0b8be75bea2b90ba2a10e GIT binary patch literal 829 zcmeAS@N?(olHy`uVBq!ia0vp^3PAjfgAGV-Io%!$q!^2X+?^QKos)S9@YLn{4h9CM<(@8% zAr*{oZ{N+o6d-Z@BfAC<*Ww<7<%gC9-&|&XY{rZI@8&NMzbDmcY?w3S zcb?FkGG(FAVDHH`pb1QW4@}_bAMJ1X>hU8dOAt>s8f*At-5n3mg!d3zVP^*_JH-`af9Tr&&4;6U(_HTg z-(QPwPEY=t6?OOGot4InGOm?hG?aJx)Vym+)q8b)>HmqcSGR0+^WS$Z>eAcY$CP_& z9n5du7T;+fRI{s#FX)!vsnwf|Yj6I}W9eAAd4byJ^CicV*FQY=N}}pa=Hi**0?!h6 z9n`uS{eExS)Tqd>UI%~fH92ha_`0n(>yFUbeoM2~ea*i5R9-tgE5GBkqo(e;NqdF0 z9O@rb@s}&Fxo%&_d>ec>% zrgtwd(mi?PQL2o@f_rZ~pDs~-+we7en(6tHE0;g7tI01(%~x0Tm%Amjy{B%z&kW85 z}Q*>w%(|Ouuvf|EoRsb*kMb+xrDSXCEys tsxPcP%dtTJ&ud2pic*4rL&94od&aE!tKRckpQ{2TT~Aj(mvv4FO#s2QNC5x< literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow_un_arrive.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow_un_arrive.png new file mode 100644 index 0000000000000000000000000000000000000000..99d8bd7b56e80b8e4dec18c733d42e944d62d9d7 GIT binary patch literal 879 zcmeAS@N?(olHy`uVBq!ia0vp^3PAjfgAGV-Io%!$q!^2X+?^QKos)S9@YLn{4h9CMo1QL? zAr*{oZ+m-$1j-!$c)!QE@4TZ{)r5uIonmPb7rHf;w8*(#RJ*=5Dn&rItH~)!B}^|{ z(q*mEqzh9V%=fBx1c|8JP6-TiyE{kn`NI;o4Li@-#qsyUzb;NH&X|98*-Z<$_h ztLL!p5J;=_NgAD@@(DrJ0n_Oocs&YD+S*Q+hyZf{x@^X&48 zh?uqfy0#UvCsVa5H~qY^wrZ>YS@)(}aiSjDW(HEh-piNHJ9u(SwV!wlYlPgFS8p1F zWbejktiS%)Wd5&v?xi~qU+SK?;_?5qJS#Si8EmrawF84|H+C`KG~HdUu}DmKNxg|( zu=eBka~S#ZbuRpDcATnjxLWu4L?5-QAJrCxU7l5*+}X2v3G0frA6`#-`FYu?KRx_U ziVO{>Ub(w(!@AP{*Iw{f3*6R=h<_LSeC5(l6?1;i$?dS&oF}ziY~`*y>wjtA&*{G{ zCHV)LDi-m%*86b$qg9cQukUONdTZ1kq^G=^;qd(A zti0`4tiR;1-~U%2_;GLH+lblrvP-rp?cVxW>%fmAQ`VJ5?)qx7g7QEuqV*N4jlM1L*yEH0W=ob2cpxX*pzirS*t4mVWdP8ja4 tSQYl{m`+MpWU(*@YLn{4h9CM<(@8% zAr*{oZ{N+o6d-Z@BfAC<*Ww<7<%gC9-&|&XY{rZI@8&NMzbDmcY?w3S zcb?FkGG(FAVDHH`pb1QW4@}_bAMJ1X>hU8dOAt>s8f*At-5n3mg!d3zVP^*_JH-`af9Tr&&4;6U(_HTg z-(QPwPEY=t6?OOGot4InGOm?hG?aJx)Vym+)q8b)>HmqcSGR0+^WS$Z>eAcY$CP_& z9n5du7T;+fRI{s#FX)!vsnwf|Yj6I}W9eAAd4byJ^CicV*FQY=N}}pa=Hi**0?!h6 z9n`uS{eExS)Tqd>UI%~fH92ha_`0n(>yFUbeoM2~ea*i5R9-tgE5GBkqo(e;NqdF0 z9O@rb@s}&Fxo%&_d>ec>% zrgtwd(mi?PQL2o@f_rZ~pDs~-+we7en(6tHE0;g7tI01(%~x0Tm%Amjy{B%z&kW85 z}Q*>w%(|Ouuvf|EoRsb*kMb+xrDSXCEys tsxPcP%dtTJ&ud2pic*4rL&94od&aE!tKRckpQ{2TT~Aj(mvv4FO#s2QNC5x< literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_un_arrive.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_un_arrive.png new file mode 100644 index 0000000000000000000000000000000000000000..99d8bd7b56e80b8e4dec18c733d42e944d62d9d7 GIT binary patch literal 879 zcmeAS@N?(olHy`uVBq!ia0vp^3PAjfgAGV-Io%!$q!^2X+?^QKos)S9@YLn{4h9CMo1QL? zAr*{oZ+m-$1j-!$c)!QE@4TZ{)r5uIonmPb7rHf;w8*(#RJ*=5Dn&rItH~)!B}^|{ z(q*mEqzh9V%=fBx1c|8JP6-TiyE{kn`NI;o4Li@-#qsyUzb;NH&X|98*-Z<$_h ztLL!p5J;=_NgAD@@(DrJ0n_Oocs&YD+S*Q+hyZf{x@^X&48 zh?uqfy0#UvCsVa5H~qY^wrZ>YS@)(}aiSjDW(HEh-piNHJ9u(SwV!wlYlPgFS8p1F zWbejktiS%)Wd5&v?xi~qU+SK?;_?5qJS#Si8EmrawF84|H+C`KG~HdUu}DmKNxg|( zu=eBka~S#ZbuRpDcATnjxLWu4L?5-QAJrCxU7l5*+}X2v3G0frA6`#-`FYu?KRx_U ziVO{>Ub(w(!@AP{*Iw{f3*6R=h<_LSeC5(l6?1;i$?dS&oF}ziY~`*y>wjtA&*{G{ zCHV)LDi-m%*86b$qg9cQukUONdTZ1kq^G=^;qd(A zti0`4tiR;1-~U%2_;GLH+lblrvP-rp?cVxW>%fmAQ`VJ5?)qx7g7QEuqV*N4jlM1L*yEH0W=ob2cpxX*pzirS*t4mVWdP8ja4 tSQYl{m`+MpWU(* models); - void routeResultByServer(List models); + void routeResultByServer(List models,int haveArrivedIndex); } \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index 1b1fec85e7..b27b6104d2 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -617,10 +617,10 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback public void loopRouteAndWipe() { if (mLocationsModels != null && mLocationsModels.size() > 0){ - List lastPoints = CoordinateCalculateRouteUtil - .getRemainPointListByCompare(mLocationsModels,mLongitude,mLatitude); + int haveArrivedIndex = CoordinateCalculateRouteUtil + .getArrivedPointIndex(mLocationsModels,mLongitude,mLatitude); if (mAutopilotPlanningCallback != null){ - mAutopilotPlanningCallback.routeResultByServer(lastPoints); + mAutopilotPlanningCallback.routeResultByServer(mLocationsModels,haveArrivedIndex); } } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java index 115ce91022..ee85371b35 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java @@ -35,7 +35,7 @@ public class TaxiPassengerModelLoopManager { private Disposable mInAndWaitServiceDisposable; //进行中、待服务订单列表轮询 private Disposable mQueryOrderRemainingDisposable; //心跳轮询 - private CompositeDisposable mRouteWipeDisposable; //轨迹擦除 + private CompositeDisposable mRouteWipeDisposable = new CompositeDisposable(); //轨迹擦除 private Disposable mReadyToAutopilotDisposable; //轮询是否可开启自动驾驶 public void startReadyToAutopilot() { @@ -60,6 +60,9 @@ public class TaxiPassengerModelLoopManager { } public void startRouteAndWipe() { + if (mRouteWipeDisposable == null){ + mRouteWipeDisposable = new CompositeDisposable(); + } CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startRouteAndWipe()"); Disposable disposable = startLoopRouteAndWipe() .doOnSubscribe(new Consumer() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java index 28bc751b01..4105a50e3c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java @@ -74,13 +74,13 @@ public class TaxiPassengerServingOrderPresenter extends Presenter mView.setLineMarker(models)); } - @Override - public void routeResultByServer(List models) { + public void routeResultByServer(List models, int haveArrivedIndex) { if (models == null) return; - runOnUIThread(() -> mView.routeResultByServer(models)); + runOnUIThread(() -> mView.routeResultByServer(models,haveArrivedIndex)); } + @Override public void onCurrentOrderStatusChanged(TaxiPassengerOrderQueryRespBean.Result order) { CallerLogger.INSTANCE.d(M_TAXI_P + TAG, GsonUtil.jsonFromObject(order)); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java index 574664279b..d7afe97db2 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java @@ -3,7 +3,6 @@ package com.mogo.och.taxi.passenger.ui; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; import android.content.Context; -import android.graphics.Color; import android.os.Bundle; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -19,6 +18,7 @@ import com.amap.api.maps.CameraUpdateFactory; import com.amap.api.maps.CoordinateConverter; import com.amap.api.maps.TextureMapView; import com.amap.api.maps.UiSettings; +import com.amap.api.maps.model.BitmapDescriptor; import com.amap.api.maps.model.BitmapDescriptorFactory; import com.amap.api.maps.model.CameraPosition; import com.amap.api.maps.model.CustomMapStyleOptions; @@ -61,8 +61,10 @@ public class TaxiPassengerMapDirectionView private Polyline mPolyline; private CameraUpdate mCameraUpdate; private Context mContext; + private int mHaveArrivedIndex; - private List colorList = new ArrayList<>(); + List textureList = new ArrayList<>(); + List texIndexList = new ArrayList<>(); private ITaxiPassengerMapViewCallback mITaxiPassengerMapViewCallback; @@ -232,7 +234,7 @@ public class TaxiPassengerMapDirectionView } if (mAMap != null) { - addRouteColorList(); +// addRouteColorList(); if (mCoordinatesLatLng.size() > 2) { //设置线段纹理 @@ -243,7 +245,9 @@ public class TaxiPassengerMapDirectionView //polylineOptions.useGradient(true); polylineOptions.width(15); polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound); - polylineOptions.setCustomTexture(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow)); + polylineOptions.setCustomTextureList(textureList); + polylineOptions.setCustomTextureIndex(texIndexList); +// polylineOptions.setCustomTexture(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_un_arrive)); // 绘制线 mPolyline = mAMap.addPolyline(polylineOptions); @@ -256,12 +260,20 @@ public class TaxiPassengerMapDirectionView * 添加画线颜色值 */ private void addRouteColorList() { + textureList.clear(); + texIndexList.clear(); for (int i = 0; i < mCoordinatesLatLng.size(); i++){ - if (i <= mCoordinatesLatLng.size()/2){ - colorList.add(Color.argb(255, 31, 195, 255));//start +// if (i <= mCoordinatesLatLng.size()/2){ +// colorList.add(Color.argb(255, 31, 195, 255));//start +// }else { +// colorList.add(Color.argb(255, 87, 171, 255));//end +// } + if (i <= mHaveArrivedIndex){ + textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_arrived)); }else { - colorList.add(Color.argb(255, 87, 171, 255));//end + textureList.add(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow_un_arrive)); } + texIndexList.add(i); } } @@ -344,6 +356,13 @@ public class TaxiPassengerMapDirectionView mCoordinatesLatLng.addAll(latLngs); } + public void setCoordinatesLatLng(List latLngs, int haveArrivedIndex){ + mCoordinatesLatLng.clear(); + mCoordinatesLatLng.addAll(latLngs); + mHaveArrivedIndex = haveArrivedIndex; + addRouteColorList(); + } + @Override public void onCameraChange(CameraPosition cameraPosition) { mITaxiPassengerMapViewCallback.onCameraChange(cameraPosition.bearing); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java index 6d6805884e..1232fbaf33 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java @@ -228,18 +228,18 @@ public class TaxiPassengerServingOrderFragment extends } } - public void routeResultByServer(List latLngList) { + public void routeResultByServer(List latLngList,int haveArrivedIndex) { CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + latLngList.size()); if (latLngList.size() > 0) { - drawablePolylineByServerRoute(latLngList); + drawablePolylineByServerRoute(latLngList,haveArrivedIndex); } else { clearPolyline(); } } - public void drawablePolylineByServerRoute(List mCoordinatesLatLng){ + public void drawablePolylineByServerRoute(List mCoordinatesLatLng,int haveArrivedIndex){ if (mMapDirectionView != null){ - mMapDirectionView.setCoordinatesLatLng(mCoordinatesLatLng); + mMapDirectionView.setCoordinatesLatLng(mCoordinatesLatLng,haveArrivedIndex); UiThreadHandler.post(new Runnable() { @Override public void run() { diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png deleted file mode 100644 index baa35592cb83ba3e19e26a33731e585765b02166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^3PAjfgAGV-Io%!$q!^2X+?^QKos)S9@YLn{4xqAao-U3d z6^w7M7<$V%iZDD7KY6vub7~lO^hVBaW*_GtxnB_auW`YD7wPPyYB!b{(W<~ z*L@PQaZa;89+a}?*aMbLuRh=HXnq%$Z8<%==poQ%Fhzd-cmCV@YLn{4h9CM*Pbqp zAr*{oZ=dxJ36weZG5y%|Hj^VUGdO06Mg}%@rX^&}P`t9}M3;cd{{}Nj5!Y#o5<6G; z3T*9A>TvSrSkpUcnQN=Q=S)9=nTb*>1s2UTz9lPuDfifISy7cA^RAw;{a#*ozGlbs zGq0>dVl3CH%A8YuV|#fP1BXHb0~7hgf&bb9a*sj|PE%>MlI5<7)Go2R`up;=)vrGI zt?lidR-F)$YU;b||ElQEm6>M+&z#O%$+>Y?%#`JGcsc8KT34}`F54AYI#>Shvo(4* zxCF#S7j_-Wkv;1*@w5CB-FNy{xh$ElUT%J6ZJjQ8KvZner6!)aw|2))T=(IolC}Ii z2_d_QX3od5&PYD+c;*&sGi7zl42{)Qr+2=5nR#{3yNfs3eP8{vlKBv~pW*hkBQL!! z>ZPvh=8rI#-+gbT=H0xy)t_#qedYUWpqqG$HCj0N>!LLge8&%Mo3^s~qw0~DA)aMj zLA_stPv^~A=F2`&Tjxqyaeukj*>`q7XT0rm*ne6jp8C=Z|BQ>3z+u2|DR`)cj2-9x2o668Q-qkwS13nr`v>>rPAjE3=W4iEWB7axBiFE zb*WoVXL9+(-M_lJ=To$nkAK+F#vIk-M{k@;luWqv`0CYPX0a=BFP^yJAI%*meS6)u zt7|98YFcgA_x`9I9&zog~jrv+-+8##?3P8i{{;on#I=V@4t+wyLHANU;7NcMNc0toHgUiDd{8ExYSaf zY%=Ke^O@!4!<4+=X4%Q3|2~x$-~Y9&Ib);rt;l|g6U-#;KWv>1`#GMu9(oE&{+_OW JF6*2UngE60X;1(F literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-sw320dp-xhdpi/bus_p_map_arrow.png rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png deleted file mode 100644 index baa35592cb83ba3e19e26a33731e585765b02166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^3PAjfgAGV-Io%!$q!^2X+?^QKos)S9@YLn{4xqAao-U3d z6^w7M7<$V%iZDD7KY6vub7~lO^hVBaW*_GtxnB_auW`YD7wPPyYB!b{(W<~ z*L@PQaZa;89+a}?*aMbLuRh=HXnq%$Z8<%==poQ%Fhzd-cmCV@YLn{4h9CM*Pbqp zAr*{oZ=dxJ36weZG5y%|Hj^VUGdO06Mg}%@rX^&}P`t9}M3;cd{{}Nj5!Y#o5<6G; z3T*9A>TvSrSkpUcnQN=Q=S)9=nTb*>1s2UTz9lPuDfifISy7cA^RAw;{a#*ozGlbs zGq0>dVl3CH%A8YuV|#fP1BXHb0~7hgf&bb9a*sj|PE%>MlI5<7)Go2R`up;=)vrGI zt?lidR-F)$YU;b||ElQEm6>M+&z#O%$+>Y?%#`JGcsc8KT34}`F54AYI#>Shvo(4* zxCF#S7j_-Wkv;1*@w5CB-FNy{xh$ElUT%J6ZJjQ8KvZner6!)aw|2))T=(IolC}Ii z2_d_QX3od5&PYD+c;*&sGi7zl42{)Qr+2=5nR#{3yNfs3eP8{vlKBv~pW*hkBQL!! z>ZPvh=8rI#-+gbT=H0xy)t_#qedYUWpqqG$HCj0N>!LLge8&%Mo3^s~qw0~DA)aMj zLA_stPv^~A=F2`&Tjxqyaeukj*>`q7XT0rm*ne6jp8C=Z|BQ>3z+u2|DR`)cj2-9x2o668Q-qkwS13nr`v>>rPAjE3=W4iEWB7axBiFE zb*WoVXL9+(-M_lJ=To$nkAK+F#vIk-M{k@;luWqv`0CYPX0a=BFP^yJAI%*meS6)u zt7|98YFcgA_x`9I9&zog~jrv+-+8##?3P8i{{;on#I=V@4t+wyLHANU;7NcMNc0toHgUiDd{8ExYSaf zY%=Ke^O@!4!<4+=X4%Q3|2~x$-~Y9&Ib);rt;l|g6U-#;KWv>1`#GMu9(oE&{+_OW JF6*2UngE60X;1(F literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow.png rename to OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png