From ab2748f9b5dc55dcbcdcb9a27d3325a65b04d171 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 1 Aug 2022 15:42:38 +0800
Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi=E5=8F=B8=E6=9C=BA=E5=B1=8F]=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E5=9C=B0=E5=9B=BE=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E7=BA=BF=E7=BB=98=E5=88=B6=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/presenter/BaseBusPassengerPresenter.java    | 3 ++-
 .../bus/passenger/ui/BusPassengerMapDirectionView.java    | 3 ++-
 .../presenter/TaxiPassengerServingOrderPresenter.java     | 3 ++-
 .../taxi/passenger/ui/TaxiPassengerMapDirectionView.java  | 8 +-------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
index 3173247834..e3b32a6960 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
@@ -137,7 +137,8 @@ public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragme
 
     @Override
     public void routeResult(List<LatLng> models, int haveArrivedIndex) {
-        CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size());
+        CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size()
+                + " haveArrivedIndex = "+haveArrivedIndex);
         mView.routeResult(models,haveArrivedIndex);
     }
 
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 b4e780ef1c..bef94a28ea 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
@@ -221,6 +221,8 @@ public class BusPassengerMapDirectionView
         }
         if (mAMap != null) {
 
+            addRouteColorList();
+
             if (mCoordinatesLatLng.size() > 2) {
 
                 //设置线段纹理
@@ -330,7 +332,6 @@ public class BusPassengerMapDirectionView
         mCoordinatesLatLng.clear();
         mCoordinatesLatLng.addAll(latLngs);
         mHaveArrivedIndex = haveArrivedIndex;
-        addRouteColorList();
     }
 
     public void clearLineMarkers(){
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 da983b4303..509b08514f 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
@@ -77,7 +77,8 @@ public class TaxiPassengerServingOrderPresenter extends Presenter<TaxiPassengerS
     @Override
     public void routeResultByServer(List<LatLng> models, int haveArrivedIndex) {
         if (models == null) return;
-        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + models.size());
+        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + models.size()
+             + " haveArrivedIndex = " + haveArrivedIndex);
         mView.routeResultByServer(models,haveArrivedIndex);
     }
 
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 d7afe97db2..73ced5eeb3 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
@@ -234,7 +234,7 @@ public class TaxiPassengerMapDirectionView
         }
         if (mAMap != null) {
 
-//            addRouteColorList();
+            addRouteColorList();
 
             if (mCoordinatesLatLng.size() > 2) {
                 //设置线段纹理
@@ -263,11 +263,6 @@ public class TaxiPassengerMapDirectionView
         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
-//            }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 {
@@ -360,7 +355,6 @@ public class TaxiPassengerMapDirectionView
         mCoordinatesLatLng.clear();
         mCoordinatesLatLng.addAll(latLngs);
         mHaveArrivedIndex = haveArrivedIndex;
-        addRouteColorList();
     }
 
     @Override