From 09480f51628e0622efe6f0415f11376406d24260 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 20 Sep 2023 15:52:19 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20=E6=A0=B9=E6=8D=AE=E8=87=AA=E9=A9=BE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E5=8C=96=E6=89=8D=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91,=20=E5=8E=BB=E9=99=A4preAutopilotSt?=
 =?UTF-8?q?atus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/presenter/TaxiPresenter.java   | 10 +---------
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java    | 16 ++--------------
 .../mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt | 10 ++--------
 .../com/mogo/och/taxi/ui/base/TaxiPresenter.java | 12 ++----------
 4 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
index 112190771e..960428b09d 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
@@ -48,8 +48,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
 
     private static final String TAG = TaxiPresenter.class.getSimpleName();
 
-    private int preAutopilotStatus = 0;
-
     public TaxiPresenter(TaxiFragment view) {
         super(view);
         TaxiModel.getInstance().init(AbsMogoApplication.getApp());
@@ -192,30 +190,24 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
     public void onAutopilotEnable() {
         runOnUIThread(() -> mView.updateAutopilotStatus(
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE));
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE;
     }
 
     @Override
     public void onAutopilotDisable() {
         runOnUIThread(() -> mView.updateAutopilotStatus(
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE));
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE;
     }
 
     @Override
     public void onAutopilotRunning() {
-        if (preAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
-            runOnUIThread(() -> mView.updateAutopilotStatus(
+        runOnUIThread(() -> mView.updateAutopilotStatus(
                     IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING));
-        }
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING;
     }
 
 
     @Override
     public void onManMachineCoDriving() {
         runOnUIThread(() -> mView.onManMachineCoDriving(IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING));
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING;
     }
 
     @Override
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 8f34ee8a99..2052aee8c9 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -331,21 +331,13 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     public void onBagManagerResult(@NonNull BagManagerOuterClass.BagManager bagManager) {
     }
 
-    /**
-     * 改变自动驾驶状态
-     *
-     * @param status 2 - running  1 - enable  2 - disable
-     */
-    private int mPrevAPStatus = -1;
-
     public void onAutopilotStatusChanged(int status) {
         getActivity().runOnUiThread(() -> {
             if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status) {
                 // 1. 主动开启自动驾驶中，不为2（为0、1）则继续loading
                 return;
             }
-            if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status
-                    && mPrevAPStatus != status) {
+            if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) {
                 // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false
                 startAutopilotDone(true);
                 return;
@@ -353,7 +345,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             // 3. 其他过程直接更新
             startOrStopLoadingAnim(false);
             autopilotStatusAnimchanged(status);
-            mPrevAPStatus = status;
         });
     }
 
@@ -363,10 +354,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     }
 
     public void onManMachineCoDriving(int manMachineCoDriving) {
-        if (mPrevAPStatus != manMachineCoDriving) {
-            autopilotStatusAnimchanged(manMachineCoDriving);
-        }
-        mPrevAPStatus = manMachineCoDriving;
+        autopilotStatusAnimchanged(manMachineCoDriving);
     }
 
     public void updateCtvAutopilotStatusTag(boolean tag) {
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
index 5fbb56c5db..318844a452 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
@@ -288,8 +288,6 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
         super.onDestroy()
     }
 
-    private var mPreAutoPilotStatus = -1
-
     /**
      * 改变自动驾驶状态
      *
@@ -301,7 +299,7 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
                 // 1. 主动开启自动驾驶中，不为2（为0、1）则继续loading
                 return@runOnUiThread
             }
-            if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status && mPreAutoPilotStatus != status
+            if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status
             ) {
                 // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false
                 startAutopilotDone(true)
@@ -310,7 +308,6 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
             // 3. 其他过程直接更新
             startOrStopLoadingAnim(false)
             updateAutopilotBtnByStatus(status)
-            mPreAutoPilotStatus = status
         })
     }
 
@@ -326,10 +323,7 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
      * 平行驾驶 【开启自动驾驶按钮】 更新
      */
     fun onParallelDrivingStatus(parallelDrivingValue: Int) {
-        if (mPreAutoPilotStatus != parallelDrivingValue) {
-            updateAutopilotBtnByStatus(parallelDrivingValue)
-        }
-        mPreAutoPilotStatus = parallelDrivingValue
+        updateAutopilotBtnByStatus(parallelDrivingValue)
     }
 
     private fun updateCtvAutopilotStatusTag(tag: Boolean) {
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java
index 128ecc72e1..f33af0258c 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java
@@ -33,8 +33,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
 
     private static final String TAG = TaxiPresenter.class.getSimpleName();
 
-    private int preAutopilotStatus = 0;
-
     public TaxiPresenter(TaxiFragment view) {
         super(view);
         TaxiTaskModel.INSTANCE.init();
@@ -103,29 +101,23 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
     public void onAutopilotEnable() {
         runOnUIThread(() -> mView.updateAutopilotStatus(
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE));
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE;
     }
 
     @Override
     public void onAutopilotDisable() {
         runOnUIThread(() -> mView.updateAutopilotStatus(
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE));
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE;
     }
 
     @Override
     public void onAutopilotRunning() {
-        if (preAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
-            runOnUIThread(() -> mView.updateAutopilotStatus(
-                    IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING));
-        }
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING;
+        runOnUIThread(() -> mView.updateAutopilotStatus(
+                IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING));
     }
 
     @Override
     public void onParallelDrivingStatus() {
         runOnUIThread(() -> mView.onParallelDrivingStatus(IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING));
-        preAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING;
     }
 
     @Override