diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmd.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmd.java index 341774e497..0eb66f7f6c 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmd.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmd.java @@ -79,24 +79,31 @@ public class SendCmd { //限制绕障开关 public static SendCmd getSendLaneChangeRestrainVaild() { List> cmds = new ArrayList<>(); - cmds.add(new SendCmdOption("限制绕障", SendCmdOption.TAG.LANE_CHANGE_RESTRAIN_VAILD, 1)); - cmds.add(new SendCmdOption("正常绕障", SendCmdOption.TAG.LANE_CHANGE_RESTRAIN_VAILD, 0)); - return new SendCmd(Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VAILD, cmds); + cmds.add(new SendCmdOption("限制绕障", SendCmdOption.TAG.LANE_CHANGE_RESTRAIN_VALID, 1)); + cmds.add(new SendCmdOption("正常绕障", SendCmdOption.TAG.LANE_CHANGE_RESTRAIN_VALID, 0)); + return new SendCmd(Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VALID, cmds); } //停车让行线前避让等待开关 public static SendCmd getSendStopYieldVaild() { List> cmds = new ArrayList<>(); - cmds.add(new SendCmdOption("停车让行线前需要避让等待", SendCmdOption.TAG.STOP_YIELD_VAILD, 1)); - cmds.add(new SendCmdOption("停车让行线前无需避让等待", SendCmdOption.TAG.STOP_YIELD_VAILD, 0)); - return new SendCmd(Constants.TITLE.SEND_STOP_YIELD_VAILD, cmds); + cmds.add(new SendCmdOption("停车让行线前需要避让等待", SendCmdOption.TAG.STOP_YIELD_VALID, 1)); + cmds.add(new SendCmdOption("停车让行线前无需避让等待", SendCmdOption.TAG.STOP_YIELD_VALID, 0)); + return new SendCmd(Constants.TITLE.SEND_STOP_YIELD_VALID, cmds); } //地图限速功能开关 public static SendCmd getSendHadmapSpeedLimitVaild() { List> cmds = new ArrayList<>(); - cmds.add(new SendCmdOption("使用地图限速功能", SendCmdOption.TAG.HADMAP_SPEED_LIMIT_VAILD, 1)); - cmds.add(new SendCmdOption("不使用地图限速功能", SendCmdOption.TAG.HADMAP_SPEED_LIMIT_VAILD, 0)); - return new SendCmd(Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VAILD, cmds); + cmds.add(new SendCmdOption("使用地图限速功能", SendCmdOption.TAG.HADMAP_SPEED_LIMIT_VALID, 1)); + cmds.add(new SendCmdOption("不使用地图限速功能", SendCmdOption.TAG.HADMAP_SPEED_LIMIT_VALID, 0)); + return new SendCmd(Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VALID, cmds); + } + //环岛模式开关 + public static SendCmd getSendRampThetaValid() { + List> cmds = new ArrayList<>(); + cmds.add(new SendCmdOption("环岛模式", SendCmdOption.TAG.RAMP_THETA_VALID, 1)); + cmds.add(new SendCmdOption("普通模式", SendCmdOption.TAG.RAMP_THETA_VALID, 0)); + return new SendCmd(Constants.TITLE.SEND_RAMP_THETA_VALID, cmds); } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmdOption.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmdOption.java index 64bc689a21..7237785ef5 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmdOption.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/bean/SendCmdOption.java @@ -10,9 +10,10 @@ public class SendCmdOption { int DETOURING = 5;//绕障类功能 int V2N_TO_PNC = 6;//V2N数据到PnC int AEB = 7;//AEB开关 - int LANE_CHANGE_RESTRAIN_VAILD = 8;//限制绕障开关 - int STOP_YIELD_VAILD = 9;//停车让行线前避让等待开关 - int HADMAP_SPEED_LIMIT_VAILD = 10;//地图限速功能开关 + int LANE_CHANGE_RESTRAIN_VALID = 8;//限制绕障开关 + int STOP_YIELD_VALID = 9;//停车让行线前避让等待开关 + int HADMAP_SPEED_LIMIT_VALID = 10;//地图限速功能开关 + int RAMP_THETA_VALID = 11;//环岛模式开关 } public final String name; diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java index e38cfeb1af..6e706eaf3d 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java @@ -855,9 +855,10 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas titleBtnData.add(Constants.TITLE.SEND_DETOURING); titleBtnData.add(Constants.TITLE.SEND_DETOURING_SPEED); titleBtnData.add(Constants.TITLE.SEND_AEB); - titleBtnData.add(Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VAILD); - titleBtnData.add(Constants.TITLE.SEND_STOP_YIELD_VAILD); - titleBtnData.add(Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VAILD); + titleBtnData.add(Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VALID); + titleBtnData.add(Constants.TITLE.SEND_STOP_YIELD_VALID); + titleBtnData.add(Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VALID); + titleBtnData.add(Constants.TITLE.SEND_RAMP_THETA_VALID); titleBtnData.add(Constants.TITLE.SEND_TRIP_INFO); titleBtnData.add(Constants.TITLE.SEND_PLANNING_CMD); titleBtnData.add(Constants.TITLE.SEND_BLIND_AREA); @@ -1673,18 +1674,22 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas //AEB new SendCmdDialog(this, SendCmd.getSendAeb()).show(); break; - case Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VAILD: + case Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VALID: //限制绕障开关 new SendCmdDialog(this, SendCmd.getSendLaneChangeRestrainVaild()).show(); break; - case Constants.TITLE.SEND_STOP_YIELD_VAILD: + case Constants.TITLE.SEND_STOP_YIELD_VALID: //停车让行线前避让等待开关 new SendCmdDialog(this, SendCmd.getSendStopYieldVaild()).show(); break; - case Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VAILD: + case Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VALID: //地图限速功能开关 new SendCmdDialog(this, SendCmd.getSendHadmapSpeedLimitVaild()).show(); break; + case Constants.TITLE.SEND_RAMP_THETA_VALID: + //环岛模式开关 + new SendCmdDialog(this, SendCmd.getSendRampThetaValid()).show(); + break; case Constants.TITLE.SEND_DETOURING_SPEED: //绕障速度设置 showDetouringSpeedDialog(); diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/SendCmdDialog.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/SendCmdDialog.java index 237f7cc637..d21651b7a4 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/SendCmdDialog.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/SendCmdDialog.java @@ -96,17 +96,21 @@ public class SendCmdDialog extends Dialog { if (data.tag == SendCmdOption.TAG.AEB) { AdasManager.getInstance().sendAebCmd((int) data.value); } - } else if (Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VAILD.equals(name)) { - if (data.tag == SendCmdOption.TAG.LANE_CHANGE_RESTRAIN_VAILD) { - AdasManager.getInstance().sendLaneChangeRestrainVaild((int) data.value); + } else if (Constants.TITLE.SEND_LANE_CHANGE_RESTRAIN_VALID.equals(name)) { + if (data.tag == SendCmdOption.TAG.LANE_CHANGE_RESTRAIN_VALID) { + AdasManager.getInstance().sendLaneChangeRestrainValid((int) data.value); } - } else if (Constants.TITLE.SEND_STOP_YIELD_VAILD.equals(name)) { - if (data.tag == SendCmdOption.TAG.STOP_YIELD_VAILD) { - AdasManager.getInstance().sendStopYieldVaild((int) data.value); + } else if (Constants.TITLE.SEND_STOP_YIELD_VALID.equals(name)) { + if (data.tag == SendCmdOption.TAG.STOP_YIELD_VALID) { + AdasManager.getInstance().sendStopYieldValid((int) data.value); } - } else if (Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VAILD.equals(name)) { - if (data.tag == SendCmdOption.TAG.HADMAP_SPEED_LIMIT_VAILD) { - AdasManager.getInstance().sendHadmapSpeedLimitVaild((int) data.value); + } else if (Constants.TITLE.SEND_HADMAP_SPEED_LIMIT_VALID.equals(name)) { + if (data.tag == SendCmdOption.TAG.HADMAP_SPEED_LIMIT_VALID) { + AdasManager.getInstance().sendHadmapSpeedLimitValid((int) data.value); + } + } else if (Constants.TITLE.SEND_RAMP_THETA_VALID.equals(name)) { + if (data.tag == SendCmdOption.TAG.RAMP_THETA_VALID) { + AdasManager.getInstance().sendRampThetaValid((int) data.value); } } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/Constants.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/Constants.java index c621600b6b..fd9ddec2d7 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/Constants.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/utils/Constants.java @@ -204,9 +204,10 @@ public class Constants { String SEND_BLIND_AREA = "盲区数据开关"; String SEND_V2N_TO_PNC = "V2N数据到PnC"; String SEND_AEB = "AEB开关"; - String SEND_LANE_CHANGE_RESTRAIN_VAILD = "限制绕障开关"; - String SEND_STOP_YIELD_VAILD = "停车让行线前避让等待开关"; - String SEND_HADMAP_SPEED_LIMIT_VAILD = "地图限速开关"; + String SEND_LANE_CHANGE_RESTRAIN_VALID = "限制绕障开关"; + String SEND_STOP_YIELD_VALID = "停车让行线前避让等待开关"; + String SEND_HADMAP_SPEED_LIMIT_VALID = "地图限速开关"; + String SEND_RAMP_THETA_VALID = "环岛模式开关"; } } diff --git a/gradle.properties b/gradle.properties index 1675f0b781..c4d4663c43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ bytex.ASM_API=ASM7 #SERVICE_BIZ_VERSION=1.2.4 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.5.24 +LOGLIB_VERSION=1.5.25 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.6.4 @@ -138,11 +138,11 @@ MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10 # ADAS LIB Maven配置（用于地图部门测试使用，鹰眼项目中使用本地依赖） # ADAS_LIB_GROUP=com.zhidao.support.adas ADAS_LIB_POM_ARTIFACT_ID=high -ADAS_LIB_CHILD_VERSION=.0 +ADAS_LIB_CHILD_VERSION=.3 ADAS_DATA_LIB_GROUP=com.zhjt.mogo.adas.data ADAS_DATA_LIB_POM_ARTIFACT_ID=adas-data -ADAS_DATA_LIB_CHILD_VERSION=.0 +ADAS_DATA_LIB_CHILD_VERSION=.3 MOGO_PLUGIN_VERSION=1.0.0.31 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 1b8597cbe5..a707584675 100644 --- a/libraries/mogo-adas-data/src/main/proto/message_pad.proto +++ b/libraries/mogo-adas-data/src/main/proto/message_pad.proto @@ -575,8 +575,12 @@ message PlanningActionMsg //message definition for MsgTypeSetParamReq message SetOneParam { - uint32 type = 1; // 0:default 1:绕障类功能开关(bool) 2:变道绕障的目标障碍物速度阈值(double, m/s) 3:AEB开关(bool) - // 4:限制绕障开关(bool) 5:停车让行线前避让等待开关(bool) 6:地图限速功能开关(bool) + uint32 type = 1; // 0:default 1:绕障类功能开关(bool) 2:变道绕障的目标碍物速度闻值(double，Ds) + // 3:AEB开关(bool) 0: 关闭自动紧急制动功能 1:启用自动紧急制动功能 + // 4:限制绕障开关(bool) 0:正常绕障 1:限制绕障 默认0 + // 5:停车让行线前避让等待开关(bool) 0:停车让行线前无需等待 1:停车让行线前需要等待 默认0 + // 6:地图限速功能开关(bol) :不使用地图限速功能 1:使用地图限速功能 默认0 + // 7:环岛模式开关(bool) //0:普通模式 1:环岛模式 默认0 string value = 2; // 转成字符串的值 } 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 a76a80f6ab..5c51ac1801 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 @@ -1571,11 +1571,11 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * 限制绕障开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:正常绕障 1：限制绕障 + * @param enable 0:正常绕障 1：限制绕障 默认0 * @return boolean */ @Override - public boolean sendLaneChangeRestrainVaild(int enable) { + public boolean sendLaneChangeRestrainValid(int enable) { return sendSetParamReq(4, String.valueOf(enable)); } @@ -1583,11 +1583,11 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * 停车让行线前避让等待开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:停车让行线前无需避让等待 1:停车让行线前需要避让等待 + * @param enable 0:停车让行线前无需避让等待 1:停车让行线前需要避让等待 默认0 * @return boolean */ @Override - public boolean sendStopYieldVaild(int enable) { + public boolean sendStopYieldValid(int enable) { return sendSetParamReq(5, String.valueOf(enable)); } @@ -1596,14 +1596,26 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * 地图限速功能开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:不使用地图限速功能 1:使用地图限速功能 + * @param enable 0:不使用地图限速功能 1:使用地图限速功能 默认0 * @return boolean */ @Override - public boolean sendHadmapSpeedLimitVaild(int enable) { + public boolean sendHadmapSpeedLimitValid(int enable) { return sendSetParamReq(6, String.valueOf(enable)); } + /** + * 环岛模式开关 + * TODO 目前仅襄阳牌照考试支持 + * + * @param enable 0:普通模式 1:环岛模式 默认0 + * @return boolean + */ + @Override + public boolean sendRampThetaValid(int enable) { + return sendSetParamReq(7, String.valueOf(enable)); + } + /** * 发生行程相关 * type=1或2的时 需要参数 lineName 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 b597261f67..9739478724 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 @@ -850,36 +850,48 @@ public class AdasManager implements IAdasNetCommApi { * 限制绕障开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:正常绕障 1：限制绕障 + * @param enable 0:正常绕障 1：限制绕障 默认0 * @return boolean */ @Override - public boolean sendLaneChangeRestrainVaild(int enable) { - return mChannel != null && mChannel.sendLaneChangeRestrainVaild(enable); + public boolean sendLaneChangeRestrainValid(int enable) { + return mChannel != null && mChannel.sendLaneChangeRestrainValid(enable); } /** * 停车让行线前避让等待开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:停车让行线前无需避让等待 1:停车让行线前需要避让等待 + * @param enable 0:停车让行线前无需避让等待 1:停车让行线前需要避让等待 默认0 * @return boolean */ @Override - public boolean sendStopYieldVaild(int enable) { - return mChannel != null && mChannel.sendStopYieldVaild(enable); + public boolean sendStopYieldValid(int enable) { + return mChannel != null && mChannel.sendStopYieldValid(enable); } /** * 地图限速功能开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:不使用地图限速功能 1:使用地图限速功能 + * @param enable 0:不使用地图限速功能 1:使用地图限速功能 默认0 * @return boolean */ @Override - public boolean sendHadmapSpeedLimitVaild(int enable) { - return mChannel != null && mChannel.sendHadmapSpeedLimitVaild(enable); + public boolean sendHadmapSpeedLimitValid(int enable) { + return mChannel != null && mChannel.sendHadmapSpeedLimitValid(enable); + } + + /** + * 环岛模式开关 + * TODO 目前仅襄阳牌照考试支持 + * + * @param enable 0:普通模式 1:环岛模式 默认0 + * @return boolean + */ + @Override + public boolean sendRampThetaValid(int enable) { + return mChannel != null && mChannel.sendRampThetaValid(enable); } /** 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 7829041bcf..098546b240 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 @@ -510,33 +510,43 @@ public interface IAdasNetCommApi { */ boolean sendAebCmd(int enable); - /** * 限制绕障开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:正常绕障 1：限制绕障 + * @param enable 0:正常绕障 1：限制绕障 默认0 * @return boolean */ - boolean sendLaneChangeRestrainVaild(int enable); + boolean sendLaneChangeRestrainValid(int enable); + /** * 停车让行线前避让等待开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:停车让行线前无需避让等待 1:停车让行线前需要避让等待 + * @param enable 0:停车让行线前无需避让等待 1:停车让行线前需要避让等待 默认0 * @return boolean */ - boolean sendStopYieldVaild(int enable); + boolean sendStopYieldValid(int enable); + /** * 地图限速功能开关 * TODO 目前仅襄阳牌照考试支持 * - * @param enable 0:不使用地图限速功能 1:使用地图限速功能 + * @param enable 0:不使用地图限速功能 1:使用地图限速功能 默认0 * @return boolean */ - boolean sendHadmapSpeedLimitVaild(int enable); + boolean sendHadmapSpeedLimitValid(int enable); + + /** + * 环岛模式开关 + * TODO 目前仅襄阳牌照考试支持 + * + * @param enable 0:普通模式 1:环岛模式 默认0 + * @return boolean + */ + boolean sendRampThetaValid(int enable); /** * 发生行程相关