From 0707b8725693aaa9e0f873ac74e72e32f28dc88f 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, 13 Oct 2020 12:21:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8A=BD=E7=A6=BBV2X=E4=B8=AD=E7=9A=84UI?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=B0=BA=E5=AF=B8=EF=BC=8C=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E7=9A=84=E9=80=82=E9=85=8D=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                      | 15 ++++++++++++---
 .../src/main/res/layout/item_v2x_event_detail.xml |  8 ++++----
 .../main/res/layout/item_v2x_fatigue_driving.xml  |  8 ++++----
 .../src/main/res/layout/item_v2x_fault_help.xml   | 12 ++++++------
 .../main/res/layout/item_v2x_illegal_parking.xml  |  6 +++---
 .../src/main/res/values-ldpi/dimens.xml           | 12 ++++++++++++
 .../src/main/res/values-mdpi/dimens.xml           | 12 ++++++++++++
 .../main/res/values-xhdpi-1920x1000/dimens.xml    | 11 +++++++++++
 .../src/main/res/values-xhdpi/dimens.xml          | 11 +++++++++++
 .../src/main/res/values/dimens.xml                | 10 ++++++++++
 10 files changed, 85 insertions(+), 20 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 663459aa50..0d156937bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,18 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" withSubpackages="false" static="false" />
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-          <package name="io.ktor" withSubpackages="true" static="false" />
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
     </JetCodeStyleSettings>
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 a4df8026d8..7a0b52969c 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
@@ -52,7 +52,7 @@
         android:paddingRight="@dimen/dp_10"
         android:paddingBottom="@dimen/dp_3"
         android:textColor="#fff"
-        android:textSize="@dimen/dp_24"
+        android:textSize="@dimen/module_v2x_event_type_title_text_size"
         app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
         app:layout_constraintTop_toTopOf="@+id/rlRoadEventImg"
         tools:text="道路施工" />
@@ -66,7 +66,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_36"
+        android:textSize="@dimen/module_v2x_event_title_text_size"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
         app:layout_constraintStart_toStartOf="@+id/tvEventTypeTitle"
@@ -89,7 +89,7 @@
         android:layout_marginStart="@dimen/dp_10"
         android:alpha="0.6"
         android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/dp_28"
+        android:textSize="@dimen/module_v2x_event_sub_title_text_size"
         app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo"
         app:layout_constraintStart_toEndOf="@id/ivEventDistanceLogo"
         app:layout_constraintTop_toTopOf="@id/ivEventDistanceLogo"
@@ -102,7 +102,7 @@
         android:layout_marginStart="@dimen/dp_30"
         android:alpha="0.6"
         android:textColor="@color/v2x_FFF_999"
-        android:textSize="@dimen/dp_28"
+        android:textSize="@dimen/module_v2x_event_sub_title_text_size"
         app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo"
         app:layout_constraintStart_toEndOf="@+id/tvEventDistance"
         app:layout_constraintTop_toTopOf="@id/ivEventDistanceLogo"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
index 05b199f00a..1610387581 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
@@ -14,8 +14,8 @@
 
     <ImageView
         android:id="@+id/ivIconP"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/module_v2x_event_icon_size"
+        android:layout_height="@dimen/module_v2x_event_icon_size"
         android:src="@drawable/icon_parking_p"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
         android:layout_marginEnd="@dimen/dp_30"
         android:layout_marginBottom="@dimen/dp_20"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_34"
+        android:textSize="@dimen/module_v2x_event_parking_text_size"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/tvAddressDistance"
@@ -54,7 +54,7 @@
         android:layout_marginEnd="@dimen/dp_30"
         android:gravity="center_vertical"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_80"
+        android:textSize="@dimen/module_v2x_event_help_distance_text_size"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
         app:layout_constraintEnd_toStartOf="@+id/ivToNav"
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 ad3974ab91..1090691eea 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
@@ -23,15 +23,15 @@
         android:paddingBottom="@dimen/dp_5"
         android:text="求助信息"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_24"
