diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index 9f21d94c8a..46bf3aefed 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -26,11 +26,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java index 1359dd3e6b..e0e752cc14 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java @@ -50,8 +50,6 @@ public class CloudPoiManager { R.drawable.module_common_icon_map_marker_road_block_up2, R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵")); poiWrapper.put(EventTypeEnumNew.FOURS_PONDING.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_PONDING.getPoiType(), R.drawable.module_common_icon_map_marker_pondingl2, R.drawable.module_common_icon_map_marker_pondingl2_white, "积水")); - poiWrapper.put(EventTypeEnumNew.FOURS_FOG.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_FOG.getPoiType(), - R.drawable.module_common_ic_rc_dark_frog2, R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾")); poiWrapper.put(EventTypeEnumNew.FOURS_ICE.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ICE.getPoiType(), R.drawable.module_common_ic_rc_freeze2, R.drawable.module_common_ic_rc_freeze2_white, "结冰")); poiWrapper.put(EventTypeEnumNew.FOURS_ACCIDENT.getPoiType(), new PoiWrapper(EventTypeEnumNew.FOURS_ACCIDENT.getPoiType(), diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index 1f9a850303..6ad2e63d6a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -45,12 +45,6 @@ enum class EventTypeEnumNew( "前方道路积水", "道路积水" ), - //浓雾 - FOURS_FOG( - "10010", "出现浓雾", "浓雾预警", R.drawable.v2x_icon_nongwu_vr, - "前方出现浓雾", "出现浓雾" - ), - //结冰 FOURS_ICE( "10011", "路面结冰", "路面结冰", R.drawable.v2x_icon_jiebing_vr, @@ -538,7 +532,6 @@ enum class EventTypeEnumNew( FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeStr FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeStr FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeStr - FOURS_FOG.poiType -> FOURS_FOG.poiTypeStr FOURS_ICE.poiType -> FOURS_ICE.poiTypeStr FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, @@ -559,7 +552,6 @@ enum class EventTypeEnumNew( FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeStrVr FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeStrVr FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeStrVr - FOURS_FOG.poiType -> FOURS_FOG.poiTypeStrVr FOURS_ICE.poiType -> FOURS_ICE.poiTypeStrVr FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, @@ -580,7 +572,6 @@ enum class EventTypeEnumNew( FOURS_ROAD_WORK.poiType -> "施工" FOURS_BLOCK_UP.poiType -> "道路拥堵" FOURS_PONDING.poiType -> "道路积水" - FOURS_FOG.poiType -> "出现浓雾" FOURS_ICE.poiType -> "路面结冰" FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> "交通事故" @@ -596,7 +587,6 @@ enum class EventTypeEnumNew( FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeSrcVr FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeSrcVr FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeSrcVr - FOURS_FOG.poiType -> FOURS_FOG.poiTypeSrcVr FOURS_ICE.poiType -> FOURS_ICE.poiTypeSrcVr FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, @@ -616,7 +606,7 @@ enum class EventTypeEnumNew( return when (poiType) { FOURS_BLOCK_UP.poiType, FOURS_LIVING.poiType-> if (isVrMode) R.drawable.bg_v2x_event_type_orange_vr else R.drawable.bg_v2x_event_type_orange TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType, FOURS_ROAD_WORK.poiType, - FOURS_PONDING.poiType, FOURS_FOG.poiType, FOURS_ICE.poiType, FOURS_ACCIDENT.poiType, + FOURS_PONDING.poiType, FOURS_ICE.poiType, FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> if (isVrMode) R.drawable.bg_v2x_event_type_red_vr else R.drawable.bg_v2x_event_type_read else -> { @@ -632,7 +622,7 @@ enum class EventTypeEnumNew( R.drawable.bg_v2x_event_type_orange TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType, FOURS_ROAD_WORK.poiType, FOURS_PONDING.poiType, - FOURS_FOG.poiType, FOURS_ICE.poiType, + FOURS_ICE.poiType, FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> @@ -649,7 +639,7 @@ enum class EventTypeEnumNew( return when (poiType) { TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType, FOURS_ROAD_WORK.poiType, FOURS_BLOCK_UP.poiType, - FOURS_PONDING.poiType, FOURS_FOG.poiType, + FOURS_PONDING.poiType, FOURS_ICE.poiType, FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, @@ -670,7 +660,6 @@ enum class EventTypeEnumNew( FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.tts FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.tts FOURS_PONDING.poiType -> FOURS_PONDING.tts - FOURS_FOG.poiType -> FOURS_FOG.tts FOURS_ICE.poiType -> FOURS_ICE.tts FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> FOURS_ACCIDENT.tts @@ -690,7 +679,6 @@ enum class EventTypeEnumNew( FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.content FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.content FOURS_PONDING.poiType -> FOURS_PONDING.content - FOURS_FOG.poiType -> FOURS_FOG.content FOURS_ICE.poiType -> FOURS_ICE.content FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> @@ -710,7 +698,6 @@ enum class EventTypeEnumNew( FOURS_BLOCK_UP.poiType -> R.raw.v2x_yongdu FOURS_ACCIDENT.poiType,FOURS_ACCIDENT_04.poiType -> R.raw.v2x_shigu FOURS_LIVING.poiType -> R.raw.v2x_shishilukuang - FOURS_FOG.poiType -> R.raw.v2x_nongwu TRAFFIC_CHECK.poiType -> R.raw.v2x_jiaotongjiancha FOURS_ROAD_WORK.poiType -> R.raw.v2x_daolushigong FOURS_ICE.poiType -> R.raw.v2x_daolujiebing @@ -763,10 +750,6 @@ enum class EventTypeEnumNew( FOURS_PONDING.poiType ->{ FOURS_PONDING.poiTypeStr } - //浓雾 - FOURS_FOG.poiType ->{ - FOURS_FOG.poiTypeStr - } //结冰 FOURS_ICE.poiType ->{ FOURS_ICE.poiTypeStr @@ -1066,10 +1049,6 @@ enum class EventTypeEnumNew( FOURS_PONDING.poiType -> { R.drawable.v2x_icon_jishui_vr } - //浓雾 - FOURS_FOG.poiType -> { - R.drawable.v2x_icon_nongwu_vr - } //结冰 FOURS_ICE.poiType -> { R.drawable.v2x_icon_jiebing_vr diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png deleted file mode 100644 index 787101fbb1..0000000000 Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png and /dev/null differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png deleted file mode 100644 index b6164bcfdd..0000000000 Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png and /dev/null differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png deleted file mode 100644 index f6e145dbea..0000000000 Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png and /dev/null differ