From 38fd24eb9dcba332c7dfefc7aae906815ccda96a Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Thu, 27 Jan 2022 17:11:08 +0800
Subject: [PATCH] =?UTF-8?q?[TaxiPassengerV1.0.0]OCH:=20taxi=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2app=E5=A2=9E=E5=8A=A0=E7=BE=8E=E5=8C=96=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=97=B6'=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6icon'?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/MogoOCHTaxiModelNew.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java
index 91427ad8da..3f18527f57 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java
@@ -926,6 +926,8 @@ public class MogoOCHTaxiModelNew {
     }
     private IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){
 
+        private boolean arriveAtEnd = false; //乘客app专用字段
+
         @Override
         public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) {
             if (autopilotStatusInfo == null) return;
@@ -942,9 +944,31 @@ public class MogoOCHTaxiModelNew {
                 }
             } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
                 mPrevAPStatus = state;
+
+                if (FunctionBuildConfig.isDemoMode
+                        && FunctionBuildConfig.appIdentityMode == 1) {
+                    // 当美化模式（演示模式）开启时：且是乘客app、且未到终点时，维持自动驾驶icon开启状态
+                    if (!arriveAtEnd) {
+                        return;
+                    } else {
+                        arriveAtEnd = false;
+                    }
+                }
+
                 if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable();
             } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
                 mPrevAPStatus = state;
+
+                if (FunctionBuildConfig.isDemoMode
+                        && FunctionBuildConfig.appIdentityMode == 1) {
+                    // 当美化模式（演示模式）开启时：且是乘客app、且未到终点时，维持自动驾驶icon开启状态
+                    if (!arriveAtEnd) {
+                        return;
+                    } else {
+                        arriveAtEnd = false;
+                    }
+                }
+
                 if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable();
             }
         }
@@ -961,6 +985,11 @@ public class MogoOCHTaxiModelNew {
 
         @Override
         public void onAutopilotArriveAtStation(@Nullable AutopilotStationInfo data) {
+            if (FunctionBuildConfig.isDemoMode
+                    && FunctionBuildConfig.appIdentityMode == 1) {
+                arriveAtEnd = true;
+            }
+
             if (data == null || !checkCurrentOCHOrder()
                     || (getCurOrderStatus() == OrderStatusEnum.ArriveAtEndStation)) {
                 return;