From f4aae0b6546b94fb61d8fb8388bbfd10c7fcd5e1 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 7 Jun 2022 18:05:22 +0800
Subject: [PATCH] =?UTF-8?q?[taxi/bus-d=20270]=20taxi/bus=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=A9=BE=E9=A9=B6=E5=8A=A8=E7=94=BBbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/fragment/BaseBusTabFragment.java    |  5 ++---
 .../java/com/mogo/och/bus/fragment/BusFragment.java  |  3 +++
 .../com/mogo/och/taxi/ui/BaseTaxiTabFragment.java    | 12 +++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index a9c9373c76..974c7b5103 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -448,8 +448,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         UiThreadHandler.postDelayed(new Runnable() {
             @Override
             public void run() { //未启动成功做处理
-                if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()
-                        != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING && isAnimateRunning){
+                if (isAnimateRunning){// 只判断动画是否在进行，根据自动驾驶当前状态去设置自动驾驶状态
                     stopAutopilotAnimation();
                     updateAutopilotStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState());
                 }
@@ -460,7 +459,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     /**
      * 停止自动驾驶中间动画
      */
-    private void stopAutopilotAnimation() {
+    protected void stopAutopilotAnimation() {
         if (autopilotLoadingAnimator != null) {
             autopilotLoadingAnimator.end();
             ctvAutopilotStatusIv.clearAnimation();
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
index 0f9e23c4d0..b8eaca09ab 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -253,6 +253,9 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
     @Override
     public void moveToEnd() {
         // 开启自动驾驶到下一站
+        if (isAnimateRunning){
+            stopAutopilotAnimation();
+        }
         mPresenter.autoDriveToNextStation(false);
     }
 
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 9ff20ab0e7..17fe9616a1 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -401,10 +401,16 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         UiThreadHandler.postDelayed(new Runnable() {
             @Override
             public void run() { //未启动成功10s后做处理
-                if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()
-                        != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING && isStarting){
-                    startAutopilotDone(false);
+                if (isStarting){ //判断动画是否在进行
+                    //并且根据状态来设置自动驾驶启动成功还是失败
+                    if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()
+                            == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
+                        startAutopilotDone(true);
+                    }else {
+                        startAutopilotDone(false);
+                    }
                 }
+
             }
         },TIMER_START_AUTOPILOT_INTERVAL);
     }