From 9e758765305744ed98028ee720755e5a94917dde Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 3 Aug 2022 12:53:22 +0800
Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi]=20=E4=BC=98=E5=8C=96=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E8=AE=A1=E7=AE=97=E5=AE=9A=E6=97=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network/BusPassengerModelLoopManager.java        | 12 +++++++++---
 .../bus/passenger/ui/BusPassengerBaseFragment.java   |  3 +++
 .../passenger/ui/BusPassengerMapDirectionView.java   |  1 +
 .../model/TaxiPassengerModelLoopManager.java         |  6 ++++--
 4 files changed, 17 insertions(+), 5 deletions(-)

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 044f2e3f72..c37b463947 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
@@ -37,11 +37,12 @@ public class BusPassengerModelLoopManager {
     }
 
     private Disposable mHeartbeatDisposable; //心跳轮询
-    private CompositeDisposable mRouteWipeDisposable = new CompositeDisposable();
-    private CompositeDisposable mCalculateRouteDisposable = new CompositeDisposable(); //每隔2s计算一次剩余里程和时间
+    private CompositeDisposable mRouteWipeDisposable;
+    private CompositeDisposable mCalculateRouteDisposable; //每隔2s计算一次剩余里程和时间
 
     public void startOrStopRouteAndWipe() {
         CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startOrStopRouteWipe()");
+        if (mRouteWipeDisposable != null) return;
         if (mRouteWipeDisposable == null){
             mRouteWipeDisposable = new CompositeDisposable();
         }
@@ -70,7 +71,10 @@ public class BusPassengerModelLoopManager {
     }
 
     public void stopOrStopRouteAndWipe() {
-          if (mRouteWipeDisposable != null) mRouteWipeDisposable.dispose();
+          if (mRouteWipeDisposable != null) {
+              mRouteWipeDisposable.dispose();
+              mRouteWipeDisposable = null;
+          }
     }
 
     public void startQueryDriverLineLoop() {
@@ -96,6 +100,7 @@ public class BusPassengerModelLoopManager {
 
     public void startCalculateRouteInfoLoop() {
         CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startCalculateRouteInfoLoop()");
+        if (mCalculateRouteDisposable != null) return;
         if (mCalculateRouteDisposable == null){
             mCalculateRouteDisposable = new CompositeDisposable();
         }
@@ -127,6 +132,7 @@ public class BusPassengerModelLoopManager {
         if (mCalculateRouteDisposable != null) {
             CallerLogger.INSTANCE.i(M_BUS_P + TAG, "stopCalculateRouteInfLoop()");
             mCalculateRouteDisposable.dispose();
+            mCalculateRouteDisposable = null;
         }
     }
 
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index 076e55c281..b509bc789d 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -107,13 +107,16 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
             if (currentIndex == 0){
                 mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init));
                 mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip_init));
+                mProgressBar.setVisibility(View.GONE);
                 return;
             }
             if (isArrived){
                 mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
                 mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
+                mProgressBar.setVisibility(View.GONE);
             }else {
                 mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_next_station_title));
+                mProgressBar.setVisibility(View.VISIBLE);
             }
         }
 
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 602792dfea..825d6a646c 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
@@ -299,6 +299,7 @@ public class BusPassengerMapDirectionView
 
     public void clearCoordinatesLatLng(){
         mCoordinatesLatLng.clear();
+        mLinePointsLatLng.clear();
     }
 
     public void onCreateView(Bundle savedInstanceState) {
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 1ce646c93c..39611e8df7 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 = new CompositeDisposable(); //轨迹擦除
+    private CompositeDisposable mRouteWipeDisposable; //轨迹擦除
     private Disposable mReadyToAutopilotDisposable; //轮询是否可开启自动驾驶
 
     public void startReadyToAutopilot() {
@@ -60,10 +60,11 @@ public class TaxiPassengerModelLoopManager {
     }
 
     public void startRouteAndWipe() {
+        CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startRouteAndWipe()");
+        if (mRouteWipeDisposable != null) return;
         if (mRouteWipeDisposable == null){
             mRouteWipeDisposable = new CompositeDisposable();
         }
-        CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startRouteAndWipe()");
         Disposable disposable = startLoopRouteAndWipe()
                 .doOnSubscribe(new Consumer<Disposable>() {
                     @Override
@@ -102,6 +103,7 @@ public class TaxiPassengerModelLoopManager {
         if (mRouteWipeDisposable != null) {
             CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopRouteAndWipe()");
             mRouteWipeDisposable.dispose();
+            mRouteWipeDisposable = null;
         }
     }