From 164c2eddeedeb54e59eb58184c22f39a03952faa Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 12 Aug 2022 20:41:49 +0800
Subject: [PATCH] =?UTF-8?q?[290]=20taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=B0=E7=AB=99=E6=97=B6=E5=B9=B6=E5=9C=A8?=
 =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=A9=BE=E9=A9=B6=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E8=87=AA=E9=A9=BE=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 9fcb3da37c..0e2c7f5ea3 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
@@ -1143,7 +1143,8 @@ public class TaxiModel {
             } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
                 if (FunctionBuildConfig.isDemoMode
                         && checkCurrentOCHOrder()
-                        && getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) {
+                        && (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
+                        || getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
                     // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
                     return;
                 }
@@ -1154,7 +1155,8 @@ public class TaxiModel {
             } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
                 if (FunctionBuildConfig.isDemoMode
                         && checkCurrentOCHOrder()
-                        && getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) {
+                        && (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
+                        || getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
                     // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
                     return;
                 }
@@ -1166,7 +1168,8 @@ public class TaxiModel {
             }else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){
                 if (FunctionBuildConfig.isDemoMode
                         && checkCurrentOCHOrder()
-                        && getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) {
+                        && (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
+                            || getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
                     // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
                     return;
                 }