From 82ec85f39e924f4e0bbabe5ca71c0c753b309da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 11:04:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../src/res/drawable/utils_toast_bg.xml | 7 -- .../src/res/layout/utils_toast_view.xml | 72 ------------------- .../src/res/values-v21/styles.xml | 18 ----- core/mogo-core-res/src/res/values/styles.xml | 17 ----- .../src/res/xml/util_code_provider_paths.xml | 26 ------- 5 files changed, 140 deletions(-) delete mode 100644 core/mogo-core-res/src/res/drawable/utils_toast_bg.xml delete mode 100644 core/mogo-core-res/src/res/layout/utils_toast_view.xml delete mode 100644 core/mogo-core-res/src/res/values-v21/styles.xml delete mode 100644 core/mogo-core-res/src/res/values/styles.xml delete mode 100644 core/mogo-core-res/src/res/xml/util_code_provider_paths.xml diff --git a/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml b/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml deleted file mode 100644 index 5e6370b319..0000000000 --- a/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/core/mogo-core-res/src/res/layout/utils_toast_view.xml b/core/mogo-core-res/src/res/layout/utils_toast_view.xml deleted file mode 100644 index 59af74b6bb..0000000000 --- a/core/mogo-core-res/src/res/layout/utils_toast_view.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/mogo-core-res/src/res/values-v21/styles.xml b/core/mogo-core-res/src/res/values-v21/styles.xml deleted file mode 100644 index 967acc3c0f..0000000000 --- a/core/mogo-core-res/src/res/values-v21/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/mogo-core-res/src/res/values/styles.xml b/core/mogo-core-res/src/res/values/styles.xml deleted file mode 100644 index 0fcfe9b91d..0000000000 --- a/core/mogo-core-res/src/res/values/styles.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml b/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml deleted file mode 100644 index ed731a2299..0000000000 --- a/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From faafac5c8cf03d372df25f7beca875b3626b30f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 11:09:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0hmi=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- core/mogo-core-res/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/core/mogo-core-res/build.gradle b/core/mogo-core-res/build.gradle index 918f0f4f27..6a4b325422 100644 --- a/core/mogo-core-res/build.gradle +++ b/core/mogo-core-res/build.gradle @@ -46,6 +46,7 @@ android { 'src/main/function-chat-res', 'src/main/function-check-res', 'src/main/function-dispatch-res', + 'src/main/function-hmi-res', 'src/main/function-map-res', 'src/main/function-notice-res', 'src/main/function-obu-res', From dc2c2921639bb05a92a8d1576222ede117ef72e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 15:00:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8B=E6=B2=89Hmi=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../icon_warning_v2x_abnormal_vehicle.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 .../function-hmi-res}/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 .../drawable/module_hmi_warning_bkg_bottom.xml | 0 .../drawable/module_hmi_warning_bkg_left.xml | 0 .../drawable/module_hmi_warning_bkg_right.xml | 0 .../drawable/module_hmi_warning_bkg_top.xml | 0 .../drawable/yi_biao_pan_bg_nor.xml | 0 .../drawable/yi_biao_pan_bg_speeding.xml | 0 .../values-xhdpi-2560x1440/dimens.xml | 0 .../main/function-hmi-res}/values-xhdpi/dimens.xml | 0 modules/mogo-module-common/build.gradle | 1 - modules/mogo-module-hmi/build.gradle | 1 + 44 files changed, 1 insertion(+), 1 deletion(-) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_collision_warning.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_congestion.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_give_way.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_no_parking.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_over_speed.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_road_construction.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_school.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_test_section.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_tramcar.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable/bg_waring_limiting_velocity.xml (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable/bg_waring_traffic_light_vr.xml (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable/bg_warning_bg.xml (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable/icon_waring_traffic_light_green_vr.xml (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable/icon_waring_traffic_light_red_vr.xml (100%) rename {modules/mogo-module-common/src/main/res-warning => core/mogo-core-res/src/main/function-hmi-res}/drawable/icon_waring_traffic_light_yellow_vr.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/drawable/module_hmi_warning_bkg_bottom.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/drawable/module_hmi_warning_bkg_left.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/drawable/module_hmi_warning_bkg_right.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/drawable/module_hmi_warning_bkg_top.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/drawable/yi_biao_pan_bg_nor.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/drawable/yi_biao_pan_bg_speeding.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/values-xhdpi-2560x1440/dimens.xml (100%) rename {modules/mogo-module-hmi/src/main/res => core/mogo-core-res/src/main/function-hmi-res}/values-xhdpi/dimens.xml (100%) diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_abnormal_vehicle.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_blind_area_collision.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_collision_warning.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_collision_warning.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_collision_warning.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_congestion.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_congestion.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_congestion.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_congestion.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_emergency_brake.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_give_way.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_give_way.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_give_way.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_give_way.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_hump_bridge.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_motorcycle_collision.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_no_parking.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_no_parking.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_no_parking.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_no_parking.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_over_speed.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_over_speed.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_over_speed.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_over_speed.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_pedestrian_crossing.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_reverse_overtaking.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_construction.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_construction.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_construction.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_construction.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_road_dangerous.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_roundaboutpng.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_school.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_school.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_school.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_school.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_special_vehicle_access.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_test_section.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_test_section.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_test_section.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_test_section.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_gray.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_green.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_red.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_light_yellow.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_red.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_tramcar.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_tramcar.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_tramcar.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_tramcar.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_turn_left_sharp.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_turn_right_sharp.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_vehicle_control.png diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_limiting_velocity.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_limiting_velocity.xml similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_limiting_velocity.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_limiting_velocity.xml diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_traffic_light_vr.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_traffic_light_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable/bg_waring_traffic_light_vr.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_traffic_light_vr.xml diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/bg_warning_bg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/bg_warning_bg.xml diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_green_vr.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/icon_waring_traffic_light_green_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_green_vr.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/icon_waring_traffic_light_green_vr.xml diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_red_vr.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/icon_waring_traffic_light_red_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_red_vr.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/icon_waring_traffic_light_red_vr.xml diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_yellow_vr.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/icon_waring_traffic_light_yellow_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res-warning/drawable/icon_waring_traffic_light_yellow_vr.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/icon_waring_traffic_light_yellow_vr.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_bottom.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_bottom.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_bottom.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_bottom.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_left.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_left.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_right.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_right.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_top.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_top.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/module_hmi_warning_bkg_top.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_top.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/yi_biao_pan_bg_nor.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_nor.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/yi_biao_pan_bg_nor.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_nor.xml diff --git a/modules/mogo-module-hmi/src/main/res/drawable/yi_biao_pan_bg_speeding.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_speeding.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/drawable/yi_biao_pan_bg_speeding.xml rename to core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_speeding.xml diff --git a/modules/mogo-module-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi-2560x1440/dimens.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml rename to core/mogo-core-res/src/main/function-hmi-res/values-xhdpi-2560x1440/dimens.xml diff --git a/modules/mogo-module-hmi/src/main/res/values-xhdpi/dimens.xml b/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi/dimens.xml similarity index 100% rename from modules/mogo-module-hmi/src/main/res/values-xhdpi/dimens.xml rename to core/mogo-core-res/src/main/function-hmi-res/values-xhdpi/dimens.xml diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index 6c5fd53bfc..150dd4bc9e 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -34,7 +34,6 @@ android { main { res.srcDirs = [ 'src/main/res',// 默认资源目录 - 'src/main/res-warning'//预警资源目录 ] } } diff --git a/modules/mogo-module-hmi/build.gradle b/modules/mogo-module-hmi/build.gradle index eedef2748e..c77aec4d73 100644 --- a/modules/mogo-module-hmi/build.gradle +++ b/modules/mogo-module-hmi/build.gradle @@ -59,6 +59,7 @@ dependencies { api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-res') } } From 36335d28c0277e1b4625e04b52dac3db46eada11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 15:34:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=BD=E7=A6=BBhmi=E5=88=B0core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .idea/gradle.xml | 1 - app/build.gradle | 4 ++- .../mogo-core-function-hmi/build.gradle | 11 +++++++ .../mogo-core-function-hmi/gradle.properties | 2 +- .../src/main/AndroidManifest.xml | 26 ++++++++++++++++ .../eagle/core/function}/hmi/WaringConst.java | 2 +- .../hmi/notification/WarningFloat.kt | 6 ++-- .../notification/WarningFloatWindowHelper.kt | 8 ++--- .../notification/WarningFloatWindowManager.kt | 2 +- .../notification/WarningNotificationConfig.kt | 12 +++---- .../hmi/notification/anim/AnimatorManager.kt | 4 +-- .../hmi/notification/anim/DefaultAnimator.kt | 6 ++-- .../hmi/notification/enums/ShowPattern.kt | 2 +- .../hmi/notification/enums/SidePattern.kt | 2 +- .../interfaces/OnFloatAnimator.kt | 4 +-- .../interfaces/OnFloatCallbacks.kt | 2 +- .../notification/widget/ParentFrameLayout.kt | 4 +-- .../V2XLimitingVelocityBroadcastReceiver.kt | 4 +-- .../V2XTrafficLightBroadcastReceiver.kt | 4 +-- .../receiver/V2XWarningBroadcastReceiver.kt | 4 +-- .../function}/hmi/ui/MoGoWarningContract.kt | 2 +- .../function}/hmi/ui/MoGoWarningFragment.kt | 12 +++---- .../core/function}/hmi/ui/WaringPresenter.kt | 2 +- .../hmi/ui/widget/SpeedChartView.java | 4 +-- .../function}/hmi/ui/widget/SpeedPanelView.kt | 4 +-- .../hmi/ui/widget/TrafficLightView.kt | 4 +-- .../hmi/ui/widget/V2XNotificationView.kt | 4 +-- .../function}/hmi/ui/widget/V2XWarningView.kt | 4 +-- .../hmi/warning/MoGoWarningProvider.java | 6 ++-- .../src/main/res/layout/fragment_warning.xml | 6 ++-- .../res/layout/module_hmi_warning_v2x.xml | 0 .../res/layout/notification_v2x_msg_vr.xml | 0 .../main/res/layout/view_traffic_light_vr.xml | 0 core/mogo-core-utils/build.gradle | 9 ------ .../core/utilcode/util/CacheDiskUtils.java | 3 +- .../core/utilcode/util/CacheDoubleUtils.java | 3 +- .../core/utilcode/util/CacheMemoryUtils.java | 3 +- .../core/utilcode/util/ConvertUtils.java | 5 +-- .../core/utilcode/util/PermissionUtils.java | 6 ++-- .../eagle/core/utilcode/util/RegexUtils.java | 3 +- .../eagle/core/utilcode/util/TimeUtils.java | 3 +- .../eagle/core/utilcode/util/ToastUtils.java | 1 - .../src/main/res/layout/utils_toast_view.xml | 2 +- gradle.properties | 18 +++-------- .../res/layout/module_ext_layout_entrance.xml | 2 +- .../src/main/AndroidManifest.xml | 31 ------------------- settings.gradle | 1 - 47 files changed, 121 insertions(+), 127 deletions(-) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/WaringConst.java (97%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/WarningFloat.kt (96%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/WarningFloatWindowHelper.kt (97%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/WarningFloatWindowManager.kt (97%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/WarningNotificationConfig.kt (80%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/anim/AnimatorManager.kt (83%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/anim/DefaultAnimator.kt (96%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/enums/ShowPattern.kt (83%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/enums/SidePattern.kt (91%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/interfaces/OnFloatAnimator.kt (81%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/interfaces/OnFloatCallbacks.kt (91%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/notification/widget/ParentFrameLayout.kt (89%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt (95%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt (95%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/receiver/V2XWarningBroadcastReceiver.kt (96%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/MoGoWarningContract.kt (98%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/MoGoWarningFragment.kt (94%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/WaringPresenter.kt (82%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/widget/SpeedChartView.java (98%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/widget/SpeedPanelView.kt (97%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/widget/TrafficLightView.kt (97%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/widget/V2XNotificationView.kt (92%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/ui/widget/V2XWarningView.kt (98%) rename {modules/mogo-module-hmi/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function}/hmi/warning/MoGoWarningProvider.java (95%) rename {modules/mogo-module-hmi => core/function-impl/mogo-core-function-hmi}/src/main/res/layout/fragment_warning.xml (91%) rename {modules/mogo-module-hmi => core/function-impl/mogo-core-function-hmi}/src/main/res/layout/module_hmi_warning_v2x.xml (100%) rename {modules/mogo-module-hmi => core/function-impl/mogo-core-function-hmi}/src/main/res/layout/notification_v2x_msg_vr.xml (100%) rename {modules/mogo-module-hmi => core/function-impl/mogo-core-function-hmi}/src/main/res/layout/view_traffic_light_vr.xml (100%) delete mode 100644 modules/mogo-module-hmi/src/main/AndroidManifest.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index beffe3a707..afee79145e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -43,7 +43,6 @@