From e2b7a082fa943d1d87256f6c779c4a1a6932dad0 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 23 Sep 2020 14:55:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[add]=20v2x=E5=BC=95=E7=94=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A4=8D=E5=88=B6=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/common/utils/Const.java | 34 +++++++++++++++++++ .../tanlu/fragment/TanluListWindow.java | 5 +-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java 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/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..9c6944db3b 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; @@ -395,8 +396,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); //埋点 From 7bc5ac558c29427b5ed260d2eb491d3a6fef4088 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 23 Sep 2020 15:03:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-tanlu/build.gradle | 6 +----- .../com/mogo/module/tanlu/fragment/TanluListWindow.java | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) 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 9c6944db3b..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 @@ -83,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;