Merge branch 'dev' into demo/shunyi_v2v_merge

# Conflicts: # app/src/main/java/com/mogo/launcher/MogoApplication.java # config.gradle # foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java # modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml # modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml # modules/mogo-module-extensions/src/main/res/values/dimens.xml # modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java # modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml # modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml # modules/mogo-module-v2x/src/main/res/values/dimens.xml # services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java # services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java # upload.sh
2020-10-18 16:40:27 +08:00
parent d5abc0b598 83f78f8288
commit e092bb4489
479 changed files with 7101 additions and 8317 deletions
--- a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_choose.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_choose.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_second.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_second.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_unchoose.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_unchoose.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_choose.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_choose.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_second.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_second.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_unchoose.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_unchoose.png
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
@@ -3,8 +3,8 @@
    android:shape="rectangle">
    <corners android:radius="@dimen/dp_24"/>
    <gradient
-        android:startColor="#5E6079"
-        android:endColor="#3F4057"
+        android:startColor="#B35E6079"
+        android:endColor="#B33F4057"
        android:type="linear"
        android:angle="180"/>

--- a/modules/mogo-module-v2x/src/main/res/drawable/share_rating_bar.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/share_rating_bar.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@android:id/background"
-        android:drawable="@drawable/icon_enthusiasm_unchoose">
-    </item>
-    <item
-        android:id="@android:id/secondaryProgress"
-        android:drawable="@drawable/icon_enthusiasm_second">
-    </item>
-    <item
-        android:id="@android:id/progress"
-        android:drawable="@drawable/icon_enthusiasm_choose">
-    </item>
-
-</layer-list>
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_180" />
-            <gradient
-                android:angle="0"
-                android:endColor="#5CC1FF"
-                android:startColor="#256BFF" />
-        </shape>
-    </item>
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_180" />
-            <gradient
-                android:angle="0"
-                android:endColor="#5CC1FF"
-                android:startColor="#256BFF" />
-        </shape>
-    </item>
-</selector>
--- 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,10 +66,10 @@
        android:ellipsize="end"
        android:maxLines="1"
        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_36"
-        app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
+        android:textSize="@dimen/module_v2x_event_title_text_size"
        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
+        app:layout_constraintStart_toStartOf="@+id/tvEventTypeTitle"
        app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle"
        tools:text="东城区北三环中路辅路小黄庄路口" />

@@ -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"
@@ -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"
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
@@ -10,7 +10,7 @@
        android:layout_width="@dimen/v2x_share_btn_width"
        android:layout_height="wrap_content"
        android:layout_centerInParent="true"
-        android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+        android:background="@drawable/module_dw_common_corner_bkg_light"
        android:gravity="center"
        android:paddingTop="@dimen/dp_12"
        android:paddingBottom="@dimen/dp_12"
--- 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"
--- 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
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
+    android:layout_height="wrap_content"
    android:background="@drawable/v2x_alert_window_bg"
    android:padding="@dimen/dp_25">

@@ -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"
--- 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"
--- 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
@@ -21,7 +21,7 @@
        android:paddingBottom="@dimen/dp_3"
        android:text="违章停车"
        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
+        android:textSize="@dimen/panel_list_item_title_size"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

@@ -38,7 +38,7 @@
        android:paddingBottom="@dimen/dp_3"
        android:text="待评价"
        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
+        android:textSize="@dimen/panel_list_item_title_size"
        app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
        app:layout_constraintStart_toEndOf="@+id/tagEventType"
        app:layout_constraintTop_toTopOf="@+id/tagEventType" />
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -52,9 +52,9 @@
                android:id="@+id/surrounding_recycleview"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/module_v2x_surrounding_list_margin_left"
                android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                android:visibility="visible" />
+<!--            android:layout_marginLeft="@dimen/module_v2x_surrounding_list_margin_left"-->

            <!--空数据显示-->
            <RelativeLayout
@@ -137,7 +137,7 @@
        </RelativeLayout>
    </RelativeLayout>

-    <com.mogo.module.v2x.view.V2XNetworkLoadingView
+    <com.mogo.module.common.view.NetworkLoadingView
        android:id="@+id/loading_iv"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
@@ -2,14 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/layout_root"
    android:layout_width="wrap_content"
-    android:layout_marginBottom="@dimen/module_v2x_surrounding_item_margin_left"
-    android:layout_marginLeft="@dimen/module_v2x_surrounding_item_margin_left"
    android:layout_height="@dimen/module_v2x_surrounding_item_height">
+<!--    android:layout_marginBottom="@dimen/module_v2x_surrounding_item_margin_left"-->
+
+<!--    android:layout_marginLeft="@dimen/module_v2x_surrounding_item_margin_left"-->

    <RelativeLayout
