From 9cc8d3aa6eee2399a00746b7ebefe8a38e9af045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 9 Aug 2021 16:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=B5=84=E6=BA=90=E5=BD=92=E7=BA=B3?= =?UTF-8?q?=E5=88=B0MogoLauncher.modules.mogo-module-common,=E9=80=9A?= =?UTF-8?q?=E8=BF=87gradle=E8=AE=BE=E7=BD=AE=E8=B5=84=E6=BA=90=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 3 ++- modules/mogo-module-common/build.gradle | 8 ++++++++ .../icon_warning_v2x_abnormal_vehicle.png | Bin ...icon_warning_v2x_accident_prone_road_section.png | Bin .../icon_warning_v2x_avoid_special_vehicles.png | Bin .../drawable-xxhdpi/icon_warning_v2x_ban_astern.png | Bin .../icon_warning_v2x_blind_area_collision.png | Bin .../icon_warning_v2x_collision_warning.png | Bin .../drawable-xxhdpi/icon_warning_v2x_congestion.png | Bin .../icon_warning_v2x_emergency_brake.png | Bin .../drawable-xxhdpi/icon_warning_v2x_give_way.png | Bin .../icon_warning_v2x_hump_bridge.png | Bin .../icon_warning_v2x_motorcycle_collision.png | Bin .../drawable-xxhdpi/icon_warning_v2x_no_parking.png | Bin .../drawable-xxhdpi/icon_warning_v2x_over_speed.png | Bin .../icon_warning_v2x_pedestrian_crossing.png | Bin .../icon_warning_v2x_reverse_overtaking.png | Bin .../icon_warning_v2x_road_construction.png | Bin .../icon_warning_v2x_road_dangerous.png | Bin .../icon_warning_v2x_roundaboutpng.png | Bin .../drawable-xxhdpi/icon_warning_v2x_school.png | Bin .../icon_warning_v2x_special_vehicle_access.png | Bin .../icon_warning_v2x_test_section.png | Bin .../icon_warning_v2x_traffic_light_gray.png | Bin .../icon_warning_v2x_traffic_light_green.png | Bin .../icon_warning_v2x_traffic_light_red.png | Bin .../icon_warning_v2x_traffic_light_yellow.png | Bin .../icon_warning_v2x_traffic_lights_green.png | Bin .../icon_warning_v2x_traffic_lights_red.png | Bin .../drawable-xxhdpi/icon_warning_v2x_tramcar.png | Bin .../icon_warning_v2x_turn_left_sharp.png | Bin .../icon_warning_v2x_turn_right_sharp.png | Bin .../icon_warning_v2x_vehicle_control.png | Bin .../drawable/bg_waring_limiting_velocity.xml | 0 .../drawable/bg_waring_traffic_light_vr.xml | 0 .../main/res-warning}/drawable/bg_warning_bg.xml | 0 .../drawable/icon_waring_traffic_light_green_vr.xml | 0 .../drawable/icon_waring_traffic_light_red_vr.xml | 0 .../icon_waring_traffic_light_yellow_vr.xml | 0 .../java/com/mogo/module/hmi/utils/WarningUtils.kt | 4 ++-- .../res/anim/notice_dialog_anim_top2bottom_in.xml | 10 ---------- .../res/anim/notice_dialog_anim_top2bottom_out.xml | 10 ---------- .../res/values/notice_dialog_anim_bottom2top.xml | 7 ------- 43 files changed, 12 insertions(+), 30 deletions(-) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_ban_astern.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_collision_warning.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_congestion.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_give_way.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_no_parking.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_over_speed.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_road_construction.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_school.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_test_section.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_tramcar.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable/bg_waring_limiting_velocity.xml (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable/bg_waring_traffic_light_vr.xml (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable/bg_warning_bg.xml (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable/icon_waring_traffic_light_green_vr.xml (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable/icon_waring_traffic_light_red_vr.xml (100%) rename modules/{mogo-module-hmi/src/main/res => mogo-module-common/src/main/res-warning}/drawable/icon_waring_traffic_light_yellow_vr.xml (100%) delete mode 100644 modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_in.xml delete mode 100644 modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_out.xml delete mode 100644 modules/mogo-module-hmi/src/main/res/values/notice_dialog_anim_bottom2top.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index c41787f30b..3bbf4cb770 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,6 +13,7 @@ + @@ -31,7 +32,7 @@ - + diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index 83df7bbeda..a2fb56d6fe 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -26,6 +26,14 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + sourceSets { + main { + res.srcDirs = [ + 'src/main/res',// 默认资源目录 + 'src/main/res-warning'//预警资源目录 + ] + } + } } dependencies { diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_ban_astern.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_ban_astern.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_ban_astern.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_ban_astern.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_collision_warning.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_collision_warning.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_congestion.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_congestion.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_congestion.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_congestion.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_give_way.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_give_way.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_give_way.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_give_way.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_no_parking.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_no_parking.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_no_parking.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_no_parking.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_over_speed.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_over_speed.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_over_speed.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_over_speed.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_road_construction.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_construction.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_road_construction.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_construction.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_school.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_school.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_school.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_school.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_test_section.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_test_section.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_test_section.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_test_section.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_tramcar.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_tramcar.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_tramcar.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_tramcar.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png rename to modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png diff --git a/modules/mogo-module-hmi/src/main/res/drawable/bg_waring_limiting_velocity.xml b/modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_limiting_velocity.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/bg_waring_limiting_velocity.xml rename to modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_limiting_velocity.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/bg_waring_traffic_light_vr.xml b/modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_traffic_light_vr.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/bg_waring_traffic_light_vr.xml rename to modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_traffic_light_vr.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/bg_warning_bg.xml b/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/bg_warning_bg.xml rename to modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/icon_waring_traffic_light_green_vr.xml b/modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_green_vr.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/icon_waring_traffic_light_green_vr.xml rename to modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_green_vr.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/icon_waring_traffic_light_red_vr.xml b/modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_red_vr.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/icon_waring_traffic_light_red_vr.xml rename to modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_red_vr.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/icon_waring_traffic_light_yellow_vr.xml b/modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_yellow_vr.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/icon_waring_traffic_light_yellow_vr.xml rename to modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_yellow_vr.xml diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/utils/WarningUtils.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/utils/WarningUtils.kt index d7a691bb14..a4974ce23a 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/utils/WarningUtils.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/utils/WarningUtils.kt @@ -1,10 +1,10 @@ package com.mogo.module.hmi.utils import com.mogo.module.common.enum.WarningTypeEnum -import com.mogo.module.hmi.R +import com.mogo.module.common.R /** - * @author xiaoyuzhou + * @author xiaoyuzhoukeyi * @date 2021/8/6 11:04 上午 */ internal object WarningUtils { diff --git a/modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_in.xml b/modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_in.xml deleted file mode 100644 index 9f59ce777c..0000000000 --- a/modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_in.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_out.xml b/modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_out.xml deleted file mode 100644 index da2ea9ff7b..0000000000 --- a/modules/mogo-module-hmi/src/main/res/anim/notice_dialog_anim_top2bottom_out.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/modules/mogo-module-hmi/src/main/res/values/notice_dialog_anim_bottom2top.xml b/modules/mogo-module-hmi/src/main/res/values/notice_dialog_anim_bottom2top.xml deleted file mode 100644 index 61d0f84750..0000000000 --- a/modules/mogo-module-hmi/src/main/res/values/notice_dialog_anim_bottom2top.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file