diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java new file mode 100644 index 0000000000..d133154149 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java @@ -0,0 +1,34 @@ +package com.mogo.module.common.utils; + +public class Const { + /** + * V2X 场景广播 Action + */ + public static final String BROADCAST_SCENE_HANDLER_ACTION = "com.v2x.scene_handler_broadcast"; + public static final String BROADCAST_SCENE_EXTRA_KEY = "V2XMessageEntity"; + + public interface V2XTypeEnum { + // 默认展示详情 + int DEFAULT_WINDOW = 0; + // 道路事件预警 + int ALERT_ROAD_WARNING = 1_000; + // 他车求助预警 + int ALERT_SEEK_WARNING = 1_001; + // 疲劳驾驶预警 + int ALERT_FATIGUE_DRIVING = 1_002; + // 后台推送展示 Window + int ALERT_PUSH_WINDOW_WARNING = 1_003; + // 后台推送展示 Toast + int ALERT_PUSH_TOAST_WARNING = 1_004; + // 后台推送展示 展示的直播 + int ALERT_PUSH_LIVE_CAR_WARNING = 1_005; + // V2X场景动画展示 + int ALERT_ANIMATION_WARNING = 1_006; + // 道路事件直播预警 + int ALERT_ROAD_LIVE_CAR_WARNING = 1_007; + // 道路事件违章停车 + int ALERT_ILLEGAL_PARK_WARNING = 1_008; + // 自车求助 + int ALERT_CAR_FOR_HELP = 8_000; + } +} diff --git a/modules/mogo-module-tanlu/build.gradle b/modules/mogo-module-tanlu/build.gradle index 293b941e74..478e05d53f 100644 --- a/modules/mogo-module-tanlu/build.gradle +++ b/modules/mogo-module-tanlu/build.gradle @@ -74,11 +74,7 @@ dependencies { implementation rootProject.ext.dependencies.videoarm64 implementation rootProject.ext.dependencies.videojava implementation rootProject.ext.dependencies.eventbus - implementation project(path: ':modules:mogo-module-v2x') - implementation project(path: ':modules:mogo-module-v2x') - implementation project(path: ':modules:mogo-module-v2x') - implementation project(path: ':modules:mogo-module-v2x') - implementation project(path: ':modules:mogo-module-v2x') + // if( Boolean.valueOf(RELEASE)){ // implementation rootProject.ext.dependencies.moduletanlulib diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java index d532afd8a4..3b93ac53d5 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java @@ -56,6 +56,7 @@ import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.MarkerUserInfo; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; +import com.mogo.module.common.utils.Const; import com.mogo.module.tanlu.R; import com.mogo.module.tanlu.callback.DataSetChangedAdapter; import com.mogo.module.tanlu.callback.NaviCallback; @@ -82,7 +83,6 @@ import com.mogo.module.tanlu.model.event.VoiceControlUpInfo; import com.mogo.module.tanlu.util.Utils; import com.mogo.module.tanlu.view.NetErrorDialog; import com.mogo.module.tanlu.view.UploadFailedDialog; -import com.mogo.module.v2x.V2XConst; import com.mogo.service.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; @@ -395,8 +395,8 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL } markerExploreWayList.add(exploreWay); - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); + Intent intent = new Intent(Const.BROADCAST_SCENE_HANDLER_ACTION); + intent.putExtra(Const.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); //埋点