From 0c02c060be248866cca15888639165a2832ddba3 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 2 Sep 2020 18:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD+=E9=BB=91=20=E5=87=BA=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81:=E6=B1=82=E5=8A=A9item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/item_v2x_scennario_history.xml |   3 +-
 .../item_v2x_scennario_history_other_help.xml | 251 ++++++++++--------
 ...e_v2x_event_panel_fragment_event_panel.xml |   1 +
 3 files changed, 136 insertions(+), 119 deletions(-)

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 fcd813cc61..d9afa4955a 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
@@ -115,7 +115,8 @@
                 android:layout_height="wrap_content"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginRight="26px"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
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 bc036adf46..cc9e7d8fdd 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
@@ -1,132 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.v2x.view.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#1F2131"
-    android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_40">
+    android:layout_marginLeft="10px"
+    android:layout_marginRight="10px"
+    android:layout_marginBottom="14px">
 
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="wrap_content"
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_24"
-        android:background="@drawable/bg_v2x_event_type_orange"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="求助信息"
-        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:cardBackgroundColor="@color/share_event_item_bg_color"
+        app:cardCornerRadius="12px"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/tagEventEvaluate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_24"
-        android:background="@drawable/bg_v2x_event_type_gray"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="待援助"
-        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
-        app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tagEventType"
-        tools:visibility="visible" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivFaultHelpHead"
-        android:layout_width="@dimen/module_v2x_history_event_icon_size"
-        android:layout_height="@dimen/module_v2x_history_event_icon_size"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_31"
-        app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
-        app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-        app:layout_constraintStart_toStartOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        app:miv_borderColor="#4cffffff"
-        app:miv_failureHolder="@drawable/icon_default_user_head"
-        app:miv_overlayImageId="@drawable/icon_default_user_head"
-        app:miv_placeHolder="@drawable/icon_default_user_head"
-        app:miv_shape="circle"
-        app:miv_shapeBorderWidth="@dimen/dp_4" />
+            <TextView
+                android:id="@+id/tagEventType"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_20"
+                android:layout_marginTop="@dimen/dp_24"
+                android:background="@drawable/bg_v2x_event_type_orange"
+                android:gravity="center"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_3"
+                android:paddingRight="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_3"
+                android:text="求助信息"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/dp_28"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_33"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
-        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_goneMarginStart="@dimen/dp_22"
-        tools:text="车主昵称" />
+            <TextView
+                android:id="@+id/tagEventEvaluate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_24"
+                android:background="@drawable/bg_v2x_event_type_gray"
+                android:gravity="center"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_3"
+                android:paddingRight="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_3"
+                android:text="待援助"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/dp_28"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
+                app:layout_constraintStart_toEndOf="@+id/tagEventType"
+                app:layout_constraintTop_toTopOf="@+id/tagEventType"
+                tools:visibility="visible" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpEventTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_5"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:layout_marginBottom="@dimen/dp_24"
-        android:alpha="0.59"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_29"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
-        app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
-        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
-        tools:text="15:30发布求助信息" />
+            <com.mogo.service.imageloader.MogoImageView
+                android:id="@+id/ivFaultHelpHead"
+                android:layout_width="@dimen/module_v2x_history_event_icon_size"
+                android:layout_height="@dimen/module_v2x_history_event_icon_size"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginTop="@dimen/dp_21"
+                android:layout_marginEnd="@dimen/dp_31"
+                app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
+                app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
+                app:layout_constraintStart_toStartOf="@+id/tagEventType"
+                app:layout_constraintTop_toBottomOf="@+id/tagEventType"
+                app:miv_borderColor="#4cffffff"
+                app:miv_failureHolder="@drawable/icon_default_user_head"
+                app:miv_overlayImageId="@drawable/icon_default_user_head"
+                app:miv_placeHolder="@drawable/icon_default_user_head"
+                app:miv_shape="circle"
+                app:miv_shapeBorderWidth="@dimen/dp_4" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpDistance"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:textColor="#FFF"
-        android:textSize="@dimen/dp_80"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
-        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintStart_toEndOf="@+id/tvFaultHelpEventTime"
-        tools:text="300M" />
+            <TextView
+                android:id="@+id/tvFaultHelpName"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginEnd="@dimen/dp_30"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_33"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
+                app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
+                app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_goneMarginStart="@dimen/dp_22"
+                tools:text="车主昵称" />
 
-    <ImageView
-        android:id="@+id/ivFaultHelpEventCall"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:src="@drawable/selector_talk_btn"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
-        app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+                android:id="@+id/tvFaultHelpEventTime"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_5"
+                android:layout_marginEnd="@dimen/dp_30"
+                android:layout_marginBottom="@dimen/dp_24"
+                android:alpha="0.59"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_29"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
+                app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
+                app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
+                tools:text="15:30发布求助信息" />
 
-    <ImageView
-        android:id="@+id/ivFaultHelpEventNavi"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:src="@drawable/selector_nav_btn"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</com.mogo.module.v2x.view.RoundConstraintLayout>
\ No newline at end of file
+            <TextView
+                android:id="@+id/tvFaultHelpDistance"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_30"
+                android:gravity="center_vertical"
+                android:textColor="#FFF"
+                android:textSize="@dimen/dp_80"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
+                app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
+                app:layout_constraintStart_toEndOf="@+id/tvFaultHelpEventTime"
+                tools:text="300M" />
+
+            <ImageView
+                android:id="@+id/ivFaultHelpEventCall"
+                android:layout_width="@dimen/module_v2x_event_button_size"
+                android:layout_height="@dimen/module_v2x_event_button_size"
+                android:layout_marginEnd="@dimen/dp_40"
+                android:src="@drawable/selector_talk_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/ivFaultHelpEventNavi"
+                android:layout_width="@dimen/module_v2x_event_button_size"
+                android:layout_height="@dimen/module_v2x_event_button_size"
+                android:src="@drawable/selector_nav_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginRight="26px"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index c5a51d5666..8823070525 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -92,6 +92,7 @@
                 android:id="@+id/btnHidePanels"
                 android:layout_width="@dimen/dp_88"
                 android:layout_height="@dimen/dp_88"
+                android:layout_marginRight="28px"
                 android:background="@drawable/icon_window_close"
                 app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
                 app:layout_constraintRight_toRightOf="parent"