-        android:layout_width="@dimen/module_v2x_surrounding_item_width"
+        android:layout_width="match_parent"
        android:layout_height="match_parent">
-
+<!--        @dimen/module_v2x_surrounding_item_width-->
        <ImageView
            android:id="@+id/iv_event_bg"
            android:layout_width="match_parent"
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
@@ -10,6 +10,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:visibility="gone"
+        android:layout_marginTop="@dimen/dp_50"
        tools:visibility="visible" />

    <LinearLayout
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
@@ -105,12 +105,10 @@
            android:orientation="vertical"
            android:paddingTop="@dimen/v2x_index_rating_top">

-            <RatingBar
+            <com.mogo.module.common.view.CustomRatingBar
                android:id="@+id/rating_bar"
-                style="@style/customRatingBarStyle"
                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:isIndicator="true" />
+                android:layout_height="wrap_content" />

            <TextView
                android:id="@+id/share_index_des"
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -56,7 +56,7 @@
            android:layout_width="@dimen/v2x_share_btn_width"
            android:layout_height="@dimen/v2x_share_btn_height"
            android:layout_toRightOf="@id/center"
-            android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+            android:background="@drawable/module_dw_common_corner_bkg_light"
            android:gravity="center"
            android:text="刷新"
            android:textColor="#FFFFFF"
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -23,7 +23,7 @@
        android:paddingBottom="@dimen/dp_3"
        android:text="道路类型"
        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_28" />
+        android:textSize="@dimen/panel_list_item_title_size" />

    <TextView
        android:id="@+id/road_case_useless_num"
@@ -80,7 +80,7 @@
        android:lines="1"
        android:text="东城区北三环附近维多欧美"
        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_32" />
+        android:textSize="@dimen/share_item_address" />

    <TextView
        android:id="@+id/road_case_share_time"
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml
@@ -13,13 +13,13 @@
        android:overScrollMode="never"
        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>

-    <com.mogo.module.v2x.view.V2XNetworkLoadingView
+    <com.mogo.module.common.view.NetworkLoadingView
        android:id="@+id/network_loading_imageview"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_centerInParent="true">

-    </com.mogo.module.v2x.view.V2XNetworkLoadingView>
+    </com.mogo.module.common.view.NetworkLoadingView>

 </RelativeLayout>

--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/loading_liner_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ProgressBar
-        android:id="@+id/loading_imageview"
-        android:layout_width="45dp"
-        android:layout_height="43dp"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/v2x_panel_loading_top"
-        android:indeterminateTint="#256BFF"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5" />
-
-    <TextView
-        android:id="@+id/loading_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/loading_imageview"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="top|center"
-        android:alpha="0.7"
-        android:text="正在获取信息…"
-        android:paddingTop="@dimen/dp_25"
-        android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/dp_34"
-        app:layout_constraintBottom_toTopOf="@+id/refresh_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />
-
-    <Button
-        android:id="@+id/refresh_button"
-        android:layout_width="@dimen/v2x_share_btn_width"
-        android:layout_height="@dimen/v2x_share_btn_height"
-        android:layout_below="@id/loading_text"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="top|center"
-        android:layout_marginTop="@dimen/dp_40"
-        android:background="@drawable/v2xt_dw_common_corner_bkg_light"
-        android:gravity="center"
-        android:text="刷新"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_32"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loading_text" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
@@ -50,7 +50,7 @@
        android:layout_height="@dimen/v2x_share_btn_height"
        android:layout_marginStart="@dimen/dp_60"
        android:layout_marginTop="@dimen/dp_60"
-        android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+        android:background="@drawable/module_dw_common_corner_bkg_light"
        android:gravity="center"
        android:text="刷新"
        android:textColor="#FFFFFF"
--- 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" />
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
@@ -7,6 +7,7 @@
    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
    android:orientation="vertical"
    android:overScrollMode="never"
+    android:padding="@dimen/module_v2x_widow_top_gaps"
    tools:itemCount="1"
    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
    tools:listitem="@layout/item_v2x_fault_help" />
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
@@ -12,6 +12,7 @@
        android:minHeight="@dimen/module_v2x_event_window_height"
        android:orientation="horizontal"
        android:overScrollMode="never"
+        android:padding="@dimen/module_v2x_widow_top_gaps"
        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -24,7 +25,7 @@
        android:layout_width="@dimen/dp_88"
        android:layout_height="@dimen/dp_88"
        android:layout_marginEnd="@dimen/dp_28"
-        android:layout_marginBottom="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_40"
        android:background="@drawable/icon_window_close2"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintRight_toRightOf="parent" />
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -128,5 +128,17 @@
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent" />

