From 8d97e7cb2dd9abaf3e4e6fc4559650a932629c4e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 4 Aug 2020 19:00:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89log=20lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index d37549c3ee..a067f4bf8e 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -73,7 +73,6 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_LOG_LIB, "LogLib")); if ( !DebugConfig.isLauncher() ) { PersistentManager.getInstance().initManager( this ); From dcf08a0c5e55df99a7d4438ea1699299e2158bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 4 Aug 2020 19:54:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=8C=E4=BC=98=E5=8C=96=E3=80=8D=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=9E=E6=97=B6=E8=B7=AF=E5=86=B5?= =?UTF-8?q?=E5=BE=97=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/utils/EventTypeUtils.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java index e70f2114cd..9ba13d8dd1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java @@ -1,7 +1,7 @@ package com.mogo.module.v2x.utils; -import com.mogo.module.v2x.R; import com.mogo.module.common.entity.V2XPoiTypeEnum; +import com.mogo.module.v2x.R; /** * @ProjectName: MoGoModulSafeDriving @@ -59,6 +59,14 @@ public class EventTypeUtils { case V2XPoiTypeEnum.FOURS_ACCIDENT: str = "交通事故"; break; + // 实时路况 + case V2XPoiTypeEnum.FOURS_LIVING: + str = "实时路况"; + break; + // 身边 + case V2XPoiTypeEnum.FOURS_NEALY: + str = "身边事件"; + break; default: str = "其它道路事件"; break; @@ -80,6 +88,8 @@ public class EventTypeUtils { strBg = R.drawable.bg_v2x_event_type_blue; break; case V2XPoiTypeEnum.FOURS_BLOCK_UP: // 拥堵 + case V2XPoiTypeEnum.FOURS_LIVING: // 实时路况 + case V2XPoiTypeEnum.FOURS_NEALY: // 身边 strBg = R.drawable.bg_v2x_event_type_orange; break; case V2XPoiTypeEnum.TRAFFIC_CHECK:// 交通检查 @@ -117,6 +127,8 @@ public class EventTypeUtils { case V2XPoiTypeEnum.FOURS_FOG://浓雾 case V2XPoiTypeEnum.FOURS_ICE://结冰 case V2XPoiTypeEnum.FOURS_ACCIDENT://事故 + case V2XPoiTypeEnum.FOURS_NEALY://身边 + case V2XPoiTypeEnum.FOURS_LIVING://实时路况 isRoadEvent = true; break; } From 65affad19d1e58a2d86837a560b584d6d9b7fa5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 4 Aug 2020 20:12:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=8C=E4=BC=98=E5=8C=96=E3=80=8D=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=9E=E6=97=B6=E8=B7=AF=E5=86=B5?= =?UTF-8?q?=E5=BE=97=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java index 93e07f7d70..b5ba5992be 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java @@ -165,6 +165,8 @@ public class V2XRoadEventWindow extends RelativeLayout case V2XPoiTypeEnum.FOURS_FOG://浓雾 case V2XPoiTypeEnum.FOURS_ICE://结冰 case V2XPoiTypeEnum.FOURS_ACCIDENT://事故 + case V2XPoiTypeEnum.FOURS_LIVING://实时路况 + case V2XPoiTypeEnum.FOURS_NEALY://身边 // 展示道路事件本身详情 if (mItemList.isEmpty()) { V2XEventShowEntity v2XEventShowEntity = new V2XEventShowEntity();