diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index bdf3ba6ec9..44351d17d3 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -1679,8 +1679,8 @@ class MoGoAdasListenerImpl : OnAdasListener { override fun onPlanningStopLine(header: MessagePad.Header, mapMsg: Hadmap.MapMsg) { } - override fun onAdasTaskManagerOriginal(header: MessagePad.Header, data: ByteArray) { - taskManagerOriginal(header, ByteUtil.byteArrToHex(data, false)) + override fun onAdasTaskManagerOriginal(header: MessagePad.Header, data: String) { + taskManagerOriginal(header, data) } @ChainLog( diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt index 97815c2539..d579413d43 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt @@ -55,6 +55,7 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen .subscribe { bizLog(SceneConstant.M_D_C + TAG, "请求底盘轨迹") CallerAutoPilotControlManager.getGlobalPath() + CallerAutoPilotControlManager.sendTaskManagerRunningInfo() } } else -> {} diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java index dffcac4499..797c126ec0 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java @@ -805,7 +805,7 @@ public interface OnAdasListener { * @param header 头 * @param data 数据 */ - void onAdasTaskManagerOriginal(@NonNull MessagePad.Header header, @NonNull byte[] data); + void onAdasTaskManagerOriginal(@NonNull MessagePad.Header header, @NonNull String data); /** * 域控任务管理离站通知 diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/TaskManagerMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/TaskManagerMessage.java index 27c28f21ca..dea191093b 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/TaskManagerMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/TaskManagerMessage.java @@ -45,8 +45,9 @@ public class TaskManagerMessage extends MyAbstractMessageHandler { if (CupidLogUtils.isEnableLog()) nowTime = SystemClock.elapsedRealtime(); if (adasListener != null) { - adasListener.onAdasTaskManagerOriginal(raw.getHeader(), data); - parse(adasListener, new String(data, StandardCharsets.UTF_8)); + String dataString = new String(data, StandardCharsets.UTF_8); + adasListener.onAdasTaskManagerOriginal(raw.getHeader(), dataString); + parse(adasListener,dataString); } AdasChannel.calculateTimeConsumingBusiness("任务管理消息", nowTime); }