From f49a77cb391a4ef2be5b15952bf057d453505477 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 13 Nov 2023 16:20:25 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0]=20=E4=BF=AE=E5=A4=8Dmogo=20Taxi?=
 =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=81=B6=E7=8E=B0?=
 =?UTF-8?q?=E5=88=B0=E7=AB=99=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8D=E6=81=A2=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/callback/ITaxiADASStatusCallback.java    | 2 ++
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java   | 3 +++
 .../java/com/mogo/och/taxi/presenter/TaxiPresenter.java    | 7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java
index 278829580f..1a993dfead 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java
@@ -21,6 +21,8 @@ public interface ITaxiADASStatusCallback {
     //人机共驾
     void onManMachineCoDriving();
 
+    void updateAutopilotStatus();
+
     //自驾返回失败
     void onStartAdasFailure();
 }
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index b2ce0b60f2..af7abe0e9c 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -849,6 +849,9 @@ public class TaxiModel {
             if (FunctionBuildConfig.isDemoMode) {
                 CallerLogger.d(M_TAXI + TAG, "setIPCDemoMode：false");
                 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);
+                if (mADASStatusCallback != null) {
+                    mADASStatusCallback.updateAutopilotStatus();
+                }
             }
 
             clearAutopilotControlParameters();
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 960428b09d..bda55a99f0 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
@@ -13,6 +13,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -210,6 +211,12 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         runOnUIThread(() -> mView.onManMachineCoDriving(IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING));
     }
 
+    @Override
+    public void updateAutopilotStatus() {
+        runOnUIThread(() -> mView.updateAutopilotStatus(
+                CallerAutoPilotStatusListenerManager.INSTANCE.getState()));
+    }
+
     @Override
     public void onStartAdasFailure() {
         runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus());