调试窗

状态中心增加工控机连接异常原因

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

@@ -44,8 +44,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort =
                 AdasManager.getInstance().ipcConnectedPort
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = true
-            CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus()
-
             // 同步SN给工控机
             syncBasicInfoToAutopilot()
             // 开启轮询上传自动驾驶状态
@@ -69,7 +67,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
             mCurrentAutopilotSpeed = 0.0f
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state = 0
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode = 0
-            CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus()
         } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTING) {
             CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在连接")
         } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.SEARCH_ADDRESS) {
@@ -77,6 +74,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
         } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.NOT_FOUND_ADDRESS) {
             CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用")
         }
+        CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatusDescribe=reason
+        CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus()
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -1477,11 +1477,17 @@ class DebugSettingView @JvmOverloads constructor(
         )
 
         tvAutopilotConnectStatus.text = Html.fromHtml(
-            "Autopilot系统连接状态：${
+            "工控机连接状态：${
                 if (AppConfigInfo.isConnectAutopilot) {
                     "<font color='blue'>正常"
                 } else {
-                    "<font color='red'>异常"
+                    "<font color='red'>异常 原因：${
+                        if(AppConfigInfo.connectStatusDescribe.isNullOrEmpty()){
+                            "主动断开连接"
+                        }else{
+                            AppConfigInfo.connectStatusDescribe
+                        }
+                    }"
                 }
             }"
         )
@@ -1578,14 +1584,16 @@ class DebugSettingView @JvmOverloads constructor(
     override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
         mAutoPilotStatusInfo = autoPilotStatusInfo
         AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
-        if (autoPilotStatusInfo.connectStatus) {
-            adasConnectStatus = true
-        }
+        AppConfigInfo.connectStatusDescribe = autoPilotStatusInfo.connectStatusDescribe
+
+//        if (autoPilotStatusInfo.connectStatus) {
+//            adasConnectStatus = true
+//        }
         //ADAS断开连接，提示异常
-        if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) {
-            adasConnectStatus = false
-            toastMsg("Autopilot系统连接状态异常")
-        }
+//        if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) {
+//            adasConnectStatus = false
+//            toastMsg("工控机连接断开")
+//        }
     }
 
     override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt

@@ -50,6 +50,9 @@ object AppConfigInfo {
     // 是否连接工控机
     var isConnectAutopilot: Boolean = false
 
+    //连接工控机状态文字描述
+    var connectStatusDescribe: String? = null
+
     // 是否OBU
     var isConnectObu: Boolean = false
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt

@@ -20,6 +20,10 @@ class AutopilotStatusInfo : Serializable {
      */
     var connectPort: Int = 4110
     var connectStatus = false
+    /**
+     * 工控机连接状态文字描述
+     */
+    var connectStatusDescribe: String? = null
     var version: String? = null
 
     /**