From c7e18bdd5e9dc59b0fb2d43c59f04801c67dae2b Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 12 Jul 2022 11:52:10 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi-d=20282]=201=E3=80=81taxi=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=8C=96=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=202=E3=80=81=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA20s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt     | 2 +-
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt
index 845e5bb961..cd34ecc455 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt
@@ -79,6 +79,6 @@ class TaxiConst {
          */
         const val TYPE_MARKER_TAXI_ORDER = "TYPE_MARKER_TAXI_ORDER"
 
-        const val TIMER_START_AUTOPILOT_INTERVAL = 10 * 1000L
+        const val TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L
     }
 }
\ No newline at end of file
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 f267c8125d..e63ac17938 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
@@ -829,6 +829,7 @@ public class TaxiModel {
                 && mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) {
             // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
+            CallerAutoPilotManager.INSTANCE.setDemoMode(true);
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）");
         }
     }
@@ -841,6 +842,7 @@ public class TaxiModel {
         if (FunctionBuildConfig.isDemoMode) {
             // 当美化模式（演示模式）开启时: 取消或订单已完成时，置false
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
+            CallerAutoPilotManager.INSTANCE.setDemoMode(false);
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（已完成or清除当前订单）");
         }
     }
@@ -1090,6 +1092,7 @@ public class TaxiModel {
                     if (FunctionBuildConfig.isDemoMode) {
                         // 当美化模式（演示模式）开启时: 订单对应自动驾驶开启后，置true
                         FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;
+                        CallerAutoPilotManager.INSTANCE.setDemoMode(true);
                         CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）");
                     }
                 } else if (mCurrentOCHOrder != null
@@ -1141,6 +1144,7 @@ public class TaxiModel {
             if (FunctionBuildConfig.isDemoMode) {
                 // 当美化模式（演示模式）开启时: 到达目的地，置false
                 FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false;
+                CallerAutoPilotManager.INSTANCE.setDemoMode(false);
                 CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）");
             }
         }