Merge branch 'cv' into qa_1.1.8

2020-11-26 20:47:54 +08:00
parent deda295b83 c89896a9f6
commit 93c8a3b235
20 changed files with 14 additions and 14 deletions
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png
--- a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/module_common_icon_close_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/module_common_icon_close" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_common_icon_close" />
+</selector>
--- a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png
+++ b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png
--- a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png
+++ b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png
--- a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png
+++ b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png
--- a/modules/mogo-module-service/src/main/res/drawable/module_services_close.png
+++ b/modules/mogo-module-service/src/main/res/drawable/module_services_close.png
--- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml
@@ -28,7 +28,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="end"
        android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top"
-        android:src="@drawable/module_services_close" />
+        android:src="@drawable/module_common_close_selector" />

    <ProgressBar
        android:id="@+id/module_services_id_loading"
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/v2x_panel_close_press" android:state_pressed="true" />
-    <item android:drawable="@drawable/v2x_panel_close" android:state_pressed="false" />
-    <item android:drawable="@drawable/v2x_panel_close" />
-</selector>
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml
@@ -18,5 +18,5 @@
        android:layout_height="wrap_content"
        android:layout_marginLeft="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_20"
-        android:src="@drawable/v2x_panel_close" />
+        android:src="@drawable/module_common_close_selector" />
 </RelativeLayout>
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -87,7 +87,7 @@
        android:layout_width="@dimen/dp_79"
        android:layout_height="@dimen/dp_79"
        android:layout_marginRight="@dimen/dp_50"
-        android:background="@drawable/v2x_selector_close"
+        android:background="@drawable/module_common_close_selector"
        app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
@@ -26,7 +26,7 @@
        android:layout_height="@dimen/dp_88"
        android:layout_marginEnd="@dimen/dp_32"
        android:layout_marginBottom="@dimen/dp_40"
-        android:background="@drawable/v2x_selector_close"
+        android:background="@drawable/module_common_close_selector"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintRight_toRightOf="parent" />

--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml
@@ -46,7 +46,7 @@
            android:layout_height="wrap_content"
            android:layout_marginLeft="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_20"
-            android:src="@drawable/v2x_panel_close" />
+            android:src="@drawable/module_common_close_selector" />
    </com.mogo.module.v2x.view.RoundLayout>

 </FrameLayout>
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_press_light.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_press_light.png
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/v2x_panel_close_press_light" android:state_pressed="true" />
-    <item android:drawable="@drawable/v2x_panel_close_light" android:state_pressed="false" />
-    <item android:drawable="@drawable/v2x_panel_close_light" />
+    <item android:drawable="@drawable/module_common_icon_close_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/module_common_icon_close" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_common_icon_close" />
 </selector>