diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml
similarity index 73%
rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml
index f4bb94cb0a..98f1fc7633 100644
--- a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
   <corners android:radius="@dimen/dp_30" />
-  <solid android:color="#3F4057" />
+  <gradient android:startColor="#3F4057" android:endColor="#2A2B38"/>
 </shape>
 
diff --git a/modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml
similarity index 100%
rename from modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml
similarity index 100%
rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml
diff --git a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
index bec43b7c93..b4aaabda53 100644
--- a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
+++ b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#7f000000"
+    android:background="@color/module_commons_dlg_bkg"
     android:layout_gravity="center">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/dp_790"
         android:layout_height="@dimen/dp_440"
         android:layout_gravity="center"
-        android:background="@drawable/module_commons_shape_round_gray">
+        android:background="@drawable/module_commons_shape_dlg_round_bkg">
 
         <TextView
             android:id="@+id/module_commons_wm_dialog_content"
@@ -19,7 +19,7 @@
             android:layout_height="@dimen/dp_56"
             android:layout_marginTop="@dimen/dp_134"
             android:maxLines="1"
-            android:textColor="@android:color/white"
+            android:textColor="@color/module_commons_wm_dialog_text_textColor"
             android:textSize="@dimen/sp_40"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -31,9 +31,9 @@
             android:id="@+id/module_commons_wm_dialog_button_ok"
             android:layout_width="@dimen/dp_395"
             android:layout_height="@dimen/dp_128"
-            android:background="@drawable/moddule_commons_shape_react_blue_grident"
+            android:background="@drawable/module_commons_shape_left_btn_bkg"
             android:gravity="center"
-            android:textColor="@android:color/white"
+            android:textColor="@color/module_commons_wm_dialog_text_textColor"
             android:textSize="@dimen/dp_40"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -43,9 +43,9 @@
             android:id="@+id/module_commons_wm_dialog_button_cancel"
             android:layout_width="@dimen/dp_395"
             android:layout_height="@dimen/dp_128"
-            android:background="@drawable/module_commons_shape_react_gray_grident"
+            android:background="@drawable/module_commons_shape_right_btn_bkg"
             android:gravity="center"
-            android:textColor="@android:color/white"
+            android:textColor="@color/module_commons_wm_dialog_text_textColor"
             android:textSize="@dimen/dp_40"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintRight_toRightOf="parent"
diff --git a/modules/mogo-module-common/src/main/res/values/colors.xml b/modules/mogo-module-common/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..993e412000
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="module_commons_dlg_bkg">#7f000000</color>
+    <color name="module_commons_wm_dialog_text_textColor">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
index a563efc7da..353af2b392 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
@@ -63,6 +63,14 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
         initMapView();
     }
 
