From 887b9bee0fd0a9fb4ac29c9d21537d25692c920f Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 13 Jun 2022 17:44:40 +0800 Subject: [PATCH] =?UTF-8?q?[change]=E6=B7=BB=E5=8A=A0=E9=9B=A8=E5=A4=A9?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/proto/message_pad.proto | 9 +++++++-- .../zhidao/support/adas/high/AdasChannel.java | 16 ++++++++++++++++ .../zhidao/support/adas/high/AdasManager.java | 11 +++++++++++ .../support/adas/high/IAdasNetCommApi.java | 9 ++++++++- .../support/adas/high/common/MessageType.java | 3 ++- 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/libraries/mogo-adas-data/src/main/proto/message_pad.proto b/libraries/mogo-adas-data/src/main/proto/message_pad.proto index da38c118c2..0184d1fabf 100644 --- a/libraries/mogo-adas-data/src/main/proto/message_pad.proto +++ b/libraries/mogo-adas-data/src/main/proto/message_pad.proto @@ -40,13 +40,14 @@ enum MessageType MsgTypeTrajectoryDownloadReq = 0x10110; //轨迹下载请求 MsgTypeStatusQueryReq = 0x10111; //状态查询请求 MsgTypeStatusQueryResp = 0x10112; //状态查询应答 + MsgTypeSetRainModeReq = 0x10113; //设置雨天模式 } message Header { uint64 msgID = 1; //消息唯一id，自增 MessageType msgType = 2; //消息类型 - double timestamp = 3; //telematics消息发送时间, 单位：秒 + double timestamp = 3; //消息发送时间, 单位：秒 double sourceTimestamp = 4; //数据源消息发送时间, 单位：秒 } @@ -338,5 +339,9 @@ message StatusQueryReq // message definition for MsgTypeStatusQueryResp // refer to system_status_info.proto - +// message definition for MsgTypeSetRainModeReq +message SetRainModeReq +{ + uint32 enable = 1; //1: enable, 0: disable +} diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 2ad94c63fc..e0db4270e4 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -877,5 +877,21 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec .build(); return sendWsMessage(MessageType.TYPE_SEND_STATUS_QUERY_REQ.typeCode, req.toByteArray()); } + + + /** + * 设置雨天模式 + * + * @param enable 1: enable, 0: disable + * @return boolean + */ + @Override + public boolean sendRainModeReq(int enable) { + MessagePad.SetRainModeReq req = MessagePad.SetRainModeReq + .newBuilder() + .setEnable(enable) + .build(); + return sendWsMessage(MessageType.TYPE_SEND_SET_RAIN_MODE_REQ.typeCode, req.toByteArray()); + } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java index 506ceb1581..a7352e41c5 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java @@ -417,6 +417,17 @@ public class AdasManager implements IAdasNetCommApi { return mChannel != null && mChannel.sendStatusQueryReq(); } + /** + * 设置雨天模式 + * + * @param enable 1: enable, 0: disable + * @return boolean + */ + @Override + public boolean sendRainModeReq(int enable) { + return mChannel != null && mChannel.sendRainModeReq(enable); + } + /** * 获取工控机固定IP列表 * diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java index 33377ef0fc..ebafd862e6 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java @@ -157,7 +157,7 @@ public interface IAdasNetCommApi { * @param arrowNo 当前车道对应地面要素转向 * @param flashYellow 黄灯总时间 * @param laneDetail 灯态具体信息 - * @param timestamp 当前卫星时间, 单位: ms + * @param timestamp 当前卫星时间, 单位: ms * @return boolean */ boolean sendTrafficLightData(@NonNull String crossID, double latitude, double longitude, @@ -196,6 +196,13 @@ public interface IAdasNetCommApi { */ boolean sendStatusQueryReq(); + /** + * 设置雨天模式 + * + * @param enable 1: enable, 0: disable + * @return boolean + */ + boolean sendRainModeReq(int enable); // TODO 需求暂停 待讨论 // boolean getRoutes(); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java index e26edeaa0d..2370b60d8d 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java @@ -42,7 +42,8 @@ public enum MessageType { TYPE_SEND_SYSTEM_CMD_REQ(MessagePad.MessageType.MsgTypeSystemCmdReq, "系统命令请求, 比如系统重启，启用新镜像"), TYPE_SEND_TRAJECTORY_DOWNLOAD_REQ(MessagePad.MessageType.MsgTypeTrajectoryDownloadReq, "轨迹下载请求"), TYPE_SEND_STATUS_QUERY_REQ(MessagePad.MessageType.MsgTypeStatusQueryReq, "状态查询请求"), - TYPE_RECEIVE_STATUS_QUERY_RESP(MessagePad.MessageType.MsgTypeStatusQueryResp, "状态查询应答"); + TYPE_RECEIVE_STATUS_QUERY_RESP(MessagePad.MessageType.MsgTypeStatusQueryResp, "状态查询应答"), + TYPE_SEND_SET_RAIN_MODE_REQ(MessagePad.MessageType.MsgTypeSetRainModeReq, "设置雨天模式"); /** * 消息action code