Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev

2020-11-25 16:07:05 +08:00
parent 45fdd0fad1 eaf7b65c26
commit 0aa99ee38f
8 changed files with 3 additions and 3 deletions
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values/dimens.xml
@@ -34,5 +34,5 @@
    <dimen name="module_main_event_panel_fragment_paddingTop">2px</dimen>
    <dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
    <dimen name="module_main_event_panel_fragment_paddingLeft">0px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingRight">0px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingRight">6px</dimen>
 </resources>
--- 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
@@ -12,7 +12,7 @@
        android:id="@+id/module_services_id_panel_item_avatar"
        android:layout_width="@dimen/module_services_panel_item_avatar_size"
        android:layout_height="@dimen/module_services_panel_item_avatar_size"
-        android:layout_marginStart="@dimen/dp_25"
+        android:layout_marginStart="@dimen/dp_24"
        android:src="@drawable/module_common_default_user_head"
        app:civ_border_color="@color/module_services_id_panel_item_avatar_border_color"
        app:civ_border_width="@dimen/module_services_id_panel_item_avatar_border_width"
--- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -45,7 +45,7 @@
    <dimen name="module_services_panel_item_distance_textSize">16px</dimen>
    <dimen name="module_services_panel_item_nickname_textSize">18px</dimen>
    <dimen name="module_services_id_panel_item_avatar_border_width">5px</dimen>
-    <dimen name="module_services_panel_item_padding">20px</dimen>
+    <dimen name="module_services_panel_item_padding">28px</dimen>
    <dimen name="module_services_panel_item_nickname_marginLeft">13px</dimen>
    <dimen name="module_services_id_panel_item_distance_marginLeft">42px</dimen>
    <dimen name="module_services_panel_item_detail_bkg_corner">8.89px</dimen>
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png
--- a/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png
--- a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_online_car_panel_background_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_online_car_panel_background_light.9.png
--- a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png
--- a/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_online_car_panel_background_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_online_car_panel_background_light.9.png