From 02ec76d2c792c98fa1b1e261dc59bf028d2f47fa Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Thu, 27 Jan 2022 17:13:41 +0800
Subject: [PATCH] =?UTF-8?q?[Bus/TaxiDriver=20v2.5.1]OCH:=20=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BAapp=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=E3=80=81=E9=80=9A=E7=9F=A5=E9=B9=B0=E7=9C=BC?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E7=BA=BF=E7=BB=98=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/model/MogoOCHTaxiModelNew.java   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
index b5459bd818..40d7277887 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
@@ -17,6 +17,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener;
@@ -702,12 +703,21 @@ public class MogoOCHTaxiModelNew {
         mCurrentOCHOrder = data;
         SharedPrefsMgr.getInstance(mContext).putString(OCHTaxiConst.SP_KEY_OCH_TAXI_ORDER,
                 GsonUtil.jsonFromObject(data));
+        if (FunctionBuildConfig.isDemoMode
+                && mCurrentOCHOrder.orderStatus == OrderStatusEnum.OnTheWayToEndStation.getCode()) {
+            // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
+            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
+        }
     }
 
     //清除订单信息
     public void clearCurrentOCHOrder() {
         mCurrentOCHOrder = null;
         SharedPrefsMgr.getInstance(mContext).remove(OCHTaxiConst.SP_KEY_OCH_TAXI_ORDER);
+        if (FunctionBuildConfig.isDemoMode) {
+            // 当美化模式（演示模式）开启时: 取消或订单已完成时，置false
+            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
+        }
     }
 
     //检测当前订单
@@ -936,12 +946,28 @@ public class MogoOCHTaxiModelNew {
                     // 当高频返回autopilot 2时，不重复调用订单状态变更
                     mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态
                     updateOCHOrderStatus(OrderStatusEnum.OnTheWayToEndStation);
+                    if (FunctionBuildConfig.isDemoMode) {
+                        // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
+                        FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
+                    }
                 }
             } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
                 mPrevAPStatus = state;
+                if (FunctionBuildConfig.isDemoMode
+                        && checkCurrentOCHOrder()
+                        && getCurOrderStatus() == OrderStatusEnum.OnTheWayToEndStation) {
+                    // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
+                    return;
+                }
                 if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable();
             } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
                 mPrevAPStatus = state;
+                if (FunctionBuildConfig.isDemoMode
+                        && checkCurrentOCHOrder()
+                        && getCurOrderStatus() == OrderStatusEnum.OnTheWayToEndStation) {
+                    // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
+                    return;
+                }
                 if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable();
             }
         }