+        android:textSize="@dimen/module_v2x_event_type_title_text_size"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivFaultHelpHead"
-        android:layout_width="@dimen/dp_75"
-        android:layout_height="@dimen/dp_75"
+        android:layout_width="@dimen/module_v2x_event_help_head_size"
+        android:layout_height="@dimen/module_v2x_event_help_head_size"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:layout_marginTop="@dimen/dp_21"
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/module_v2x_event_help_title_text_size"
         android:textStyle="bold"
         app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
         app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         android:alpha="0.59"
         android:textColor="@color/v2x_FFF_999"
-        android:textSize="@dimen/dp_26"
+        android:textSize="@dimen/module_v2x_event_help_sub_title_text_size"
         app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
         app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
         tools:text="15:30发布求助信息" />
@@ -78,7 +78,7 @@
         android:layout_marginEnd="@dimen/dp_30"
         android:gravity="center_vertical"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_80"
+        android:textSize="@dimen/module_v2x_event_help_distance_text_size"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
         app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
index 9bd3f76b78..1a0f011c8c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
@@ -33,7 +33,7 @@
         android:paddingBottom="@dimen/dp_3"
         android:text="违章停车"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_24"
+        android:textSize="@dimen/module_v2x_event_type_title_text_size"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/tvAddress"
         app:layout_constraintStart_toEndOf="@+id/ivIconP"
@@ -48,7 +48,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_34"
+        android:textSize="@dimen/module_v2x_event_title_text_size"
         app:layout_constraintBottom_toTopOf="@+id/tvAddressDistance"
         app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
         app:layout_constraintStart_toStartOf="@+id/tagEventType"
@@ -63,7 +63,7 @@
         android:alpha="0.6"
         android:gravity="center_vertical"
         android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/dp_26"
+        android:textSize="@dimen/module_v2x_event_sub_title_text_size"
         app:layout_constraintEnd_toEndOf="@+id/tvAddress"
         app:layout_constraintStart_toStartOf="@+id/tagEventType"
         app:layout_constraintTop_toBottomOf="@+id/tvAddress"
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 63f2dac657..77bde39522 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -81,4 +81,16 @@
     <dimen name="share_item_text_size">16px</dimen>
     <dimen name="share_item_padding">20px</dimen>
     <dimen name="module_v2x_widow_top_gaps">6px</dimen>
+
+    <!--适配 V2X 弹窗 UI-->
+    <dimen name="module_v2x_event_type_title_text_size">13px</dimen>
+    <dimen name="module_v2x_event_title_text_size">20px</dimen>
+    <dimen name="module_v2x_event_sub_title_text_size">16px</dimen>
+
+    <dimen name="module_v2x_event_help_head_size">41px</dimen>
+    <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
+    <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
+    <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 7afc5f5e14..37279ba003 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -81,4 +81,16 @@
     <dimen name="share_item_text_size">16px</dimen>
     <dimen name="share_item_padding">20px</dimen>
     <dimen name="module_v2x_widow_top_gaps">3px</dimen>
+
+    <!--适配 V2X 弹窗 UI-->
+    <dimen name="module_v2x_event_type_title_text_size">13px</dimen>
+    <dimen name="module_v2x_event_title_text_size">20px</dimen>
+    <dimen name="module_v2x_event_sub_title_text_size">16px</dimen>
+
+    <dimen name="module_v2x_event_help_head_size">41px</dimen>
+    <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
+    <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
+    <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+
 </resources>
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 2e18d47106..8dbb945b9d 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
@@ -64,4 +64,15 @@
 
     <dimen name="module_v2x_panel_tab_height">158px</dimen>
 
+    <!--适配 V2X 弹窗 UI-->
+    <dimen name="module_v2x_event_type_title_text_size">24px</dimen>
+    <dimen name="module_v2x_event_title_text_size">36px</dimen>
+    <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
+
+    <dimen name="module_v2x_event_help_head_size">75px</dimen>
+    <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
+    <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
+    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 562b1d7038..025c49d591 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -80,4 +80,15 @@
     <dimen name="share_item_padding">25px</dimen>
     <dimen name="module_v2x_widow_top_gaps">2px</dimen>
 
