yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[8.4.0]

Browse Source 
[任务管理的情况下启动自驾不在手FSM影响]
This commit is contained in:
yangyakun
2026-04-17 16:21:14 +08:00
parent 9662cac761
commit 823e87a329
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt
View File

@@ -150,10 +150,14 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCallb
} }
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {
if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 if (AppIdentityModeUtils.getCockpitType() == CockpitType.UNMANNED) {
this.viewCallback?.canStartAutopilot()
} else {// 部分可用
this.viewCallback?.canStartAutopilot() 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 -> { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {
if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 if (AppIdentityModeUtils.getCockpitType() == CockpitType.UNMANNED) {
this.viewCallback?.canStartAutopilot() this.viewCallback?.canStartAutopilot()
} else {// 部分可用 }else{
this.viewCallback?.autopilotDisable() if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用
this.viewCallback?.canStartAutopilot()
} else {// 部分可用
this.viewCallback?.autopilotDisable()
}
} }
} }

7
libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/dto/cmd/TaskStartNotification.java
View File

@@ -126,11 +126,10 @@ public class TaskStartNotification {
} }
public boolean isCloseDoorStartAuto(){ public boolean isCloseDoorStartAuto(){
if(Objects.equals(lastTaskCmdType, MessageCmdEnum.TaskStartNotification.getCode()) || if(Objects.equals(lastTaskCmdType, MessageCmdEnum.TaskContinueByDoorClosed.getCode())){
Objects.equals(lastTaskCmdType, MessageCmdEnum.TaskContinueNotification.getCode()) ){ return true;
return false;
} }
return true; return false;
} }

2
libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/unmanned/task/enums/MessageCmdEnum.java
View File

@@ -18,6 +18,8 @@ public enum MessageCmdEnum {
TaskStartNotification("TaskStartNotification", "自驾/离站结果回执"), TaskStartNotification("TaskStartNotification", "自驾/离站结果回执"),
TaskContinueByDoorClosed("TaskContinueByDoorClosed", "通过关门来出发"),
TaskArrivalNotification("TaskArrivalNotification", "到站通知"), TaskArrivalNotification("TaskArrivalNotification", "到站通知"),
TaskAbortNotification("TaskAbortNotification", "任务终止"), TaskAbortNotification("TaskAbortNotification", "任务终止"),