From 3fff1f476523a3327dcf6e7483938ec36589400d Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Tue, 10 May 2022 16:05:20 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=20d=20v2.7.0]=E5=88=B0=E8=BE=BE=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=97=B6=EF=BC=9A=E7=BE=8E=E5=8C=96=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E7=BB=98=E5=88=B6=E5=BC=95=E5=AF=BC=E7=BA=BF=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BAfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/bus/model/BusOrderModel.java    | 2 +-
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index 33515d6cb1..5c28ba04bf 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -846,7 +846,7 @@ public class BusOrderModel {
             CallerLogger.INSTANCE.e( M_BUS + TAG, "到站异常，取消后续操作结束" );
             return;
         }
-        if (FunctionBuildConfig.isDemoMode && currentStationIndex == stationList.size() - 1){//到达最后一站结束美化
+        if (FunctionBuildConfig.isDemoMode && currentStationIndex == stationList.size() - 1) {//到达最后一站结束美化
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false（到最后一站）");
         }
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 2e813280c0..b0219a8d33 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
@@ -763,7 +763,7 @@ public class TaxiModel {
         if (FunctionBuildConfig.isDemoMode) {
             // 当美化模式（演示模式）开启时: 取消或订单已完成时，置false
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-            CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（清除当前订单）");
+            CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（已完成or清除当前订单）");
         }
     }
 
@@ -1042,6 +1042,11 @@ public class TaxiModel {
                 // TipToast.shortTip("到达目的地");
             }
             updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtEnd);
+            if (FunctionBuildConfig.isDemoMode) {
+                // 当美化模式（演示模式）开启时: 到达目的地，置false
+                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
+                CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）");
+            }
         }
     };
     private final IMoGoAutopilotPlanningListener moGoAutopilotPlanningListener = new IMoGoAutopilotPlanningListener() {