From 0806e99e5eb6e32ca2557e2e857dd58fd1d50dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 17 Sep 2020 18:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_v2x_event_detail.xml         | 8 +++++---
 .../src/main/res/layout/item_v2x_scennario_history.xml    | 6 +++---
 .../res/layout/item_v2x_scennario_history_other_help.xml  | 1 +
 .../src/main/res/layout/window_road_event_detail.xml      | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
index 37ac4f3d26..d2586adedc 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
@@ -5,18 +5,20 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/v2x_alert_window_bg"
-    android:padding="@dimen/dp_25"
+    android:paddingTop="@dimen/dp_20"
+    android:paddingBottom="@dimen/dp_20"
     app:roundLayoutRadius="@dimen/dp_30">
 
     <com.mogo.module.v2x.view.RoundLayout
         android:id="@+id/rlRoadEventImg"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/dp_20"
         android:background="@color/v2x_555A_F5F5"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30">
+        app:roundLayoutRadius="@dimen/dp_18">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivEventImg"
@@ -109,7 +111,7 @@
         android:id="@+id/ivEventHead"
         android:layout_width="@dimen/dp_55"
         android:layout_height="@dimen/dp_55"
-        android:layout_marginEnd="@dimen/dp_33"
+        android:layout_marginEnd="@dimen/dp_28"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tvEventTypeTitle"
         app:miv_borderColor="#4cffffff"
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 251c55419e..2309dab1bf 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
@@ -11,12 +11,12 @@
         android:id="@+id/tagEventType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_24"
+        android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
         android:layout_marginTop="@dimen/dp_24"
         android:background="@drawable/bg_v2x_event_type_read"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
+        android:paddingTop="@dimen/dp_5"
         android:paddingRight="@dimen/dp_10"
         android:paddingBottom="@dimen/dp_3"
         android:text="违章停车"
@@ -50,7 +50,7 @@
         android:layout_marginStart="@dimen/dp_24"
         android:layout_marginEnd="@dimen/dp_16"
         android:src="@drawable/icon_illegal_parking"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintLeft_toLeftOf="@+id/tagEventType"
         app:layout_constraintTop_toBottomOf="@+id/tagEventType"
         app:layout_constraintTop_toTopOf="@+id/tvAddress" />
 
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 e78fa5aac2..59bd21876d 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
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rlContent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_v2x_event_list_item">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
index 0d28b2a2fa..c34c2ce6dd 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
@@ -24,7 +24,7 @@
         android:layout_width="@dimen/dp_88"
         android:layout_height="@dimen/dp_88"
         android:layout_marginEnd="@dimen/dp_28"
-        android:layout_marginBottom="@dimen/dp_28"
+        android:layout_marginBottom="@dimen/dp_65"
         android:background="@drawable/icon_window_close2"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent" />