+    <!--适配 V2X 弹窗 UI-->
+    <dimen name="module_v2x_event_type_title_text_size">24px</dimen>
+    <dimen name="module_v2x_event_title_text_size">36px</dimen>
+    <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
+
+    <dimen name="module_v2x_event_help_head_size">75px</dimen>
+    <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
+    <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
+    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index f0c403220a..2ff91d91f1 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -74,5 +74,15 @@
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
     <dimen name="module_v2x_panel_tab_height">84px</dimen>
 
+    <!--适配 V2X 弹窗 UI-->
+    <dimen name="module_v2x_event_type_title_text_size">13px</dimen>
+    <dimen name="module_v2x_event_title_text_size">20px</dimen>
+    <dimen name="module_v2x_event_sub_title_text_size">16px</dimen>
+
+    <dimen name="module_v2x_event_help_head_size">41px</dimen>
+    <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
+    <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
+    <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
 
 </resources>

From b8f778286ac0832e904e908dbd88075815acd3a1 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, 13 Oct 2020 14:56:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=95=B4=E7=90=86UI=E5=B0=BA=E5=AF=B8?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_v2x_event_detail.xml         | 4 ++--
 .../src/main/res/layout/view_video_layout_normal.xml      | 4 ++--
 .../mogo-module-v2x/src/main/res/values-ldpi/dimens.xml   | 7 +++++--
 .../mogo-module-v2x/src/main/res/values-mdpi/dimens.xml   | 7 +++++--
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml        | 7 +++++--
 .../mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml  | 7 +++++--
 modules/mogo-module-v2x/src/main/res/values/dimens.xml    | 8 +++++---
 7 files changed, 29 insertions(+), 15 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 7a0b52969c..886ad47555 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
@@ -110,8 +110,8 @@
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivEventHead"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
+        android:layout_width="@dimen/module_v2x_event_head_size"
+        android:layout_height="@dimen/module_v2x_event_head_size"
         android:layout_marginEnd="@dimen/dp_28"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tvEventTypeTitle"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
index 9cbfa8f4ef..99bb075aaf 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
@@ -42,7 +42,7 @@
             android:layout_marginStart="@dimen/dp_20"
             android:text="直播获取失败"
             android:textColor="@color/v2x_FFF_333"
-            android:textSize="@dimen/dp_36"
+            android:textSize="@dimen/module_v2x_event_live_error_text_size"
             app:layout_constraintBottom_toBottomOf="@+id/ivErrorIcon"
             app:layout_constraintStart_toEndOf="@+id/ivErrorIcon"
             app:layout_constraintTop_toTopOf="@+id/ivErrorIcon" />
@@ -59,7 +59,7 @@
             android:paddingBottom="@dimen/dp_25"
             android:text="重试"
             android:textColor="@color/v2x_FFF_333"
-            android:textSize="@dimen/dp_34"
+            android:textSize="@dimen/module_v2x_event_live_error_text_size"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/ivErrorIcon" />
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 77bde39522..c2f40d31a1 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -15,7 +15,6 @@
 
     <dimen name="module_v2x_event_button_size">54px</dimen>
 
-    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
 
     <dimen name="module_v2x_event_image_height">156px</dimen>
     <dimen name="module_v2x_event_image_width">234px</dimen>
@@ -28,7 +27,6 @@
 
     <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
 
-    <dimen name="module_v2x_live_window_height">150px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
@@ -86,11 +84,16 @@
     <dimen name="module_v2x_event_type_title_text_size">13px</dimen>
     <dimen name="module_v2x_event_title_text_size">20px</dimen>
     <dimen name="module_v2x_event_sub_title_text_size">16px</dimen>
+    <dimen name="module_v2x_event_head_size">31px</dimen>
+    <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
+    <dimen name="module_v2x_live_window_height">150px</dimen>
 
     <dimen name="module_v2x_event_help_head_size">41px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
+    <!--适配 V2X 弹窗 UI-->
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 37279ba003..ab4fa5463d 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -15,7 +15,6 @@
 
     <dimen name="module_v2x_event_button_size">54px</dimen>
 
