From 51ae94106bba66eb193d27496df12a5c95d3e5d5 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 12 Sep 2023 14:17:15 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=BF=90=E8=90=A5=E6=A8=A1=E5=BC=8F(?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E8=BF=98=E6=98=AF=E7=BE=8E=E5=8C=96),?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E7=BB=93=E6=9D=9F=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/task/TaxiTaskModel.kt    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index 17ea8c627c..d3dcbd8fc4 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -259,7 +259,7 @@ object TaxiTaskModel {
                 if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
                     DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_RUNNING，meaning=自动驾驶中")
                     mADASStatusCallback?.onAutopilotRunning()
-                    if ((QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder))) {
+                    if ((QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder))) {
                         TaxiAnalyticsManager.getInstance().triggerStartAutopilotEvent(
                             isRestartAutopilot,
                             true,
@@ -283,7 +283,7 @@ object TaxiTaskModel {
                     DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_ENABLE，meaning=可自动驾驶，人工干预状态")
                     if ((FunctionBuildConfig.isDemoMode
                                 && checkCurrentTaskCondition()
-                                && (QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder)
+                                && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder)
                                 || QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder))
                             )
                     ) {
@@ -295,7 +295,7 @@ object TaxiTaskModel {
                     DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_DISABLE，meaning=不可自动驾驶")
                     if ((FunctionBuildConfig.isDemoMode
                                 && checkCurrentTaskCondition()
-                                && (QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder)
+                                && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder)
                                 || QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder))
                             )
                     ) {
@@ -309,7 +309,7 @@ object TaxiTaskModel {
                     DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_PARALLEL_DRIVING，meaning=平行驾驶中")
                     if (FunctionBuildConfig.isDemoMode) {
                         if ((checkCurrentTaskCondition()
-                                    && (QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder)
+                                    && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder)
                                     || QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder))
                                 )
                         ) {  //订单中
@@ -1378,13 +1378,13 @@ object TaxiTaskModel {
 
         if (endSite != null) {
             if (QueryCurrentTaskRespBean.isStartTaskType(data)) {
-//                if (FunctionBuildConfig.isDemoMode) {
-//                    // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
-//                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
-//                    CallerAutoPilotControlManager.setIgnoreConditionDraw(true)
-//                    CallerAutoPilotControlManager.setIPCDemoMode(true)
-//                    d(TAG, "美化模式-ignore：置为true（更新本地order信息）")
-//                }
+                if (FunctionBuildConfig.isDemoMode) {
+                    // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
+                    FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
+                    CallerAutoPilotControlManager.setIgnoreConditionDraw(true)
+                    CallerAutoPilotControlManager.setIPCDemoMode(true)
+                    d(TAG, "美化模式-ignore：置为true（更新本地order信息）")
+                }
                 updateAutopilotControlParameters()
             }
             if (QueryCurrentTaskRespBean.isCompleteTaskType(data)) {