From 10a2cdd4a205e2dc194798666d7853c9637f83a2 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 18 Jun 2025 14:46:45 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0][adas]=20=E6=96=B0=E5=A2=9EOTA=202.0=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 16 ++++++++++++++++ .../mogo-adas-data/src/main/proto/ssm_info.proto | 15 +++++++++++++-- .../zhidao/support/adas/high/OnAdasListener.java | 12 +++++++++++- .../adas/high/msg/PadSsmFuncMsgMessage.java | 9 +++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) 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 a1dc92b336..05218db30e 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 @@ -606,6 +606,22 @@ class MoGoAdasListenerImpl : OnAdasListener { } } + /** + * OTA 2.0 新接口 + * + * @param header 头 + * @param token PadSsmMsg唯一消息ID + * @param timestamp 消息发送时间 单位：毫秒 + * @param status OTA 2.0 数据 + */ + override fun onOtaPureStr( + header: MessagePad.Header?, + token: Long, + timestamp: Long, + status: SsmInfo.PureStr? + ) { + } + /** * 冷启动状态变更上报以及查询状态 * diff --git a/libraries/mogo-adas-data/src/main/proto/ssm_info.proto b/libraries/mogo-adas-data/src/main/proto/ssm_info.proto index 1351f7d453..c3fc3f96df 100644 --- a/libraries/mogo-adas-data/src/main/proto/ssm_info.proto +++ b/libraries/mogo-adas-data/src/main/proto/ssm_info.proto @@ -65,6 +65,8 @@ enum MessageType { COLD_START_STATE_QUERY = 7; // 冷启动状态查询 req:None resp:ColdStartState AUTO_PILOT_INFO = 8; // 自驾命令状态查询 resp:AutoPilotInfo STATION_STATUS_QUERY = 9; //到站信息查询 req: OrderInfo resp:AutoPilotStation + OPERATE_STATUS = 10; // pad下发运营状态 + OTA_PAD_MSG = 11; } message PadSsmMsg { @@ -85,6 +87,11 @@ message Notification { required string msg = 2; // 通知 } +//MessageType.OTA_PAD_MSG +message PureStr { + required string data = 1; +} + enum OtaType { IMAGE = 1; FIRMWARE = 2; @@ -181,7 +188,7 @@ message ColdStartNode { required string node_name = 1; //节点名称 required string event_code = 2; //上报事件 required NodeStatus status = 3; //0:启动中, 1:启动成功, 2:启动失败, 3:启动超时 - required string desc = 4; //事件描述 + required string desc = 4; //事件描述 repeated string have_flt = 5; //故障码 } @@ -211,4 +218,8 @@ message OrderInfo{ message AutoPilotStation { required bool arrived_station_flag = 1; //是否到站 optional string order_id = 2; //订单号 -} \ No newline at end of file +} + +message OperateStatus{ + required uint32 operate_status = 1; // 1:开始,2:结束 +} 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 3ab06add72..51ccb7fbdc 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 @@ -154,7 +154,7 @@ public interface OnAdasListener { * @param header 头 * @param predictionObjects 他车轨迹预测数据 */ - void onPredictionObstacleTrajectory(@NonNull MessagePad.Header header,@NonNull Prediction2025.mPredictionObjects predictionObjects); + void onPredictionObstacleTrajectory(@NonNull MessagePad.Header header, @NonNull Prediction2025.mPredictionObjects predictionObjects); /** * 透传的点云数据 @@ -250,6 +250,16 @@ public interface OnAdasListener { */ void onOtaStatus(MessagePad.Header header, long token, long timestamp, boolean isQuery, @Nullable SsmInfo.OtaStatus status); + /** + * OTA 2.0 新接口 + * + * @param header 头 + * @param token PadSsmMsg唯一消息ID + * @param timestamp 消息发送时间 单位：毫秒 + * @param status OTA 2.0 数据 + */ + void onOtaPureStr(MessagePad.Header header, long token, long timestamp, @Nullable SsmInfo.PureStr status); + /** * 冷启动状态变更上报以及查询状态 * diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java index 8cd2db31d5..cc7f3fb906 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/PadSsmFuncMsgMessage.java @@ -80,6 +80,15 @@ public class PadSsmFuncMsgMessage extends MyAbstractMessageHandler { if (adasListener != null) { adasListener.onOtaStatus(raw.getHeader(), padSsmMsg.getToken(), timestamp, type == SsmInfo.MessageType.OTA_STATUS_QUERY, status); } + } else if (type == SsmInfo.MessageType.OTA_PAD_MSG) { + //SSM OTA2.0接口 + SsmInfo.PureStr pure = null; + if (!data.isEmpty()) { + pure = SsmInfo.PureStr.parseFrom(data); + } + if (adasListener != null) { + adasListener.onOtaPureStr(raw.getHeader(), padSsmMsg.getToken(), timestamp, pure); + } } AdasChannel.calculateTimeConsumingBusiness("SSM功能", nowTime); }