From f8c50978d77a66da64b466f42b928497257c6859 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 2 Apr 2024 10:07:15 +0800 Subject: [PATCH] =?UTF-8?q?[640][=E7=B3=BB=E7=BB=9F=E7=9B=91=E6=8E=A7]=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=9B=91=E6=8E=A7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=BA=BF=E8=B7=AF=E4=B8=8B=E8=BD=BD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BA=BF=E8=B7=AFID=E8=A7=A3=E6=9E=90=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B8=A6=E6=9C=89=E7=BA=BF=E8=B7=AFID=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/presenter/BusPresenter.java | 5 +++ .../autopilot/IOchAutopilotStatusListener.kt | 7 +++- .../OchAutoPilotStatusListenerManager.kt | 32 +++++++++++++++++++ .../mogo/och/bus/presenter/BusPresenter.java | 3 ++ .../autopilot/adapter/MoGoAdasListenerImpl.kt | 2 +- .../autopilot/IMoGoAutopilotStatusListener.kt | 2 +- .../CallerAutoPilotStatusListenerManager.kt | 2 +- 7 files changed, 49 insertions(+), 4 deletions(-) diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index c3f484e46e..10deb32cd8 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -247,6 +247,11 @@ public class BusPresenter extends Presenter 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) { } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/IOchAutopilotStatusListener.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/IOchAutopilotStatusListener.kt index 6d895c2268..544b1c1d1f 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/IOchAutopilotStatusListener.kt +++ b/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) {} + /** * 工控机连接状态回调 */ diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/OchAutoPilotStatusListenerManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/OchAutoPilotStatusListenerManager.kt index 8b7a23f68c..f021bd4c39 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/autopilot/OchAutoPilotStatusListenerManager.kt +++ b/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(),IMoGoAutopilotStatusListener { @@ -52,9 +54,39 @@ object OchAutoPilotStatusListenerManager : CallerBase 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) { } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 1b856b1ab8..a98e8ef5cb 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/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, diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt index 96c4d80018..183d1d7bca 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt +++ b/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?) {} diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index fd1fcd4406..ed06079fe8 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -195,7 +195,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase