From b45b2ac59831cc5841e0c3c96910e63b68f2fc03 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 11 May 2021 11:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=B7=AF=E4=BA=91=E9=A2=84=E8=AD=A6-?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E5=88=B0V2X=E5=8E=9F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/TestPanelBroadcastReceiver.java | 21 ++++++++++++------- .../module/v2x/utils/TestOnLineCarUtils.java | 8 +++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java index fa3a0748d3..93d9c8cde2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java @@ -16,6 +16,7 @@ import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; import com.mogo.module.v2x.entity.net.V2XSpecialCarRes; +import com.mogo.module.v2x.scenario.impl.V2XScenarioManager; import com.mogo.module.v2x.scenario.scene.livecar.V2XVoiceCallLiveBiz; import com.mogo.module.v2x.utils.TestOnLineCarUtils; import com.mogo.module.v2x.utils.V2XSQLiteUtils; @@ -133,17 +134,21 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver { intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); } else if (sceneType == 12) {//车路云场景预警-右侧 - Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "right"); + V2XMessageEntity messageEntity = TestOnLineCarUtils.getV2XScenarioPushFrontWarningEventData("right"); + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, messageEntity); + LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); mContext.sendBroadcast(intent); } else if (sceneType == 13) {//车路云场景预警-左侧 - Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "left"); - mContext.sendBroadcast(intent); + V2XMessageEntity messageEntity = TestOnLineCarUtils.getV2XScenarioPushFrontWarningEventData("left"); + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, messageEntity); + LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); } else if (sceneType == 14) {//行人预警，行人路线预测 车路云预警-前方行人 - Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "pedestrians"); - mContext.sendBroadcast(intent); + V2XMessageEntity messageEntity = TestOnLineCarUtils.getV2XScenarioPushFrontWarningEventData("pedestrians"); + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, messageEntity); + LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); } else if (sceneType == 15) {// 交通状况查询 V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus(); } else if (sceneType == 16) {//触发基于目的地预测的线路推荐 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java index f797621688..f4c0dedff9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java @@ -162,7 +162,7 @@ public class TestOnLineCarUtils { /** * 测试数据 */ - private void getV2XScenarioPushFrontWarningEventData(String adasResult) { + public static V2XMessageEntity getV2XScenarioPushFrontWarningEventData(String adasResult) { try { int id = R.raw.scenario_warning_event_data_right; @@ -188,10 +188,14 @@ public class TestOnLineCarUtils { // 加载数据源 V2XWarningEntity warningEntity = GsonUtil.objectFromJson(baos.toString(), V2XWarningEntity.class); - V2XServiceManager.getMoGoV2XCloundDataManager().analysisV2XCloundDataEvent(warningEntity); + V2XMessageEntity messageEntity = new V2XMessageEntity(); + messageEntity.setType(warningEntity.getDirection()); + messageEntity.setContent(warningEntity); + return messageEntity; } catch (Exception e) { e.printStackTrace(); } + return null; } /**