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 620ac1fa6b..5deea1e6e3 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 @@ -43,6 +43,7 @@ public class SendCmd { cmds.add(new SendCmdOption("关闭", SendCmdOption.TAG.BLIND_AREA, false)); return new SendCmd(Constants.TITLE.SEND_BLIND_AREA, cmds); } + //V2N数据到PnC public static SendCmd getSendV2nToPnc() { List> cmds = new ArrayList<>(); @@ -50,6 +51,7 @@ public class SendCmd { cmds.add(new SendCmdOption("关闭", SendCmdOption.TAG.V2N_TO_PNC, false)); return new SendCmd(Constants.TITLE.SEND_V2N_TO_PNC, cmds); } + //雨天模式开关 public static SendCmd getSendRainMode() { List> cmds = new ArrayList<>(); @@ -65,4 +67,12 @@ public class SendCmd { cmds.add(new SendCmdOption("关", SendCmdOption.TAG.DETOURING, 0)); return new SendCmd(Constants.TITLE.SEND_DETOURING, cmds); } + + //AEB + public static SendCmd getSendAeb() { + List> cmds = new ArrayList<>(); + cmds.add(new SendCmdOption("开", SendCmdOption.TAG.AEB, 1)); + cmds.add(new SendCmdOption("关", SendCmdOption.TAG.AEB, 0)); + return new SendCmd(Constants.TITLE.SEND_AEB, 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 0cfa16eebc..194b9f6555 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 @@ -8,7 +8,8 @@ public class SendCmdOption { int BLIND_AREA = 3;//盲区数据开关 int RAIN_MODE = 4;//雨天模式 int DETOURING = 5;//绕障类功能 - int V2N_TO_PNC = 5;//V2N数据到PnC + int V2N_TO_PNC = 6;//V2N数据到PnC + int AEB = 7;//AEB开关 } 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 d42ebc1b04..660731c9ea 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 @@ -226,6 +226,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas // wifiLock = wifiManager.createWifiLock(wifiLockType, TAG); // wifiLock.acquire(); } + private void initRegisterForActivityResult() { intentActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { @Override @@ -323,6 +324,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas public void onPermissionsSucceed() { } }; + private void showHint() { boolean isShowHint = PreferencesUtils.getBoolean(this, "show_hint", true); if (isShowHint) { @@ -856,6 +858,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas titleBtnData.add(Constants.TITLE.SEND_PLANNING_CMD); titleBtnData.add(Constants.TITLE.SEND_BLIND_AREA); titleBtnData.add(Constants.TITLE.SEND_V2N_TO_PNC); + titleBtnData.add(Constants.TITLE.SEND_AEB); } private void initBtnRecyclerView() { @@ -1663,6 +1666,10 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas //绕障类功能 new SendCmdDialog(this, SendCmd.getSendDetouring()).show(); break; + case Constants.TITLE.SEND_AEB: + //AEB + new SendCmdDialog(this, SendCmd.getSendAeb()).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 b2a82d7cbd..7bac67a8ba 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 @@ -92,6 +92,10 @@ public class SendCmdDialog extends Dialog { if (data.tag == SendCmdOption.TAG.DETOURING) { AdasManager.getInstance().sendDetouring((int) data.value); } + } else if (Constants.TITLE.SEND_AEB.equals(name)) { + if (data.tag == SendCmdOption.TAG.AEB) { + AdasManager.getInstance().sendAebCmd((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 6c743f2245..569de0d7a1 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 @@ -203,6 +203,7 @@ public class Constants { String SEND_PLANNING_CMD = "Planning指令"; String SEND_BLIND_AREA = "盲区数据开关"; String SEND_V2N_TO_PNC = "V2N数据到PnC"; + String SEND_AEB = "AEB开关"; } } 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 daa7cbe5e7..c6fc529b2a 100644 --- a/libraries/mogo-adas-data/src/main/proto/message_pad.proto +++ b/libraries/mogo-adas-data/src/main/proto/message_pad.proto @@ -575,7 +575,7 @@ message PlanningActionMsg //message definition for MsgTypeSetParamReq message SetOneParam { - uint32 type = 1; // 0:default 1:绕障类功能开关(bool) 2:变道绕障的目标障碍物速度阈值(double, m/s) + uint32 type = 1; // 0:default 1:绕障类功能开关(bool) 2:变道绕障的目标障碍物速度阈值(double, m/s) 3:AEB开关(bool) 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 b0b0fdaff8..fa74bc73ed 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 @@ -1553,6 +1553,18 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec return sendSetParamReq(2, String.valueOf(speed)); } + /** + * AEB开关 + * TODO 目前仅襄阳牌照考试支持 + * + * @param enable 0：关闭，1：开启 + * @return boolean + */ + @Override + public boolean sendAebCmd(int enable) { + return sendSetParamReq(3, 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 255808838d..c619375b84 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 @@ -834,6 +834,18 @@ public class AdasManager implements IAdasNetCommApi { return mChannel != null && mChannel.sendDetouringSpeed(speed); } + /** + * AEB开关 + * TODO 目前仅襄阳牌照考试支持 + * + * @param enable 0：关闭，1：开启 + * @return boolean + */ + @Override + public boolean sendAebCmd(int enable) { + return mChannel != null && mChannel.sendAebCmd(enable); + } + /** * 发生行程相关 * type=1或2的时 需要参数 lineName 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 14dc5df6d8..ff38cfe0cc 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 @@ -501,6 +501,15 @@ public interface IAdasNetCommApi { */ boolean sendDetouringSpeed(double speed); + /** + * AEB开关 + * TODO 目前仅襄阳牌照考试支持 + * + * @param enable 0：关闭，1：开启 + * @return boolean + */ + boolean sendAebCmd(int enable); + /** * 发生行程相关 * type=1或2的时 需要参数 lineName