From fa7a01e1d7af99cc739c055deed5ddc83f25d569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 28 Jul 2020 15:51:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86UI=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../v2x/adapter/V2XSeekHelpAdapter.java       |  9 +-
 .../v2x/adapter/holder/V2XBaseViewHolder.java | 20 ++---
 .../adapter/holder/V2XRoadEventDetailVH.java  |  1 +
 .../listener/V2XMessageListener_401003.java   | 16 +---
 .../manager/impl/MoGoV2XPolylineManager.java  |  1 +
 .../module/v2x/marker/V2XMarkerAdapter.java   |  4 +-
 .../fatigue/V2XFatigueDrivingWindow.java      |  2 +-
 .../module/v2x/utils/RoadConditionUtils.java  | 13 +--
 .../res/anim/v2x_unlike_heart_animation.xml   |  8 +-
 .../main/res/drawable/v2x_fault_help_bg.xml   |  5 +-
 .../main/res/layout/item_v2x_fault_help.xml   | 88 ++++++++-----------
 .../res/layout/window_fatigue_driving.xml     |  6 +-
 .../res/layout/window_illegal_parking.xml     |  8 +-
 .../res/values-xhdpi-1920x1000/dimens.xml     |  6 +-
 .../src/main/res/values/color.xml             |  2 +-
 16 files changed, 77 insertions(+), 114 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
index 09f0e3441b..0a901e78ad 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
@@ -18,6 +18,7 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
 import com.mogo.module.v2x.utils.ChartingUtil;
+import com.mogo.module.v2x.utils.SpanUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.imageloader.MogoImageView;
 import com.mogo.utils.logger.Logger;
@@ -103,7 +104,7 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
                 if (infoBean != null) {
                     long time = entity.getCreateTime();
                     SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
-                    String eventDistance = String.format("距离%d m", entity.getDistance());
+                    String eventDistance = String.format("%d", entity.getDistance());
                     String eventTime = String.format("%s发布求助信息", sdf.format(new Date(time)));
                     holder.initView(infoBean.getHeadImgUrl(), infoBean.getDisplayName(), eventDistance, eventTime);
                 }
@@ -191,6 +192,12 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
             }
             tvName.setText(name);
             tvDistance.setText(distance);
+            SpanUtils.with(tvDistance)
+                    .append("" + distance)
+                    .setFontSize(80)
+                    .append("M")
+                    .setFontSize(30)
+                    .create();
             tvEventTime.setText(eventTime);
         }
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
index d7c9aa2c4e..50f87a3f4f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
@@ -1,9 +1,6 @@
 package com.mogo.module.v2x.adapter.holder;
 
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -15,14 +12,13 @@ import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.navi.MogoTraffic;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
-import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.utils.ChartingUtil;
 import com.mogo.module.v2x.utils.RoadConditionUtils;
-import com.mogo.module.v2x.utils.ToastUtils;
 import com.mogo.module.v2x.utils.TrackUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
+import com.mogo.utils.TipToast;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 
@@ -84,7 +80,7 @@ public abstract class V2XBaseViewHolder
                     V2XConst.V2X_ROAD_CHAT);
         } catch (Exception e) {
             e.printStackTrace();
-            ToastUtils.showShort("用户信息异常");
+            TipToast.tip("用户信息异常");
         }
         delayedCloseWindow();
     }
@@ -105,7 +101,7 @@ public abstract class V2XBaseViewHolder
                     V2XConst.V2X_ROAD_REPORT_ERROR);
         } catch (Exception e) {
             e.printStackTrace();
-            ToastUtils.showShort("路况信息异常");
+            TipToast.tip("路况信息异常");
         }
         delayedCloseWindow();
     }
@@ -126,7 +122,7 @@ public abstract class V2XBaseViewHolder
                     V2XConst.V2X_ROAD_REPORT_RIGHT);
         } catch (Exception e) {
             e.printStackTrace();
-            ToastUtils.showShort("路况信息异常");
+            TipToast.tip("路况信息异常");
         }
         delayedCloseWindow();
     }