-    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
 
     <dimen name="module_v2x_event_image_height">156px</dimen>
     <dimen name="module_v2x_event_image_width">234px</dimen>
@@ -28,7 +27,6 @@
 
     <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
 
-    <dimen name="module_v2x_live_window_height">150px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
@@ -86,11 +84,16 @@
     <dimen name="module_v2x_event_type_title_text_size">13px</dimen>
     <dimen name="module_v2x_event_title_text_size">20px</dimen>
     <dimen name="module_v2x_event_sub_title_text_size">16px</dimen>
+    <dimen name="module_v2x_event_head_size">31px</dimen>
+    <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
+    <dimen name="module_v2x_live_window_height">150px</dimen>
 
     <dimen name="module_v2x_event_help_head_size">41px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
+    <!--适配 V2X 弹窗 UI-->
 
 </resources>
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 8dbb945b9d..1c0527149d 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
@@ -14,7 +14,6 @@
     <dimen name="module_v2x_event_icon_size">160px</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>
     <dimen name="module_v2x_event_image_width">480px</dimen>
@@ -24,7 +23,6 @@
 
     <dimen name="module_v2x_history_event_icon_size">80px</dimen>
 
-    <dimen name="module_v2x_live_window_height">310px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</dimen>
@@ -68,11 +66,16 @@
     <dimen name="module_v2x_event_type_title_text_size">24px</dimen>
     <dimen name="module_v2x_event_title_text_size">36px</dimen>
     <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
+    <dimen name="module_v2x_event_head_size">55px</dimen>
+    <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
+    <dimen name="module_v2x_live_window_height">310px</dimen>
 
     <dimen name="module_v2x_event_help_head_size">75px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">100px</dimen>
+    <!--适配 V2X 弹窗 UI-->
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 025c49d591..6c42c94a44 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -14,7 +14,6 @@
     <dimen name="module_v2x_event_icon_size">147px</dimen>
 
     <dimen name="module_v2x_event_button_size">98px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">130px</dimen>
 
     <dimen name="module_v2x_event_image_height">280px</dimen>
     <dimen name="module_v2x_event_image_width">421px</dimen>
@@ -25,7 +24,6 @@
 
     <dimen name="module_v2x_history_event_icon_size">80px</dimen>
 
-    <dimen name="module_v2x_live_window_height">310px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</dimen>
@@ -84,11 +82,16 @@
     <dimen name="module_v2x_event_type_title_text_size">24px</dimen>
     <dimen name="module_v2x_event_title_text_size">36px</dimen>
     <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
+    <dimen name="module_v2x_event_head_size">55px</dimen>
+    <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
+    <dimen name="module_v2x_live_window_height">310px</dimen>
 
     <dimen name="module_v2x_event_help_head_size">75px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">130px</dimen>
+    <!--适配 V2X 弹窗 UI-->
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index 2ff91d91f1..bede4aa179 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -15,8 +15,6 @@
 
     <dimen name="module_v2x_event_button_size">54px</dimen>
 
-    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
-
     <dimen name="module_v2x_event_image_height">156px</dimen>
     <dimen name="module_v2x_event_image_width">234px</dimen>
 
@@ -28,7 +26,6 @@
 
     <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
 
-    <dimen name="module_v2x_live_window_height">170px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
@@ -78,11 +75,16 @@
     <dimen name="module_v2x_event_type_title_text_size">13px</dimen>
     <dimen name="module_v2x_event_title_text_size">20px</dimen>
     <dimen name="module_v2x_event_sub_title_text_size">16px</dimen>
+    <dimen name="module_v2x_event_head_size">31px</dimen>
+    <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
+    <dimen name="module_v2x_live_window_height">170px</dimen>
 
     <dimen name="module_v2x_event_help_head_size">41px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
+    <!--适配 V2X 弹窗 UI-->
 
 </resources>