+        <Button
+            android:id="@+id/btnTriggerCallUserInfo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#E91451"
+            android:padding="@dimen/dp_10"
+            android:text="打开用户信息"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/dp_22"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
    </com.google.android.flexbox.FlexboxLayout>
 </RelativeLayout>
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="module_main_v2x_animation_width">445px</dimen>
+
+    <dimen name="module_v2x_search_marginLeft">18px</dimen>
+    <dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
+
+    <dimen name="module_v2x_push_img_height">190px</dimen>
+    <dimen name="module_v2x_push_img_container_height">210px</dimen>
+
+
+    <dimen name="module_v2x_event_icon_size">82px</dimen>
+
+
+
+    <dimen name="module_v2x_event_distance_text">34px</dimen>
+    <dimen name="module_v2x_event_distance_title">22px</dimen>
+
+    <dimen name="module_v2x_history_event_icon_size">40px</dimen>
+
+    <dimen name="module_v2x_surrounding_item_bottom_size">6px</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>
+    <dimen name="module_v2x_map_bottom">100px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">50px</dimen>
+    <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
+    <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
+    <dimen name="module_v2x_surrounding_empty_iv_margin_top">40px</dimen>
+    <dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
+    <dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
+    <dimen name="module_v2x_surrounding_margin_left">28px</dimen>
+    <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
+    <dimen name="module_v2x_surrounding_item_width">238px</dimen>
+    <dimen name="module_v2x_surrounding_item_height">170px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
+    <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
+    <dimen name="module_v2x_surrounding_item_marigin_bottom_left">8px</dimen>
+    <dimen name="module_v2x_panel_surrounding_marginbottom">2px</dimen>
+    <dimen name="module_v2x_panel_surrounding_stance">30px</dimen>
+    <dimen name="module_v2x_surrounding_top">34px</dimen>
+
+    <dimen name="module_v2x_surrounding_list_margin_left">12px</dimen>
+    <dimen name="module_v2x_surrounding_item_margin_left">16px</dimen>
+
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
+    <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">28px</dimen>
+
+    <dimen name="module_v2x_panel_width">82px</dimen>
+    <dimen name="module_v2x_panel_icon_cor">16px</dimen>
+    <dimen name="share_empty_icon_width">117px</dimen>
+    <dimen name="v2x_loading_ani_width">50px</dimen>
+    <dimen name="v2x_index_rating_top">17px</dimen>
+    <dimen name="share_top_text_size">16px</dimen>
+    <dimen name="share_des_num_size">36px</dimen>
+    <dimen name="share_index_des_size">16px</dimen>
+    <dimen name="share_empty_btn_padding">20px</dimen>
+    <dimen name="shaer_refresh_padding">34px</dimen>
+    <dimen name="share_index_bottom_padding">15px</dimen>
+    <dimen name="share_btn_middle_padding">29px</dimen>
+    <dimen name="v2x_panel_btn_translationY">-8px</dimen>
+    <dimen name="module_v2x_panel_tab_height">84px</dimen>
+
+    <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_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>
+    <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>
+    <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+    <!--适配 V2X 弹窗 UI-->
+
+</resources>
--- 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,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_button_size_detail">64px</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>
@@ -28,7 +21,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>
@@ -61,25 +53,51 @@
    <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
-    <dimen name="module_v2x_des_index_width">17px</dimen>
-    <dimen name="module_v2x_des_index_height">14px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">28px</dimen>
+
    <dimen name="module_v2x_panel_width">82px</dimen>
    <dimen name="module_v2x_panel_icon_cor">16px</dimen>
    <dimen name="share_empty_icon_width">117px</dimen>
    <dimen name="v2x_loading_ani_width">50px</dimen>
-    <dimen name="v2x_share_btn_width">150px</dimen>
-    <dimen name="v2x_share_btn_height">48px</dimen>
    <dimen name="v2x_index_rating_top">17px</dimen>
    <dimen name="share_top_text_size">16px</dimen>
    <dimen name="share_des_num_size">36px</dimen>
    <dimen name="share_index_des_size">16px</dimen>
    <dimen name="share_empty_btn_padding">20px</dimen>
    <dimen name="shaer_refresh_padding">34px</dimen>
-    <dimen name="share_index_bottom_padding">15px</dimen>
+    <dimen name="share_index_bottom_padding">16px</dimen>
    <dimen name="share_btn_middle_padding">29px</dimen>
    <dimen name="v2x_panel_btn_translationY">-8px</dimen>
-    <dimen name="module_v2x_panel_tab_height">84px</dimen>
-    <dimen name="v2x_panel_loading_top">120px</dimen>
+    <dimen name="module_v2x_panel_tab_height">84px</dimen>w
+
    <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_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>
+    <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>
+    <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+    <!--适配 V2X 弹窗 UI-->
+
 </resources>
--- 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,27 +4,19 @@

    <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_button_size_detail">100px</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>

    <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>
@@ -58,10 +50,36 @@
    <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
-    <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">42px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
+
    <dimen name="module_v2x_panel_width">120px</dimen>

    <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_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>
