[6.4.0]

[启动自驾 拦截顺序整理]

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -37,16 +37,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.*
-import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
-import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox
-import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.registerSocketMessageListener
-import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.releaseSocketMessageListener
-import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
-import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.startLoopAbnormalFactors
-import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.stopLoopAbnormalFactors
+import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
@@ -55,6 +48,12 @@ import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
 import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager
+import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.startLoopAbnormalFactors
+import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.stopLoopAbnormalFactors
+import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
+import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox
+import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.registerSocketMessageListener
+import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.releaseSocketMessageListener
 import com.mogo.och.common.module.manager.socket.cloud.data.OperateDoorMsg
 import com.mogo.och.common.module.manager.socket.cloud.data.OrderCloseMsg
 import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg
@@ -65,6 +64,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.manager.socket.lan.bean.DPOrderClosedMsg
 import com.mogo.och.common.module.manager.stopside.StopSideManager
+import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.*
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.data.bean.*
@@ -479,14 +479,7 @@ class DriverM1Model {
      * @param isRestart
      */
     private fun startAutopilot() {
-        if (!OCHAdasAbilityManager.getInstance().autopilotAbilityStatus) {
-            ToastUtils.showLong(
-                OCHAdasAbilityManager.getInstance().autopilotUnAbilityReason +
-                        ", 请稍候重试"
-            )
-            triggerUnableStartAPReasonEvent()
-            return
-        }
+        //判断轨迹Id是否可用
         mCurrentRoute?.let {
             //根据开关和后台是否发布轨迹启动自驾
             if (FunctionBuildConfig.isPassStartAutopilotCommand
@@ -502,9 +495,20 @@ class DriverM1Model {
                 return
             }
         }
+        // 6个条件判断
         if (!CallerAutoPilotControlManager.isCanStartAutopilot(true)) {
             return
         }
+        // ssm 给出数据
+        if (!OCHAdasAbilityManager.getInstance().autopilotAbilityStatus) {
+            ToastUtils.showLong(
+                OCHAdasAbilityManager.getInstance().autopilotUnAbilityReason +
+                        ", 请稍候重试"
+            )
+            triggerUnableStartAPReasonEvent()
+            return
+        }
+
         triggerStartServiceEvent(false, false)
         val parameters = initAutopilotControlParameters()
         if (null == parameters) {