From e1f67cdf8f62c0e92fb49081c155379f6cf9cc1c Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 2 Aug 2023 19:18:02 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20[bus=20=E8=87=AA=E9=A9=BE=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=E5=90=AF=E5=8A=A8=E8=87=AA?=
 =?UTF-8?q?=E9=A9=BE=20=E4=BD=86=E6=98=AF=E4=B8=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/model/OrderModel.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
index bb99b9c96c..ad92e2fc57 100644
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
@@ -647,6 +647,10 @@ public class OrderModel {
      */
     private void startAutopilot(boolean isRestart, int leaveIndex) {
 
+
+        // 非自驾状态---->预写日志---->  启动自驾 ---> 自驾启动成功 ----> 上报日志
+        // 　自驾状态---->启动自驾 ---> 自驾启动成功
+
         //根据开关和后台是否发布轨迹启动自驾
         if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(busRoutesResult.csvFileUrl)
                 && TextUtils.isEmpty(busRoutesResult.csvFileUrlDPQP)){
@@ -661,12 +665,6 @@ public class OrderModel {
         CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " +
                 FunctionBuildConfig.isPassStartAutopilotCommand);
 
-        if(CallerAutoPilotStatusListenerManager.INSTANCE.getState()
-                == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
-            ToastUtils.showShort("自驾中、请勿重复启动");
-            return;
-        }
-
 
         if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) {
             ToastUtils.showLong(OCHAdasAbilityManager.getInstance().getAutopilotUnAbilityReason() +
@@ -677,7 +675,10 @@ public class OrderModel {
 
         firstStartAutopilot++;
 
-        triggerStartServiceEvent(isRestart, false);
+        if(CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
+            // 预写日志
+            triggerStartServiceEvent(isRestart, false);
+        }
 
         AutopilotControlParameters parameters = initAutopilotControlParameters(leaveIndex);
         if (null == parameters) {