From eaa4cd8db9e7922e4609928792a1c6c6d49d1676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 16 Sep 2020 17:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI=20=E5=87=BA=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=20=20=20=20=20=E5=88=86=E4=BA=AB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=83=8C=E6=99=AF=20=20=20=20=20Tab=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=8A=A0=E7=B2=97=E6=95=88=E6=9E=9C=20=20=20=20=20=E4=B8=8A?=
 =?UTF-8?q?=E8=BE=B9=E8=B7=9D=EF=BC=8C=E5=B7=A6=E8=BE=B9=20=20=20=20=20?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=20=20=20?=
 =?UTF-8?q?=20=20=E5=8E=BB=E6=8E=89=E4=BA=86=E5=88=97=E8=A1=A8=E4=B8=8A?=
 =?UTF-8?q?=E6=96=B9=E6=A0=87=E9=A2=98=E7=9A=84=E5=8A=A0=E7=B2=97=20=20=20?=
 =?UTF-8?q?=20=20=E6=B2=A1=E6=9C=89=E6=9B=B4=E5=A4=9A=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/v2x/SpacesItemDecoration.java     | 7 -------
 .../src/main/res/drawable/v2x_alert_window_bg.xml          | 2 +-
 .../src/main/res/layout/item_v2x_scennario_history.xml     | 3 ---
 .../res/layout/item_v2x_scennario_history_other_help.xml   | 5 +----
 .../module_v2x_event_panel_fragment_scenario_history.xml   | 5 +++--
 .../src/main/res/layout/module_v2x_event_share_empty.xml   | 7 +++++--
 .../module-v2x-res/drawable/v2x_alert_window_bg_light.xml  | 2 +-
 7 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
index 005984f991..f0e2739521 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
@@ -20,13 +20,6 @@ public class SpacesItemDecoration extends RecyclerView.ItemDecoration {
     @Override
     public void getItemOffsets(Rect outRect, View view,
                                RecyclerView parent, RecyclerView.State state) {
-        outRect.left = space;
-        outRect.right = space;
         outRect.bottom = space;
-
-        // Add top margin only for the first item to avoid double space between items
-        if (parent.getChildPosition(view) == 0) {
-            outRect.top = space;
-        }
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
index 376de58348..da72944890 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/dp_40" />
+    <corners android:radius="@dimen/dp_22" />
     <gradient
         android:angle="135"
         android:endColor="#3F4057"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index 7bd7a12d7a..251c55419e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -5,9 +5,6 @@
     android:id="@+id/rlContent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="10px"
-    android:layout_marginRight="10px"
-    android:layout_marginBottom="14px"
     android:background="@drawable/bg_v2x_event_list_item">
 
     <TextView
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
index 36eaea608e..e78fa5aac2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
@@ -4,9 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="10px"
-    android:layout_marginRight="10px"
-    android:layout_marginBottom="14px"
     android:background="@drawable/bg_v2x_event_list_item">
 
     <TextView
@@ -86,11 +83,11 @@
         android:id="@+id/tvFaultHelpEventTime"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_24"
         android:alpha="0.59"
         android:textColor="@color/v2x_FFF_999"
         android:textSize="@dimen/dp_29"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_24"
         app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
         app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
         tools:text="15:30发布求助信息" />
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
index 365d806d3c..d02313fb49 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
@@ -16,13 +16,14 @@
         android:id="@+id/clHistoryList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingStart="@dimen/dp_48"
+        android:paddingEnd="@dimen/dp_48">
 
         <TextView
             android:id="@+id/tvMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/dp_28"
             android:text="今日出行遇到的交通事件"
             android:textColor="@color/v2x_FFF_333"
             android:textSize="@dimen/dp_36"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index f35d333ec2..ba0580b33c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -27,8 +27,9 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/share_empty_btn_padding">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/share_empty_btn_padding"
+        android:paddingBottom="@dimen/dp_10">
 
         <Button
             android:id="@+id/share_event_button"
@@ -38,6 +39,7 @@
             android:layout_toLeftOf="@id/center"
             android:background="@drawable/v2x_bkg_dark_light_same"
             android:clickable="true"
+            android:gravity="center"
             android:onClick="shareEventAction"
             android:text="去分享"
             android:textColor="@color/v2x_FFF_333"
@@ -55,6 +57,7 @@
             android:layout_height="@dimen/v2x_share_btn_height"
             android:layout_toRightOf="@id/center"
             android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+            android:gravity="center"
             android:text="刷新"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/dp_32" />
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
index fc0bfb4660..c665f666f0 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/dp_40" />
+    <corners android:radius="@dimen/dp_21" />
     <gradient
         android:angle="135"
         android:endColor="#FFFFFF"