From 5084d329152ee0be83768976a749baace609e4fc Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 15 Jul 2024 19:49:37 +0800 Subject: [PATCH] =?UTF-8?q?[644=20pnc][adas]=20=E5=A2=9E=E5=8A=A0=20PNC=20?= =?UTF-8?q?=E4=BC=9A=E8=BD=A6=E8=B6=85=E8=BD=A6=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/proto/personal/adas_constants.proto | 4 ++-- .../com/zhidao/support/adas/high/AdasChannel.java | 12 ++++++------ .../com/zhidao/support/adas/high/AdasManager.java | 12 ++++++------ .../zhidao/support/adas/high/IAdasNetCommApi.java | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/mogo-adas-data/src/main/proto/personal/adas_constants.proto b/libraries/mogo-adas-data/src/main/proto/personal/adas_constants.proto index a540f15908..3b62c37d9c 100644 --- a/libraries/mogo-adas-data/src/main/proto/personal/adas_constants.proto +++ b/libraries/mogo-adas-data/src/main/proto/personal/adas_constants.proto @@ -23,8 +23,8 @@ enum MapSystemParamType{ OVERTAKE_MAX_SPEED = 16;//16: 超车的最大速度阈值(double, m/s, 范围[3, 12.5]) FAULT_SIMULATION_CMD = 17;//17: 故障模拟指令(int) default:0(do nothing), 1:线控失效 COLLISION_REPORTING = 18;//18: 碰撞上报(null) - PASS_EACH_OTHER = 19;//19: 会车开关(bool) 0: off 1:on 默认0 - OVERTAKE = 20;//20: 超车开关(bool) 0: off 1:on 默认0 + PARK_VEH_CROSS = 19;//19: 会车开关(bool) 0: off 1:on 默认0 + PARK_VEH_OVERTAKE = 20;//20: 超车开关(bool) 0: off 1:on 默认0 } /** 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 25a4ba6fd5..306c78bd6b 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 @@ -2249,8 +2249,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * {@link AdasConstants.MapSystemParamType#OVERTAKE_MAX_SPEED Value类型：double或double类型String} * {@link AdasConstants.MapSystemParamType#FAULT_SIMULATION_CMD Value类型：int或int类型String} * {@link AdasConstants.MapSystemParamType#COLLISION_REPORTING Value类型：null} - * {@link AdasConstants.MapSystemParamType#PASS_EACH_OTHER Value类型：int或int类型String} - * {@link AdasConstants.MapSystemParamType#OVERTAKE Value类型：int或int类型String} + * {@link AdasConstants.MapSystemParamType#PARK_VEH_CROSS Value类型：int或int类型String} + * {@link AdasConstants.MapSystemParamType#PARK_VEH_OVERTAKE Value类型：int或int类型String} * @return 消息是否添加到WS消息发送队列。由于批量设置参数，调用的域控接口存在不同，实际调用域控最多2个接口，调用次数最多4次，所以最多返回4条ID数据 * * 返回值为非0的正整数时表示下发消息的消息ID * * >=0：表示添加到WS发送消息队列 @@ -2469,8 +2469,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * * -1L：添加到WS发送消息队列失败 */ @Override - public long sendPassEachOther(int enable) { - return sendSetParamReq(AdasConstants.MapSystemParamType.PASS_EACH_OTHER_VALUE, String.valueOf(enable)); + public long sendParkVehCross(int enable) { + return sendSetParamReq(AdasConstants.MapSystemParamType.PARK_VEH_CROSS_VALUE, String.valueOf(enable)); } /** @@ -2484,8 +2484,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * * -1L：添加到WS发送消息队列失败 */ @Override - public long sendOvertake(int enable) { - return sendSetParamReq(AdasConstants.MapSystemParamType.OVERTAKE_VALUE, String.valueOf(enable)); + public long sendParkVehOvertake(int enable) { + return sendSetParamReq(AdasConstants.MapSystemParamType.PARK_VEH_OVERTAKE_VALUE, String.valueOf(enable)); } /** 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 43ad5dc024..a82e210b6f 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 @@ -1382,8 +1382,8 @@ public class AdasManager implements IAdasNetCommApi { * * -1L：添加到WS发送消息队列失败 */ @Override - public long sendPassEachOther(int enable) { - return mChannel == null ? -1L : mChannel.sendPassEachOther(enable); + public long sendParkVehCross(int enable) { + return mChannel == null ? -1L : mChannel.sendParkVehCross(enable); } /** @@ -1397,8 +1397,8 @@ public class AdasManager implements IAdasNetCommApi { * * -1L：添加到WS发送消息队列失败 */ @Override - public long sendOvertake(int enable) { - return mChannel == null ? -1L : mChannel.sendOvertake(enable); + public long sendParkVehOvertake(int enable) { + return mChannel == null ? -1L : mChannel.sendParkVehOvertake(enable); } /** @@ -1467,8 +1467,8 @@ public class AdasManager implements IAdasNetCommApi { * {@link AdasConstants.MapSystemParamType#OVERTAKE_MAX_SPEED Value类型：double或double类型String} * {@link AdasConstants.MapSystemParamType#FAULT_SIMULATION_CMD Value类型：int或int类型String} * {@link AdasConstants.MapSystemParamType#COLLISION_REPORTING Value类型：null} - * {@link AdasConstants.MapSystemParamType#PASS_EACH_OTHER Value类型：int或int类型String} - * {@link AdasConstants.MapSystemParamType#OVERTAKE Value类型：int或int类型String} + * {@link AdasConstants.MapSystemParamType#PARK_VEH_CROSS Value类型：int或int类型String} + * {@link AdasConstants.MapSystemParamType#PARK_VEH_OVERTAKE Value类型：int或int类型String} * @return 消息是否添加到WS消息发送队列。由于批量设置参数，调用的域控接口存在不同，实际调用域控最多2个接口，调用次数最多4次，所以最多返回4条ID数据 * * 返回值为非0的正整数时表示下发消息的消息ID * * >=0：表示添加到WS发送消息队列 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 53a94eceff..0fb65021f7 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 @@ -956,7 +956,7 @@ public interface IAdasNetCommApi { * * =0：表示乘客屏模式添加到WS发送消息队列 * * -1L：添加到WS发送消息队列失败 */ - long sendPassEachOther(int enable); + long sendParkVehCross(int enable); /** * 超车开关 @@ -968,7 +968,7 @@ public interface IAdasNetCommApi { * * =0：表示乘客屏模式添加到WS发送消息队列 * * -1L：添加到WS发送消息队列失败 */ - long sendOvertake(int enable); + long sendParkVehOvertake(int enable); /*******************************设置参数命令 V2************************************/ @@ -1031,8 +1031,8 @@ public interface IAdasNetCommApi { * {@link AdasConstants.MapSystemParamType#OVERTAKE_MAX_SPEED Value类型：double或double类型String} * {@link AdasConstants.MapSystemParamType#FAULT_SIMULATION_CMD Value类型：int或int类型String} * {@link AdasConstants.MapSystemParamType#COLLISION_REPORTING Value类型：null} - * {@link AdasConstants.MapSystemParamType#PASS_EACH_OTHER Value类型：int或int类型String} - * {@link AdasConstants.MapSystemParamType#OVERTAKE Value类型：int或int类型String} + * {@link AdasConstants.MapSystemParamType#PARK_VEH_CROSS Value类型：int或int类型String} + * {@link AdasConstants.MapSystemParamType#PARK_VEH_OVERTAKE Value类型：int或int类型String} * @return 消息是否添加到WS消息发送队列。由于批量设置参数，调用的域控接口存在不同，实际调用域控最多2个接口，调用次数最多4次，所以最多返回4条ID数据 * * 返回值为非0的正整数时表示下发消息的消息ID * * >=0：表示添加到WS发送消息队列