From 8748712e906a27f89f0321145ac6088fdbc95f2a Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 26 Jun 2024 11:28:09 +0800 Subject: [PATCH] =?UTF-8?q?[650][adas]=20=E6=A0=B9=E6=8D=AE=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E9=9C=80=E6=B1=82=EF=BC=8C=E5=BD=93=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E6=97=B6=E7=9A=84=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=A6=82=E6=9E=9C=E6=95=B0=E6=8D=AE=E6=98=AFfsm?= =?UTF-8?q?=E5=B0=86=E6=8F=92=E5=85=A5=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?= =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BB=96=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=8E=9F=E6=9C=89=E6=96=B9=E5=BC=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/OCHAdasAbilityManager.java | 9 +++++++ .../autopilot/OchAutoPilotManager.kt | 25 ++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java index cb43850345..0335b46428 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java @@ -59,9 +59,18 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo return isAutopilotAbility; } + public String getAbilityVersion() { + return launchConditionData == null ? "" : launchConditionData.abilityVersion; + } + public String getOriginalData() { return launchConditionData == null ? "" : launchConditionData.getJson(); } + + public ArrayList getUnableAutopilotReasons() { + return unableAutopilotReasons; + } + public String getAutopilotUnAbilityReason(){ try { if(unableAutopilotReasons==null||unableAutopilotReasons.isEmpty()){ diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt index 7e99e340a2..ce201d7def 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt @@ -2,9 +2,13 @@ package com.mogo.och.common.module.manager.autopilot.autopilot import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.msgbox.AutopilotMsg +import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.function.api.autopilot.IMoGoReceiveReceivedAckListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerReceiveReceivedAckListenerManager +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager @@ -29,10 +33,23 @@ object OchAutoPilotManager : IMoGoReceiveReceivedAckListener { } @JvmStatic - fun canStartAutoPilotSSM():Boolean{ - if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) { - ToastUtils.showLong(OCHAdasAbilityManager.getInstance().getAutopilotUnAbilityReason() + - ", 请稍候重试"); + fun canStartAutoPilotSSM(): Boolean { + if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().autopilotAbilityStatus) { + val reasons = OCHAdasAbilityManager.getInstance().unableAutopilotReasons + if ("AutopilotAbility440" == OCHAdasAbilityManager.getInstance().abilityVersion && !reasons.isNullOrEmpty()) { + val msg = reasons[0].unableLaunchReason + " 来源:" + reasons[0].source + CallerMsgBoxManager.saveMsgBox( + MsgBoxBean( + MsgBoxType.AUTOPILOT, + AutopilotMsg(0, "自动驾驶启动失败", msg, System.currentTimeMillis()) + ) + ) + } else { + ToastUtils.showLong( + OCHAdasAbilityManager.getInstance().autopilotUnAbilityReason + + ", 请稍候重试" + ); + } return false } return true