From b659233d005ad7fbde789ea4c5af16c6adb94b22 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 23 Aug 2022 17:49:28 +0800
Subject: [PATCH] =?UTF-8?q?[2.10.0]taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/model/TaxiModel.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 160fe20f3f..1e774098a4 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1166,11 +1166,16 @@ public class TaxiModel {
                 mPrevAPStatus = state;
 
             }else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){
-                if (FunctionBuildConfig.isDemoMode
-                        && checkCurrentOCHOrder()
-                        && (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
-                            || getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
-                    // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
+                if (FunctionBuildConfig.isDemoMode){
+                    if (checkCurrentOCHOrder()
+                            && (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
+                            || getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)){//订单中
+                        // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
+                    }else { //美化模式下没订单，显示人工驾驶
+                        if (mADASStatusCallback != null){
+                            mADASStatusCallback.onAutopilotDisable();
+                        }
+                    }
                     return;
                 }
                 if (state != mPrevAPStatus && mADASStatusCallback != null){