From ed13a7bc88161597936f4b13f99cf880142ab4b5 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 12 Jan 2023 15:12:50 +0800 Subject: [PATCH] =?UTF-8?q?[ADAS=20LIB]=20=E5=90=91=E5=B7=A5=E6=8E=A7?= =?UTF-8?q?=E6=9C=BA=E5=8F=91=E9=80=81=E7=BA=A2=E7=BB=BF=E7=81=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E6=A0=87=E8=AF=86=EF=BC=8CMAP290=E5=BC=80=E5=A7=8B=E6=AD=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zhidao/support/adas/high/AdasChannel.java | 2 ++ .../src/main/java/com/zhidao/support/adas/high/AdasManager.java | 2 ++ .../main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java | 2 ++ .../java/com/zhidao/support/adas/high/common/MessageType.java | 1 + 4 files changed, 7 insertions(+) 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 4c506bdf23..cc41289c5a 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 @@ -970,6 +970,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec /** * 发送红绿灯数据到工控机 + * TODO MAP290开始此接口弃用 * * @param crossID roadID * @param latitude 纬度 @@ -984,6 +985,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * @param timestamp 当前卫星时间, 单位: ms * @return */ + @Deprecated @Override public boolean sendTrafficLightData(@NonNull String crossID, double latitude, double longitude, @NonNull String heading, @NonNull String direction, int lightId, int laneNo, 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 b3196efb2a..463223afc8 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 @@ -450,6 +450,7 @@ public class AdasManager implements IAdasNetCommApi { /** * 发送红绿灯数据到工控机 + * TODO MAP290开始此接口弃用 * * @param crossID roadID * @param latitude @@ -464,6 +465,7 @@ public class AdasManager implements IAdasNetCommApi { * @param timestamp 当前卫星时间, 单位: ms * @return */ + @Deprecated @Override public boolean sendTrafficLightData(@NonNull String crossID, double latitude, double longitude, @NonNull String heading, @NonNull String direction, int lightId, int laneNo, int arrowNo, int flashYellow, MessagePad.TrafficLightDetail laneDetail, long timestamp) { return mChannel != null && mChannel.sendTrafficLightData(crossID, latitude, longitude, heading, direction, lightId, laneNo, arrowNo, flashYellow, laneDetail, timestamp); 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 a3d7f800a3..74fc34769a 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 @@ -205,6 +205,7 @@ public interface IAdasNetCommApi { /** * 发送红绿灯数据到工控机 + * TODO MAP290开始此接口弃用 * * @param crossID roadID * @param latitude 纬度 @@ -219,6 +220,7 @@ public interface IAdasNetCommApi { * @param timestamp 当前卫星时间, 单位: ms * @return 加入WS发送消息队列是否成功 */ + @Deprecated boolean sendTrafficLightData(@NonNull String crossID, double latitude, double longitude, @NonNull String heading, @NonNull String direction, int lightId, int laneNo, int arrowNo, int flashYellow, MessagePad.TrafficLightDetail laneDetail, long timestamp); 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 e26821efc5..5c9d79eb3e 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 @@ -38,6 +38,7 @@ public enum MessageType { TYPE_SEND_SET_AUTOPILOT_SPEED_REQ(MessagePad.MessageType.MsgTypeSetAutopilotSpeedReq, "设置自动驾驶最大速度"), TYPE_SEND_GLOBAL_PATH_REQ(MessagePad.MessageType.MsgTypeGlobalPathReq, "自动驾驶路径请求"), TYPE_RECEIVE_GLOBAL_PATH_RESP(MessagePad.MessageType.MsgTypeGlobalPathResp, "自动驾驶路径应答"), + @Deprecated//MAP290开始此接口弃用 TYPE_SEND_TRAFFIC_LIGHT_DATA(MessagePad.MessageType.MsgTypeTrafficLightData, "发送红绿灯数据到工控机"), @Deprecated TYPE_RECEIVE_WARN(MessagePad.MessageType.MsgTypeWarn, "预警数据"),