[6.6.2]

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

@@ -68,6 +68,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerColdStartStateListenerM
 import com.mogo.eagle.core.function.call.autopilot.CallerFaultManagementStateListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerFsm2024ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerLocalizationStateListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerNodeStateListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingActionsListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager.invokePNCActions
@@ -79,7 +80,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerRoboBusJinlvM1StitchedV
 import com.mogo.eagle.core.function.call.autopilot.CallerStartAutopilotFailedListenerManager.invokeStartAutopilotFailed
 import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCleanSystemListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCloudTaskListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerNodeStateListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerTakeoverListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerV2nNioEventListenerManager
@@ -992,8 +992,19 @@ class MoGoAdasListenerImpl : OnAdasListener {
      * @param sysTime           当前时间戳
      * @param bigTaskActionPush 数据
      */
-    override fun onSweeperFutianCloudTaskCloudSuspendResume(header: MessagePad.Header, messageType: AiCloudTask.MessageType, reqNo: String?, sysTime: Long, bigTaskActionPush: SweeperTaskCloudSuspendResume.BigTaskActionPush?) {
+    override fun onSweeperFutianCloudTaskCloudSuspendResume(
-        CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskCloudSuspendResume(messageType, reqNo, sysTime, bigTaskActionPush)
+        header: MessagePad.Header,
+        messageType: AiCloudTask.MessageType,
+        reqNo: String?,
+        sysTime: Long,
+        bigTaskActionPush: SweeperTaskCloudSuspendResume.BigTaskActionPush?
+    ) {
+        CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskCloudSuspendResume(
+            messageType,
+            reqNo,
+            sysTime,
+            bigTaskActionPush
+        )
     }
 
     /**
@@ -1251,9 +1262,19 @@ class MoGoAdasListenerImpl : OnAdasListener {
             if (stateInfo.nodeName == AdasConstants.NodeName.SSM) {
                 //域控SSM接口接收是否超时
                 if (stateInfo.existState == NodeExistState.NODE_EXIST_TIMEOUT) {
-                    CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.SSMINFO, SSMMsg(0, "连接超时", "SSM超时无响应", System.currentTimeMillis())))
+                    CallerMsgBoxManager.saveMsgBox(
+                        MsgBoxBean(
+                            MsgBoxType.SSMINFO,
+                            SSMMsg(0, "连接超时", "SSM超时无响应", System.currentTimeMillis())
+                        )
+                    )
                 } else {
-                    CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.SSMINFO, SSMMsg(0, "连接恢复", "SSM连接恢复", System.currentTimeMillis())))
+                    CallerMsgBoxManager.saveMsgBox(
+                        MsgBoxBean(
+                            MsgBoxType.SSMINFO,
+                            SSMMsg(0, "连接恢复", "SSM连接恢复", System.currentTimeMillis())
+                        )
+                    )
                 }
             } else if (stateInfo.nodeName == AdasConstants.NodeName.FSM2024) {
                 //域控FSM接口接收是否超时

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt

@@ -299,7 +299,7 @@ object FunctionBuildConfig {
     var isShowBagRecordWindow = true
 
     /**
-     * 融合模式(int) 1:全融合模式 2:盲区模式 3:超视距模式 4:透传模式 5:纯路侧模式，默认1
+     * 融合模式(int) 1:全融合模式 2:盲区模式 3:超视距模式 4:透传模式 5:纯路侧模式，默认2
      * /telematics/fusion/fusion_mode
      */
     @Volatile