From 823e87a329065d3bef563f7b2858cf264493266f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Apr 2026 16:21:14 +0800 Subject: [PATCH] =?UTF-8?q?[8.4.0]=20[=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=90=AF=E5=8A=A8=E8=87=AA?= =?UTF-8?q?=E9=A9=BE=E4=B8=8D=E5=9C=A8=E6=89=8BFSM=E5=BD=B1=E5=93=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/autopilot/AutopilotStateModel.kt | 20 +++++++++++++------ .../task/dto/cmd/TaskStartNotification.java | 7 +++---- .../unmanned/task/enums/MessageCmdEnum.java | 2 ++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt index e653e9fe7b..35fdb8aa83 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt @@ -150,10 +150,14 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCallb } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> { - if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 - this.viewCallback?.canStartAutopilot() - } else {// 部分可用 + if (AppIdentityModeUtils.getCockpitType() == CockpitType.UNMANNED) { this.viewCallback?.canStartAutopilot() + }else{ + if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 + this.viewCallback?.canStartAutopilot() + } else {// 部分可用 + this.viewCallback?.canStartAutopilot() + } } } @@ -203,10 +207,14 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCallb } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> { - if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 + if (AppIdentityModeUtils.getCockpitType() == CockpitType.UNMANNED) { this.viewCallback?.canStartAutopilot() - } else {// 部分可用 - this.viewCallback?.autopilotDisable() + }else{ + if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 + this.viewCallback?.canStartAutopilot() + } else {// 部分可用 + this.viewCallback?.autopilotDisable() + } } } diff --git a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/dto/cmd/TaskStartNotification.java b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/dto/cmd/TaskStartNotification.java index 3833d2f1aa..7071442388 100644 --- a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/dto/cmd/TaskStartNotification.java +++ b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/dto/cmd/TaskStartNotification.java @@ -126,11 +126,10 @@ public class TaskStartNotification { } public boolean isCloseDoorStartAuto(){ - if(Objects.equals(lastTaskCmdType, MessageCmdEnum.TaskStartNotification.getCode()) || - Objects.equals(lastTaskCmdType, MessageCmdEnum.TaskContinueNotification.getCode()) ){ - return false; + if(Objects.equals(lastTaskCmdType, MessageCmdEnum.TaskContinueByDoorClosed.getCode())){ + return true; } - return true; + return false; } diff --git a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/enums/MessageCmdEnum.java b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/enums/MessageCmdEnum.java index 20196dfd8b..b6f38936d4 100644 --- a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/enums/MessageCmdEnum.java +++ b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/enums/MessageCmdEnum.java @@ -18,6 +18,8 @@ public enum MessageCmdEnum { TaskStartNotification("TaskStartNotification", "自驾/离站结果回执"), + TaskContinueByDoorClosed("TaskContinueByDoorClosed", "通过关门来出发"), + TaskArrivalNotification("TaskArrivalNotification", "到站通知"), TaskAbortNotification("TaskAbortNotification", "任务终止"),