From d746b0c798d95a07ac49d9aeea0bdf9ef02b27a5 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 15 Jun 2022 14:27:22 +0800 Subject: [PATCH] =?UTF-8?q?[change]=E6=B5=8B=E8=AF=95=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/adas/client/ui/MainActivity.java | 65 +++++++++++-------- .../zhidao/adas/client/utils/Constants.java | 18 +++++ 2 files changed, 57 insertions(+), 26 deletions(-) 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 edda866112..5722e2b169 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 @@ -592,18 +592,21 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas titleFragmentData.add(Constants.TITLE.RECEIVE_ERROR); - titleBtnData.add("自动驾驶模式"); - titleBtnData.add("自动驾驶路径查询"); - titleBtnData.add("下发SN"); - titleBtnData.add("数据采集5秒"); - titleBtnData.add("数据采集start"); - titleBtnData.add("数据采集end"); - titleBtnData.add("发送信号灯"); - titleBtnData.add("自动驾驶限速"); - titleBtnData.add("重启所有节点"); - titleBtnData.add("采集类型"); - titleBtnData.add("打开演示模式"); - titleBtnData.add("关闭演示模式"); + titleBtnData.add(Constants.TITLE.SEND_SET_AUTOPILOT_MODE_REQ); + titleBtnData.add(Constants.TITLE.SEND_GLOBAL_PATH_REQ); + titleBtnData.add(Constants.TITLE.SEND_STATUS_QUERY_REQ); + titleBtnData.add(Constants.TITLE.SEND_BASIC_INFO_RESP); + titleBtnData.add(Constants.TITLE.SEND_RECORD_DATA_5); + titleBtnData.add(Constants.TITLE.SEND_RECORD_DATA_START); + titleBtnData.add(Constants.TITLE.SEND_RECORD_DATA_END); + titleBtnData.add(Constants.TITLE.SEND_TRAFFIC_LIGHT_DATA); + titleBtnData.add(Constants.TITLE.SEND_SET_AUTOPILOT_SPEED_REQ); + titleBtnData.add(Constants.TITLE.SEND_SYSTEM_CMD_REQ_REBOOT); + titleBtnData.add(Constants.TITLE.SEND_RECORD_CAUSE); + titleBtnData.add(Constants.TITLE.SEND_SET_DEMO_MODE_REQ_OPEN); + titleBtnData.add(Constants.TITLE.SEND_SET_DEMO_MODE_REQ_CLOSE); + titleBtnData.add(Constants.TITLE.SEND_SET_RAIN_MODE_REQ_OPEN); + titleBtnData.add(Constants.TITLE.SEND_SET_RAIN_MODE_REQ_CLOSE); } private void initBtnRecyclerView() { @@ -1059,8 +1062,8 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas showToastCenter("IPC 未连接"); return; } - switch (position) { - case 0: + switch (data) { + case Constants.TITLE.SEND_SET_AUTOPILOT_MODE_REQ: // MessagePad.Line.Builder line = MessagePad.Line.newBuilder(); // line.setLineId(10); // line.setTrajUrl("我是TrajUrl"); @@ -1076,32 +1079,34 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas if (!autoPilotModeDialog.isShowing()) { autoPilotModeDialog.show(); } - break; - case 1: + case Constants.TITLE.SEND_GLOBAL_PATH_REQ: //自动驾驶路径查询 AdasManager.getInstance().sendGlobalPathReq(); break; - case 2: + case Constants.TITLE.SEND_STATUS_QUERY_REQ: + AdasManager.getInstance().sendStatusQueryReq(); + break; + case Constants.TITLE.SEND_BASIC_INFO_RESP: //发送sn AdasManager.getInstance().sendBasicInfoResp("X202021111192N41VY", 0); break; - case 3: + case Constants.TITLE.SEND_RECORD_DATA_5: //数据采集5秒 boolean b = AdasManager.getInstance().startRecordPackage(1, 5, 1); CupidLogUtils.w(TAG, "AutopilotRecord===>send:" + b); break; - case 4: + case Constants.TITLE.SEND_RECORD_DATA_START: //数据采集start boolean bStart = AdasManager.getInstance().startRecordPackage(1, 1); CupidLogUtils.w(TAG, "AutopilotRecord===>send:" + bStart); break; - case 5: + case Constants.TITLE.SEND_RECORD_DATA_END: //数据采集end boolean bEnd = AdasManager.getInstance().stopRecordPackage(1, 1); CupidLogUtils.w(TAG, "AutopilotRecord===>send:" + bEnd); break; - case 6: + case Constants.TITLE.SEND_TRAFFIC_LIGHT_DATA: //发送信号灯 MessagePad.TrafficLightStatus left = MessagePad.TrafficLightStatus.newBuilder() .setPhaseNo("1") @@ -1125,7 +1130,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas .build(); AdasManager.getInstance().sendTrafficLightData("10038", 26.848153, 112.574883, "180.0", "SN", 100413, -4, 201, 0, detail, System.currentTimeMillis()); break; - case 7: + case Constants.TITLE.SEND_SET_AUTOPILOT_SPEED_REQ: //速度设置 AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("自动驾驶限速"); @@ -1152,23 +1157,31 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas builder.show();//显示Dialog对话框 break; - case 8: + case Constants.TITLE.SEND_SYSTEM_CMD_REQ_REBOOT: //重启所有节点 AdasManager.getInstance().sendSystemCmdReq(MessagePad.SystemCmdType.SYSTEMCMD_REBOOT); break; - case 9: + case Constants.TITLE.SEND_RECORD_CAUSE: //采集类型 AdasManager.getInstance().sendRecordCause(recordKey, recordFileName, "1", "变道有干扰"); break; - case 10: + case Constants.TITLE.SEND_SET_DEMO_MODE_REQ_OPEN: //打开演示模式 AdasManager.getInstance().sendDemoModeReq(1); break; - case 11: + case Constants.TITLE.SEND_SET_DEMO_MODE_REQ_CLOSE: //关闭演示模式 AdasManager.getInstance().sendDemoModeReq(0); break; + case Constants.TITLE.SEND_SET_RAIN_MODE_REQ_OPEN: + //打开雨天模式 + AdasManager.getInstance().sendRainModeReq(1); + break; + case Constants.TITLE.SEND_SET_RAIN_MODE_REQ_CLOSE: + //关闭雨天模式 + AdasManager.getInstance().sendRainModeReq(0); + break; } } 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 3aab3ec62e..ff2ea6e065 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 @@ -172,5 +172,23 @@ public class Constants { String RECEIVE_ERROR = "错误数据"; + + String SEND_SET_AUTOPILOT_MODE_REQ="自动驾驶模式"; + String SEND_GLOBAL_PATH_REQ="自动驾驶路径查询"; + String SEND_STATUS_QUERY_REQ="状态查询"; + String SEND_BASIC_INFO_RESP="下发SN"; + String SEND_RECORD_DATA_5="数据采集5秒"; + String SEND_RECORD_DATA_START="数据采集Start"; + String SEND_RECORD_DATA_END="数据采集End"; + String SEND_TRAFFIC_LIGHT_DATA="发送信号灯"; + String SEND_SET_AUTOPILOT_SPEED_REQ="自动驾驶限速"; + String SEND_SYSTEM_CMD_REQ_REBOOT="重启所有节点"; + String SEND_RECORD_CAUSE="采集类型"; + String SEND_SET_DEMO_MODE_REQ_OPEN="打开演示模式"; + String SEND_SET_DEMO_MODE_REQ_CLOSE="关闭演示模式"; + String SEND_SET_RAIN_MODE_REQ_OPEN="打开雨天模式"; + String SEND_SET_RAIN_MODE_REQ_CLOSE="关闭雨天模式"; + + } }