From 80206fc102fd690e046e336411ba290745943818 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, 13 Oct 2020 15:32:22 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values-ldpi/dimens.xml         | 17 ++++++++++-------
 .../src/main/res/values-mdpi/dimens.xml         | 16 ++++++++++------
 .../main/res/values-xhdpi-1920x1000/dimens.xml  | 16 ++++++++++------
 .../src/main/res/values-xhdpi/dimens.xml        | 17 ++++++++++-------
 .../src/main/res/values/dimens.xml              | 17 ++++++++++-------
 5 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index c2f40d31a1..89dfb50578 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -4,22 +4,16 @@
 
     <dimen name="module_v2x_search_marginLeft">18px</dimen>
     <dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
-    <dimen name="module_v2x_event_window_height">190px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
+
     <dimen name="module_v2x_push_img_height">190px</dimen>
     <dimen name="module_v2x_push_img_container_height">210px</dimen>
 
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
 
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
     <dimen name="module_v2x_event_button_size">54px</dimen>
 
 
-    <dimen name="module_v2x_event_image_height">156px</dimen>
-    <dimen name="module_v2x_event_image_width">234px</dimen>
-
-
     <dimen name="module_v2x_event_distance_text">34px</dimen>
     <dimen name="module_v2x_event_distance_title">22px</dimen>
 
@@ -88,6 +82,15 @@
     <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
     <dimen name="module_v2x_live_window_height">150px</dimen>
 
+    <!--道路事件 高的弹窗-->
+    <dimen name="module_v2x_event_window_height">190px</dimen>
+    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
+    <dimen name="module_v2x_event_image_height">156px</dimen>
+    <dimen name="module_v2x_event_image_width">234px</dimen>
+
+    <!--疲劳驾驶、违章停车、道路求助-->
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
+
     <dimen name="module_v2x_event_help_head_size">41px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index ab4fa5463d..c6e4eea0b8 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -4,21 +4,16 @@
 
     <dimen name="module_v2x_search_marginLeft">18px</dimen>
     <dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
-    <dimen name="module_v2x_event_window_height">190px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
+
     <dimen name="module_v2x_push_img_height">190px</dimen>
     <dimen name="module_v2x_push_img_container_height">210px</dimen>
 
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
 
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
     <dimen name="module_v2x_event_button_size">54px</dimen>
 
 
-    <dimen name="module_v2x_event_image_height">156px</dimen>
-    <dimen name="module_v2x_event_image_width">234px</dimen>
-
 
     <dimen name="module_v2x_event_distance_text">34px</dimen>
     <dimen name="module_v2x_event_distance_title">22px</dimen>
@@ -88,6 +83,15 @@
     <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
     <dimen name="module_v2x_live_window_height">150px</dimen>
 
+    <!--道路事件 高的弹窗-->
+    <dimen name="module_v2x_event_window_height">190px</dimen>
+    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
+    <dimen name="module_v2x_event_image_height">156px</dimen>
+    <dimen name="module_v2x_event_image_width">234px</dimen>
+
+    <!--疲劳驾驶、违章停车、道路求助-->
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
+
     <dimen name="module_v2x_event_help_head_size">41px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
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 1c0527149d..6f07b7e356 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
@@ -4,20 +4,15 @@
 
     <dimen name="module_v2x_search_marginLeft">32px</dimen>
     <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
-    <dimen name="module_v2x_event_window_height">330px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
+
     <dimen name="module_v2x_push_img_height">390px</dimen>
     <dimen name="module_v2x_push_img_container_height">410px</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_button_size">110px</dimen>
 
-    <dimen name="module_v2x_event_image_height">270px</dimen>
-    <dimen name="module_v2x_event_image_width">480px</dimen>
-
     <dimen name="module_v2x_event_distance_text">60px</dimen>
     <dimen name="module_v2x_event_distance_title">40px</dimen>
 
@@ -70,6 +65,15 @@
     <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
     <dimen name="module_v2x_live_window_height">310px</dimen>
 
