Merge branch 'jo' into dev

2020-11-17 10:45:23 +08:00
parent 199976c153 25c0061476
commit 07721afdbf
8 changed files with 2 additions and 2 deletions
--- a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png
+++ b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -40,7 +40,7 @@
            android:id="@+id/module_entrance_id_button1"
            android:layout_width="@dimen/module_ext_operation_panel_width"
            android:layout_height="@dimen/module_ext_operation_panel_width"
-            android:background="@drawable/v2x_cancel_help"
+            android:background="@drawable/module_ext_shadow_bkg"
            android:gravity="center"
            android:padding="0dp"
            android:text="前方\n实况"
@@ -55,7 +55,7 @@
            android:layout_width="@dimen/module_ext_operation_panel_width"
            android:layout_height="@dimen/module_ext_operation_panel_width"
            android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
-            android:background="@drawable/v2x_cancel_help"
+            android:background="@drawable/module_ext_shadow_bkg"
            android:gravity="center"
            android:padding="0dp"
            android:text="取消\n求助"
--- a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png
+++ b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png