diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b3a159f443..59454de005 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -90,7 +90,6 @@ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java index dd82eba7fa..48fba32e7b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java @@ -81,9 +81,8 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog } mV2XScenario.setWarningEntity(cloundWarningInfo); mV2XScenario.init(null); - //预警蒙层 - MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(cloundWarningInfo.getType(), MogoReceiver.ACTION_V2X_FRONT_WARNING); + MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(cloundWarningInfo.getDirection(), MogoReceiver.ACTION_V2X_FRONT_WARNING); isSelfLineClear = false; isFirstLocation = false; V2XServiceManager.getMarkerManager().removeMarkers(WARNING_ARROWS); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java index f485da232b..6cd528ca95 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java @@ -312,7 +312,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout { mBtnAdasDataWarn.setOnClickListener(v -> { Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "23"); + intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "right"); getContext().sendBroadcast(intent); }); diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json index c3b8c824d9..c2799d1f93 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json @@ -17,7 +17,7 @@ ], "from": 1, "angle": 0, - "direction": 3, + "direction": 10015, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, 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 e8cce60732..ca8fc38eba 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": 0, - "direction": 3, + "direction": 10014, "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 bb40841a6e..e48685867f 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 @@ -17,7 +17,7 @@ ], "from": 1, "angle": 0, - "direction": 1, + "direction": 10013, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60,