+    <!--道路事件 高的弹窗-->
+    <dimen name="module_v2x_event_image_height">270px</dimen>
+    <dimen name="module_v2x_event_image_width">480px</dimen>
+    <dimen name="module_v2x_event_window_height">330px</dimen>
+    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
+
+    <!--疲劳驾驶、违章停车、道路求助-->
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
+
     <dimen name="module_v2x_event_help_head_size">75px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 6c42c94a44..53b72623d8 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -4,21 +4,15 @@
 
     <dimen name="module_v2x_search_marginLeft">32px</dimen>
     <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
-    <dimen name="module_v2x_event_window_height">330px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
+
     <dimen name="module_v2x_push_img_height">390px</dimen>
     <dimen name="module_v2x_push_img_container_height">410px</dimen>
 
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>
 
     <dimen name="module_v2x_event_icon_size">147px</dimen>
 
     <dimen name="module_v2x_event_button_size">98px</dimen>
 
-    <dimen name="module_v2x_event_image_height">280px</dimen>
-    <dimen name="module_v2x_event_image_width">421px</dimen>
-
-
     <dimen name="module_v2x_event_distance_text">60px</dimen>
     <dimen name="module_v2x_event_distance_title">40px</dimen>
 
@@ -86,6 +80,15 @@
     <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
     <dimen name="module_v2x_live_window_height">310px</dimen>
 
+    <!--道路事件 高的弹窗-->
+    <dimen name="module_v2x_event_window_height">330px</dimen>
+    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
+    <dimen name="module_v2x_event_image_height">280px</dimen>
+    <dimen name="module_v2x_event_image_width">421px</dimen>
+
+    <!--疲劳驾驶、违章停车、道路求助-->
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>
+
     <dimen name="module_v2x_event_help_head_size">75px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index bede4aa179..b5f9d961b9 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -4,20 +4,14 @@
 
     <dimen name="module_v2x_search_marginLeft">18px</dimen>
     <dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
-    <dimen name="module_v2x_event_window_height">190px</dimen>
-    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
+
     <dimen name="module_v2x_push_img_height">190px</dimen>
     <dimen name="module_v2x_push_img_container_height">210px</dimen>
 
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
-
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
     <dimen name="module_v2x_event_button_size">54px</dimen>
 
-    <dimen name="module_v2x_event_image_height">156px</dimen>
-    <dimen name="module_v2x_event_image_width">234px</dimen>
-
 
     <dimen name="module_v2x_event_distance_text">34px</dimen>
     <dimen name="module_v2x_event_distance_title">22px</dimen>
@@ -79,6 +73,15 @@
     <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
     <dimen name="module_v2x_live_window_height">170px</dimen>
 
+    <!--道路事件 高的弹窗-->
+    <dimen name="module_v2x_event_window_height">190px</dimen>
+    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
+    <dimen name="module_v2x_event_image_height">156px</dimen>
+    <dimen name="module_v2x_event_image_width">234px</dimen>
+
+    <!--疲劳驾驶、违章停车、道路求助-->
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
+
     <dimen name="module_v2x_event_help_head_size">41px</dimen>
     <dimen name="module_v2x_event_help_title_text_size">18px</dimen>
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>

From 0713f3d89c0284971916e69bbdf606a0df1427cc 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, 13 Oct 2020 16:19:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=95=B4=E7=90=86UI=E9=80=82=E9=85=8Ddimen?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml   | 4 ++--
 modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml   | 4 ++--
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml            | 4 ++--
 modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml  | 4 ++--
 modules/mogo-module-v2x/src/main/res/values/dimens.xml        | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 89dfb50578..e911308385 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -11,7 +11,6 @@
 
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
-    <dimen name="module_v2x_event_button_size">54px</dimen>
 
 
     <dimen name="module_v2x_event_distance_text">34px</dimen>
@@ -81,6 +80,8 @@
     <dimen name="module_v2x_event_head_size">31px</dimen>
     <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
     <dimen name="module_v2x_live_window_height">150px</dimen>
+    <dimen name="module_v2x_event_button_size">54px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
 
     <!--道路事件 高的弹窗-->
     <dimen name="module_v2x_event_window_height">190px</dimen>
@@ -96,7 +97,6 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index c6e4eea0b8..17684331f1 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -11,7 +11,6 @@
 
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
-    <dimen name="module_v2x_event_button_size">54px</dimen>
 
 
 
