From 514c31f4ee07226771363a44eb0cf35220530fa1 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 10:33:54 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E8=B5=84=E6=BA=90=E5=90=8C=E6=AD=A5,?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E8=B5=84=E6=BA=90:?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E5=92=8C=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=A5=BD=E5=8F=8B=E5=88=97=E8=A1=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/selector_call_btn_normal.png} | Bin .../selector_call_btn_pressed.png} | Bin .../res/drawable/module_common_selector_call.xml | 6 ++++++ .../res/drawable/selector_call_btn_normal.png | Bin 0 -> 4524 bytes .../drawable/selector_service_car_panel_call.xml | 6 ------ .../module_services_online_car_panel_item.xml | 2 +- .../src/main/res/drawable/selector_call_btn.xml | 6 ------ .../item_v2x_scennario_history_other_help.xml | 2 +- .../drawable-xhdpi/selector_call_btn_light.png} | Bin .../selector_call_btn_pressed_light.png} | Bin .../module_common_selector_call_light.xml | 6 ++++++ .../drawable/selector_call_btn_light.png} | Bin .../selector_call_btn_pressed_light.png} | Bin .../selector_service_car_panel_call_light.xml | 6 ------ 14 files changed, 14 insertions(+), 20 deletions(-) rename modules/{mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png => mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png} (100%) rename modules/{mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png => mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png} (100%) create mode 100644 modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml create mode 100644 modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml rename skin/mogo-skin-light/src/main/{module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png => module-common-res/drawable-xhdpi/selector_call_btn_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png => module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png} (100%) create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml rename skin/mogo-skin-light/src/main/{module-services-res/drawable/service_car_panel_call_normal_light.png => module-common-res/drawable/selector_call_btn_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-services-res/drawable/service_car_panel_call_pressed_light.png => module-common-res/drawable/selector_call_btn_pressed_light.png} (100%) delete mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml new file mode 100644 index 0000000000..edc0ec8bc3 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..361ea198656c7bc05a67f3e808c0ab557646313e GIT binary patch literal 4524 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 KMNUMnLSTZg^Sjaj literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml deleted file mode 100644 index f24ebf2862..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index e11c589602..13915be41a 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -62,7 +62,7 @@ android:layout_width="@dimen/modle_car_panel_call" android:layout_height="@dimen/modle_car_panel_call" android:layout_marginEnd="@dimen/modle_car_panel_call_margin" - android:background="@drawable/selector_service_car_panel_call" + android:background="@drawable/module_common_selector_call" android:padding="@dimen/module_services_panel_item_detail_padding" android:textColor="@color/module_services_panel_item_detail_textColor" android:textSize="@dimen/module_services_panel_item_detail_textSize" diff --git a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml b/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml deleted file mode 100644 index bae6d6289a..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8d055540e7..bb00ca4b09 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -112,7 +112,7 @@ android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" - android:src="@drawable/selector_call_btn" + android:src="@drawable/module_common_selector_call" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi" diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml new file mode 100644 index 0000000000..44b5570c79 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml deleted file mode 100644 index a0367b590f..0000000000 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file