From 5ce3181293999487cd0af3648671eac1c0dd90db Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 28 Jul 2023 17:40:10 +0800 Subject: [PATCH] =?UTF-8?q?[340][och]=E4=B8=B4=E6=97=B6=E8=83=BD=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E5=88=A4=E6=96=AD=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/manager/OCHAdasAbilityManager.java | 60 ++++++++++++++++++- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java index e97c0b6b34..a82b3b7b70 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java @@ -2,27 +2,36 @@ package com.mogo.och.common.module.manager; import android.content.Context; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatisticsListener; +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; import com.zhjt.mogo.adas.data.bean.AutopilotStatistics; +import mogo.telematics.pad.MessagePad; +import mogo_msg.MogoReportMsg; +import system_master.SystemStatusInfo; + /** * Created on 2022/10/9 * 工控机状态信息回调(判断是否能否启动自动驾驶的回调) * 目前定的是3秒回调一次 */ -public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMoGoAutopilotStatisticsListener { +public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMoGoAutopilotStatisticsListener, IMoGoAutopilotStatusListener { private static final String TAG = OCHAdasAbilityManager.class.getSimpleName(); - private boolean isAutopilotAbility = true; - private String autopilotAbilityReason = ""; + private boolean isAutopilotAbility; + private String autopilotAbilityReason; private String startFailedCode = ""; private String startFailedMessage = ""; @@ -37,6 +46,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo } public void init(Context context) { + ipcConnectStatusChanged(); initListeners(); } @@ -64,11 +74,18 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo //2022.10.9 工控机状态信息回调(判断是否能否启动自动驾驶的回调), 目前定的是3秒回调一次 CallerAutopilotActionsListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotStatisticsListenerManager.INSTANCE.addListener(TAG,this); + CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this); } private void releaseListeners() { CallerAutopilotActionsListenerManager.INSTANCE.removeListener(this); CallerAutopilotStatisticsListenerManager.INSTANCE.removeListener(this); + CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(this); + } + + private void ipcConnectStatusChanged() { + this.isAutopilotAbility = CallerAutoPilotControlManager.INSTANCE.isConnected(); + this.autopilotAbilityReason = isAutopilotAbility ? "" : "未连接自动驾驶系统"; } @Override @@ -95,4 +112,41 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo public void release() { releaseListeners(); } + + @Override + public void onAutopilotIpcConnectStatusChanged(int status, @Nullable String reason) { + ipcConnectStatusChanged(); + } + + @Override + public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) { + } + + @Override + public void onAutopilotStatusResponse(int state) { + } + + @Override + public void onAutopilotDockerInfo(@NonNull String dockerVersion) { + } + + @Override + public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) { + } + + @Override + public void onAutopilotSNRequest() { + } + + @Override + public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) { + } + + @Override + public void onAutopilotStatusRespByQuery(@NonNull SystemStatusInfo.StatusInfo status) { + } + + @Override + public void onAutopilotRouteLineId(long lineId) { + } }