@@ -82,6 +81,8 @@
     <dimen name="module_v2x_event_head_size">31px</dimen>
     <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
     <dimen name="module_v2x_live_window_height">150px</dimen>
+    <dimen name="module_v2x_event_button_size">54px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
 
     <!--道路事件 高的弹窗-->
     <dimen name="module_v2x_event_window_height">190px</dimen>
@@ -97,7 +98,6 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
 </resources>
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 6f07b7e356..4d5042d290 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
@@ -11,7 +11,6 @@
 
     <dimen name="module_v2x_event_icon_size">160px</dimen>
 
-    <dimen name="module_v2x_event_button_size">110px</dimen>
 
     <dimen name="module_v2x_event_distance_text">60px</dimen>
     <dimen name="module_v2x_event_distance_title">40px</dimen>
@@ -64,6 +63,8 @@
     <dimen name="module_v2x_event_head_size">55px</dimen>
     <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
     <dimen name="module_v2x_live_window_height">310px</dimen>
+    <dimen name="module_v2x_event_button_size">110px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">120px</dimen>
 
     <!--道路事件 高的弹窗-->
     <dimen name="module_v2x_event_image_height">270px</dimen>
@@ -79,7 +80,6 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">100px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 53b72623d8..714c300b34 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -11,7 +11,6 @@
 
     <dimen name="module_v2x_event_icon_size">147px</dimen>
 
-    <dimen name="module_v2x_event_button_size">98px</dimen>
 
     <dimen name="module_v2x_event_distance_text">60px</dimen>
     <dimen name="module_v2x_event_distance_title">40px</dimen>
@@ -79,6 +78,8 @@
     <dimen name="module_v2x_event_head_size">55px</dimen>
     <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
     <dimen name="module_v2x_live_window_height">310px</dimen>
+    <dimen name="module_v2x_event_button_size">98px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">130px</dimen>
 
     <!--道路事件 高的弹窗-->
     <dimen name="module_v2x_event_window_height">330px</dimen>
@@ -94,7 +95,6 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">130px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index b5f9d961b9..0153624746 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -10,7 +10,6 @@
 
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
-    <dimen name="module_v2x_event_button_size">54px</dimen>
 
 
     <dimen name="module_v2x_event_distance_text">34px</dimen>
@@ -72,6 +71,8 @@
     <dimen name="module_v2x_event_head_size">31px</dimen>
     <dimen name="module_v2x_event_live_error_text_size">20px</dimen>
     <dimen name="module_v2x_live_window_height">170px</dimen>
+    <dimen name="module_v2x_event_button_size">54px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
 
     <!--道路事件 高的弹窗-->
     <dimen name="module_v2x_event_window_height">190px</dimen>
@@ -87,7 +88,6 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
-    <dimen name="module_v2x_event_button_size_detail">64px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
 </resources>

From 4f81fa600138de2aa27d6ab32c8ecbe1bb53c66a Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 13 Oct 2020 16:33:09 +0800
Subject: [PATCH 5/5] add report switch

---
 .../roadcondition/service/MainService.kt      | 22 +++++++++++++------
 .../module/extensions/bean/CommonConfig.java  | 11 +++++++++-
 .../entrance/EntrancePresenter.java           |  9 +++++++-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
index 1cff5c7d5a..7909e83a62 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -11,10 +11,14 @@ import android.os.IBinder
 import android.util.Log
 import com.elegant.analytics.Analytics
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.commons.debug.DebugConfig
+import com.mogo.utils.logger.Logger
+import com.mogo.utils.storage.SharedPrefsMgr
 import com.zhidao.cosupload.manager.CosUploadManagerImpl
 import com.zhidao.roadcondition.BuildConfig
