[add][rm] 删除重复

2022-03-21 18:30:24 +08:00
parent bcc8ec98c7
commit 8b0c919ef6
15 changed files with 4 additions and 4 deletions
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml
+++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml
@@ -12,7 +12,7 @@
        android:layout_width="@dimen/module_v2x_brake_image_width"
        android:layout_height="@dimen/module_v2x_brake_image_width"
        android:layout_marginStart="@dimen/module_v2x_brake_image_margin_left"
-        android:src="@drawable/v2x_icon_ahead_car_brake"
+        android:src="@drawable/icon_warning_v2x_emergency_brake"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongshigu_vr.png
+++ b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongshigu_vr.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiebing_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiebing_vr.png
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_nongwu_vr.png
+++ b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_nongwu_vr.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt
@@ -37,13 +37,13 @@ enum class EventTypeEnum(

    //施工
    FOURS_ROAD_WORK(
-            "10006", "道路施工", "前方施工", R.drawable.v2x_icon_daolushigong_vr,
+            "10006", "道路施工", "前方施工", R.drawable.icon_warning_v2x_road_construction,
            "前方施工", "道路施工"
    ),

    //拥堵
    FOURS_BLOCK_UP(
-            "10007", "道路拥堵", "前方拥堵", R.drawable.v2x_icon_yongdu_vr,
+            "10007", "道路拥堵", "前方拥堵", R.drawable.icon_warning_v2x_congestion,
            "前方道路拥堵", "道路拥堵"
    ),

--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png
--- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -8,7 +8,7 @@
    <dimen name="module_v2n_image_margin_left">37px</dimen>
    <dimen name="module_v2x_brake_tip_width">435px</dimen>
    <dimen name="module_v2x_brake_tip_height">186px</dimen>
-    <dimen name="module_v2x_brake_image_width">133px</dimen>
+    <dimen name="module_v2x_brake_image_width">120px</dimen>
    <dimen name="module_v2x_brake_image_margin_left">37px</dimen>
    <dimen name="module_v2x_brake_image_margin_right">27px</dimen>