[6.8.4]

[fea]
[fsm orderId 和och上层保存的不同]

OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt

@@ -54,6 +54,12 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene
         }
     }
 
+    private var _orderIdFromFSM:String? by Delegates.observable("") { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+            LineManager.compareFSMAndOchOrderId(newValue)
+        }
+    }
+
     val canStartAutopilotFromFSM:Boolean
         get() = _canStartAutopilotFromFSM
 
@@ -252,6 +258,7 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene
     override fun onFSM2024State(fsmState: Fsm2024.FSMStateMsg) {
         fsmBackSessionId.set(fsmState.failToPilotSessionId)
         _canStartAutopilotFromFSM = fsmState.pilotStandbyFlag
+        _orderIdFromFSM = fsmState.orderId
     }
 
     /**

OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt

@@ -556,4 +556,26 @@ object LineManager : CallerBase<ILineCallback>() {
         }
     }
 
+    fun compareFSMAndOchOrderId(autopilotIdFromFsm: String?) {
+        if(autopilotIdFromFsm == autopilotId){
+            // 地盘有和上层一样 不用操作
+        }else{
+            if(autopilotIdFromFsm.isNullOrEmpty()){
+                // 地盘没有 不做操作
+            }else{
+                // 地盘有但是和och出不一样
+                // todo 需要och 重新出发轨迹下载操作
+                ToastUtils.showShort("${autopilotIdFromFsm}_${autopilotId}_自动驾驶id不同请排查")
+                OchChainLogManager.writeChainLogAutopilot("自驾Id","${autopilotIdFromFsm}_${autopilotId}_自动驾驶id不同请排查")
+//                val initAutopilotControlParameters = initAutopilotControlParameters()
+//                if (initAutopilotControlParameters!==null&&initAutopilotControlParameters.autoPilotLine!=null
+//                    && contraiInfo!=null
+//                ) {
+//                    CallerAutoPilotControlManager.sendTrajectoryDownloadReq(initAutopilotControlParameters.autoPilotLine!!,
+//                        contraiInfo!!.source, autopilotId)
+//                }
+            }
+        }
+    }
+
 }