From acbf2106cf414d7e8c60aec88b4f4a482b7830af Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 9 Aug 2022 16:43:46 +0800
Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi]=E4=BF=AE=E5=A4=8D=E7=BE=8E?=
 =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/bus/model/BusOrderModel.java   | 6 +++---
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java  | 8 ++++----
 2 files changed, 7 insertions(+), 7 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 d98bdd536a..d875ea8929 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
@@ -682,7 +682,7 @@ public class BusOrderModel {
     private void closeBeautificationMode() {
         if (FunctionBuildConfig.isDemoMode) {//收车结束美化
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-            CallerAutoPilotManager.INSTANCE.setDemoMode(false);
+            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false（收车）");
         }
     }
@@ -801,7 +801,7 @@ public class BusOrderModel {
                 && backgroundCurrentStationIndex <= stationList.size()-1)
                 && stationList.get(backgroundCurrentStationIndex).isLeaving()){//行驶过程中设置美化
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
-            CallerAutoPilotManager.INSTANCE.setDemoMode(true);
+            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）");
         }
 
@@ -941,7 +941,7 @@ public class BusOrderModel {
 
         if (FunctionBuildConfig.isDemoMode && backgroundCurrentStationIndex <= stationList.size() - 1) {//到达一站结束美化
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-            CallerAutoPilotManager.INSTANCE.setDemoMode(false);
+            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
             CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false（到最后一站）");
         }
         CallerLogger.INSTANCE.d( M_BUS + TAG, "到站====currentStationIndex=" + backgroundCurrentStationIndex);
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 b5c057b931..0f4b553e09 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
@@ -832,7 +832,7 @@ public class TaxiModel {
                 && mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) {
             // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
-            CallerAutoPilotManager.INSTANCE.setDemoMode(true);
+            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
         }
     }
@@ -846,7 +846,7 @@ public class TaxiModel {
         if (FunctionBuildConfig.isDemoMode) {
             // 当美化模式（演示模式）开启时: 取消或订单已完成时，置false
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-            CallerAutoPilotManager.INSTANCE.setDemoMode(false);
+            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（已完成or清除当前订单）");
         }
     }
@@ -1135,7 +1135,7 @@ public class TaxiModel {
                         if (FunctionBuildConfig.isDemoMode) {
                             // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
                             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
-                            CallerAutoPilotManager.INSTANCE.setDemoMode(true);
+                            CallerAutoPilotManager.INSTANCE.setIPCDemoMode(true);
                             CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）");
                         }
                     }
@@ -1190,7 +1190,7 @@ public class TaxiModel {
             if (FunctionBuildConfig.isDemoMode) {
                 // 当美化模式（演示模式）开启时: 到达目的地，置false
                 FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
-                CallerAutoPilotManager.INSTANCE.setDemoMode(false);
+                CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
                 CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）");
             }
         }