From 28f7c06530896f26fb33a21ab3846d2a4b5a3e9b Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 31 May 2021 20:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/common/entity/V2XMessageEntity.java | 8 ++++---- .../v2x/scenario/scene/warning/V2XWarningMarker.java | 3 ++- .../com/mogo/module/v2x/utils/TestOnLineCarUtils.java | 2 +- .../main/res/raw/scenario_warning_event_data_left.json | 2 +- .../res/raw/scenario_warning_event_data_pedestrians.json | 2 +- .../main/res/raw/scenario_warning_event_data_right.json | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java index 7740e3a18d..36755b20ff 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java @@ -148,13 +148,13 @@ public class V2XMessageEntity implements Serializable { // 弱势交通参与者401018 int ALERT_THE_FRONT_WEAKNESS = 40_1018; // 前方行人碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_TOP = 0; + int ALERT_THE_FRONT_CRASH_WARNING_TOP = 1; // 后方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_BOTTOM = 1; + int ALERT_THE_FRONT_CRASH_WARNING_BOTTOM = 2; // 左前方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_LEFT = 2; + int ALERT_THE_FRONT_CRASH_WARNING_LEFT = 3; // 右前方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_RIGHT = 3; + int ALERT_THE_FRONT_CRASH_WARNING_RIGHT = 4; // 推送VR消息展示 int ALERT_PUSH_VR_SHOW = 2_000; // 自车求助 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java index 78d610c64e..ae1cd29416 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java @@ -124,7 +124,8 @@ public class V2XWarningMarker implements IV2XMarker { //二轮车和行人的渲染和移动 V2XServiceManager.getMarkerManager().removeMarkers(TYPE_MARKER_CLOUD_WARN_DATA); V2XWarnDataDrawer.getInstance().renderWarnData(mCloundWarningInfo); - + //添加停止线marker + handleStopLine(); //车辆静止的时候 drawSelfCarLine(carLocation.lon, carLocation.lat, bearing); 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 381d9d460f..19a0e03e70 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 @@ -189,7 +189,7 @@ public class TestOnLineCarUtils { // 加载数据源 V2XWarningEntity warningEntity = GsonUtil.objectFromJson(baos.toString(), V2XWarningEntity.class); V2XMessageEntity messageEntity = new V2XMessageEntity(); - messageEntity.setType(warningEntity.getDirection()); + messageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_WEAKNESS); messageEntity.setContent(warningEntity); return messageEntity; } catch (Exception e) { diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index ee432bbd59..3208f594ac 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -17,7 +17,7 @@ ], "from": 1, "angle": 220, - "direction": 2, + "direction": 3, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json index 13f6b9853e..c93a6ec99c 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -18,7 +18,7 @@ ], "from": 1, "angle": 240, - "direction": 0, + "direction": 1, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json index bbc74917d5..5d7ca4b80f 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json @@ -17,7 +17,7 @@ ], "from": 1, "angle": 260, - "direction": 3, + "direction": 4, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60,