@@ -150,7 +146,7 @@ public abstract class V2XBaseViewHolder
                     V2XConst.V2X_ROAD_NAVI);
         } catch (Exception e) {
             e.printStackTrace();
-            ToastUtils.showShort("路况信息异常");
+            TipToast.tip("路况信息异常");
         }
         delayedCloseWindow();
     }
@@ -161,11 +157,7 @@ public abstract class V2XBaseViewHolder
      * @param msg
      */
     public void showTip(String msg) {
-        ToastUtils.setGravity(Gravity.CENTER, 0, 0);
-        View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
-        TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
-        msgView.setText(msg);
-        ToastUtils.showCustomShort(toastView);
+        TipToast.tip(msg);
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
index a144024721..d3724def78 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
@@ -25,6 +25,7 @@ import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventScenario;
 import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventWindow;
 import com.mogo.module.v2x.utils.ChartingUtil;
 import com.mogo.module.v2x.utils.EventTypeUtils;
+import com.mogo.module.v2x.utils.SpanUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
index 9f485d8446..57e1a24978 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
@@ -1,20 +1,14 @@
 package com.mogo.module.v2x.listener;
 
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
+import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.utils.ADASUtils;
 import com.mogo.module.v2x.utils.MarkerUtils;
-import com.mogo.module.v2x.utils.ToastUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
@@ -113,11 +107,7 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener<V2XPush
     }
 
     private void showTip(String msg) {
-        ToastUtils.setGravity(Gravity.CENTER, 0, 0);
-        View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
-        TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
-        msgView.setText(msg);
-        ToastUtils.showCustomShort(toastView);
+        TipToast.tip(msg);
     }
 
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
index ffbcecf49e..2db8b216c6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
@@ -46,6 +46,7 @@ public class MoGoV2XPolylineManager implements IMoGoV2XPolylineManager {
                     case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
                     case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
                     case V2XPoiTypeEnum.FOURS_BLOCK_UP:
+                    case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
                         colors.add(0xFFFA8C34);
                         colors.add(0xFFBD6D36);
                         colors.add(0xFFFA8C34);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
index 2e8cf7d8a1..4e17b03803 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
@@ -4,9 +4,9 @@ import android.content.Context;
 import android.graphics.Bitmap;
 
 import com.mogo.module.common.entity.MarkerShowEntity;
-import com.mogo.module.v2x.R;
 import com.mogo.module.common.entity.V2XPoiTypeEnum;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.v2x.R;
 
 import java.util.ArrayList;
 
@@ -42,6 +42,7 @@ public class V2XMarkerAdapter {
             case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
             case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
             case V2XPoiTypeEnum.FOURS_BLOCK_UP:
+            case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
                 bitmap = getV2XRoadEventMarkerView(
                         context,
                         alarmInfo,
@@ -66,6 +67,7 @@ public class V2XMarkerAdapter {
             case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
             case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
             case V2XPoiTypeEnum.FOURS_BLOCK_UP:
+            case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
                 bitmapArrayList = getV2XRoadEventOrangeMarkerView(context, alarmInfo);
                 break;
             default:
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
index d1901c1fd4..f0b7f152e4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
@@ -98,7 +98,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
             }
             SpanUtils.with(mTvAddressDistance)
                     .append("" + (int) entity.getDistance())
-                    .setFontSize(82)
+                    .setFontSize(80)
                     .append("M")
                     .setFontSize(30)
                     .create();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
index 4302c9d997..09e6941de4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
@@ -1,15 +1,10 @@
 package com.mogo.module.v2x.utils;
 
 import android.content.Intent;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
 
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.common.entity.V2XPoiTypeEnum;
+import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -92,10 +87,6 @@ public class RoadConditionUtils {
      */
     private static void showTip() {
         AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已反馈", null);
-        ToastUtils.setGravity(Gravity.CENTER, 0, 0);
-        View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
-        TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
-        msgView.setText("已反馈");
-        ToastUtils.showCustomShort(toastView);
+        TipToast.tip("已反馈");
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
index 2982515e45..80c10a9a34 100644
--- a/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
+++ b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
@@ -4,13 +4,13 @@
         android:duration="100"
         android:propertyName="translationX"
         android:valueFrom="0"
-        android:valueTo="-2"
+        android:valueTo="-5"
         android:valueType="floatType" />
 
     <objectAnimator
         android:duration="100"
         android:propertyName="translationX"
-        android:valueFrom="-2"
+        android:valueFrom="-5"
         android:valueTo="0"
         android:valueType="floatType" />
 
@@ -18,13 +18,13 @@
         android:duration="100"
         android:propertyName="translationX"
         android:valueFrom="0"
-        android:valueTo="2"
+        android:valueTo="5"
         android:valueType="floatType" />
 
     <objectAnimator
         android:duration="100"
         android:propertyName="translationX"
-        android:valueFrom="2"
+        android:valueFrom="5"
         android:valueTo="0"
         android:valueType="floatType" />
 
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
index 3a224c6654..ee2a754125 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
         android:angle="135"
-        android:startColor="#ff3a435e"
-        android:endColor="#ff525b7b"
+        android:startColor="#3F4057"
+        android:endColor="#3F4057"
         android:type="linear"
         android:useLevel="true" />
 </shape>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index 417047d526..a87e825882 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -5,74 +5,42 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
     android:background="@drawable/v2x_fault_help_bg"
-    android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40">
-
-    <LinearLayout
-        android:id="@+id/llFaultHelpTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_10"
-        android:background="@drawable/v2x_gas_station_title_bg"
-        android:gravity="center_vertical"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
-        app:layout_constraintVertical_chainStyle="packed">
-
-        <ImageView
-            android:id="@+id/ivImgTextIcon"
-            android:layout_width="@dimen/dp_28"
-            android:layout_height="@dimen/dp_30"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/v2x_icon_fault_help_warn" />
-
-        <TextView
-            android:id="@+id/tvImgTextContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginStart="@dimen/dp_7"
-            android:layout_marginTop="@dimen/dp_6"
-            android:layout_marginEnd="@dimen/dp_26"
-            android:layout_marginBottom="@dimen/dp_6"
-            android:text="求助信息"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/dp_24" />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/ivNavIcon"
-        android:layout_width="@dimen/dp_30"
-        android:layout_height="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_29"
-        android:src="@drawable/v2x_icon_help_navi"
-        app:layout_constraintStart_toStartOf="@id/llFaultHelpTitle"
-        app:layout_constraintTop_toBottomOf="@id/llFaultHelpTitle" />
+    android:paddingEnd="@dimen/dp_40"
+    app:roundLayoutRadius="@dimen/dp_30">
 
     <TextView
-        android:id="@+id/tvFaultHelpDistance"
+        android:id="@+id/tvImgTextContent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_46"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/dp_13"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_7"
+        android:layout_marginBottom="@dimen/dp_6"
+        android:background="@drawable/bg_v2x_event_type_orange"
+        android:gravity="center_vertical"
+        android:paddingStart="@dimen/dp_13"
+        android:paddingTop="@dimen/dp_5"
+        android:paddingEnd="@dimen/dp_13"
+        android:paddingBottom="@dimen/dp_5"
+        android:text="求助信息"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_24"
-        app:layout_constraintBottom_toBottomOf="@+id/ivNavIcon"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/ivNavIcon"
-        tools:text="距离 300m" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivFaultHelpHead"
-        android:layout_width="@dimen/dp_128"
-        android:layout_height="@dimen/dp_128"
+        android:layout_width="@dimen/dp_108"
+        android:layout_height="@dimen/dp_108"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:layout_marginStart="@dimen/dp_30"
         android:layout_marginEnd="@dimen/dp_31"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-        app:layout_constraintStart_toEndOf="@+id/llFaultHelpTitle"
+        app:layout_constraintStart_toEndOf="@+id/tvImgTextContent"
         app:layout_constraintTop_toTopOf="parent"
         app:miv_borderColor="#4cffffff"
         app:miv_failureHolder="@drawable/icon_default_user_head"
@@ -109,11 +77,25 @@
         app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
         tools:text="15:30发布求助信息" />
 
+    <TextView
+        android:id="@+id/tvFaultHelpDistance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp_30"
+        android:fontFamily="sans-serif-condensed-medium"
+        android:gravity="center_vertical"
+        android:textColor="#FFF"
+        android:textSize="@dimen/dp_70"
+        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
+        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_20"
+        android:layout_marginEnd="@dimen/dp_40"
         android:src="@drawable/selector_talk_btn"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
index 1f3f529ba3..a03b1bfd5a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
@@ -45,11 +45,11 @@
         android:id="@+id/tvAddressDistance"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_30"
+        android:fontFamily="sans-serif-condensed-medium"
         android:gravity="center_vertical"
         android:textColor="#FFF"
-        android:textSize="@dimen/dp_86"
-        android:textStyle="bold"
+        android:textSize="@dimen/dp_80"
         app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
         app:layout_constraintEnd_toStartOf="@+id/ivToNav"
         app:layout_constraintTop_toTopOf="@+id/ivToNav"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
index 3f2acc3bd0..9d55aabd0c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
@@ -23,7 +23,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_23"
         android:background="@drawable/bg_v2x_event_type_read"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_10"
@@ -35,7 +34,7 @@
         android:textSize="@dimen/dp_24"
         app:layout_constraintBottom_toTopOf="@+id/tvAddress"
         app:layout_constraintStart_toEndOf="@+id/ivIconP"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/ivIconP" />
 
     <TextView
         android:id="@+id/tvAddress"
@@ -44,7 +43,7 @@
         android:layout_marginTop="@dimen/dp_10"
         android:layout_marginRight="@dimen/dp_30"
         android:ellipsize="end"
-        android:maxLines="2"
+        android:maxLines="1"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_34"
         app:layout_constraintBottom_toTopOf="@+id/tvAddressDistance"
@@ -63,7 +62,6 @@
         android:gravity="center_vertical"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_30"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/tvAddress"
         app:layout_constraintStart_toStartOf="@+id/ivIconPIcon"
         app:layout_constraintTop_toBottomOf="@+id/tvAddress"
@@ -73,7 +71,7 @@
         android:id="@+id/llIllegalParkingLike"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_40"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 721fba8c3c..936ab7c995 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -8,11 +8,11 @@
     <dimen name="module_v2x_event_window_height_ground">450px</dimen>
     <dimen name="module_v2x_push_img_height">390px</dimen>
 
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">210px</dimen>
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
 
-    <dimen name="module_v2x_event_icon_size">160px</dimen>
+    <dimen name="module_v2x_event_icon_size">180px</dimen>
 
-    <dimen name="module_v2x_event_button_size">90px</dimen>
+    <dimen name="module_v2x_event_button_size">110px</dimen>
     <dimen name="module_v2x_event_button_size_detail">100px</dimen>
 
     <dimen name="module_v2x_event_image_height">270px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values/color.xml b/modules/mogo-module-v2x/src/main/res/values/color.xml
index 0faa50d319..f8a3476000 100644
--- a/modules/mogo-module-v2x/src/main/res/values/color.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="live_video_progress_bar_loading_color">#256BFF</color>
-    <color name="live_video_background_color">#FF3F4057</color>
+    <color name="live_video_background_color">#3F4057</color>
 </resources>
\ No newline at end of file