[640][系统监控] 添加系统监控接口线路下载状态线路ID解析，添加带有线路ID的回调

OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java

@@ -247,6 +247,11 @@ public class BusPresenter extends Presenter<BusFragment>
         BusTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo);
     }
 
+    @Override
+    public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo, long lineId) {
+
+    }
+
     @Override
     public void onAutopilotIpcConnectStatusChanged(@NonNull AdasConstants.IpcConnectionStatus status, @Nullable String reason) {
     }

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/IOchAutopilotStatusListener.kt

@@ -34,10 +34,15 @@ interface IOchAutopilotStatusListener {
     fun onAutopilotSNRequest(basicInfoReq: MessagePad.BasicInfoReq) {}
 
     /**
-     * 工控机监控节点
+     * 监控事件报告
      */
     fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {}
 
+    /**
+     * 监控事件报告
+     */
+    fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?,lineId: Long) {}
+
     /**
      * 工控机连接状态回调
      */

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/OchAutoPilotStatusListenerManager.kt

@@ -4,10 +4,12 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.och.common.module.utils.CallerBase
 import com.zhjt.mogo.adas.data.AdasConstants
+import com.zhjt.mogo.adas.data.bean.MogoReport
 import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
 import system_master.SsmInfo
 import system_master.SystemStatusInfo
+import java.lang.Exception
 
 object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListener>(),IMoGoAutopilotStatusListener {
 
@@ -52,9 +54,39 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene
 
     override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
         super.onAutopilotGuardian(guardianInfo)
+        var lineId = -1L
+        if (MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_START == guardianInfo?.code ||
+            MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_SUCCESS == guardianInfo?.code ||
+            MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_FAILURE == guardianInfo?.code ||
+            MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_WARNING == guardianInfo?.code ||
+            MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_TIMEOUT == guardianInfo?.code
+        ) {
+            val msg = guardianInfo.msg
+            try {
+                val regex = Regex("lineid:(\\d+)")
+                val matchResult = regex.find(msg)
+                if (matchResult != null) {
+                    lineId = matchResult.groupValues[1].toLong()
+                }
+            } catch (e: Exception) {
+
+            }
+            if (lineId == -1L) {
+                try {
+                    val regex = Regex("lineID=(\\d+)")
+                    val matchResult = regex.find(msg)
+                    if (matchResult != null) {
+                        lineId = matchResult.groupValues[1].toLong()
+                    }
+                } catch (e: Exception) {
+
+                }
+            }
+        }
         M_LISTENERS.forEach {
             val listener = it.value
             listener.onAutopilotGuardian(guardianInfo)
+            listener.onAutopilotGuardian(guardianInfo, lineId)
         }
     }
 

OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java

@@ -241,6 +241,9 @@ public class BusPresenter extends Presenter<ShuttleFragment>
         BusTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo);
     }
 
+    @Override
+    public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo, long lineId) {
+    }
     @Override
     public void onAutopilotIpcConnectStatusChanged(@NonNull AdasConstants.IpcConnectionStatus status, @Nullable String reason) {
     }

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

@@ -297,7 +297,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
         }
     }
 
-    //监控
+    //监控事件报告
     @ChainLog(
         linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT,
         linkCode = CHAIN_SOURCE_ADAS,

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt

@@ -39,7 +39,7 @@ interface IMoGoAutopilotStatusListener {
     fun onAutopilotSNRequest(basicInfoReq: MessagePad.BasicInfoReq) {}
 
     /**
-     * 工控机监控节点
+     * 监控事件报告
      */
     fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {}
 

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt

@@ -195,7 +195,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
     }
 
     /**
-     * 工控机监控节点 回调
+     * 监控事件报告
      */
     @Synchronized
     fun invokeAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {