From 37866cd5ae1955d31f5a76b5e8b48d8680bfcc00 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 18 Sep 2020 15:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4m4=E4=B8=8A=E8=BE=B9=E7=95=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/dimens.xml            |  4 +--
 .../res/layout/module_main_activity_main.xml  | 23 +++++++-------
 .../src/main/res/values-mdpi/dimens.xml       | 31 +++++++++++++++++++
 .../res/values-xhdpi-1920x1000/dimens.xml     |  1 +
 .../src/main/res/values-xhdpi/dimens.xml      |  1 +
 .../src/main/res/values/dimens.xml            |  1 +
 .../src/main/res/values-ldpi/dimens.xml       |  4 +--
 .../src/main/res/values-mdpi/dimens.xml       |  4 +--
 .../src/main/res/values/dimens.xml            |  4 +--
 9 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml

diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml
index d335541a42..8864e74f0f 100644
--- a/modules/mogo-module-apps/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml
@@ -21,8 +21,8 @@
     <dimen name="module_apps_all_icon_width">50px</dimen>
     <dimen name="module_apps_all_icon_height">50px</dimen>
 
-    <dimen name="module_apps_navigator_icon_width">78px</dimen>
-    <dimen name="module_apps_navigator_icon_height">78px</dimen>
+    <dimen name="module_apps_navigator_icon_width">94px</dimen>
+    <dimen name="module_apps_navigator_icon_height">94px</dimen>
     <dimen name="module_apps_navigator_icon_divider">17px</dimen>
     <dimen name="module_apps_voice_icon_width">55px</dimen>
     <dimen name="module_apps_voice_icon_height">55px</dimen>
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 592d7824ff..89e4866069 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -19,20 +19,15 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-    <!-- 时间、天气、消息 与entrance合到了一起，减少一个view -->
-    <!--    <FrameLayout-->
-    <!--        android:id="@+id/module_main_id_header_fragment_container"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="@dimen/module_ext_height"-->
-    <!--        android:layout_marginLeft="@dimen/module_main_header_fragment_container_marginLeft"-->
-    <!--        android:layout_marginTop="@dimen/module_main_header_fragment_container_marginTop" />-->
-
     <!-- 左边按钮 -->
     <FrameLayout
         android:id="@+id/module_main_id_apps_fragment_container"
         android:layout_width="@dimen/module_main_apps_fragment_container_width"
         android:layout_height="match_parent"
-        android:padding="@dimen/module_main_apps_fragment_container_padding" />
+        android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
+        android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/>
 
     <!--  左侧浮层,布局位置目前只考虑了1+16独立app情况  -->
     <FrameLayout
@@ -46,7 +41,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
-        android:padding="@dimen/module_main_entrance_fragment_container_padding" />
+        android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
+        android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
     <!-- 浮层-->
     <FrameLayout
@@ -59,7 +57,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
-        android:padding="@dimen/module_event_fragment_container_padding" />
+        android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
+        android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
     <FrameLayout
         android:id="@+id/module_main_id_message_history_fragment_container"
diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..d27dfc19e4
--- /dev/null
+++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<!--    module_main_activity_main.xml-->
+    <dimen name="module_main_map_left_shadow_frame_width">350px</dimen>
+    <dimen name="module_main_card_container_marginTop">8px</dimen>
+    <dimen name="module_main_card_container_width">352px</dimen>
+    <dimen name="module_main_card_container_height">370px</dimen>
+    <dimen name="module_main_card_container_marginLeft">32px</dimen>
+    <dimen name="module_main_card_container_marginBottom">140.5px</dimen>
+    <dimen name="module_main_card_container_paddingBottom">18px</dimen>
+    <dimen name="module_main_card_card_shadow_width_div">20px</dimen>
+    <dimen name="module_main_card_card_shadow_height_div">10px</dimen>
+    <dimen name="module_main_top_shadow_height">144px</dimen>
+    <dimen name="module_main_card_cover_up_margin">352px</dimen>
+
+    <dimen name="cards_container_dp_600">320px</dimen>
+    <dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
+
+    <dimen name="module_main_apps_fragment_container_width">110px</dimen>
+    <dimen name="module_main_apps_fragment_container_padding">10px</dimen>
+    <dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
+    <dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
+    <dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>
+    <dimen name="module_main_id_left_panel_fragment_container_width">350px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding">10px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
+    <dimen name="module_main_entrance_fragment_container_width">658px</dimen>
+    <dimen name="module_event_fragment_container_padding">8px</dimen>
+    <dimen name="module_main_apps_fragment_container_paddingTop">2px</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 59fb5b577a..34395c22d7 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -26,5 +26,6 @@
     <dimen name="module_main_id_left_panel_fragment_container_width">635px</dimen>
     <dimen name="module_main_entrance_fragment_container_width">1263px</dimen>
     <dimen name="module_event_fragment_container_padding">20px</dimen>
+    <dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
index 6f39e995db..197f976f30 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
@@ -26,4 +26,5 @@
     <dimen name="module_main_id_left_panel_fragment_container_width">340px</dimen>
     <dimen name="module_main_entrance_fragment_container_width">1313px</dimen>
     <dimen name="module_event_fragment_container_padding">20px</dimen>
+    <dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml
index adabf11063..3cf1f1ee39 100644
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values/dimens.xml
@@ -26,5 +26,6 @@
     <dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
     <dimen name="module_main_entrance_fragment_container_width">658px</dimen>
     <dimen name="module_event_fragment_container_padding">8px</dimen>
+    <dimen name="module_main_apps_fragment_container_paddingTop">10px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
index 4c801b2ae2..1f1106b6c5 100644
--- a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
@@ -87,8 +87,8 @@
     <dimen name="module_push_item_minHeight_vertical">310px</dimen>
     <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
     <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
-    <dimen name="module_push_panel_marginTop">8px</dimen>
-    <dimen name="module_push_panel_marginBottom">8px</dimen>
+    <dimen name="module_push_panel_marginTop">2px</dimen>
+    <dimen name="module_push_panel_marginBottom">2px</dimen>
     <dimen name="module_push_panel_marginRight">8px</dimen>
     <dimen name="module_push_panel_paddingLeft">28px</dimen>
     <dimen name="module_push_panel_paddingBottom">16px</dimen>
diff --git a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
index 4c801b2ae2..1f1106b6c5 100644
--- a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
@@ -87,8 +87,8 @@
     <dimen name="module_push_item_minHeight_vertical">310px</dimen>
     <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
     <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
-    <dimen name="module_push_panel_marginTop">8px</dimen>
-    <dimen name="module_push_panel_marginBottom">8px</dimen>
+    <dimen name="module_push_panel_marginTop">2px</dimen>
+    <dimen name="module_push_panel_marginBottom">2px</dimen>
     <dimen name="module_push_panel_marginRight">8px</dimen>
     <dimen name="module_push_panel_paddingLeft">28px</dimen>
     <dimen name="module_push_panel_paddingBottom">16px</dimen>
diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml
index b397604b5d..06dbe9cde9 100644
--- a/modules/mogo-module-push/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values/dimens.xml
@@ -87,8 +87,8 @@
     <dimen name="module_push_item_minHeight_vertical">310px</dimen>
     <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
     <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
-    <dimen name="module_push_panel_marginTop">8px</dimen>
-    <dimen name="module_push_panel_marginBottom">8px</dimen>
+    <dimen name="module_push_panel_marginTop">2px</dimen>
+    <dimen name="module_push_panel_marginBottom">2px</dimen>
     <dimen name="module_push_panel_marginRight">8px</dimen>
     <dimen name="module_push_panel_paddingLeft">28px</dimen>
     <dimen name="module_push_panel_paddingBottom">16px</dimen>