Merge branch 'dev_robotaxi-d_250117_6.10.0' into dev_robotaxi-d_241210_6.10.0_yyk

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt

@@ -824,18 +824,16 @@ class MoGoAdasListenerImpl : OnAdasListener {
         autopilotMode: Int
     ) {
         CallerFsm2024ListenerManager.invokeFSM2024State(fsmState)
-//        val mode: Int = if (fsmState.functionState != Fsm2024.State.ACTIVE) {
-//            0//人工驾驶
-//        } else {
-//            if (fsmState.activeMode == Fsm2024.ActiveMode.PILOT_ACTIVE) {
-//                1//自动驾驶
-//            } else if (fsmState.activeMode == Fsm2024.ActiveMode.PARALLEL_ACTIVE || fsmState.activeMode.number == 6) {
-//                6//远程驾驶
-//            } else {
-//                0//人工驾驶
-//            }
-//        }
-        updateAutoPilotStatus(2, autopilotState, autopilotMode)
+        //M1方向盘驾驶状态转为非自动驾驶状态
+        var mode = autopilotMode
+        if (autopilotMode == 9) {
+            mode = 0
+        }
+        var state = autopilotState
+        if (autopilotState == 10) {
+            state = 1
+        }
+        updateAutoPilotStatus(2, state, mode)
     }
 
     /**