From 959f0bafab433325ea2c466a210ce349ab288728 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 18 Oct 2022 12:06:20 +0800
Subject: [PATCH] =?UTF-8?q?[2.11.0]=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8Cbus=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=88=B0?=
 =?UTF-8?q?=E8=BE=BE=E4=B8=AD=E9=97=B4=E7=AB=99=EF=BC=8C=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E7=BB=98=E5=88=B6=E4=B8=8D=E4=BC=A0false,=E4=B9=98=E5=AE=A2?=
 =?UTF-8?q?=E5=B1=8F=E5=90=8C=E6=AD=A5=E4=B8=8D=E4=BC=A0false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/model/BusOrderModel.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 ac7140a5f2..4e9f1e8fb4 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
@@ -674,9 +674,9 @@ public class BusOrderModel {
     public void closeBeautificationMode() {
         Logger.d("Route", "BusOrderModel -> closeBeautificationMode ==> isDemoMode:" + FunctionBuildConfig.isDemoMode);
         if (FunctionBuildConfig.isDemoMode) {//收车结束美化
-            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-            CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false);
-            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
+            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; //是否强制绘制引导线
+            CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false);// 同步给乘客屏
+            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false");
         }
     }
@@ -745,9 +745,13 @@ public class BusOrderModel {
             if (stationList.get(backgroundCurrentStationIndex).isLeaving()){
                 startBeautificationMode();
                 CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）");
-            }else {
+            }else if (backgroundCurrentStationIndex >0 && backgroundCurrentStationIndex < stationList.size()-1){
+                //美化模式下 中间站点到站 引导线要一直绘制，所以此处不出强制绘制不传false
+                CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
+                CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）");
+                clearStartAutopilotTag();
+            }else{
                 closeBeautificationMode();
-                CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：false（到站）");
                 clearStartAutopilotTag();
             }
         }