From 39b9d10162595b20da01c6efe127a7ca17fdfa8c Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 13 Jul 2022 14:44:31 +0800
Subject: [PATCH] =?UTF-8?q?[bus=20=E5=8F=B8=E6=9C=BA=E5=B1=8F]=20=E7=BE=8E?=
 =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/model/BusOrderModel.java | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 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 bddebb2e4d..dffee2123e 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
@@ -608,6 +608,7 @@ public class BusOrderModel {
             @Override
             public void onSuccess(BaseData o) {
                 mIsWorking = !mIsWorking;
+                closeBeautificationMode();
                 carOperationStatusCallback.changeOperationStatus(isWorking());
                 startOrStopOrderLoop(mIsWorking);
                 BusTrajectoryManager.getInstance().stopTrajReqLoop();
@@ -623,6 +624,17 @@ public class BusOrderModel {
         });
     }
 
+    /**
+     * 关闭美化模式
+     */
+    private void closeBeautificationMode() {
+        if (FunctionBuildConfig.isDemoMode) {//收车结束美化
+            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
+            CallerAutoPilotManager.INSTANCE.setDemoMode(false);
+            CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false（收车）");
+        }
+    }
+
     /**
      * 出车
      */
@@ -725,9 +737,9 @@ public class BusOrderModel {
             arriveSiteStation(true);
         }
         // 美化是否开始
-        if (FunctionBuildConfig.isDemoMode && ((currentStationIndex > 0
-                && currentStationIndex < stationList.size()-1)
-                || (stationList.get(0).isLeaving() || stationList.get(stationList.size() -1).isLeaving()))){//行驶过程中设置美化
+        if (FunctionBuildConfig.isDemoMode && (currentStationIndex >= 0
+                && currentStationIndex <= stationList.size()-1)
+                && stationList.get(currentStationIndex).isLeaving()){//行驶过程中设置美化
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
             CallerAutoPilotManager.INSTANCE.setDemoMode(true);
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）");
@@ -867,7 +879,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;
             CallerAutoPilotManager.INSTANCE.setDemoMode(false);
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false（到最后一站）");