From 23df7936f16b842487b27a814747451066e277f2 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 2 Sep 2020 17:08:32 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E7=99=BD+=E9=BB=91=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/footer_nomore_view.xml | 2 +- .../src/main/res/layout/item_v2x_fault_help.xml | 4 ++-- .../module_v2x_event_panel_fragment_event_panel.xml | 6 +++--- .../src/main/res/layout/v2x_network_loading_item.xml | 1 + modules/mogo-module-v2x/src/main/res/values/colors.xml | 4 ++++ .../drawable/v2x_shadow_shape_view_light.xml | 8 ++++++++ .../module-v2x-res/color/radiobutton_textcolor_light.xml | 2 +- .../module-v2x-res/drawable/v2x_panel_color_bg_light.xml | 2 -- .../src/main/module-v2x-res/values/colors.xml | 3 +++ 9 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_shadow_shape_view_light.xml diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml index db5cb0e6ee..b516dedff0 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml @@ -25,7 +25,7 @@ android:layout_marginStart="@dimen/dp_32" android:layout_marginEnd="@dimen/dp_32" android:text="没有更多记录了" - android:textColor="#99FFFFFF" + android:textColor="@color/share_event_no_more_color" android:textSize="@dimen/dp_26" app:layout_constraintEnd_toStartOf="@+id/viewLinEnd" app:layout_constraintStart_toEndOf="@+id/viewLinStart" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index 328ace0186..280a8a0185 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" - android:background="@drawable/v2x_alert_window_bg" + android:background="@drawable/v2x_panel_color_bg" android:paddingStart="@dimen/dp_40" android:paddingEnd="@dimen/dp_40" app:roundLayoutRadius="@dimen/dp_40"> @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="0.59" - android:textColor="@android:color/white" + android:textColor="@color/v2x_FFF_999_white" android:textSize="@dimen/dp_26" app:layout_constraintStart_toStartOf="@id/tvFaultHelpName" app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName" diff --git 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 index 580a9423bf..824ba59205 100644 --- 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 @@ -10,7 +10,7 @@ android:paddingStart="@dimen/dp_30" android:paddingEnd="@dimen/dp_30" android:visibility="gone" - app:roundLayoutRadius="@dimen/dp_40" + app:roundLayoutRadius="16px" tools:visibility="visible"> @@ -53,7 +53,7 @@ android:textStyle="bold" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml index 60ff28d81c..e158e640af 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml @@ -13,6 +13,7 @@ android:layout_height="200px" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" + android:layout_marginTop="133px" android:background="@drawable/v_to_x_loading_car0000" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintVertical_bias="0.5" diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 2d83a0fb6b..5b32848fff 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -10,6 +10,10 @@ #FFFFFF #FFFFFF #10121E + #99FFFFFF + #FFFFFF + #FFFFFF + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_shadow_shape_view_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_shadow_shape_view_light.xml new file mode 100644 index 0000000000..7c8291b6c3 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_shadow_shape_view_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/color/radiobutton_textcolor_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/color/radiobutton_textcolor_light.xml index 56ec481949..0b615ca429 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/color/radiobutton_textcolor_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/color/radiobutton_textcolor_light.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_panel_color_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_panel_color_bg_light.xml index 813b1fe28f..6c0812711e 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_panel_color_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_panel_color_bg_light.xml @@ -1,8 +1,6 @@ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index ebd1091e57..20c2a27b35 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -5,5 +5,8 @@ #999999 #333333 #F5F5F5 + #333333 + #999999 + #333333