diff --git 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 index 37971199fb..759382f950 100644 --- 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" /> diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_car_collide_warning.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_car_collide_warning.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongjiancha_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongjiancha_vr.png diff --git 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 new file mode 100644 index 0000000000..86b955658e Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongshigu_vr.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiebing_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiebing_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiebing_vr.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiebing_vr.png diff --git 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 new file mode 100644 index 0000000000..d337e248c0 Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_nongwu_vr.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_yongdu_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_yongdu_vr.png diff --git 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 index 487157b473..94c63c047d 100644 --- 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, "前方道路拥堵", "道路拥堵" ), diff --git 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 deleted file mode 100644 index 31ea64f0ea..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png and /dev/null differ diff --git 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 deleted file mode 100644 index 3b658c62d3..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png and /dev/null differ diff --git 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 deleted file mode 100644 index d5cca39f45..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png and /dev/null differ diff --git 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 deleted file mode 100644 index 3ed7564641..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png and /dev/null differ diff --git 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 index 05903f6e61..5cbd0c6809 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png differ diff --git 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 index da68268420..9c33431aae 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png differ diff --git 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 index 36123b8fe0..3fec33a8e2 100644 --- 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 @@ 37px 435px 186px - 133px + 120px 37px 27px