+    @Override
+    public void onSaveInstanceState( @NonNull Bundle outState ) {
+        super.onSaveInstanceState( outState );
+        if ( mMogoMapView != null ) {
+            mMogoMapView.onSaveInstanceState( outState );
+        }
+    }
+
     @Override
     public void onPause() {
         super.onPause();
diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png
new file mode 100644
index 0000000000..a4c313e353
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png
new file mode 100644
index 0000000000..a4c313e353
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png
new file mode 100644
index 0000000000..1de561aa65
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png
new file mode 100644
index 0000000000..a4c313e353
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
index 284ab8bac6..81c7cc2c7d 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
+++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
@@ -90,7 +90,7 @@
             android:gravity="center_vertical"
             android:maxLines="1"
             android:text="东城区北三环中路辅路小黄庄西路68号"
-            android:textColor="@color/white"
+            android:textColor="@color/tanlu_white"
             android:textSize="@dimen/tanlu_module_full_title_content"
             android:textStyle="bold" />
 
diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml
index 48a00d3b8d..24181bdd65 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml
@@ -39,5 +39,6 @@
     <color name="color_999999">#999999</color>
     <color name="color_99FFFFFF">#99FFFFFF</color>
     <color name="color_59FFFFFF">#59FFFFFF</color>
+    <color name="tanlu_white">#FFFFFF</color>
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png
deleted file mode 100644
index 03da771490..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png
new file mode 100644
index 0000000000..892b93afaf
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png
index 245c2e855c..a4c313e353 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png
new file mode 100644
index 0000000000..892b93afaf
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png
index e69d3fbacb..1de561aa65 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png differ
diff --git 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
index 10fe9e7433..a7d161b299 100644
--- 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="12px"/>
+    <corners android:radius="@dimen/dp_11"/>
     <gradient
         android:startColor="#5E6079"
         android:endColor="#3F4057"
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml
index 82b27ed3d0..a5a333b605 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/share_event_item_bg_color"/>
+    <solid android:color="#1F2131"/>
     <corners android:radius="12px"/>
 
 </shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_dialog_right_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_dialog_right_bg.xml
index 9c3812f50e..a7017424a7 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_dialog_right_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_dialog_right_bg.xml
@@ -3,7 +3,7 @@
     <item >
         <shape android:shape="rectangle">
             <solid android:color="#ff3c3d51" />
-            <corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="@dimen/dp_10" android:bottomRightRadius="@dimen/dp_10" />
+            <corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="@dimen/dp_10" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
index c5f6baf569..bf2f16368a 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
@@ -2,9 +2,7 @@
     <item>
         <shape>
             <corners android:radius="@dimen/module_v2x_panel_cor" />
-            <gradient android:angle="135"
-                android:endColor="#2E3141"
-                android:startColor="#3F435F" />
+            <gradient android:startColor="#FF2E3141" android:endColor="#FF3F435F" android:angle="0" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
index 8d8ef310db..12e6ec50cf 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="12px"/>
     <gradient
         android:angle="270"
         android:startColor="@android:color/transparent"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
index d82d598dd3..624445d9d6 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_75"
         android:gravity="center"
-        android:textColor="#FFF"
+        android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/dp_40"
         app:layout_constraintEnd_toEndOf="@id/ivDialogBg"
         app:layout_constraintStart_toStartOf="@id/ivDialogBg"
@@ -35,7 +35,7 @@
         android:layout_height="@dimen/dp_130"
         android:background="@drawable/v2x_dialog_left_bg"
         android:gravity="center"
-        android:textColor="#FFF"
+        android:textColor="@color/v2x_FFF_2896FF"
         android:textSize="@dimen/dp_40"
         app:layout_constraintBottom_toBottomOf="@id/ivDialogBg"
         app:layout_constraintEnd_toStartOf="@id/tvDialogRight"
@@ -48,7 +48,7 @@
         android:layout_height="@dimen/dp_130"
         android:background="@drawable/v2x_dialog_right_bg"
         android:gravity="center"
-        android:textColor="#FFF"
+        android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/dp_40"
         app:layout_constraintBottom_toBottomOf="@id/ivDialogBg"
         app:layout_constraintEnd_toEndOf="@id/ivDialogBg"
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 903bed8cfa..a7fe228083 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
@@ -3,118 +3,107 @@
     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="@dimen/module_v2x_fatigue_driving_window_height_ground"
+    android:background="@drawable/bg_v2x_event_list_item">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:cardBackgroundColor="@color/share_event_item_bg_color"
-        app:cardCornerRadius="@dimen/dp_40"
-        app:layout_constraintTop_toTopOf="parent">
+    <TextView
+        android:id="@+id/tvImgTextContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
+        android:layout_marginTop="@dimen/dp_40"
+        android:layout_marginEnd="@dimen/dp_7"
+        android:background="@drawable/bg_v2x_event_type_orange"
+        android:gravity="center_vertical"
+        android:paddingStart="@dimen/dp_23"
+        android:paddingTop="@dimen/dp_5"
+        android:paddingEnd="@dimen/dp_23"
+        android:paddingBottom="@dimen/dp_5"
+        android:text="求助信息"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_24"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+    <com.mogo.service.imageloader.MogoImageView
+        android:id="@+id/ivFaultHelpHead"
+        android:layout_width="@dimen/dp_75"
+        android:layout_height="@dimen/dp_75"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginTop="@dimen/dp_21"
+        android:layout_marginEnd="@dimen/dp_31"
+        app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
+        app:layout_constraintStart_toStartOf="@+id/tvImgTextContent"
+        app:layout_constraintTop_toBottomOf="@+id/tvImgTextContent"
+        app:miv_borderColor="#4cffffff"
+        app:miv_failureHolder="@drawable/icon_default_user_head"
+        app:miv_overlayImageId="@drawable/icon_default_user_head"
+        app:miv_placeHolder="@drawable/icon_default_user_head"
+        app:miv_shape="circle"
+        app:miv_shapeBorderWidth="@dimen/dp_4" />
 
-            <TextView
-                android:id="@+id/tvImgTextContent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
-                android:layout_marginTop="@dimen/dp_40"
-                android:layout_marginEnd="@dimen/dp_7"
-                android:background="@drawable/bg_v2x_event_type_orange"
-                android:gravity="center_vertical"
-                android:paddingStart="@dimen/dp_23"
-                android:paddingTop="@dimen/dp_5"
-                android:paddingEnd="@dimen/dp_23"
-                android:paddingBottom="@dimen/dp_5"
-                android:text="求助信息"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/dp_24"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed" />
+    <TextView
+        android:id="@+id/tvFaultHelpName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_10"
+        android:textColor="@color/v2x_FFF_333"
+        android:textSize="@dimen/dp_28"
+        android:textStyle="bold"
+        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
+        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_goneMarginStart="@dimen/dp_22"
+        tools:text="车主昵称" />
 
-            <com.mogo.service.imageloader.MogoImageView
-                android:id="@+id/ivFaultHelpHead"
-                android:layout_width="@dimen/dp_75"
-                android:layout_height="@dimen/dp_75"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginTop="@dimen/dp_21"
-                android:layout_marginEnd="@dimen/dp_31"
-                app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-                app:layout_constraintStart_toStartOf="@+id/tvImgTextContent"
-                app:layout_constraintTop_toBottomOf="@+id/tvImgTextContent"
-                app:miv_borderColor="#4cffffff"
-                app:miv_failureHolder="@drawable/icon_default_user_head"
-                app:miv_overlayImageId="@drawable/icon_default_user_head"
-                app:miv_placeHolder="@drawable/icon_default_user_head"
-                app:miv_shape="circle"
-                app:miv_shapeBorderWidth="@dimen/dp_4" />
+    <TextView
+        android:id="@+id/tvFaultHelpEventTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:alpha="0.59"
+        android:textColor="@color/v2x_FFF_999"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
+        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
+        tools:text="15:30发布求助信息" />
 
-            <TextView
-                android:id="@+id/tvFaultHelpName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:textColor="@color/v2x_FFF_333"
-                android:textSize="@dimen/dp_28"
-                android:textStyle="bold"
-                app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-                app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
-                app:layout_constraintVertical_chainStyle="packed"
-                app:layout_goneMarginStart="@dimen/dp_22"
-                tools:text="车主昵称" />
+    <TextView
+        android:id="@+id/tvFaultHelpDistance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp_30"
+        android:gravity="center_vertical"
+        android:textColor="@color/v2x_FFF_333"
+        android:textSize="@dimen/dp_80"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
+        tools:text="300M" />
 
-            <TextView
-                android:id="@+id/tvFaultHelpEventTime"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:alpha="0.59"
-                android:textColor="@color/v2x_FFF_999"
-                android:textSize="@dimen/dp_26"
-                app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
-                app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
-                tools:text="15:30发布求助信息" />
+    <ImageView
+        android:id="@+id/ivFaultHelpEventCall"
+        android:layout_width="@dimen/module_v2x_event_button_size"
+        android:layout_height="@dimen/module_v2x_event_button_size"
+        android:layout_marginEnd="@dimen/dp_40"
+        android:src="@drawable/selector_talk_btn"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/tvFaultHelpDistance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:gravity="center_vertical"
-                android:textColor="@color/v2x_FFF_333"
-                android:textSize="@dimen/dp_80"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
-                app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-                app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
-                tools:text="300M" />
+    <ImageView
+        android:id="@+id/ivFaultHelpEventNavi"
+        android:layout_width="@dimen/module_v2x_event_button_size"
+        android:layout_height="@dimen/module_v2x_event_button_size"
+        android:layout_marginRight="26px"
+        android:src="@drawable/selector_nav_btn"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/ivFaultHelpEventCall"
-                android:layout_width="@dimen/module_v2x_event_button_size"
-                android:layout_height="@dimen/module_v2x_event_button_size"
-                android:layout_marginEnd="@dimen/dp_40"
-                android:src="@drawable/selector_talk_btn"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/ivFaultHelpEventNavi"
-                android:layout_width="@dimen/module_v2x_event_button_size"
-                android:layout_height="@dimen/module_v2x_event_button_size"
-                android:layout_marginRight="26px"
-                android:src="@drawable/selector_nav_btn"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
index 41be2d9bb6..ec8da8c971 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.v2x.view.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rlContent"
@@ -7,8 +7,7 @@
     android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
     android:background="@drawable/v2x_alert_window_bg"
     android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_40">
+    android:paddingEnd="@dimen/dp_40">
 
     <ImageView
         android:id="@+id/ivIconP"
@@ -84,4 +83,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</com.mogo.module.v2x.view.RoundConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index cabc198172..7bd7a12d7a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -7,117 +7,105 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="10px"
     android:layout_marginRight="10px"
-    android:layout_marginBottom="14px">
+    android:layout_marginBottom="14px"
+    android:background="@drawable/bg_v2x_event_list_item">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/road_case_history_card_view"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/tagEventType"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="@color/share_event_item_bg_color"
-        app:cardCornerRadius="12px"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginStart="@dimen/dp_24"
+        android:layout_marginTop="@dimen/dp_24"
+        android:background="@drawable/bg_v2x_event_type_read"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_3"
+        android:paddingRight="@dimen/dp_10"
+        android:paddingBottom="@dimen/dp_3"
+        android:text="违章停车"
+        android:textColor="#ffffff"
+        android:textSize="@dimen/dp_28"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/tagEventEvaluate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_24"
+        android:background="@drawable/bg_v2x_event_type_gray"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_3"
+        android:paddingRight="@dimen/dp_10"
+        android:paddingBottom="@dimen/dp_3"
+        android:text="待评价"
+        android:textColor="#ffffff"
+        android:textSize="@dimen/dp_28"
+        app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
+        app:layout_constraintStart_toEndOf="@+id/tagEventType"
+        app:layout_constraintTop_toTopOf="@+id/tagEventType" />
 
-            <TextView
-                android:id="@+id/tagEventType"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_24"
-                android:layout_marginTop="@dimen/dp_24"
-                android:background="@drawable/bg_v2x_event_type_read"
-                android:gravity="center"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="@dimen/dp_3"
-                android:paddingRight="@dimen/dp_10"
-                android:paddingBottom="@dimen/dp_3"
-                android:text="违章停车"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/dp_28"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+    <ImageView
+        android:id="@+id/ivIconP"
+        android:layout_width="@dimen/module_v2x_history_event_icon_size"
+        android:layout_height="@dimen/module_v2x_history_event_icon_size"
+        android:layout_marginStart="@dimen/dp_24"
+        android:layout_marginEnd="@dimen/dp_16"
+        android:src="@drawable/icon_illegal_parking"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
+        app:layout_constraintTop_toTopOf="@+id/tvAddress" />
 
-            <TextView
-                android:id="@+id/tagEventEvaluate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_24"
-                android:background="@drawable/bg_v2x_event_type_gray"
-                android:gravity="center"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="@dimen/dp_3"
-                android:paddingRight="@dimen/dp_10"
-                android:paddingBottom="@dimen/dp_3"
-                android:text="待评价"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/dp_28"
-                app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
-                app:layout_constraintStart_toEndOf="@+id/tagEventType"
-                app:layout_constraintTop_toTopOf="@+id/tagEventType" />
+    <TextView
+        android:id="@+id/tvAddress"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_24"
+        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginRight="@dimen/dp_30"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/v2x_FFF_333"
+        android:textSize="@dimen/dp_34"
+        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
+        app:layout_constraintStart_toEndOf="@+id/ivIconP"
+        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
+        tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
 
-            <ImageView
-                android:id="@+id/ivIconP"
-                android:layout_width="@dimen/module_v2x_history_event_icon_size"
-                android:layout_height="@dimen/module_v2x_history_event_icon_size"
-                android:layout_marginStart="@dimen/dp_24"
-                android:layout_marginEnd="@dimen/dp_16"
-                android:src="@drawable/icon_illegal_parking"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-                app:layout_constraintTop_toTopOf="@+id/tvAddress" />
+    <TextView
+        android:id="@+id/tvIllegalNum"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_24"
+        android:alpha="0.6"
+        android:gravity="center_vertical"
+        android:textColor="@color/v2x_FFF_666"
+        android:textSize="@dimen/dp_30"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/tvAddress"
+        app:layout_constraintStart_toStartOf="@+id/tvAddress"
+        app:layout_constraintTop_toBottomOf="@+id/tvAddress"
+        tools:text="违章人数：10人" />
 
-            <TextView
-                android:id="@+id/tvAddress"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_24"
-                android:layout_marginTop="@dimen/dp_24"
-                android:layout_marginRight="@dimen/dp_30"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="@color/v2x_FFF_333"
-                android:textSize="@dimen/dp_34"
-                app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
-                app:layout_constraintStart_toEndOf="@+id/ivIconP"
-                app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-                tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
+    <com.mogo.module.v2x.view.HeartLikeView
+        android:id="@+id/llIllegalParkingLike"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp_40"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
+        app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/tvIllegalNum"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_24"
-                android:alpha="0.6"
-                android:gravity="center_vertical"
-                android:textColor="@color/v2x_FFF_666"
-                android:textSize="@dimen/dp_30"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="@+id/tvAddress"
-                app:layout_constraintStart_toStartOf="@+id/tvAddress"
-                app:layout_constraintTop_toBottomOf="@+id/tvAddress"
-                tools:text="违章人数：10人" />
+    <com.mogo.module.v2x.view.HeartUnLikeView
+        android:id="@+id/llIllegalParkingUnLike"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="26px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-            <com.mogo.module.v2x.view.HeartLikeView
-                android:id="@+id/llIllegalParkingLike"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_40"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.mogo.module.v2x.view.HeartUnLikeView
-                android:id="@+id/llIllegalParkingUnLike"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginRight="26px"/>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
index cc9e7d8fdd..70bb272cf3 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
@@ -6,142 +6,128 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="10px"
     android:layout_marginRight="10px"
-    android:layout_marginBottom="14px">
+    android:layout_marginBottom="14px"
+    android:background="@drawable/bg_v2x_event_list_item">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/tagEventType"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="@color/share_event_item_bg_color"
-        app:cardCornerRadius="12px"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
+        android:layout_marginTop="@dimen/dp_24"
+        android:background="@drawable/bg_v2x_event_type_orange"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_5"
+        android:paddingRight="@dimen/dp_10"
+        android:paddingBottom="@dimen/dp_3"
+        android:text="求助信息"
+        android:textColor="#ffffff"
+        android:textSize="@dimen/dp_28"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/tagEventEvaluate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_24"
+        android:background="@drawable/bg_v2x_event_type_gray"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_3"
+        android:paddingRight="@dimen/dp_10"
+        android:paddingBottom="@dimen/dp_3"
+        android:text="待援助"
+        android:textColor="#ffffff"
+        android:textSize="@dimen/dp_28"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
+        app:layout_constraintStart_toEndOf="@+id/tagEventType"
+        app:layout_constraintTop_toTopOf="@+id/tagEventType"
+        tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/tagEventType"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_20"
-                android:layout_marginTop="@dimen/dp_24"
-                android:background="@drawable/bg_v2x_event_type_orange"
-                android:gravity="center"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="@dimen/dp_3"
-                android:paddingRight="@dimen/dp_10"
-                android:paddingBottom="@dimen/dp_3"
-                android:text="求助信息"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/dp_28"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+    <com.mogo.service.imageloader.MogoImageView
+        android:id="@+id/ivFaultHelpHead"
+        android:layout_width="@dimen/module_v2x_history_event_icon_size"
+        android:layout_height="@dimen/module_v2x_history_event_icon_size"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginTop="@dimen/dp_21"
+        android:layout_marginEnd="@dimen/dp_31"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
+        app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
+        app:layout_constraintStart_toStartOf="@+id/tagEventType"
+        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
+        app:miv_borderColor="#4cffffff"
+        app:miv_failureHolder="@drawable/icon_default_user_head"
+        app:miv_overlayImageId="@drawable/icon_default_user_head"
+        app:miv_placeHolder="@drawable/icon_default_user_head"
+        app:miv_shape="circle"
+        app:miv_shapeBorderWidth="@dimen/dp_4" />
 
-            <TextView
-                android:id="@+id/tagEventEvaluate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_24"
-                android:background="@drawable/bg_v2x_event_type_gray"
-                android:gravity="center"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="@dimen/dp_3"
-                android:paddingRight="@dimen/dp_10"
-                android:paddingBottom="@dimen/dp_3"
-                android:text="待援助"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/dp_28"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
-                app:layout_constraintStart_toEndOf="@+id/tagEventType"
-                app:layout_constraintTop_toTopOf="@+id/tagEventType"
-                tools:visibility="visible" />
+    <TextView
+        android:id="@+id/tvFaultHelpName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginEnd="@dimen/dp_30"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_33"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
+        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
+        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_goneMarginStart="@dimen/dp_22"
+        tools:text="车主昵称" />
 
-            <com.mogo.service.imageloader.MogoImageView
-                android:id="@+id/ivFaultHelpHead"
-                android:layout_width="@dimen/module_v2x_history_event_icon_size"
-                android:layout_height="@dimen/module_v2x_history_event_icon_size"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginTop="@dimen/dp_21"
-                android:layout_marginEnd="@dimen/dp_31"
-                app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
-                app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-                app:layout_constraintStart_toStartOf="@+id/tagEventType"
-                app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-                app:miv_borderColor="#4cffffff"
-                app:miv_failureHolder="@drawable/icon_default_user_head"
-                app:miv_overlayImageId="@drawable/icon_default_user_head"
-                app:miv_placeHolder="@drawable/icon_default_user_head"
-                app:miv_shape="circle"
-                app:miv_shapeBorderWidth="@dimen/dp_4" />
+    <TextView
+        android:id="@+id/tvFaultHelpEventTime"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:alpha="0.59"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_29"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_24"
+        app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
+        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
+        tools:text="15:30发布求助信息" />
 
-            <TextView
-                android:id="@+id/tvFaultHelpName"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/dp_33"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
-                app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-                app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
-                app:layout_constraintVertical_chainStyle="packed"
-                app:layout_goneMarginStart="@dimen/dp_22"
-                tools:text="车主昵称" />
+    <TextView
+        android:id="@+id/tvFaultHelpDistance"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp_30"
+        android:gravity="center_vertical"
+        android:textColor="#FFF"
+        android:textSize="@dimen/dp_80"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
+        tools:text="300M" />
 
-            <TextView
-                android:id="@+id/tvFaultHelpEventTime"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_5"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:layout_marginBottom="@dimen/dp_24"
-                android:alpha="0.59"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/dp_29"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
-                app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
-                app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
-                tools:text="15:30发布求助信息" />
+    <ImageView
+        android:id="@+id/ivFaultHelpEventCall"
+        android:layout_width="@dimen/module_v2x_event_button_size"
+        android:layout_height="@dimen/module_v2x_event_button_size"
+        android:layout_marginEnd="@dimen/dp_40"
+        android:src="@drawable/selector_talk_btn"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
+        app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/tvFaultHelpDistance"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:gravity="center_vertical"
-                android:textColor="#FFF"
-                android:textSize="@dimen/dp_80"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
-                app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-                app:layout_constraintStart_toEndOf="@+id/tvFaultHelpEventTime"
-                tools:text="300M" />
+    <ImageView
+        android:id="@+id/ivFaultHelpEventNavi"
+        android:layout_width="@dimen/module_v2x_event_button_size"
+        android:layout_height="@dimen/module_v2x_event_button_size"
+        android:layout_marginRight="26px"
+        android:src="@drawable/selector_nav_btn"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/ivFaultHelpEventCall"
-                android:layout_width="@dimen/module_v2x_event_button_size"
-                android:layout_height="@dimen/module_v2x_event_button_size"
-                android:layout_marginEnd="@dimen/dp_40"
-                android:src="@drawable/selector_talk_btn"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/ivFaultHelpEventNavi"
-                android:layout_width="@dimen/module_v2x_event_button_size"
-                android:layout_height="@dimen/module_v2x_event_button_size"
-                android:src="@drawable/selector_nav_btn"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginRight="26px"/>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index c3e82ff512..6806e32aa2 100644
--- 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
@@ -3,9 +3,8 @@
     xmlns:androud="http://schemas.android.com/apk/res-auto"
     android:id="@+id/clPanelContainer"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
->
-<!--    android:background="@drawable/bg_v2x_event_surrounding_item"-->
+    android:layout_height="match_parent">
+    <!--    android:background="@drawable/bg_v2x_event_surrounding_item"-->
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -20,7 +19,7 @@
                 android:id="@+id/tv_brief"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="top"
+                android:layout_centerVertical="true"
                 android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
                 android:text="周围5公里，共15条交通信息"
                 android:textColor="@color/v2x_white"
@@ -53,9 +52,9 @@
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/surrounding_recycleview"
-                android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                 android:visibility="visible" />
 
             <!--空数据显示-->
@@ -101,34 +100,42 @@
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
 
-                <TextView
-                    android:id="@+id/tv_main_share"
-                    android:layout_width="@dimen/module_v2x_surrounding_empty_bt_width"
-                    android:layout_height="@dimen/module_v2x_surrounding_empty_bt_height"
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:layout_below="@+id/tv_main_empty_2"
-                    android:layout_marginLeft="@dimen/module_v2x_surrounding_empty_bt_maigin_left"
-                    android:layout_marginTop="@dimen/module_v2x_surrounding_empty_bt_margin_top"
-                    android:background="@drawable/bg_v2x_go_to_share"
-                    android:gravity="center"
-                    android:text="@string/v2x_surrounding_go_to_share"
-                    android:textColor="@color/v2x_white"
-                    android:textSize="@dimen/module_v2x_surrounding_top_textsize"
-                    android:textStyle="bold" />
+                    android:layout_marginTop="@dimen/module_v2x_surrounding_empty_bt_margin_top">
 
-                <TextView
-                    android:id="@+id/tv_main_refresh"
-                    android:layout_width="@dimen/module_v2x_surrounding_empty_bt_width"
-                    android:layout_height="@dimen/module_v2x_surrounding_empty_bt_height"
-                    android:layout_below="@+id/tv_main_empty_2"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="@dimen/module_v2x_surrounding_empty_bt_margin_top"
-                    android:layout_marginRight="@dimen/module_v2x_surrounding_empty_bt_maigin_left"
-                    android:background="@drawable/bg_v2x_refresh"
-                    android:gravity="center"
-                    android:text="@string/v2x_surrounding_refresh"
-                    android:textColor="@color/v2x_white_refresh"
-                    android:textSize="@dimen/module_v2x_surrounding_top_textsize"
-                    android:textStyle="bold" />
+                    <TextView
+                        android:id="@+id/tv_main_share"
+                        android:layout_width="@dimen/module_v2x_surrounding_empty_bt_width"
+                        android:layout_height="@dimen/module_v2x_surrounding_empty_bt_height"
+                        android:background="@drawable/bg_v2x_go_to_share"
+                        android:layout_toLeftOf="@+id/center_empty"
+                        android:text="@string/v2x_surrounding_go_to_share"
+                        android:gravity="center"
+                        android:textColor="@color/v2x_white"
+                        android:textSize="@dimen/module_v2x_surrounding_top_textsize"
+                        android:textStyle="bold" />
+
+                    <View
+                        android:id="@+id/center_empty"
+                        android:layout_width="29px"
+                        android:layout_height="29px"
+                        android:layout_centerInParent="true" />
+
+                    <TextView
+                        android:id="@+id/tv_main_refresh"
+                        android:layout_width="@dimen/module_v2x_surrounding_empty_bt_width"
+                        android:layout_height="@dimen/module_v2x_surrounding_empty_bt_height"
+                        android:background="@drawable/bg_v2x_refresh"
+                        android:layout_toRightOf="@+id/center_empty"
+                        android:text="@string/v2x_surrounding_refresh"
+                        android:gravity="center"
+                        android:textColor="@color/v2x_white_refresh"
+                        android:textSize="@dimen/module_v2x_surrounding_top_textsize"
+                        android:textStyle="bold" />
+                </RelativeLayout>
             </RelativeLayout>
         </RelativeLayout>
     </RelativeLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 3270297d56..91a0af3bb2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -84,16 +84,15 @@
         android:layout_width="@dimen/dp_88"
         android:layout_height="@dimen/dp_88"
         android:layout_marginRight="28px"
-        android:background="@drawable/icon_window_close"
+        android:background="@drawable/v2x_panel_close"
         app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="58px"
-        android:background="@drawable/v2x_shadow_shape_view"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
+<!--    <View-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="58px"-->
+<!--        android:background="@drawable/v2x_shadow_shape_view"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent" />-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git 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
index 4af60c1787..fc1e9abc1e 100644
--- 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
@@ -1,113 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/road_case_liset_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginLeft="20px"
     android:layout_marginRight="20px"
-    android:layout_marginBottom="14px">
+    android:layout_marginBottom="14px"
+    android:background="@drawable/bg_v2x_event_list_item">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/road_case_card_view"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/road_case_style"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="@color/share_event_item_bg_color"
-        app:cardCornerRadius="12px"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginLeft="20px"
+        android:layout_marginTop="12px"
+        android:background="@drawable/bg_v2x_event_type_read"
+        android:gravity="center"
+        android:paddingLeft="5px"
+        android:paddingTop="3px"
+        android:paddingRight="5px"
+        android:paddingBottom="3px"
+        android:text="道路类型"
+        android:textColor="#FFFFFF"
+        android:textSize="14px" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/road_case_useless_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerInParent="true"
+        android:gravity="center"
+        android:paddingRight="20px"
+        android:text="100"
+        android:textColor="#FFFFFF"
+        android:textSize="18px" />
 
-            <TextView
-                android:id="@+id/road_case_style"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20px"
-                android:layout_marginTop="12px"
-                android:background="@drawable/bg_v2x_event_type_read"
-                android:gravity="center"
-                android:paddingLeft="5px"
-                android:paddingTop="3px"
-                android:paddingRight="5px"
-                android:paddingBottom="3px"
-                android:text="道路类型"
-                android:textColor="#FFFFFF"
-                android:textSize="14px" />
+    <com.mogo.module.v2x.view.HeartUnLikeView
+        android:id="@+id/road_case_useless"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_toLeftOf="@id/road_case_useless_num"
+        android:clickable="false"
+        android:gravity="center"
+        android:paddingRight="5px" />
 
-            <TextView
-                android:id="@+id/road_case_useless_num"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:paddingRight="20px"
-                android:text="100"
-                android:textColor="#FFFFFF"
-                android:textSize="18px" />
+    <TextView
+        android:id="@+id/road_case_useful_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_toLeftOf="@id/road_case_useless"
+        android:gravity="center"
+        android:paddingRight="26px"
+        android:text="100"
+        android:textColor="#FFFFFF"
+        android:textSize="18px" />
 
+    <com.mogo.module.v2x.view.HeartLikeView
+        android:id="@+id/road_case_uselful"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_toLeftOf="@id/road_case_useful_num"
+        android:clickable="false"
+        android:paddingRight="5px" />
 
-            <com.mogo.module.v2x.view.HeartUnLikeView
-                android:id="@+id/road_case_useless"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:clickable="false"
-                android:layout_toLeftOf="@id/road_case_useless_num"
-                android:gravity="center"
-                android:paddingRight="5px" />
+    <TextView
+        android:id="@+id/road_case_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/road_case_style"
+        android:layout_alignLeft="@id/road_case_style"
+        android:layout_toLeftOf="@id/road_case_uselful"
+        android:ellipsize="end"
+        android:gravity="left"
+        android:lines="1"
+        android:paddingTop="2px"
+        android:text="东城区北三环附近维多欧美"
+        android:textColor="@color/share_event_address_color"
+        android:textSize="18px" />
 
-            <TextView
-                android:id="@+id/road_case_useful_num"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_toLeftOf="@id/road_case_useless"
-                android:gravity="center"
-                android:paddingRight="26px"
-                android:text="100"
-                android:textColor="#FFFFFF"
-                android:textSize="18px" />
-
-            <com.mogo.module.v2x.view.HeartLikeView
-                android:id="@+id/road_case_uselful"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:clickable="false"
-                android:layout_toLeftOf="@id/road_case_useful_num"
-                android:paddingRight="5px" />
-
-            <TextView
-                android:id="@+id/road_case_address"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/road_case_style"
-                android:layout_alignLeft="@id/road_case_style"
-                android:layout_toLeftOf="@id/road_case_uselful"
-                android:ellipsize="end"
-                android:gravity="left"
-                android:lines="1"
-                android:paddingTop="2px"
-                android:text="东城区北三环附近维多欧美"
-                android:textColor="@color/share_event_address_color"
-                android:textSize="18px" />
-
-            <TextView
-                android:id="@+id/road_case_share_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/road_case_address"
-                android:layout_marginLeft="20px"
-                android:layout_marginBottom="11px"
-                android:alpha="0.5"
-                android:gravity="left"
-                android:text="时间:"
-                android:paddingTop="2px"
-                android:textColor="@color/share_event_share_time_color"
-                android:textSize="16px" />
-        </RelativeLayout>
-    </androidx.cardview.widget.CardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/road_case_share_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/road_case_address"
+        android:layout_marginLeft="20px"
+        android:layout_marginBottom="11px"
+        android:alpha="0.5"
+        android:gravity="left"
+        android:paddingTop="2px"
+        android:text="时间:"
+        android:textColor="@color/share_event_share_time_color"
+        android:textSize="16px" />
+</RelativeLayout>
\ No newline at end of file
diff --git 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
index 237458f7a2..93ff8fbf3c 100644
--- 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
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:overScrollMode="never"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"></androidx.recyclerview.widget.RecyclerView>
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
     <com.mogo.module.v2x.view.V2XNetworkLoadingView
         android:id="@+id/network_loading_imageview"
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 7ec4ead5fe..5f0253cabc 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
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_event_window_height"
-    android:background="@drawable/v2x_alert_window_bg"
-    app:roundLayoutRadius="@dimen/dp_40">
+    android:background="@drawable/v2x_alert_window_bg">
 
     <com.tencent.rtmp.ui.TXCloudVideoView
         android:id="@+id/txcVideoView"
diff --git 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
index 8ddffb0bab..7959d63977 100644
--- 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
@@ -95,7 +95,7 @@
         <Button
             android:id="@+id/btnTriggerFatigueDrivingEvent"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="45px"
             android:background="#DF4019"
             android:padding="@dimen/dp_10"
             android:text="触发疲劳驾驶"
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 a81b6217db..68b7d93098 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
@@ -36,7 +36,6 @@
     <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_empty_bt_maigin_left">110px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
@@ -50,5 +49,5 @@
     <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_panel_cor">30px</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 ca2c085464..09a571b944 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
@@ -37,7 +37,6 @@
     <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_empty_bt_maigin_left">110px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
@@ -53,7 +52,7 @@
     <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">4px</dimen>
-    <dimen name="module_v2x_panel_cor">30px</dimen>
+    <dimen name="module_v2x_panel_cor">16px</dimen>
     <dimen name="module_v2x_panel_width">120px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml
index 2c5b584b68..7adad41988 100644
--- a/modules/mogo-module-v2x/src/main/res/values/colors.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml
@@ -8,7 +8,6 @@
     <color name="v2x_white_refresh">#FFFFFF</color>
     <color name="transparent_white_30">#B3FFFFFF</color>
     <color name="surrounding_item_bottom_color">#1F2131</color>
-    <color name="share_event_item_bg_color">#1F2131</color>
     <color name="share_event_share_time_color">#FFFFFF</color>
     <color name="share_event_address_color">#FFFFFF</color>
     <color name="panel_shadow_shape_color">#10121E</color>
@@ -19,5 +18,7 @@
     <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>
+
 
 </resources>
\ No newline at end of file
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 5d2165aaac..949dfa9098 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -31,7 +31,7 @@
     <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">40px</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>
@@ -39,7 +39,6 @@
     <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_empty_bt_maigin_left">90px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml
similarity index 55%
rename from modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml
rename to skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml
index 3b99489f77..93887743bb 100644
--- a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#F710121E" />
-    <corners android:radius="@dimen/module_push_panel_corner" />
+  <corners android:radius="@dimen/dp_30" />
+  <gradient android:startColor="#FFFFFF" android:endColor="#E2F5F5F5"/>
 </shape>
+
diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml
new file mode 100644
index 0000000000..387c9ca303
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"
+    >
+
+    <gradient
+        android:angle="180"
+        android:endColor="#FFFFfF"
+        android:startColor="#FFFFfF" />
+
+    <corners
+        android:bottomLeftRadius="@dimen/dp_30"
+        />
+</shape>
+
diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml
new file mode 100644
index 0000000000..1b269d1650
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+
+    <gradient
+        android:angle="180"
+        android:endColor="#E8E8E8"
+        android:startColor="#E8E8E8" />
+    <corners android:bottomRightRadius="@dimen/dp_30"/>
+
+</shape>
+
diff --git a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml
index 51e1eac4ef..f7dcb3f6c3 100644
--- a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="modules_commons_toast_text_color_light">#FF333333</color>
+    <color name="module_commons_dlg_bkg_light">#66000000</color>
+    <color name="module_commons_wm_dialog_text_textColor_light">#333333</color>
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png
new file mode 100644
index 0000000000..245c2e855c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png
new file mode 100644
index 0000000000..0bbb52b488
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png
new file mode 100644
index 0000000000..0bbb52b488
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png
new file mode 100644
index 0000000000..c18352b4fa
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml
new file mode 100644
index 0000000000..24460bd967
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#DDDDDD"/>
+    <corners android:radius="12px"/>
+
+</shape>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_bg_light.xml
new file mode 100644
index 0000000000..210df32190
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_bg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="rectangle">
+            <gradient android:angle="135" android:endColor="#FFFFFF" android:startColor="#F5F5F5" android:type="linear" android:useLevel="true" />
+            <corners android:radius="@dimen/dp_20" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_left_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_left_bg_light.xml
new file mode 100644
index 0000000000..49fab59997
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_left_bg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:angle="90" android:endColor="#FFF" android:startColor="#FFF" android:type="linear" android:useLevel="true" />
+            <corners android:bottomLeftRadius="@dimen/dp_11" android:bottomRightRadius="0dp" android:topLeftRadius="0dp" android:topRightRadius="0dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_right_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_right_bg_light.xml
new file mode 100644
index 0000000000..e348dafea7
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_right_bg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="rectangle">
+            <solid android:color="#E8E8E8" />
+            <corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="@dimen/dp_10" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml
index bbd1124438..f6b3018a25 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml
@@ -2,9 +2,7 @@
     <item>
         <shape>
             <corners android:radius="@dimen/dp_40" />
-            <gradient android:angle="135"
-                android:endColor="#FFFFFF"
-                android:startColor="#F5F5F5" />
+            <gradient android:startColor="#FFFFFFFF" android:endColor="#E5F5F5F5" android:angle="0" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
index dc220b6993..acfa530deb 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
@@ -15,4 +15,5 @@
     <color name="v2x_FFF_666_light">#666666</color>
     <color name="v2x_555A_F5F5_light">#F5F5F5</color>
     <color name="v2x_000_FFF_light">#FFFFFF</color>
+    <color name="v2x_FFF_2896FF_light">#2896FF</color>
 </resources>