diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index bbe709f901..511770f1ee 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -178,7 +178,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } @Override - public void warningChangedWithType(int type) { + public void warningChangedWithDirection(int type) { Log.d(TAG, "显示红色预警蒙层"); switch (type) { case ALERT_THE_FRONT_CRASH_WARNING_TOP: diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java index 2bd4ce2b84..cbbbee5473 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java @@ -39,7 +39,7 @@ import java.util.List; * @since: 2021/3/24 */ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMogoTopViewStatusListener { - private int type; + private int direction; private V2XWarningEntity mMarkerEntity; public V2XFrontWarningScenario() { @@ -48,11 +48,11 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMogoTopV @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { - type = v2XMessageEntity.getType(); - MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithType(type, MogoReceiver.ACTION_V2X_FRONT_WARNING); try { if (v2XMessageEntity != null && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { mMarkerEntity = (V2XWarningEntity) v2XMessageEntity.getContent(); + direction = mMarkerEntity.getDirection(); + MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(direction, MogoReceiver.ACTION_V2X_FRONT_WARNING); show(); } } catch (Exception e) { 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 1f31458761..aa48b7241f 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 @@ -8,7 +8,7 @@ "collisionLon": 116.411360351446, "from": 1, "angle": 120, - "direction": 1, + "direction": 10014, "speed":11.108121 } \ No newline at end of file diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XListener.java index 4931132089..440dbca18d 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XListener.java @@ -6,5 +6,5 @@ package com.mogo.service.v2x; * @since: 2021/3/24 */ public interface IV2XListener { - void warningChangedWithType(int type); + void warningChangedWithDirection(int direction); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XProvider.java index cded9418b3..96a94ac5e8 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/v2x/IV2XProvider.java @@ -14,5 +14,5 @@ public interface IV2XProvider extends IProvider { public void unregisterIntentListener(String intent, IV2XListener listener); - public void warningChangedForListenerWithType(int type, String command); + public void warningChangedForListenerWithDirection(int direction, String command); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java index e1cb2627d5..d27ca128e8 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java @@ -47,14 +47,14 @@ public class V2XManager implements IV2XProvider { } @Override - public void warningChangedForListenerWithType(int type, String command) { + public void warningChangedForListenerWithDirection(int direction, String command) { List listeners = mListeners.get(command); if (listeners != null && !listeners.isEmpty()) { Iterator iterator = listeners.iterator(); while (iterator.hasNext()) { IV2XListener listener = iterator.next(); if (listener != null) { - listener.warningChangedWithType(type); + listener.warningChangedWithDirection(direction); } } }