-import com.zhidao.roadcondition.constant.*
+import com.zhidao.roadcondition.constant.DEFAULT_VIDEO_DURATION
+import com.zhidao.roadcondition.constant.TANLU_ROAD_CURRENT
+import com.zhidao.roadcondition.constant.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO
+import com.zhidao.roadcondition.constant.UPLOAD_FROM_STRATEGY_BLOCK_AUTO
 import com.zhidao.roadcondition.event.GetImageSuccessEvent
 import com.zhidao.roadcondition.event.LatLngStickyEventBus
 import com.zhidao.roadcondition.util.*
@@ -221,12 +225,16 @@ class MainService : Service() {
         //开始开始监听速度,只要超过一次5公里每小时则即开始获取策略进行本地上报   只有release才加此判断，qa环境方便测试
         LocationUtil.getInstance().setonSpeedlistenner(object : LocationUtil.SpeedListener {
             override fun onSpeedGet(speed: Float) {
-                if (speed > (5 / 3.6f) && !isGetStrategies) {
-                    mainServiceHttpModel.initStrategies {
-                        handleReportStrategy()
+                var isOpen = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp().applicationContext).getBoolean("KEY_SERVER_REPORTSTRATEGY_SWITCH", false)
+                Logger.d("EntrancePresenter", " -------- isOpen = $isOpen")
+                if (isOpen) {
+                    if (speed > (5 / 3.6f) && !isGetStrategies) {
+                        mainServiceHttpModel.initStrategies {
+                            handleReportStrategy()
+                        }
+                        Log.d("MainService", "initLocationListener more than 5 start upload  speed = $speed")
+                        isGetStrategies = true
                     }
-                    Log.d("MainService", "initLocationListener more than 5 start upload  speed = $speed")
-                    isGetStrategies = true
                 }
             }
         })
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java
index 0f9f7cd97a..36e5ca7a48 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java
@@ -12,11 +12,13 @@ public class CommonConfig {
     public Active active;//活动配置
     public Auth auth; //授权配置
     public Speech speech; //语音播报次数
+    public ReportStrategy reportStrategy; //被动上报策略开关
 
-    public CommonConfig(Active active, Auth auth, Speech speech) {
+    public CommonConfig(Active active, Auth auth, Speech speech, ReportStrategy reportStrategy) {
         this.active = active;
         this.auth = auth;
         this.speech = speech;
+        this.reportStrategy = reportStrategy;
     }
 
     public class Active{
@@ -47,4 +49,11 @@ public class CommonConfig {
             this.isNeedAuth = isNeedAuth;
         }
     }
+
+    public class ReportStrategy {
+        public boolean open;
+        ReportStrategy(boolean open) {
+            this.open = open;
+        }
+    }
 }
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
index ab25f3a2ba..6f1b8824f4 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -130,7 +130,6 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
     public void getCommonConfig() {
         Map<String, Object> params = new ArrayMap<>();
         params.put("sn", Utils.getSn());
-
         mNetWork.create(GetConfigApiServices.class, UserInfoConstant.getUserInfoBaseUrl())
                 .getConfig(params)
                 .subscribeOn(Schedulers.io())
@@ -145,12 +144,20 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
                 Logger.d(TAG, "getCommonConfig  onSuccess -----> ");
                 if (config != null && config.result != null) {
                     CommonConfig.Speech speech = config.result.speech;
+                    CommonConfig.ReportStrategy strategy = config.result.reportStrategy;
                     if (speech != null) {
                         Logger.d(TAG, "getCommonConfig  onSuccess speech.count = " + speech.count);
                         SharedPrefsMgr.getInstance(getContext()).putInt(KEY_SERVER_SHOW_DAY_COUNT, speech.count);
                     } else {
                         Logger.e(TAG, "getCommonConfig  onSuccess speech == null ");
                     }
+
+                    if (strategy != null) {
+                        Logger.d(TAG, "getCommonConfig  onSuccess strategy.open = " + strategy.open);
+                        SharedPrefsMgr.getInstance(getContext()).putBoolean("KEY_SERVER_REPORTSTRATEGY_SWITCH", strategy.open);
+                    } else {
+                        Logger.e(TAG, "getCommonConfig  onSuccess strategy == null ");
+                    }
                 } else {
                     Logger.e(TAG, "getCommonConfig onSuccess config == null");
                 }