+    <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>
+    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+    <!--适配 V2X 弹窗 UI-->
+
 </resources>
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -5,29 +5,19 @@
    <dimen name="module_v2x_search_marginLeft">32px</dimen>
    <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
    <dimen name="module_v2x_event_window_width">1060px</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_event_see_live_window_height">670px</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_button_size_detail">130px</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>

    <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>
@@ -61,28 +51,51 @@
    <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
-    <dimen name="module_v2x_des_index_width">31.9px</dimen>
-    <dimen name="module_v2x_des_index_height">26px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
+
    <dimen name="module_v2x_panel_icon_cor">30px</dimen>
    <dimen name="module_v2x_panel_width">140px</dimen>
    <dimen name="share_empty_icon_width">219px</dimen>
    <dimen name="v2x_loading_ani_width">100px</dimen>
-    <dimen name="v2x_share_btn_width">281px</dimen>
-    <dimen name="v2x_share_btn_height">90px</dimen>
    <dimen name="v2x_index_rating_top">28px</dimen>
    <dimen name="share_top_text_size">28px</dimen>
    <dimen name="share_des_num_size">67.5px</dimen>
    <dimen name="share_index_des_size">30px</dimen>
    <dimen name="share_empty_btn_padding">40px</dimen>
    <dimen name="shaer_refresh_padding">60px</dimen>
-    <dimen name="share_index_bottom_padding">36px</dimen>
+    <dimen name="share_index_bottom_padding">31px</dimen>
    <dimen name="share_btn_middle_padding">54px</dimen>
    <dimen name="v2x_panel_btn_translationY">-10px</dimen>
    <dimen name="v2x_panel_btn_image_width">114px</dimen>
    <dimen name="module_v2x_panel_tab_height">158px</dimen>
-    <dimen name="v2x_panel_loading_top">300px</dimen>
    <dimen name="share_item_text_size">26px</dimen>
    <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_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>
+    <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>
+    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+    <!--适配 V2X 弹窗 UI-->

 </resources>
--- a/modules/mogo-module-v2x/src/main/res/values/colors.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml
@@ -13,7 +13,6 @@
    <color name="v2x_FFF_999">#FFFFFF</color>
    <color name="v2x_FFF_333">#FFFFFF</color>
    <color name="v2x_ff6163_333">#ff616381</color>
-    <color name="v2x_FFF_666">#FFFFFF</color>
    <color name="v2x_555A_F5F5">#555A75</color>
    <color name="v2x_000_FFF">#000000</color>
    <color name="v2x_FFF_2896FF">#FFF</color>
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -5,23 +5,13 @@
    <dimen name="module_v2x_search_marginLeft">18px</dimen>
    <dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
    <dimen name="module_v2x_event_window_width">642px</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_event_see_live_window_height">670px</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_button_size_detail">64px</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>
@@ -30,7 +20,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>
@@ -59,14 +48,12 @@
    <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
-    <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">20px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">28px</dimen>
+
    <dimen name="module_v2x_panel_width">82px</dimen>
    <dimen name="module_v2x_panel_icon_cor">16px</dimen>
    <dimen name="share_empty_icon_width">117px</dimen>
    <dimen name="v2x_loading_ani_width">200px</dimen>
-    <dimen name="v2x_share_btn_width">150px</dimen>
-    <dimen name="v2x_share_btn_height">48px</dimen>
    <dimen name="v2x_index_rating_top">17px</dimen>
    <dimen name="share_top_text_size">16px</dimen>
    <dimen name="share_des_num_size">36px</dimen>
@@ -77,6 +64,31 @@
    <dimen name="share_btn_middle_padding">29px</dimen>
    <dimen name="v2x_panel_btn_translationY">-8px</dimen>
    <dimen name="module_v2x_panel_tab_height">84px</dimen>
-    <dimen name="v2x_panel_loading_top">120px</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_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>
+    <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>
+    <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+    <!--适配 V2X 弹窗 UI-->

 </resources>
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -4,17 +4,6 @@
        <attr name="roundLayoutRadius" format="dimension" />
    </declare-styleable>

-    <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
-        <item name="android:minHeight">@dimen/module_v2x_des_index_height</item>
-        <item name="android:maxHeight">@dimen/module_v2x_des_index_height</item>
-        <item name="android:maxWidth">@dimen/module_v2x_des_index_width</item>
-        <item name="android:minWidth">@dimen/module_v2x_des_index_width</item>
-        <item name="android:numStars">5</item>
-        <item name="android:rating">1</item>
-        <item name="android:stepSize">0.5</item>
-        <item name="android:progressDrawable">@drawable/share_rating_bar</item>
-    </style>
-
    <style name="customTabLayoutTextAppearance" parent="TextAppearance.Design.Tab">
        <item name="android:textSize">@dimen/dp_40</item>
    </style>