From ac5847d0547f66be20b48db1af46a0fe1efa9981 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 27 Nov 2020 16:11:32 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=99=BD=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/module_main_activity_main.xml    | 12 ++++++------
 .../src/main/res/values-xhdpi/dimens.xml             |  8 ++++----
 .../drawable/module_common_close_selector_light.xml  |  6 ++++++
 3 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml

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 677fca5348..fb58d8aef2 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
@@ -26,9 +26,9 @@
         android:layout_width="@dimen/module_main_apps_fragment_container_width"
         android:layout_height="match_parent"
         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"/>
+        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
     <!--  左侧浮层,布局位置目前只考虑了1+16独立app情况  -->
     <FrameLayout
@@ -43,8 +43,8 @@
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
         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:paddingRight="@dimen/module_main_apps_fragment_container_padding"
         android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
     <!-- 浮层-->
@@ -59,15 +59,15 @@
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
         android:paddingLeft="@dimen/module_main_event_panel_fragment_paddingLeft"
-        android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight"
         android:paddingTop="@dimen/module_main_event_panel_fragment_paddingTop"
+        android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight"
         android:paddingBottom="@dimen/module_main_event_panel_fragment_paddingBottom" />
 
     <FrameLayout
         android:id="@+id/module_main_id_message_history_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"/>
+        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" />
 
     <FrameLayout
         android:id="@+id/module_main_id_search_fragment"
@@ -78,8 +78,8 @@
         android:id="@+id/module_main_id_cover_up"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
         android:background="@drawable/main_bitmap_splash_bg"
+        android:scaleType="centerCrop"
         android:visibility="visible" />
 
     <FrameLayout
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 0f5abc133c..1e3dc1ca7d 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
@@ -28,8 +28,8 @@
     <dimen name="module_event_fragment_container_padding">20px</dimen>
     <dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
 
-    <dimen name="module_main_event_panel_fragment_paddingTop">15px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingBottom">15px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingLeft">15px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingRight">15px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingTop">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingBottom">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingLeft">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingRight">18px</dimen>
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml
new file mode 100644
index 0000000000..328ea41398
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.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_light" android:state_pressed="true" />
+    <item android:drawable="@drawable/module_common_icon_close_light" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_common_icon_close_light" />
+</selector>
\ No newline at end of file