diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 208412c15e..2a3c941289 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -72,7 +72,6 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME ) ); MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); - MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_LOG_LIB, "LogLib")); if ( !DebugConfig.isLauncher() ) { PersistentManager.getInstance().initManager( this ); 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 de10aabafe..c6d11ae933 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(); 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; }