From 9662cac761731c5acdb44e537297e1760d51482d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Apr 2026 16:20:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[8.4.0]=20[=E6=A8=A1=E6=8B=9F=E5=99=A8?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=B1=8F=E5=8F=91=E9=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/common/module/debug/DebugDataDispatch.kt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt index 61f42da3b1..82d43ff6ad 100644 --- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt +++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt @@ -36,6 +36,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapRomaListener import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManager +import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils @@ -46,8 +47,11 @@ import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.biz.media.MediaManager import com.mogo.och.common.module.biz.media.data.MediaItem import com.mogo.och.common.module.biz.order.OrderManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.debug.location.MogoLocationExit import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType +import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg import com.mogo.och.common.module.view.DebugFloatWindow import com.zhjt.mogo.adas.data.bean.AutopilotStatistics import mogo.telematics.pad.MessagePad @@ -88,6 +92,7 @@ object DebugDataDispatch { const val mediaStationMedia = "stationMedia" const val startAutopilot = "startAutopilot" const val taskManager = "taskManager" + const val mockLanSocketRecycler = "mockLanSocketRecycler" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "video" --ei add 2 --es url "rtmp://liteavapp.qcloud.com/live/liteavdemoplayerstreamid" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "1111/11111" @@ -110,6 +115,7 @@ object DebugDataDispatch { // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "vlmMessage" --es message "前方100米有道路施工，施工长度100米，影响第1、2车道通行。" --ei id 128 --ef time 1880.0 // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "vlmImage" --ef time 1880.0 // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "stationMedia" +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "mockLanSocketRecycler" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "startAutopilot" --ei startType 0 // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "taskManager" --ei startType 0 --ei indexStation 3 @@ -126,6 +132,15 @@ object DebugDataDispatch { } when (type) { + mockLanSocketRecycler -> { + val test = """ +{"loginStatus":1,"routesResult":{"carModel":"","contrailSaveTime":0,"contrailSaveTimeDPQP":0,"csvFileMd5":"","csvFileMd5DPQP":"","csvFileUrl":"","csvFileUrlDPQP":"","description":null,"lineId":599,"lineType":0,"name":"日照路线","runningDur":null,"sites":[{"blackPoints":[],"drivingStatus":1,"gcjLat":35.415598215570135,"gcjLon":119.5672437999642,"introduction":"","isLeaving":false,"isPlayTts":false,"lat":35.4159636,"lon":119.5619282,"name":"万平口二号门","nameKr":null,"passPoints":[],"pointType":0,"seq":1,"siteId":2237,"tag":0,"videoList":null},{"blackPoints":[],"drivingStatus":1,"gcjLat":35.42508993381021,"gcjLon":119.57061731633829,"introduction":"","isLeaving":false,"isPlayTts":true,"lat":35.425452664666736,"lon":119.56530882358173,"name":"万平口三号门","nameKr":null,"passPoints":[],"pointType":0,"seq":2,"siteId":2230,"tag":0,"videoList":null},{"blackPoints":[],"drivingStatus":1,"gcjLat":35.42789752698308,"gcjLon":119.57172358693678,"introduction":"","isLeaving":false,"isPlayTts":true,"lat":35.42825955320252,"lon":119.56641733292894,"name":"开元森泊乐园东门","nameKr":null,"passPoints":[],"pointType":0,"seq":3,"siteId":2231,"tag":0,"videoList":null},{"blackPoints":[],"drivingStatus":1,"gcjLat":35.42965006565593,"gcjLon":119.57241326575509,"introduction":"","isLeaving":false,"isPlayTts":true,"lat":35.43001162948568,"lon":119.56710837593442,"name":"海洋公园","nameKr":null,"passPoints":[],"pointType":0,"seq":4,"siteId":2232,"tag":0,"videoList":null},{"blackPoints":[],"drivingStatus":1,"gcjLat":35.4298883896066,"gcjLon":119.5673148330974,"introduction":"","isLeaving":false,"isPlayTts":true,"lat":35.43024230685599,"lon":119.56199792414594,"name":"啤酒海鲜演艺广场","nameKr":null,"passPoints":[],"pointType":0,"seq":5,"siteId":2233,"tag":0,"videoList":null},{"blackPoints":[],"drivingStatus":2,"gcjLat":35.423815445495705,"gcjLon":119.56504380207225,"introduction":"","isLeaving":true,"isPlayTts":true,"lat":35.424170582431444,"lon":119.55972176882035,"name":"七彩活力乐园","nameKr":null,"passPoints":[],"pointType":0,"seq":6,"siteId":2234,"tag":0,"videoList":null},{"blackPoints":[],"drivingStatus":3,"gcjLat":35.414575023544536,"gcjLon":119.56483592968372,"introduction":"","isLeaving":false,"isPlayTts":false,"lat":35.414937342862615,"lon":119.55951431818669,"name":"开元名都大酒店","nameKr":null,"passPoints":[],"pointType":0,"seq":7,"siteId":2235,"tag":0,"videoList":null},{"blackPoints":[],"drivingStatus":3,"gcjLat":35.41507372147241,"gcjLon":119.56679371308033,"introduction":"","isLeaving":false,"isPlayTts":false,"lat":35.41543882408331,"lon":119.56147704544072,"name":"万平口二号门","nameKr":null,"passPoints":[],"pointType":0,"seq":8,"siteId":2236,"tag":0,"videoList":null}],"status":0,"taskId":8784531,"taskTime":1776328254000,"txtFileMd5":"","txtFileMd5DPQP":"","txtFileUrl":"","txtFileUrlDPQP":"","writeVersion":1776329091789}} """.trimIndent() + val msg = TaskDetailsMsg(test, BusinessType.shuttle) + val message = GsonUtils.toJson(msg) + ThreadUtils.getIoPool().submit{ + CallerTelematicListenerManager.invokeReceivedMsg(OchCommonConst.BUSINESS_STRING,message.toByteArray()) + } + } taskManager -> { val type = intent.getIntExtra("startType", 0) val indexStation = intent.getIntExtra("indexStation", 0) From 823e87a329065d3bef563f7b2858cf264493266f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Apr 2026 16:21:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[8.4.0]=20[=E4=BB=BB=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=87=AA=E9=A9=BE=E4=B8=8D=E5=9C=A8=E6=89=8BFSM=E5=BD=B1?= =?UTF-8?q?=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", "任务终止"),