From a49550b8479cc1e3bfe5d5e9f9da3254416365ea Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 19 Nov 2020 17:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../V2XScenarioHistoryOtherSeekHelpVH.java    |   8 +-
 .../item_v2x_scennario_history_other_help.xml | 120 +++++++++---------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index 15c5cae0c4..06ebd14159 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -89,16 +89,16 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
             if (xPushMessageEntity.getDistance() > 1000) {
                 SpanUtils.with(mTvFaultHelpDistance)
                         .append("" + (int) xPushMessageEntity.getDistance() / 1000)
-                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
-                        .append("公里")
                         .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+                        .append("公里")
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.dp_32))
                         .create();
             } else {
                 SpanUtils.with(mTvFaultHelpDistance)
                         .append("" + (int) xPushMessageEntity.getDistance())
-                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
-                        .append("米")
                         .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+                        .append("米")
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.dp_32))
                         .create();
             }
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
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 83ff056b82..cddd798ccb 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
@@ -7,12 +7,60 @@
     android:layout_height="wrap_content"
     android:background="@drawable/bg_v2x_event_list_item">
 
+    <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_marginStart="@dimen/dp_40"
+        android:layout_marginTop="@dimen/dp_21"
+        android:layout_marginEnd="@dimen/dp_31"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        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/tvFaultHelpName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginEnd="@dimen/dp_30"
+        android:textColor="@color/v2x_FFF_333"
+        android:textSize="@dimen/share_item_address"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginStart="@dimen/dp_22"
+        tools:text="车主昵称" />
+
+    <TextView
+        android:id="@+id/tvFaultHelpEventTime"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_17"
+        android:alpha="0.59"
+        android:textColor="@color/v2x_FFF_666"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
+        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
+        tools:text="15:30发布求助信息" />
+
     <TextView
         android:id="@+id/tagEventType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_36"
-        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginTop="@dimen/dp_11"
+        android:layout_marginBottom="@dimen/dp_36"
         android:background="@drawable/bg_v2x_event_type_orange"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_10"
@@ -22,8 +70,9 @@
         android:text="求助信息"
         android:textColor="#ffffff"
         android:textSize="@dimen/dp_28"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@+id/tvFaultHelpName"
+        app:layout_constraintTop_toBottomOf="@+id/tvFaultHelpEventTime" />
 
     <TextView
         android:id="@+id/tagEventEvaluate"
@@ -42,70 +91,21 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
         app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tagEventType"
-        tools:visibility="visible" />
-
-    <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/tvFaultHelpName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:textColor="@color/v2x_FFF_333"
-        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/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_666"
-        android:textSize="@dimen/dp_26"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
-        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
-        tools:text="15:30发布求助信息" />
+        app:layout_constraintTop_toTopOf="@+id/tagEventType" />
 
     <TextView
         android:id="@+id/tvFaultHelpDistance"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_33"
+        android:layout_marginTop="@dimen/dp_5"
         android:layout_marginEnd="@dimen/dp_30"
-        android:gravity="center_vertical"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_80"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
+        android:textSize="@dimen/dp_40"
         app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
-        tools:text="300M" />
+        app:layout_constraintStart_toEndOf="@+id/tagEventType"
+        app:layout_constraintTop_toBottomOf="@+id/tvFaultHelpEventTime"
+        tools:text="300米" />
 
     <ImageView
         android:id="@+id/ivFaultHelpEventCall"