From b59997f2bce8ee0516707d2d11b65ad38ba22419 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 18 Dec 2024 11:37:07 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.4]=20[fea]=20[fsm=20orderId=20=E5=92=8Coch?=
 =?UTF-8?q?=E4=B8=8A=E5=B1=82=E4=BF=9D=E5=AD=98=E7=9A=84=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OchAutoPilotStatusListenerManager.kt      |  7 ++++++
 .../och/bridge/autopilot/line/LineManager.kt  | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt
index db07b47f75..c435372d77 100644
--- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt
+++ b/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
     }
 
     /**
diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
index 0a3806c0cf..25db968812 100644
--- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
+++ b/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)
+//                }
+            }
+        }
+    }
+
 }
\ No newline at end of file