diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 59722ee7ff..be1ab181c1 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -76,8 +76,8 @@
                 app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title"
                 app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" />
             <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_27"
                 app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_name"
                 app:layout_constraintBottom_toBottomOf="@+id/bus_p_cur_station_name"
                 app:layout_constraintRight_toLeftOf="@+id/bus_p_cur_station_name"
@@ -123,8 +123,8 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_299"
+        android:layout_height="@dimen/dp_75"
         android:layout_marginRight="@dimen/dp_40"
         android:layout_marginBottom="@dimen/dp_48"
         android:src="@drawable/bus_p_mogo_nor"
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_no_data_common_view.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_no_data_common_view.xml
index 0f71796c64..2eefe569cf 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_no_data_common_view.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_no_data_common_view.xml
@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/no_order_data_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_386"
+        android:layout_height="@dimen/dp_350"
         android:src="@drawable/bus_p_no_order_data"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
index 9ba777c975..c1ba1d3d29 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
@@ -165,8 +165,8 @@
 
         <ImageView
             android:id="@+id/bus_p_arrow_nor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_108"
+            android:layout_height="@dimen/dp_107"
             android:layout_marginRight="@dimen/dp_20"
             android:layout_marginBottom="@dimen/dp_370"
             android:src="@drawable/bus_p_arrow_nor"
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
index 37f59ac8ea..1f6e75b4b4 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
@@ -32,16 +32,16 @@
 
     <ImageView
         android:id="@+id/bus_p_circle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="62dp"
+        android:layout_height="62dp"
         android:src="@drawable/bus_p_point_blue"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="@+id/bus_p_station"
         app:layout_constraintBottom_toBottomOf="@+id/bus_p_station"/>
     <ImageView
         android:id="@+id/bus_p_cur_arrow_bg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_12"
+        android:layout_height="@dimen/dp_61"
         android:scaleType="fitXY"
         android:layout_marginLeft="8dp"
         android:src="@drawable/bus_p_line_blue"
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
index 43ca6e7372..af192612df 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
@@ -67,7 +67,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         layout="@layout/bus_test_bar_view"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_station_panel_container"
         app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_station_panel_container"
         tools:visibility="visible"/>
@@ -206,7 +206,7 @@
         android:layout_height="wrap_content"
         android:background="#f00"
         android:text="Disable"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -216,7 +216,7 @@
         android:layout_height="wrap_content"
         android:background="#0f0"
         android:text="Enable"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotDisable" />
 
@@ -226,7 +226,7 @@
         android:layout_height="wrap_content"
         android:background="#00f"
         android:text="Running"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotEnable" />
 
@@ -236,7 +236,7 @@
         android:layout_height="wrap_content"
         android:background="#f00"
         android:text="Arrived"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotRunning" />
     <Button
@@ -245,7 +245,7 @@
         android:layout_height="wrap_content"
         android:background="#023D35"
         android:text="上传全路径"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotArrive" />
 
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml
index 4d6ba6a01a..6d81e77fc7 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml
@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/no_line_data_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_245"
+        android:layout_height="@dimen/dp_223"
         android:src="@drawable/bus_no_line_icon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml
index c7fe3c3432..28078230ca 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml
@@ -24,8 +24,8 @@
 
     <ImageView
         android:id="@+id/busCircleIvBg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_38"
+        android:layout_height="@dimen/dp_38"
         android:src="@drawable/icon_point_grey_bus"
         android:layout_marginTop="@dimen/dp_4"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -33,16 +33,16 @@
 
     <ImageView
         android:id="@+id/busCircleIv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_38"
+        android:layout_height="@dimen/dp_38"
         android:background="@drawable/icon_point_blue_bus"
         android:layout_marginTop="@dimen/dp_4"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="@+id/busStationNameTv"/>
     <ImageView
         android:id="@+id/busArrowBg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_8"
+        android:layout_height="@dimen/dp_61"
         android:scaleType="fitXY"
         android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/icon_arrow_blue_bus"
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
index 3fa382fed9..ec0a05030b 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml
@@ -21,8 +21,8 @@
 
     <ImageView
         android:id="@+id/switch_line_item_select_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_19"
+        android:layout_height="@dimen/dp_34"
         android:layout_marginEnd="@dimen/dp_80"
         android:background="@drawable/bus_line_task_arrow"
         app:layout_constraintBottom_toTopOf="@+id/v_line_task"
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml
index f71b6208a6..d3e7bffd9e 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml
@@ -8,30 +8,35 @@
         android:id="@+id/bus_test_bar_current_line_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_traj_md5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_stop_md5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_traj_md5_dpqp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_stop_md5_dpqp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
deleted file mode 100644
index 141dd9b506..0000000000
--- a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
+++ /dev/null
@@ -1,58 +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:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.mogo.och.bus.view.VerticalDashLineView
-        android:id="@+id/module_mogo_och_bus_station_bottom_dash"
-        android:layout_width="1dp"
-        android:layout_height="30dp"
-        app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintRight_toRightOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintTop_toTopOf="@id/module_mogo_och_bus_station_name"
-        android:layout_marginTop="15dp"/>
-
-    <com.mogo.och.bus.view.VerticalDashLineView
-        android:id="@+id/module_mogo_och_bus_station_top_dash"
-        android:layout_width="1dp"
-        android:layout_height="30dp"
-        app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
-        android:layout_marginBottom="15dp"
-        app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintRight_toRightOf="@id/module_mogo_och_bus_station_icon" />
-    <ImageView
-        android:id="@+id/module_mogo_och_bus_station_icon"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:scaleType="center"
-        android:src="@drawable/bus_icon_arrived_station"
-        app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintVertical_bias="0.4"
-        app:layout_constraintTop_toTopOf="@id/module_mogo_och_bus_station_name" />
-    <TextView
-        android:id="@+id/module_mogo_och_bus_station_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_mogo_och_bus_station_name_margin_left"
-        android:text="后鲁站"
-        android:textColor="@color/bus_arrived_station_name_text_color"
-        android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
-        app:layout_constraintLeft_toRightOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <TextView
-        android:id="@+id/module_mogo_och_bus_station_notice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="起点"
-        android:textColor="@color/bus_station_notice_text_color"
-        android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
-        android:layout_marginEnd="10dp"
-        app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@id/module_mogo_och_bus_station_name" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/res/layout/taxi_login_view.xml b/OCH/mogo-och-common-module/src/main/res/layout/taxi_login_view.xml
index 8201138841..89577408f8 100644
--- a/OCH/mogo-och-common-module/src/main/res/layout/taxi_login_view.xml
+++ b/OCH/mogo-och-common-module/src/main/res/layout/taxi_login_view.xml
@@ -9,6 +9,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_login_bg"
         android:src="@drawable/taxi_ic_login_bg"
+        android:scaleType="fitXY"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index 21ec411aee..0655477217 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -2,6 +2,8 @@ package com.mogo.och.taxi.ui;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ScaleDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -36,6 +38,8 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 /**
  * @author congtaowang
  * @since 2021/1/18
@@ -191,13 +195,13 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             }
             tvOperationStatus.setText("暂停接单");
             mPersonalBtn.setVisibility(View.VISIBLE);
-            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_back_btn), null, null, null);
+            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_back), null, null, null);
             showPanel();
         } else {
             mDriverRole.setVisibility(View.GONE);
 //            AIAssist.getInstance(getContext()).speakTTSVoice("已接单");
             tvOperationStatus.setText("接单");
-            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_out_btn), null, null, null);
+            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_out), null, null, null);
             mPersonalBtn.setVisibility(View.GONE);
             hidPanel();
         }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java
index 88a4c527a3..0690d2db3f 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java
@@ -107,7 +107,7 @@ public class TaxiGrabOrderFragment extends BaseTaxiUIFragment implements View.On
         ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams)mOrderGrabBt.getLayoutParams();
         lp.bottomMargin = 3;
         mOrderGrabBt.setLayoutParams(lp);
-        mOrderGrabBt.setBackground(getResources().getDrawable(R.drawable.taxi_driver_grab_order_bt));
+        mOrderGrabBt.setBackground(getResources().getDrawable(R.drawable.shape_size_grab_order_bt));
         mOrderGrabBt.setText("抢单(10S)"); //开始倒计时任务
         countDownTimer = new CountDownTimer(11000,1000){
 
@@ -127,7 +127,6 @@ public class TaxiGrabOrderFragment extends BaseTaxiUIFragment implements View.On
         if (null != countDownTimer){
             countDownTimer.cancel();
         }
-        mOrderGrabBt.setTextSize(21);
         mOrderGrabBt.setText("抢单中...");
         ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams)mOrderGrabBt.getLayoutParams();
         lp.bottomMargin = 40;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java
index 5b0f8560a5..5fab127639 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java
@@ -195,9 +195,9 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi
             }
             viewHolder.checkBoxTv.setText(datas[position]);
             if(viewHolder.checkBoxTv.getText().toString().equals(currentReasons)){
-                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.taxi_selected_btn),null,null,null);
+                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_selected_btn),null,null,null);
             }else {
-                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.taxi_unselect_btn),null,null,null);
+                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_unselected_btn),null,null,null);
             }
             return convertView;
         }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java
index 5ff117c9ef..e9df207e2c 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java
@@ -46,6 +46,8 @@ import java.util.List;
 import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 /**
  * @author: wangmingjun
  * @date: 2021/8/18
@@ -219,13 +221,13 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
         TextView textView = (TextView) tab.getCustomView().findViewById(R.id.operation_tab_title);
         ImageView imageView = (ImageView) tab.getCustomView().findViewById(R.id.operation_tab_line_iv);
         if (isSelected){
-            textView.setTextSize(23);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),46));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
             textView.setTextColor(Color.parseColor("#FFFFFF"));
             imageView.setImageDrawable(getResources().getDrawable(R.drawable.taxi_driver_operation_tab_line));
         }else {
-            textView.setTextSize(20);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),40));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
             textView.setTextColor(Color.parseColor("#A7B6F0"));
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
index 0e4f2bd53b..55563d273d 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
@@ -27,6 +27,8 @@ import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
 import java.util.ArrayList;
 import java.util.List;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 /**
  * @author congtaowang
  * @since 2021/1/18
@@ -75,9 +77,9 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
         for (int i= 0;i < mTabTitles.length; i++){
             TabLayout.Tab tab = mTaxiOrderTab.newTab();
             tab.view.setBackgroundColor(Color.parseColor("#00000000"));
-            View tabView = View.inflate(getActivity(),R.layout.taxi_tab_item_custom,null);
-            TextView tv = tabView.findViewById(R.id.tab_title);
-            tv.setText(mTabTitles[i]);
+            TextView tabView = (TextView) View.inflate(getActivity(),R.layout.taxi_tab_item_custom,null);
+            tabView.setText(mTabTitles[i]);
+            tabView.setHeight(AutoSizeUtils.dp2px(getContext(),120));
             tab.setCustomView(tabView);
             if (0  == i){
                 mTaxiOrderTab.addTab(tab,true);
@@ -134,13 +136,13 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
         TextView textView = (TextView) tab.getCustomView().findViewById(R.id.tab_title);
         if (isSelected){
             textView.setBackground(getActivity().getDrawable(R.drawable.taxi_driver_tab_item_bg));
-            textView.setTextSize(20);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),40));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
             textView.setTextColor(Color.parseColor("#FFFFFF"));
         }else {
             textView.setBackground(null);
-            textView.setTextSize(18);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),36));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
             textView.setTextColor(Color.parseColor("#CCD4F5"));
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png
deleted file mode 100755
index 8acf113151..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/end_maker_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png
deleted file mode 100755
index e98738b192..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png
deleted file mode 100755
index d3e0107c02..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png
deleted file mode 100755
index c0a978fc2b..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png
deleted file mode 100755
index ebacf3a11a..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png
deleted file mode 100644
index 04580a8f0d..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_station_start_end.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/order_drive_mode_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/order_drive_mode_bg.png
deleted file mode 100644
index ec754b829f..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/order_drive_mode_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png
deleted file mode 100644
index 9eca61e199..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/start_maker_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml
deleted file mode 100644
index e323eca4c3..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
-        </shape>
-    </item>
-</selector>
-
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_back_btn.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_back_btn.png
deleted file mode 100644
index 35e13ff68c..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_back_btn.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_base_icon_not_in_autopilot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_base_icon_not_in_autopilot.png
deleted file mode 100644
index 927296d690..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_base_icon_not_in_autopilot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_close_navi_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_close_navi_icon.png
deleted file mode 100644
index 56525e7ed2..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_close_navi_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_dot_line.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_dot_line.png
deleted file mode 100644
index a720a532ea..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_dot_line.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot.png
deleted file mode 100644
index 539e106058..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg.png
deleted file mode 100644
index ef5a5ea880..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg_pressed.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg_pressed.png
deleted file mode 100644
index 39194f8e55..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_bg_pressed.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_disable.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_disable.png
deleted file mode 100644
index 695515a366..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_disable.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_failed.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_failed.png
deleted file mode 100644
index 3347b2bfc2..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_failed.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_loading.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_loading.png
deleted file mode 100644
index a71cf9a4f9..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_loading.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_success.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_success.png
deleted file mode 100644
index dd7dc2d6b2..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_ic_autopilot_success.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arrived_station.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arrived_station.png
deleted file mode 100644
index 8a065b66dd..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arrived_station.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arriving_station.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arriving_station.png
deleted file mode 100644
index 4ed57a0e30..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_icon_arriving_station.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_green_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_green_nor.png
deleted file mode 100644
index bc9fed952d..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_green_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_red_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_red_nor.png
deleted file mode 100644
index 8732508ded..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_red_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_lightyellow_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_lightyellow_nor.png
deleted file mode 100644
index bae01408fd..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_lightyellow_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_masking.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_masking.png
deleted file mode 100644
index b33738106e..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_masking.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_arrow_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_arrow_icon.png
deleted file mode 100644
index a83b7c9e74..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_arrow_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_direction_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_direction_icon.png
deleted file mode 100755
index 1b96799531..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_direction_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_icon.png
deleted file mode 100644
index bd4e6ccde4..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_line_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_line_icon.png
deleted file mode 100644
index 7f758d5999..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_navi_line_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_out_btn.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_out_btn.png
deleted file mode 100644
index a3a771d686..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_out_btn.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_personal_btn.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_personal_btn.png
deleted file mode 100644
index 0cb863cecb..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_personal_btn.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_setting_btn_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_setting_btn_bg.png
deleted file mode 100644
index a21f54cc53..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_setting_btn_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png
deleted file mode 100644
index 62942a7a42..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_long.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_long.png
deleted file mode 100755
index cf3e5a3778..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_long.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_medium.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_medium.png
deleted file mode 100755
index bdc2725468..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_switch_map_medium.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png
deleted file mode 100755
index 8acf113151..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/end_maker_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png
deleted file mode 100755
index e98738b192..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png
deleted file mode 100755
index d3e0107c02..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png
deleted file mode 100755
index c0a978fc2b..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png
deleted file mode 100755
index ebacf3a11a..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png
deleted file mode 100644
index 04580a8f0d..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_station_start_end.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/order_drive_mode_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/order_drive_mode_bg.png
deleted file mode 100644
index ec754b829f..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/order_drive_mode_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png
deleted file mode 100644
index 9eca61e199..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/start_maker_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_bg_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_bg_selector.xml
deleted file mode 100644
index e01265811f..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_bg_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
-    <item android:drawable="@drawable/taxi_ic_autopilot_bg_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/taxi_ic_autopilot_bg"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_status_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_status_bg.xml
deleted file mode 100644
index e323eca4c3..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_status_bg.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
-        </shape>
-    </item>
-</selector>
-
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_back_btn.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_back_btn.png
deleted file mode 100644
index 35e13ff68c..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_back_btn.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_base_icon_not_in_autopilot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_base_icon_not_in_autopilot.png
deleted file mode 100644
index 927296d690..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_base_icon_not_in_autopilot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_close_navi_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_close_navi_icon.png
deleted file mode 100644
index 56525e7ed2..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_close_navi_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_dot_line.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_dot_line.png
deleted file mode 100644
index a720a532ea..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_dot_line.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot.png
deleted file mode 100644
index 539e106058..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg.png
deleted file mode 100644
index ef5a5ea880..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg_pressed.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg_pressed.png
deleted file mode 100644
index 39194f8e55..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_bg_pressed.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_disable.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_disable.png
deleted file mode 100644
index 695515a366..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_disable.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_failed.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_failed.png
deleted file mode 100644
index 3347b2bfc2..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_failed.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_loading.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_loading.png
deleted file mode 100644
index a71cf9a4f9..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_loading.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_success.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_success.png
deleted file mode 100644
index dd7dc2d6b2..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_ic_autopilot_success.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arrived_station.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arrived_station.png
deleted file mode 100644
index 8a065b66dd..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arrived_station.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arriving_station.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arriving_station.png
deleted file mode 100644
index 4ed57a0e30..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_icon_arriving_station.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_green_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_green_nor.png
deleted file mode 100644
index bc9fed952d..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_green_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_red_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_red_nor.png
deleted file mode 100644
index 8732508ded..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_red_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_lightyellow_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_lightyellow_nor.png
deleted file mode 100644
index bae01408fd..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_lightyellow_nor.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_masking.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_masking.png
deleted file mode 100644
index b33738106e..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_masking.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_arrow_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_arrow_icon.png
deleted file mode 100644
index a83b7c9e74..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_arrow_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_direction_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_direction_icon.png
deleted file mode 100755
index 1b96799531..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_direction_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_icon.png
deleted file mode 100644
index bd4e6ccde4..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_line_icon.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_line_icon.png
deleted file mode 100644
index 7f758d5999..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_navi_line_icon.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_out_btn.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_out_btn.png
deleted file mode 100644
index a3a771d686..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_out_btn.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_personal_btn.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_personal_btn.png
deleted file mode 100644
index 0cb863cecb..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_personal_btn.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_setting_btn_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_setting_btn_bg.png
deleted file mode 100644
index a21f54cc53..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_setting_btn_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_bg.png
deleted file mode 100644
index 62942a7a42..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_bg.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_selector.xml
deleted file mode 100644
index c87ede1476..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_selector.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<!--    <item android:state_checked="true">-->
-<!--        <shape android:shape="rectangle">-->
-<!--            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />-->
-<!--            <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />-->
-<!--        </shape>-->
-<!--    </item>-->
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#1E2E87 " android:startColor="#7792F9" />
-        </shape>
-    </item>
-</selector>
-
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_long.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_long.png
deleted file mode 100755
index cf3e5a3778..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_long.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_medium.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_medium.png
deleted file mode 100755
index bdc2725468..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_switch_map_medium.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml
new file mode 100644
index 0000000000..8659116cbc
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_driver_grab_order_bt"
+        android:width="@dimen/dp_380"
+        android:height="@dimen/dp_140"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml
new file mode 100644
index 0000000000..ec1ff5c06d
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_back_btn"
+        android:width="@dimen/dp_50"
+        android:height="@dimen/dp_50"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml
new file mode 100644
index 0000000000..b505323904
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_out_btn"
+        android:width="@dimen/dp_50"
+        android:height="@dimen/dp_50"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml
new file mode 100644
index 0000000000..09e02705e4
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_order_list_page"
+        android:width="@dimen/dp_35"
+        android:height="@dimen/dp_43"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml
new file mode 100644
index 0000000000..ac27d621f3
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_selected_btn"
+        android:width="@dimen/dp_63"
+        android:height="@dimen/dp_63"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml
new file mode 100644
index 0000000000..b29cd86d64
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_unselect_btn"
+        android:width="@dimen/dp_63"
+        android:height="@dimen/dp_63"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_bg_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_bg_selector.xml
rename to OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_bg_selector.xml
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml
index 041d4e61c2..e323eca4c3 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml
@@ -2,13 +2,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="30dp" android:bottomRightRadius="70dp" android:topLeftRadius="70dp" android:topRightRadius="30dp" />
+            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
             <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="30dp" android:bottomRightRadius="70dp" android:topLeftRadius="70dp" android:topRightRadius="30dp" />
+            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
             <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
         </shape>
     </item>
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_speed_selector.xml
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_selector.xml
rename to OCH/mogo-och-taxi/src/main/res/drawable/taxi_speed_selector.xml
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml
index 2bb20db45c..42d12d25ad 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml
@@ -17,7 +17,7 @@
         android:layout_marginLeft="@dimen/dp_40"
         android:text="@string/och_taxi_auto_txt"
         android:textColor="#FFFFFF"
-        android:textSize="24sp"/>
+        android:textSize="@dimen/dp_48"/>
     <TextView
         android:id="@+id/taxi_start_by_manual"
         android:layout_width="0dp"
@@ -28,6 +28,6 @@
         android:text="@string/och_taxi_manual_txt"
         android:layout_marginRight="@dimen/dp_40"
         android:textColor="#FFFFFF"
-        android:textSize="24sp"/>
+        android:textSize="@dimen/dp_48"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
index 124e600867..650a453c96 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
@@ -59,8 +59,8 @@
         <ImageView
             android:id="@+id/module_och_autopilot_iv"
             android:layout_marginTop="@dimen/dp_56"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_65"
+            android:layout_height="@dimen/dp_65"
             android:layout_gravity="center_horizontal"
             android:layout_centerHorizontal="true"
             android:src="@drawable/taxi_ic_autopilot"
@@ -97,7 +97,7 @@
         android:layout_marginLeft="48dp"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:background="@drawable/taxi_operation_status_bg"
-        android:drawableLeft="@drawable/taxi_out_btn"
+        android:drawableLeft="@drawable/shape_size_operation_out"
         android:drawablePadding="10dp"
         android:elevation="@dimen/dp_10"
         android:gravity="center"
@@ -106,7 +106,7 @@
         android:text="--"
         android:textAlignment="center"
         android:textColor="@color/taxi_autopilot_text_color_selector"
-        android:textSize="20sp"
+        android:textSize="@dimen/dp_40"
         android:textStyle="bold"
 
         app:layout_constraintBottom_toBottomOf="parent"
@@ -134,8 +134,8 @@
         android:gravity="center"
         app:layout_goneMarginLeft="48dp">
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"
             android:background="@drawable/taxi_personal_btn"
             android:layout_gravity="center" />
 
@@ -153,8 +153,8 @@
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_personal_layout">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
             android:background="@drawable/taxi_setting_btn_bg" />
@@ -174,8 +174,8 @@
 
         <ImageView
             android:id="@+id/taxi_switch_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_60"
             android:layout_gravity="center" />
     </LinearLayout>
 
@@ -191,8 +191,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout">
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="@dimen/dp_80"
             android:layout_gravity="center"
             android:background="@drawable/bad_case_selector"/>
     </LinearLayout>
@@ -209,8 +209,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll">
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="@dimen/dp_80"
             android:layout_gravity="center"
             android:background="@drawable/ai_collect_selector"/>
     </LinearLayout>
@@ -220,7 +220,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="模拟 自动驾驶Disable"
-        android:textSize="20sp"
+        android:textSize="@dimen/dp_40"
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -230,7 +230,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="模拟 自动驾驶Enable"
-        android:textSize="20sp"
+        android:textSize="@dimen/dp_40"
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotDisable" />
@@ -240,7 +240,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="模拟 自动驾驶Running"
-        android:textSize="20sp"
+        android:textSize="@dimen/dp_40"
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotEnable" />
@@ -249,7 +249,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="模拟 人机共驾"
-        android:textSize="20sp"
+        android:textSize="@dimen/dp_40"
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotRunning" />
@@ -271,8 +271,8 @@
         app:layout_constraintBottom_toBottomOf="parent" />
     <ImageView
         android:id="@+id/taxi_close_navi_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
         android:layout_marginBottom="534dp"
         android:layout_marginRight="532dp"
         android:visibility="gone"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
index 517496855a..767d943059 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
@@ -27,7 +27,7 @@
             android:gravity="center_vertical"
             android:text="前往乘客上车点"
             android:textColor="@color/taxi_order_status_textColor"
-            android:textSize="18sp"
+            android:textSize="@dimen/dp_36"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -58,7 +58,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="210dp"
                 android:textColor="#CAD6FF"
-                android:textSize="17sp"
+                android:textSize="@dimen/dp_34"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_goneMarginTop="50dp"
@@ -73,7 +73,7 @@
                 android:ellipsize="end"
                 android:lineSpacingExtra="10dp"
                 android:textColor="#FFFFFF"
-                android:textSize="23sp"
+                android:textSize="@dimen/dp_46"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_station_title_2"
                 tools:text="- -" />
@@ -87,7 +87,7 @@
                 android:lineSpacingExtra="16dp"
                 android:text="距离 - - 公里，用时 - - 分"
                 android:textColor="#CAD6FF"
-                android:textSize="16sp"
+                android:textSize="@dimen/dp_32"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_station_2" />
 
@@ -196,8 +196,8 @@
                         android:textSize="28dp" />
                     <ImageView
                         android:id="@+id/module_och_taxi_navi_iv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/dp_50"
+                        android:layout_height="@dimen/dp_50"
                         android:visibility="gone"
                         android:src="@drawable/taxi_navi_icon"
                         android:layout_alignParentRight="true"/>
@@ -273,7 +273,7 @@
             android:gravity="center"
             android:text="@string/module_och_taxi_order_server_start"
             android:textColor="#4DFFFFFF"
-            android:textSize="24sp"
+            android:textSize="@dimen/dp_48"
             app:layout_constraintBottom_toBottomOf="parent" />
 
         <include layout="@layout/auto_or_manual_btn_view"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml
index 84f9065fdf..9ccbe981ef 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml
@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/no_order_data_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_386"
+        android:layout_height="@dimen/dp_350"
         android:src="@drawable/no_order_data"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="#91A1EA"
-        android:textSize="15sp"
+        android:textSize="@dimen/dp_30"
         android:layout_marginTop="50dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml
index 9598dbfc61..30f972ca38 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
         android:layout_marginLeft="60dp"
-        android:textSize="18sp"
+        android:textSize="@dimen/dp_36"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:textColor="#FFFFFF"
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="#A7B6F0"
-        android:textSize="15sp"
+        android:textSize="@dimen/dp_30"
         app:layout_constraintLeft_toLeftOf="@+id/operation_data_tv"
         app:layout_constraintTop_toBottomOf="@+id/operation_data_tv"
         android:text="总数"/>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml
index f3adc6e4de..7db8cad308 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml
@@ -11,15 +11,15 @@
     android:gravity="center"
     android:text="完成订单数"
     android:textColor="#A7B6F0"
-    android:textSize="20sp"
+    android:textSize="@dimen/dp_40"
     app:layout_constraintLeft_toLeftOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintRight_toRightOf="parent"/>
 
     <ImageView
         android:id="@+id/operation_tab_line_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_72"
+        android:layout_height="@dimen/dp_24"
         app:layout_constraintTop_toBottomOf="@+id/operation_tab_title"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml
index d0cbcc1da0..0be1796d6d 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml
@@ -9,21 +9,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/module_och_taxi_order_cancel_title"
-        android:textSize="28sp"
+        android:textSize="@dimen/dp_56"
         android:textColor="#FFFFFFFF"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="46dp"
         />
+
     <GridView
         android:id="@+id/module_och_taxi_order_cancel_content_gv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/module_och_taxi_order_cancel_title_tv"
-        android:numColumns="2"
-        android:stretchMode="columnWidth"
-        android:verticalSpacing="50dp"
         android:layout_marginTop="74dp"
-        android:paddingLeft="144dp"/>
+        android:numColumns="2"
+        android:paddingLeft="144dp"
+        android:stretchMode="columnWidth"
+        android:verticalSpacing="50dp" />
 
     <View
         android:id="@+id/line_deliver_h"
@@ -46,7 +47,7 @@
             android:layout_weight="1"
             android:text="确认"
             android:textColor="#FFFFFF"
-            android:textSize="26sp"
+            android:textSize="@dimen/dp_52"
             android:gravity="center"/>
         <View
             android:layout_width="2dp"
@@ -59,7 +60,7 @@
             android:layout_weight="1"
             android:text="取消"
             android:textColor="#FFFFFF"
-            android:textSize="26sp"
+            android:textSize="@dimen/dp_52"
             android:gravity="center"/>
 
     </LinearLayout>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml
index 7f751168ca..6cc1730044 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:textSize="22sp"
+    android:textSize="@dimen/dp_44"
     android:textColor="#FFFFFFFF"
     android:paddingLeft="8dp"
     android:id="@+id/item_checkbox"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml
index ce6f9442f7..96f9445fe9 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml
@@ -10,7 +10,7 @@
         android:id="@+id/grab_order_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="20sp"
+        android:textSize="@dimen/dp_40"
         android:textColor="#181D6D"
         android:layout_marginTop="34dp"
         android:layout_marginLeft="40dp"
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:text="预约时间：今天15：30"
         android:textColor="#5C5F8E"
-        android:textSize="18sp"
+        android:textSize="@dimen/dp_36"
         android:layout_marginTop="42dp"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_title"
         app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status_divider1"/>
@@ -66,7 +66,7 @@
         android:layout_marginLeft="74dp"
         android:text="上车："
         android:textColor="#5C5F8E"
-        android:textSize="17sp"
+        android:textSize="@dimen/dp_34"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_reserver_time"
         app:layout_constraintLeft_toLeftOf="parent"/>
 
@@ -75,8 +75,8 @@
         app:layout_constraintTop_toBottomOf="@+id/grab_order_start_station_title"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_reserver_time"
         android:layout_marginTop="26dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_28"
+        android:layout_height="@dimen/dp_28"
         android:src="@drawable/taxi_driver_circle_green_small" />
 
     <TextView
@@ -92,7 +92,7 @@
         android:text="- -"
         app:layout_goneMarginTop="56dp"
         android:textColor="#181D6D"
-        android:textSize="23sp" />
+        android:textSize="@dimen/dp_46" />
 
     <ImageView
         android:id="@+id/grab_order_end_dotLine"
@@ -110,8 +110,8 @@
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_reserver_time"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_end_station_title"
         android:layout_marginTop="26dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_33"
+        android:layout_height="@dimen/dp_33"
         android:src="@drawable/taxi_driver_circle_blue_small" />
     <TextView
         android:id="@+id/grab_order_end_station_title"
@@ -119,7 +119,7 @@
         android:layout_height="wrap_content"
         android:text="下车："
         android:textColor="#5C5F8E"
-        android:textSize="17sp"
+        android:textSize="@dimen/dp_34"
         android:layout_marginTop="50dp"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_start_station"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_start_station"/>
@@ -135,7 +135,7 @@
         android:layout_width="@dimen/taxi_grab_order_start_station_width"
         android:layout_height="wrap_content"
         android:textColor="#181D6D"
-        android:textSize="23sp" />
+        android:textSize="@dimen/dp_46" />
     
     <TextView
         android:id="@+id/grab_order_tv"
@@ -146,19 +146,19 @@
         android:paddingTop="22dp"
         android:gravity="center_horizontal"
         android:textStyle="bold"
-        android:textSize="21sp"
+        android:textSize="@dimen/dp_42"
         android:textColor="@android:color/white"
         android:text="抢单"
         android:clickable="true"
-        android:background="@drawable/taxi_driver_grab_order_bt"
+        android:background="@drawable/shape_size_grab_order_bt"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
     <com.mogo.och.common.module.wigets.OCHRadiusImageView
         android:id="@+id/grab_result_anim"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_280"
+        android:layout_height="@dimen/dp_600"
         android:src="@drawable/grab_failure_anmi_flow"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml
index 4e24c65314..47f9446ca7 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml
@@ -4,6 +4,6 @@
     android:layout_height="@dimen/taxi_order_nodata_height"
     android:gravity="center"
     android:text="已经到底了…"
-    android:textSize="15sp"
+    android:textSize="@dimen/dp_30"
     android:textColor="#91A1EA">
 </TextView>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml
index a107c7358f..1890c0baa1 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml
@@ -16,7 +16,7 @@
         android:inputType="textMultiLine"
         android:text="今天 9：00"
         android:textColor="#CAD6FF"
-        android:textSize="17sp"
+        android:textSize="@dimen/dp_34"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginBottom="26dp"/>
@@ -37,8 +37,8 @@
         app:layout_constraintBottom_toBottomOf="@+id/base_start_station"
         app:layout_constraintLeft_toLeftOf="@+id/to_be_order_time"
         app:layout_constraintTop_toTopOf="@+id/base_start_station"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_28"
+        android:layout_height="@dimen/dp_28"
         android:src="@drawable/taxi_driver_circle_green_small" />
 
     <TextView
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
         android:textColor="#FFFFFF"
-        android:textSize="18sp" />
+        android:textSize="@dimen/dp_36" />
 
     <ImageView
         android:id="@+id/base_end_dotLine"
@@ -71,8 +71,8 @@
         app:layout_constraintBottom_toBottomOf="@+id/base_end_station"
         app:layout_constraintLeft_toLeftOf="@+id/base_start_greenDot"
         app:layout_constraintTop_toTopOf="@+id/base_end_station"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_33"
+        android:layout_height="@dimen/dp_33"
         android:src="@drawable/taxi_driver_circle_blue_small" />
     <TextView
         android:id="@+id/base_end_station"
@@ -85,7 +85,7 @@
         android:layout_width="@dimen/taxi_reserve_item_station_width"
         android:layout_height="wrap_content"
         android:textColor="#FFFFFF"
-        android:textSize="18sp" />
+        android:textSize="@dimen/dp_36" />
     <View
         android:id="@+id/to_be_order_divider"
         android:layout_width="480dp"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml
index d2047c43b0..c5e9947df0 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml
@@ -11,7 +11,7 @@
         android:gravity="center"
         android:text="2020.08.17"
         android:textColor="#FFFFFF"
-        android:textSize="17sp"
+        android:textSize="@dimen/dp_34"
         android:layout_marginTop="40dp"
         android:background="#80203076">
     </TextView>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml
index 045fe93a86..b9d6794ace 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:text="9:01"
         android:textColor="#8E9DD4"
-        android:textSize="20sp" />
+        android:textSize="@dimen/dp_40" />
 
     <Button
         android:id="@+id/order_status_bt"
@@ -24,7 +24,7 @@
         android:background="@drawable/taxi_order_button_status_bg"
         android:text="服务中"
         android:textColor="#FFFFFF"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_24" />
 
     <Button
         android:id="@+id/order_type_bt"
@@ -35,7 +35,7 @@
         android:background="@drawable/taxi_order_button_type_bg"
         android:text="即时单"
         android:textColor="#FFFFFF"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_24" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/order_item_cl"
@@ -47,8 +47,8 @@
 
         <ImageView
             android:id="@+id/grab_order_start_greenDot"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_30"
+            android:layout_height="@dimen/dp_30"
             android:src="@drawable/taxi_driver_circle_green_big"
             app:layout_constraintBottom_toBottomOf="@+id/grab_order_start_station"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="40dp"
             android:textColor="#FFFFFF"
-            android:textSize="22sp" />
+            android:textSize="@dimen/dp_44" />
 
         <ImageView
             android:id="@+id/grab_order_end_dotLine"
@@ -73,7 +73,7 @@
             app:layout_constraintLeft_toLeftOf="@+id/grab_order_start_greenDot"
             app:layout_constraintRight_toRightOf="@+id/grab_order_start_greenDot"
             app:layout_constraintTop_toBottomOf="@+id/grab_order_start_greenDot"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_4"
             android:layout_height="0dp"
             android:scaleType="fitXY"
             android:src="@drawable/taxi_dot_line" />
@@ -83,8 +83,8 @@
             app:layout_constraintBottom_toBottomOf="@+id/grab_order_end_station"
             app:layout_constraintLeft_toLeftOf="@+id/grab_order_start_greenDot"
             app:layout_constraintTop_toTopOf="@+id/grab_order_end_station"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_30"
+            android:layout_height="@dimen/dp_30"
             android:src="@drawable/taxi_driver_circle_blue_big" />
 
         <TextView
@@ -92,7 +92,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#FFFFFF"
-            android:textSize="22sp"
+            android:textSize="@dimen/dp_44"
             android:maxLines="2"
             android:ellipsize="end"
             android:layout_marginTop="40dp"
@@ -105,7 +105,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#8E9DD4"
-            android:textSize="20sp"
+            android:textSize="@dimen/dp_40"
             android:layout_marginTop="40dp"
             app:layout_constraintTop_toBottomOf="@+id/grab_order_end_blueDot"
             app:layout_constraintLeft_toLeftOf="@+id/grab_order_end_blueDot"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml
index 384d4266e8..8d04684ac7 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml
@@ -18,13 +18,13 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="206dp"
             android:background="@drawable/taxi_show_orders_bg"
-            android:drawableLeft="@drawable/taxi_order_list_page"
+            android:drawableLeft="@drawable/shape_size_see_all_order"
             android:gravity="center"
             android:paddingLeft="154dp"
             android:paddingRight="132dp"
             android:text="查看全部订单"
             android:textColor="#FFFFFFFF"
-            android:textSize="22sp" />
+            android:textSize="@dimen/dp_44" />
 
         <TextView
             android:id="@+id/module_och_taxi_operation_data_title"
@@ -36,7 +36,7 @@
             android:gravity="center"
             android:text="出租车运营数据:"
             android:textColor="#FFFFFF"
-            android:textSize="22sp" />
+            android:textSize="@dimen/dp_44" />
 
         <View
             android:layout_width="14dp"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
index ee3975515c..1c57c4e6fe 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
@@ -26,36 +26,42 @@
             android:id="@+id/test_bar_current_order_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="@dimen/dp_24"
             android:textColor="@android:color/white"/>
 
         <TextView
             android:id="@+id/test_bar_current_line_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="@dimen/dp_24"
             android:textColor="@android:color/white"/>
 
         <TextView
             android:id="@+id/test_bar_current_traj_md5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="@dimen/dp_24"
             android:textColor="@android:color/white"/>
 
         <TextView
             android:id="@+id/test_bar_current_stop_md5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="@dimen/dp_24"
             android:textColor="@android:color/white"/>
 
         <TextView
             android:id="@+id/test_bar_current_traj_md5_dpqp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="@dimen/dp_24"
             android:textColor="@android:color/white"/>
 
         <TextView
             android:id="@+id/test_bar_current_stop_md5_dpqp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="@dimen/dp_24"
             android:textColor="@android:color/white"/>
 
         <Button
@@ -63,19 +69,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="到达上车点"
-            android:textSize="12sp" />
+            android:textSize="@dimen/dp_24" />
         <Button
             android:id="@+id/test_bar_start_service_confirm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_24"
             android:text="开启服务"/>
 
         <Button
             android:id="@+id/test_bar_on_the_way_to_end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_24"
             android:text="开启自动驾驶"/>
 
         <Button
@@ -83,7 +89,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="到达目的地"
-            android:textSize="12sp" />
+            android:textSize="@dimen/dp_24" />
 
     </LinearLayout>
 </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml
index f7ae4c3fdb..b52c347f82 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml
@@ -34,12 +34,12 @@
         app:layout_constraintStart_toStartOf="parent"/>
     <TextView
         android:id="@+id/wait_order_num"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_46"
+        android:layout_height="@dimen/dp_46"
         android:layout_marginTop="10dp"
         android:layout_marginRight="40dp"
         android:gravity="center"
-        android:textSize="15sp"
+        android:textSize="@dimen/dp_30"
         android:textColor="@android:color/white"
         android:text="0"
         android:textStyle="bold"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml
index c852e54e3b..859589df62 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml
@@ -6,6 +6,6 @@
     android:gravity="center"
     android:text="进行中"
     android:textColor="#CCD4F5"
-    android:textSize="18sp"
+    android:textSize="@dimen/dp_36"
     android:textStyle="bold"
     android:layout_marginTop="9dp"/>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
deleted file mode 100644
index 9839662706..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_mogo_och_margin_left">40dp</dimen>
-    <dimen name="module_mogo_och_margin_right">40dp</dimen>
-    <dimen name="module_mogo_och_margin_bottom">46dp</dimen>
-    <dimen name="module_mogo_och_margin_top">24dp</dimen>
-
-    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">530dp</dimen>
-    <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492dp</dimen>
-
-    <dimen name="module_mogo_och_slide_panel_block_start_x">20dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_block_start_y">20dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_normal_text_margin_left">70dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_normal_text_margin_right">130dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_short_text_margin_left">93dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_short_text_margin_right">150dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_textSize">70dp</dimen>
-
-    <dimen name="module_mogo_och_autopilot_status_bg_corner">24dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_bg_width">460dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_bg_height">140dp</dimen>
-
-    <dimen name="module_mogo_och_operation_status_bg_width">102dp</dimen>
-    <dimen name="module_mogo_och_operation_status_bg_height">102dp</dimen>
-
-    <dimen name="module_mogo_och_operation_status_padding">83dp</dimen>
-
-    <dimen name="module_mogo_och_autopilot_order_m_t">40dp</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_width">466dp</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_height">414dp</dimen>
-
-
-    <!--    <dimen name="module_mogo_och_autopilot_status_text_size">44dp</dimen>-->
-    <dimen name="module_mogo_och_autopilot_status_text_size">46dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_text_padding_top">13dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_text_m_l">350dp</dimen>
-
-    <dimen name="module_mogo_och_notice_text_max_width">460dp</dimen>
-    <dimen name="module_mogo_och_notice_text_size">30dp</dimen>
-
-    <dimen name="module_och_taxi_order_start_station_marginLeft">15dp</dimen>
-    <dimen name="module_och_taxi_order_status_marginLeft">25dp</dimen>
-    <dimen name="module_och_taxi_order_status_marginTop">25dp</dimen>
-    <dimen name="module_och_taxi_order_status_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_height">1dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_marginLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_marginTop">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_marginRight">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_height">140dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">41dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingRight">17dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">41dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_textSize">42dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_anchor_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_end_station_anchor_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_distance_container_height">84dp</dimen>
-    <dimen name="module_och_taxi_order_distance_container_marginLeft">3dp</dimen>
-    <dimen name="module_och_taxi_order_distance_anchor_marginLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_distance_anchor_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_distance_textSize">36dp</dimen>
-    <dimen name="module_och_taxi_order_distance_marginRight">17dp</dimen>
-    <dimen name="module_och_taxi_order_text_marginRight">31.5dp</dimen>
-
-    <dimen name="module_och_taxi_panel_width">560dp</dimen>
-    <dimen name="module_och_taxi_panel_height">910dp</dimen>
-    <dimen name="taxi_operation_data_item_width">800dp</dimen>
-    <dimen name="taxi_operation_data_item_height">222dp</dimen>
-    <dimen name="taxi_order_cancel_width">1120dp</dimen>
-    <dimen name="taxi_order_cancel_btn_height">162dp</dimen>
-    <dimen name="taxi_grab_order_start_station_width">446dp</dimen>
-    <dimen name="taxi_order_nodata_width">400dp</dimen>
-    <dimen name="taxi_order_nodata_height">160dp</dimen>
-    <dimen name="taxi_reserve_item_station_width">432dp</dimen>
-    <dimen name="taxi_order_list_item_height">64dp</dimen>
-    <dimen name="taxi_order_list_show_bt_width">616dp</dimen>
-    <dimen name="taxi_order_list_show_bt_height">132dp</dimen>
-    <dimen name="taxi_order_list_tab_max_weight">300dp</dimen>
-    <dimen name="taxi_order_list_tab_min_weight">240dp</dimen>
-    <dimen name="taxi_order_list_boot_refresh_no_data_view_width">400dp</dimen>
-    <dimen name="taxi_order_list_boot_refresh_no_data_view_height">160dp</dimen>
-    <dimen name="taxi_tab_item_custom_width">280dp</dimen>
-    <dimen name="taxi_tab_item_custom_height">120dp</dimen>
-
-    <dimen name="taxi_tab_speed_width_height">220dp</dimen>
-    <dimen name="taxi_tab_autoaploit_width">420dp</dimen>
-    <dimen name="taxi_tab_autoaploit_height">220dp</dimen>
-
-    <dimen name="taxi_diver_role_size">16dp</dimen>
-
-    <dimen name="taxi_traffic_light_layout_width">225dp</dimen>
-    <dimen name="taxi_traffic_light_layout_height">154dp</dimen>
-    <dimen name="taxi_traffic_light_layout_corner">60dp</dimen>
-    <dimen name="taxi_traffic_light_layout_margin_right">40dp</dimen>
-    <dimen name="taxi_traffic_light_layout_margin_top">23dp</dimen>
-    <dimen name="taxi_traffic_light_bg_width">210dp</dimen>
-    <dimen name="taxi_traffic_light_bg_height">120dp</dimen>
-    <dimen name="taxi_traffic_light_bg_margin_left">15dp</dimen>
-    <dimen name="taxi_traffic_light_bg_margin_top">17dp</dimen>
-    <dimen name="taxi_traffic_light_icon_size">154dp</dimen>
-    <dimen name="taxi_traffic_light_time_view_width">130dp</dimen>
-    <dimen name="taxi_traffic_light_time_size">60dp</dimen>
-
-    <dimen name="taxi_passenger_txt_size">34dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
deleted file mode 100644
index bc2b378e25..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--  此资源适配分体机 xhdpi  -->
-    <dimen name="module_mogo_och_margin_left">40dp</dimen>
-    <dimen name="module_mogo_och_margin_right">40dp</dimen>
-    <dimen name="module_mogo_och_margin_bottom">46dp</dimen>
-    <dimen name="module_mogo_och_margin_top">24dp</dimen>
-
-    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">530dp</dimen>
-    <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492dp</dimen>
-
-    <dimen name="module_mogo_och_slide_panel_block_start_x">20dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_block_start_y">20dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_normal_text_margin_left">70dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_normal_text_margin_right">130dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_short_text_margin_left">93dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_short_text_margin_right">150dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_textSize">70dp</dimen>
-
-    <dimen name="module_mogo_och_autopilot_status_bg_corner">24dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_bg_width">460dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_bg_height">140dp</dimen>
-
-    <dimen name="module_mogo_och_operation_status_bg_width">102dp</dimen>
-    <dimen name="module_mogo_och_operation_status_bg_height">102dp</dimen>
-
-    <dimen name="module_mogo_och_operation_status_padding">83dp</dimen>
-
-    <dimen name="module_mogo_och_autopilot_order_m_t">40dp</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_width">466dp</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_height">414dp</dimen>
-
-
-    <!--    <dimen name="module_mogo_och_autopilot_status_text_size">44dp</dimen>-->
-    <dimen name="module_mogo_och_autopilot_status_text_size">46dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_text_padding_top">13dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_text_m_l">350dp</dimen>
-
-    <dimen name="module_mogo_och_notice_text_max_width">460dp</dimen>
-    <dimen name="module_mogo_och_notice_text_size">30dp</dimen>
-    <dimen name="module_och_taxi_panel_width">560dp</dimen>
-    <dimen name="module_och_taxi_panel_height">310dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_marginLeft">15dp</dimen>
-    <dimen name="module_och_taxi_order_status_marginLeft">25dp</dimen>
-    <dimen name="module_och_taxi_order_status_marginTop">25dp</dimen>
-    <dimen name="module_och_taxi_order_status_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_height">1dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_marginLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_marginTop">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_divider_marginRight">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_height">140dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">41dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingRight">17dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">41dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_textSize">42dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_anchor_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_end_station_anchor_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_distance_container_height">84dp</dimen>
-    <dimen name="module_och_taxi_order_distance_container_marginLeft">3dp</dimen>
-    <dimen name="module_och_taxi_order_distance_anchor_marginLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_distance_anchor_textSize">32dp</dimen>
-    <dimen name="module_och_taxi_order_distance_textSize">36dp</dimen>
-    <dimen name="module_och_taxi_order_distance_marginRight">17dp</dimen>
-    <dimen name="module_och_taxi_order_text_marginRight">31.5dp</dimen>
-
-    <dimen name="taxi_operation_data_item_width">800dp</dimen>
-    <dimen name="taxi_operation_data_item_height">222dp</dimen>
-    <dimen name="taxi_order_cancel_width">1120dp</dimen>
-    <dimen name="taxi_order_cancel_btn_height">162dp</dimen>
-    <dimen name="taxi_grab_order_start_station_width">446dp</dimen>
-    <dimen name="taxi_order_nodata_width">400dp</dimen>
-    <dimen name="taxi_order_nodata_height">160dp</dimen>
-    <dimen name="taxi_reserve_item_station_width">432dp</dimen>
-    <dimen name="taxi_order_list_item_height">64dp</dimen>
-    <dimen name="taxi_order_list_show_bt_width">616dp</dimen>
-    <dimen name="taxi_order_list_show_bt_height">132dp</dimen>
-    <dimen name="taxi_order_list_tab_max_weight">300dp</dimen>
-    <dimen name="taxi_order_list_tab_min_weight">240dp</dimen>
-    <dimen name="taxi_order_list_boot_refresh_no_data_view_width">400dp</dimen>
-    <dimen name="taxi_order_list_boot_refresh_no_data_view_height">160dp</dimen>
-    <dimen name="taxi_tab_item_custom_width">280dp</dimen>
-    <dimen name="taxi_tab_item_custom_height">120dp</dimen>
-
-    <dimen name="taxi_tab_speed_width_height">220dp</dimen>
-    <dimen name="taxi_tab_autoaploit_width">420dp</dimen>
-    <dimen name="taxi_tab_autoaploit_height">220dp</dimen>
-
-    <dimen name="taxi_diver_role_size">16dp</dimen>
-
-    <dimen name="taxi_traffic_light_layout_width">225dp</dimen>
-    <dimen name="taxi_traffic_light_layout_height">154dp</dimen>
-    <dimen name="taxi_traffic_light_layout_corner">60dp</dimen>
-    <dimen name="taxi_traffic_light_layout_margin_right">40dp</dimen>
-    <dimen name="taxi_traffic_light_layout_margin_top">23dp</dimen>
-    <dimen name="taxi_traffic_light_bg_width">210dp</dimen>
-    <dimen name="taxi_traffic_light_bg_height">120dp</dimen>
-    <dimen name="taxi_traffic_light_bg_margin_left">15dp</dimen>
-    <dimen name="taxi_traffic_light_bg_margin_top">17dp</dimen>
-    <dimen name="taxi_traffic_light_icon_size">154dp</dimen>
-    <dimen name="taxi_traffic_light_time_view_width">130dp</dimen>
-    <dimen name="taxi_traffic_light_time_size">60dp</dimen>
-
-    <dimen name="taxi_passenger_txt_size">34dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
index da3c3d7e5a..089ad7c16f 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
@@ -1,65 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--  此资源适配分体机 xhdpi  -->
+    <dimen name="module_mogo_och_margin_left">40dp</dimen>
     <dimen name="module_mogo_och_margin_right">40dp</dimen>
     <dimen name="module_mogo_och_margin_bottom">46dp</dimen>
     <dimen name="module_mogo_och_margin_top">24dp</dimen>
 
-    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">345dp</dimen>
+    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">530dp</dimen>
     <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492dp</dimen>
 
-    <dimen name="module_mogo_och_slide_panel_block_start_x">15dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_block_start_y">15dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_normal_text_margin_left">40dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_normal_text_margin_right">50dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_short_text_margin_left">50dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_short_text_margin_right">70dp</dimen>
-    <dimen name="module_mogo_och_slide_panel_textSize">40dp</dimen>
+    <dimen name="module_mogo_och_slide_panel_block_start_x">20dp</dimen>
+    <dimen name="module_mogo_och_slide_panel_block_start_y">20dp</dimen>
+    <dimen name="module_mogo_och_slide_panel_normal_text_margin_left">70dp</dimen>
+    <dimen name="module_mogo_och_slide_panel_normal_text_margin_right">130dp</dimen>
+    <dimen name="module_mogo_och_slide_panel_short_text_margin_left">93dp</dimen>
+    <dimen name="module_mogo_och_slide_panel_short_text_margin_right">150dp</dimen>
+    <dimen name="module_mogo_och_slide_panel_textSize">70dp</dimen>
 
     <dimen name="module_mogo_och_autopilot_status_bg_corner">24dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_bg_width">300dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_bg_height">100dp</dimen>
+    <dimen name="module_mogo_och_autopilot_status_bg_width">460dp</dimen>
+    <dimen name="module_mogo_och_autopilot_status_bg_height">140dp</dimen>
 
-    <dimen name="module_mogo_och_operation_status_bg_width">100dp</dimen>
-    <dimen name="module_mogo_och_operation_status_bg_height">100dp</dimen>
+    <dimen name="module_mogo_och_operation_status_bg_width">102dp</dimen>
+    <dimen name="module_mogo_och_operation_status_bg_height">102dp</dimen>
 
-    <dimen name="module_mogo_och_operation_status_padding">35dp</dimen>
+    <dimen name="module_mogo_och_operation_status_padding">83dp</dimen>
 
-    <dimen name="module_mogo_och_autopilot_order_m_t">15dp</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_width">300dp</dimen>
-    <dimen name="module_mogo_och_autopilot_order_bg_height">270dp</dimen>
+    <dimen name="module_mogo_och_autopilot_order_m_t">40dp</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_width">466dp</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_height">414dp</dimen>
 
-    <dimen name="module_mogo_och_autopilot_status_text_size">30dp</dimen>
+
+    <!--    <dimen name="module_mogo_och_autopilot_status_text_size">44dp</dimen>-->
+    <dimen name="module_mogo_och_autopilot_status_text_size">46dp</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_padding_top">13dp</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12dp</dimen>
-    <dimen name="module_mogo_och_autopilot_status_text_m_l">288dp</dimen>
+    <dimen name="module_mogo_och_autopilot_status_text_m_l">350dp</dimen>
+
+
+    <dimen name="module_och_taxi_panel_width">560dp</dimen>
+    <dimen name="module_och_taxi_panel_height">910dp</dimen>
+
 
     <dimen name="module_mogo_och_notice_text_max_width">460dp</dimen>
     <dimen name="module_mogo_och_notice_text_size">30dp</dimen>
-    <dimen name="module_och_taxi_panel_width">464dp</dimen>
-    <dimen name="module_och_taxi_panel_height">310dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_marginLeft">5dp</dimen>
-    <dimen name="module_och_taxi_order_status_marginLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_marginTop">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_textSize">20dp</dimen>
+
+
+    <dimen name="module_och_taxi_order_start_station_marginLeft">15dp</dimen>
+    <dimen name="module_och_taxi_order_status_marginLeft">25dp</dimen>
+    <dimen name="module_och_taxi_order_status_marginTop">25dp</dimen>
+    <dimen name="module_och_taxi_order_status_textSize">32dp</dimen>
+
+
     <dimen name="module_och_taxi_order_status_divider_height">1dp</dimen>
     <dimen name="module_och_taxi_order_status_divider_marginLeft">20dp</dimen>
     <dimen name="module_och_taxi_order_status_divider_marginTop">20dp</dimen>
     <dimen name="module_och_taxi_order_status_divider_marginRight">20dp</dimen>
+
+
     <dimen name="module_och_taxi_order_status_stationInfo_height">140dp</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_paddingLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">20dp</dimen>
+    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">41dp</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_paddingRight">17dp</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">20dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_textSize">26dp</dimen>
-    <dimen name="module_och_taxi_order_start_station_anchor_textSize">20dp</dimen>
-    <dimen name="module_och_taxi_order_end_station_anchor_textSize">20dp</dimen>
-    <dimen name="module_och_taxi_order_distance_container_height">64dp</dimen>
+    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">41dp</dimen>
+
+
+    <dimen name="module_och_taxi_order_start_station_textSize">42dp</dimen>
+    <dimen name="module_och_taxi_order_start_station_anchor_textSize">32dp</dimen>
+    <dimen name="module_och_taxi_order_end_station_anchor_textSize">32dp</dimen>
+    <dimen name="module_och_taxi_order_distance_container_height">84dp</dimen>
     <dimen name="module_och_taxi_order_distance_container_marginLeft">3dp</dimen>
+
+
     <dimen name="module_och_taxi_order_distance_anchor_marginLeft">20dp</dimen>
-    <dimen name="module_och_taxi_order_distance_anchor_textSize">20dp</dimen>
-    <dimen name="module_och_taxi_order_distance_textSize">24dp</dimen>
+    <dimen name="module_och_taxi_order_distance_anchor_textSize">32dp</dimen>
+    <dimen name="module_och_taxi_order_distance_textSize">36dp</dimen>
+
+
     <dimen name="module_och_taxi_order_distance_marginRight">17dp</dimen>
-    <dimen name="module_och_taxi_order_text_marginRight">22.5dp</dimen>
+    <dimen name="module_och_taxi_order_text_marginRight">31.5dp</dimen>
+
 
     <dimen name="taxi_operation_data_item_width">800dp</dimen>
     <dimen name="taxi_operation_data_item_height">222dp</dimen>
@@ -83,8 +103,6 @@
     <dimen name="taxi_tab_autoaploit_width">420dp</dimen>
     <dimen name="taxi_tab_autoaploit_height">220dp</dimen>
 
-    <dimen name="module_mogo_och_margin_left">40dp</dimen>
-
     <dimen name="taxi_diver_role_size">16dp</dimen>
 
     <dimen name="taxi_traffic_light_layout_width">225dp</dimen>
diff --git a/OCH/mogo-och-taxi/src/main/res/values/styles.xml b/OCH/mogo-och-taxi/src/main/res/values/styles.xml
index 221bf2219e..4dc523b396 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/styles.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
         <item name="android:windowFrame">@null</item>
     </style>
     <style name="tabstyle" parent="android:Widget">
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">@dimen/dp_36</item>
     </style>
     <style name="och_speed_style1">
         <item name="android:textSize">74dp</item>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
index 26c294afd6..9c781d100d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
@@ -21,6 +21,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showTurnLight
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.utils.KeyBoardUtil
 import com.mogo.eagle.core.utilcode.kotlin.onClick
@@ -106,6 +107,9 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
         }
         ivDebugPanel.setOnClickListener {
             clickListener?.showDebugPanelView()
+
+
+
         }
         ivDebugFeedback.onClick {
             clickListener?.showFeedbackView()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 359d1f4080..39b28692ca 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -1165,9 +1165,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:padding="@dimen/dp_5"
-                        android:paddingStart="@dimen/dp_20"
-                        android:paddingEnd="@dimen/dp_20"
+                        android:padding="@dimen/dp_20"
                         android:text="连接司机屏IP"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_corner.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_corner.png
deleted file mode 100644
index 840089ceab..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_corner.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_smooth_route.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_smooth_route.png
deleted file mode 100644
index 99d8bd7b56..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_bus_smooth_route.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_smooth_route.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_smooth_route.png
deleted file mode 100644
index 1dcfe1d5a3..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_smooth_route.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/arrow_arrived_img.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/arrow_arrived_img.png
deleted file mode 100644
index ac919d5a4b..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/arrow_arrived_img.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/count_bg.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/count_bg.png
deleted file mode 100644
index cc905ef7b6..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/count_bg.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_bus_icon.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_bus_icon.png
deleted file mode 100644
index b1d54919d7..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_bus_icon.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_car_icon.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_car_icon.png
deleted file mode 100644
index ba8ffc5b82..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/map_car_icon.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_border_north.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_border_north.png
deleted file mode 100644
index 1c4bf333ca..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_border_north.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png
deleted file mode 100644
index fa98de96a1..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_arrived.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_arrived.png
deleted file mode 100644
index 36ef2e88d3..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_arrived.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_un_arrive.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_un_arrive.png
deleted file mode 100644
index baa35592cb..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/taxi_map_arrow_un_arrive.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_left.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_left.png
deleted file mode 100755
index 0259cb33eb..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_left.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_right.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_right.png
deleted file mode 100644
index b395889f64..0000000000
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/video_icon_right.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_corner.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_custom_corner.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_corner.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_custom_corner.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_pass_route.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_custom_pass_route.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_custom_pass_route.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_custom_pass_route.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_reset.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_reset.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset_bus.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_reset_bus.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset_bus.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_reset_bus.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset_passenger.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_reset_passenger.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset_passenger.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/amap_reset_passenger.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_bad.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_bad.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_bad.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_bad.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_grayred.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_grayred.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_grayred.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_grayred.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_green.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_green.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_green.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_green.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_no.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_no.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_no.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_no.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_slow.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_slow.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/custtexture_slow.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/custtexture_slow.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/jianbian.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/jianbian.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/jianbian.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/jianbian.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_navi_direction.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_navi_direction.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_dir_end.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_dir_end.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_dir_pass_route.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_dir_pass_route.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_dir_start.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_dir_start.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_end.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_end.png
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png
index 16a3e0d511..fa98de96a1 100644
Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png and b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png differ
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_start.png
similarity index 100%
rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png
rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_start.png
diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml
index 3a7c752ced..da872500d7 100644
--- a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml
+++ b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_push_live_video.xml
@@ -14,8 +14,8 @@
 
     <ImageView
         android:id="@+id/pushVideoClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_82"
+        android:layout_height="@dimen/dp_82"
         android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/module_common_close_selector" />
diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml
index 4d18f01ebd..07238da557 100644
--- a/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml
+++ b/core/function-impl/mogo-core-function-monitoring/src/main/res/layout/camera_view_video_layout_normal.xml
@@ -29,8 +29,8 @@
 
         <ImageView
             android:id="@+id/ivErrorIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_66"
+            android:layout_height="@dimen/dp_66"
             android:src="@drawable/icon_live_load_error"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item.xml b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item.xml
index f6375db0f6..05c207a146 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item.xml
+++ b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item.xml
@@ -7,7 +7,7 @@
     android:layout_marginTop="@dimen/module_push_ui_margin_top"
     android:background="@drawable/module_push_item_background">
 
-    <com.mogo.module.push.view.roundimage.RoundedImageView
+    <com.mogo.eagle.core.function.notice.view.roundimage.RoundedImageView
         android:id="@+id/module_push_image"
         android:layout_width="@dimen/module_push_ui_image_width"
         android:layout_height="@dimen/module_push_ui_image_height"
diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item_vertical.xml b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item_vertical.xml
deleted file mode 100644
index d7829a2fb7..0000000000
--- a/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item_vertical.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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:layout_width="@dimen/module_push_ui_width_vertical"
-    android:layout_height="wrap_content"
-    android:background="@drawable/module_push_item_background_origin"
-    android:maxHeight="@dimen/module_push_item_maxHeight_vertical"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/module_push_ui_app_icon_leftMargin_vertical"
-    android:paddingRight="@dimen/module_push_ui_app_icon_leftMargin_vertical">
-
-    <LinearLayout
-        android:id="@+id/module_push_content_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/module_push_content_paddingBottom_vertical">
-
-        <RelativeLayout
-            android:id="@+id/module_push_app_icon_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin_vertical"
-            android:layout_marginBottom="@dimen/module_push_image_marginTop_vertical"
-            android:minHeight="@dimen/module_push_ui_app_icon_size">
-
-            <ImageView
-                android:id="@+id/module_push_app_icon"
-                android:layout_width="@dimen/module_push_ui_app_icon_size"
-                android:layout_height="@dimen/module_push_ui_app_icon_size"
-                android:layout_marginRight="@dimen/module_push_title_margin_start"
-                tools:background="@drawable/module_push_ui_ic_message2" />
-
-            <TextView
-                android:id="@+id/module_push_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/module_push_app_icon"
-                android:ellipsize="end"
-                android:gravity="center_vertical|left"
-                android:maxWidth="@dimen/module_push_title_mix_width"
-                android:singleLine="true"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/module_push_ui_title_textSize"
-                tools:text="push title" />
-
-            <FrameLayout
-                android:id="@+id/module_push_progress_bar_frame"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/module_push_decrease_timer_bkg"
-                android:paddingLeft="@dimen/module_push_progress_bar_frame_padding"
-                android:paddingRight="@dimen/module_push_progress_bar_frame_padding">
-
-                <TextView
-                    android:id="@+id/module_push_timer"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textColor="#80FFFFFF"
-                    android:textSize="@dimen/module_push_ui_timer_textSize"
-                    tools:text="11s" />
-            </FrameLayout>
-        </RelativeLayout>
-
-        <com.mogo.module.push.view.roundimage.RoundedImageView
-            android:id="@+id/module_push_image"
-            android:layout_width="@dimen/module_push_ui_image_width_vertical"
-            android:layout_height="@dimen/module_push_ui_image_height_vertical"
-            android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/module_push_ui_content_marginTop_vertical"
-            android:scaleType="fitXY"
-            app:riv_corner_radius="@dimen/module_push_ui_image_corner" />
-
-        <TextView
-            android:id="@+id/module_push_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="@dimen/module_push_button_margin_top"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="4"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_push_ui_title_text_size"
-            tools:text="文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/module_push_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_push_button_height"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="@dimen/module_push_button_margin_bottom"
-        android:gravity="center">
-
-        <TextView
-            android:id="@+id/module_push_button_left"
-            android:layout_width="@dimen/module_push_button_width"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@drawable/module_push_left_button"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:lines="1"
-            android:maxWidth="@dimen/module_push_button_maxWidth"
-            android:maxLength="6"
-            android:text="查看"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/module_push_title_text_size"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/module_push_button_right"
-            android:layout_width="@dimen/module_push_button_width"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/module_push_button_right_marLeft"
-            android:layout_weight="1"
-            android:background="@drawable/module_push_right_button"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:lines="1"
-            android:maxWidth="@dimen/module_push_button_maxWidth"
-            android:maxLength="6"
-            android:text="忽略"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/module_push_title_text_size"
-            android:textStyle="bold" />
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_message_item.xml b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_message_item.xml
index a01bc6197c..27c2335ceb 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_message_item.xml
+++ b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_message_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.push.view.SwipeItemLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.eagle.core.function.notice.view.SwipeItemLayout 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:layout_width="match_parent"
@@ -102,4 +102,4 @@
             android:textColor="@color/module_push_item_title_textColor"
             android:textSize="@dimen/module_push_title_text_size" />
     </FrameLayout>
-</com.mogo.module.push.view.SwipeItemLayout>
\ No newline at end of file
+</com.mogo.eagle.core.function.notice.view.SwipeItemLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/dialog_v2x_seek_help.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
deleted file mode 100644
index 9afcb13fb0..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
+++ /dev/null
@@ -1,56 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/ivDialogBg"
-        android:layout_width="@dimen/dp_790"
-        android:layout_height="@dimen/dp_366"
-        android:background="@drawable/module_commons_dialog_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvDialogContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_75"
-        android:gravity="center"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_40"
-        app:layout_constraintEnd_toEndOf="@id/ivDialogBg"
-        app:layout_constraintStart_toStartOf="@id/ivDialogBg"
-        app:layout_constraintTop_toTopOf="@id/ivDialogBg"
-        tools:text="确定解除求助状态？" />
-
-    <TextView
-        android:id="@+id/tvDialogLeft"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/dp_130"
-        android:background="@drawable/module_commons_dialog_left_bg"
-        android:gravity="center"
-        android:textColor="@color/v2x_FFF_2896FF"
-        android:textSize="@dimen/dp_40"
-        app:layout_constraintBottom_toBottomOf="@id/ivDialogBg"
-        app:layout_constraintEnd_toStartOf="@id/tvDialogRight"
-        app:layout_constraintStart_toStartOf="@id/ivDialogBg"
-        tools:text="继续求助" />
-
-    <TextView
-        android:id="@+id/tvDialogRight"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/dp_130"
-        android:background="@drawable/module_commons_dialog_right_bg"
-        android:gravity="center"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_40"
-        app:layout_constraintBottom_toBottomOf="@id/ivDialogBg"
-        app:layout_constraintEnd_toEndOf="@id/ivDialogBg"
-        app:layout_constraintStart_toEndOf="@id/tvDialogLeft"
-        tools:text="放弃求助" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml
deleted file mode 100644
index 1f78233f39..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/footer_nomore_view.xml
+++ /dev/null
@@ -1,42 +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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/dp_102"
-    android:layout_marginEnd="@dimen/dp_102"
-    android:paddingTop="@dimen/dp_56"
-    android:paddingBottom="@dimen/dp_56">
-
-    <View
-        android:id="@+id/viewLinStart"
-        android:layout_width="@dimen/dp_22"
-        android:layout_height="1dp"
-        android:layout_marginRight="16dp"
-        android:background="@color/share_event_no_more_color"
-        app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
-        app:layout_constraintEnd_toStartOf="@+id/tvNoMoreDataTrip"
-        app:layout_constraintTop_toTopOf="@+id/tvNoMoreDataTrip" />
-
-    <TextView
-        android:id="@+id/tvNoMoreDataTrip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="没有更多记录了"
-        android:textColor="@color/share_event_no_more_color"
-        android:textSize="@dimen/dp_26"
-        app:layout_constraintEnd_toStartOf="parent"
-        app:layout_constraintStart_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <View
-        android:id="@+id/viewLinEnd"
-        android:layout_width="@dimen/dp_22"
-        android:layout_height="1dp"
-        android:layout_marginLeft="16dp"
-        android:background="@color/share_event_no_more_color"
-        app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
-        app:layout_constraintStart_toEndOf="@+id/tvNoMoreDataTrip"
-        app:layout_constraintTop_toTopOf="@+id/tvNoMoreDataTrip" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml
deleted file mode 100644
index a87f69c85b..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml
+++ /dev/null
@@ -1,286 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingTop="@dimen/dp_20"
-    android:paddingBottom="@dimen/dp_20"
-    app:roundLayoutRadius="@dimen/dp_30">
-
-    <com.mogo.eagle.core.widget.RoundLayout
-        android:id="@+id/rlRoadEventImg"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/dp_20"
-        android:background="@color/v2x_555A_F5F5"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_18">
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/ivEventImg"
-            android:layout_width="@dimen/module_v2x_event_image_width"
-            android:layout_height="@dimen/module_v2x_event_image_height"
-            android:scaleType="center"
-            app:miv_failureHolder="@drawable/v2x_icon_live_logo"
-            app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
-            app:miv_placeHolder="@drawable/v2x_icon_live_logo" />
-
-        <ImageView
-            android:id="@+id/ivEventPlay"
-            android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_100"
-            android:layout_centerInParent="true"
-            android:src="@drawable/v2x_icon_event_play"
-            android:visibility="gone" />
-
-    </com.mogo.eagle.core.widget.RoundLayout>
-
-    <TextView
-        android:id="@+id/tvEventTypeTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_10"
-        android:background="@drawable/bg_v2x_event_type_blue"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_3"
-        android:textColor="#fff"
-        android:textSize="@dimen/module_v2x_event_type_title_text_size"
-        app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
-        app:layout_constraintTop_toTopOf="@+id/rlRoadEventImg"
-        tools:text="道路施工" />
-
-    <TextView
-        android:id="@+id/tvEventAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_5"
-        android:layout_marginRight="@dimen/dp_30"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/module_v2x_event_title_text_size"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
-        app:layout_constraintStart_toStartOf="@+id/tvEventTypeTitle"
-        app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle"
-        tools:text="东城区北三环中路辅路小黄庄路口" />
-
-    <ImageView
-        android:id="@+id/ivEventDistanceLogo"
-        android:layout_width="@dimen/dp_35"
-        android:layout_height="@dimen/dp_35"
-        android:layout_marginTop="@dimen/dp_5"
-        android:src="@drawable/v2x_icon_help_navi"
-        app:layout_constraintStart_toStartOf="@id/tvEventTypeTitle"
-        app:layout_constraintTop_toBottomOf="@+id/tvEventAddress" />
-
-    <TextView
-        android:id="@+id/tvEventDistance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:alpha="0.6"
-        android:textColor="@color/v2x_FFF_666"
-        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"
-        tools:text="距离 300m" />
-
-    <TextView
-        android:id="@+id/tvEventTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_30"
-        android:alpha="0.6"
-        android:textColor="@color/v2x_FFF_999"
-        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"
-        tools:text="2020/01/02 12:54" />
-
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivEventHead"
-        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"
-        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" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_10"
-        android:gravity="center"
-        android:orientation="horizontal"
-        app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
-        app:layout_constraintTop_toBottomOf="@+id/ivEventDistanceLogo">
-
-        <ImageView
-            android:id="@+id/ivEventLive"
-            android:layout_width="@dimen/module_v2x_event_button_size_detail"
-            android:layout_height="@dimen/module_v2x_event_button_size_detail"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:padding="@dimen/dp_15"
-            android:src="@drawable/selector_live_btn"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/ivEventReportTrue"
-            android:layout_width="@dimen/module_v2x_event_button_size_detail"
-            android:layout_height="@dimen/module_v2x_event_button_size_detail"
-            android:padding="@dimen/dp_15"
-            android:scaleType="fitXY"
-            android:src="@drawable/v2x_selector_icon_report_true"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-            app:layout_constraintStart_toEndOf="@id/ivEventLive"
-            app:layout_goneMarginLeft="@dimen/dp_10"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/ivEventReportErr"
-            android:layout_width="@dimen/module_v2x_event_button_size_detail"
-            android:layout_height="@dimen/module_v2x_event_button_size_detail"
-            android:padding="@dimen/dp_15"
-            android:src="@drawable/v2x_selector_icon_report_err"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-            app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
-            app:layout_goneMarginLeft="@dimen/dp_10"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/ivEventCallChart"
-            android:layout_width="@dimen/module_v2x_event_button_size_detail"
-            android:layout_height="@dimen/module_v2x_event_button_size_detail"
-            android:padding="@dimen/dp_15"
-            android:src="@drawable/selector_talk_btn"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-            app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
-            app:layout_goneMarginLeft="@dimen/dp_10"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/ivEventEventNav"
-            android:layout_width="@dimen/module_v2x_event_button_size_detail"
-            android:layout_height="@dimen/module_v2x_event_button_size_detail"
-            android:padding="@dimen/dp_15"
-            android:src="@drawable/selector_nav_btn"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-            app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
-            app:layout_goneMarginLeft="@dimen/dp_10"
-            tools:visibility="visible" />
-
-        <com.mogo.eagle.core.function.v2x.events.view.HeartLikeView
-            android:id="@+id/ivEventZan"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/dp_15"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-            app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
-            app:layout_goneMarginLeft="@dimen/dp_10"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_140"
-        android:background="@drawable/bg_v2x_event_bg"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/iv_event"
-            android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginLeft="@dimen/dp_30"
-            android:scaleType="fitXY"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:miv_failureHolder="@drawable/v2x_icon_live_logo"
-            app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
-            app:miv_placeHolder="@drawable/v2x_icon_live_logo"
-            app:miv_topLeftRadius="@dimen/dp_20" />
-
-        <LinearLayout
-            android:id="@+id/ll_event"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/iv_event"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/tv_event"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="@dimen/dp_480"
-                android:paddingLeft="@dimen/dp_40"
-                android:paddingRight="@dimen/dp_40"
-                android:textColor="@color/v2x_white"
-                android:textSize="@dimen/dp_32" />
-
-            <ImageView
-                android:id="@+id/iv_play"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/dp_40"
-                android:src="@drawable/icon_play"
-                android:visibility="gone" />
-        </LinearLayout>
-
-
-        <TextView
-            android:id="@+id/tv_line"
-            android:layout_width="@dimen/dp_0_5"
-            android:layout_height="@dimen/dp_70"
-            android:background="@color/v2x_white"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tv_play"
-            app:layout_constraintStart_toEndOf="@+id/ll_event"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_play"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_140"
-            android:gravity="center"
-            android:paddingLeft="@dimen/dp_40"
-            android:paddingRight="@dimen/dp_40"
-            android:text="播放"
-            android:textColor="@color/v2x_event_play_text"
-            android:textSize="@dimen/dp_30"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
deleted file mode 100644
index a054e62a0c..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:layout_width="@dimen/module_v2x_road_event_window_width_vr"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:gravity="center">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/dp_822"
-        android:layout_height="@dimen/dp_182"
-        android:background="@drawable/v2x_tip_bg"
-        android:clipChildren="true"
-        android:visibility="gone">
-
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/ivEventImg"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginStart="@dimen/dp_30"
-            android:layout_marginBottom="@dimen/dp_42"
-            android:scaleType="fitXY"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:miv_failureHolder="@drawable/v2x_icon_live_logo"
-            app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
-            app:miv_placeHolder="@drawable/v2x_icon_live_logo"
-            app:miv_topLeftRadius="@dimen/dp_20" />
-
-        <ImageView
-            android:id="@+id/ivEventPlay"
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
-            android:layout_centerInParent="true"
-            android:src="@drawable/v2x_icon_event_play"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/ivEventImg"
-            app:layout_constraintEnd_toEndOf="@id/ivEventImg"
-            app:layout_constraintStart_toStartOf="@id/ivEventImg"
-            app:layout_constraintTop_toTopOf="@id/ivEventImg" />
-
-        <TextView
-            android:id="@+id/tvEventTypeTitle"
-            android:layout_width="@dimen/dp_120"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginStart="@dimen/dp_31"
-            android:layout_marginBottom="@dimen/dp_42"
-            android:background="@drawable/bg_v2x_event_type_red_vr"
-            android:gravity="center"
-            android:paddingLeft="@dimen/dp_10"
-            android:paddingTop="@dimen/dp_2"
-            android:paddingRight="@dimen/dp_10"
-            android:paddingBottom="@dimen/dp_3"
-            android:textColor="#fff"
-            android:textSize="@dimen/module_v2x_event_type_title_text_size"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:text="道路施工" />
-
-
-        <ImageView
-            android:id="@+id/ivEventDistanceLogo"
-            android:layout_width="@dimen/dp_35"
-            android:layout_height="@dimen/dp_35"
-            android:layout_marginTop="@dimen/dp_5"
-            android:src="@drawable/v2x_icon_help_navi"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvEventAddress" />
-
-        <TextView
-            android:id="@+id/tvEventDistance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_10"
-            android:alpha="0.6"
-            android:textColor="@color/v2x_FFF_666"
-            android:textSize="@dimen/module_v2x_event_sub_title_text_size"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo"
-            app:layout_constraintStart_toEndOf="@id/ivEventDistanceLogo"
-            app:layout_constraintTop_toTopOf="@id/ivEventDistanceLogo"
-            tools:text="距离 300m" />
-
-        <TextView
-            android:id="@+id/tvEventTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_30"
-            android:alpha="0.6"
-            android:textColor="@color/v2x_FFF_999"
-            android:textSize="@dimen/module_v2x_event_sub_title_text_size"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo"
-            app:layout_constraintStart_toEndOf="@+id/tvEventDistance"
-            app:layout_constraintTop_toTopOf="@id/ivEventDistanceLogo"
-            tools:text="2020/01/02 12:54" />
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/ivEventHead"
-            android:layout_width="@dimen/module_v2x_event_head_size"
-            android:layout_height="@dimen/module_v2x_event_head_size"
-            android:layout_marginEnd="@dimen/dp_28"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:miv_borderColor="#4cffffff"
-            app:miv_failureHolder="@drawable/icon_default_user_head"
-            app:miv_overlayImageId="@drawable/icon_default_user_head"
-            app:miv_placeHolder="@drawable/icon_default_user_head"
-            app:miv_shape="circle"
-            app:miv_shapeBorderWidth="@dimen/dp_4" />
-
-        <LinearLayout
-            android:id="@+id/rightLinear"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/dp_34"
-            android:layout_marginBottom="@dimen/dp_26"
-            android:gravity="center"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/tvEventAddress"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/ivEventLive"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:padding="@dimen/dp_15"
-                android:src="@drawable/selector_live_btn_vr"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/ivEventReportTrue"
-                android:layout_width="@dimen/module_v2x_event_button_size_detail_vr"
-                android:layout_height="@dimen/module_v2x_event_button_size_detail_vr"
-                android:padding="@dimen/dp_15"
-                android:scaleType="fitXY"
-                android:src="@drawable/v2x_selector_icon_report_true"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-                app:layout_constraintStart_toEndOf="@id/ivEventLive"
-                app:layout_goneMarginLeft="@dimen/dp_10"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/ivEventReportErr"
-                android:layout_width="@dimen/module_v2x_event_button_size_detail_vr"
-                android:layout_height="@dimen/module_v2x_event_button_size_detail_vr"
-                android:padding="@dimen/dp_15"
-                android:src="@drawable/v2x_selector_icon_report_err"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-                app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
-                app:layout_goneMarginLeft="@dimen/dp_10"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/ivEventCallChart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_15"
-                android:src="@drawable/selector_talk_btn_vr"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-                app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
-                app:layout_goneMarginLeft="@dimen/dp_10"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/ivEventEventNav"
-                android:layout_width="@dimen/module_v2x_event_button_size_detail_vr"
-                android:layout_height="@dimen/module_v2x_event_button_size_detail_vr"
-                android:padding="@dimen/dp_15"
-                android:src="@drawable/selector_nav_btn"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-                app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
-                app:layout_goneMarginLeft="@dimen/dp_10"
-                tools:visibility="visible" />
-
-            <com.mogo.eagle.core.function.v2x.events.view.HeartLikeView
-                android:id="@+id/ivEventZan"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_15"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-                app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
-                app:layout_goneMarginLeft="@dimen/dp_10"
-                tools:visibility="visible" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tvEventAddress"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_5"
-            android:layout_marginBottom="4dp"
-            android:maxLines="1"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/dp_40"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/rightLinear"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@+id/ivEventImg"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.363"
-            tools:text="东城区北三环中路辅路小黄庄路口当前位置属于测试数据,看一下换行" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/module_v2x_road_event_height"
-        android:background="@drawable/bg_v2x_event_bg">
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/iv_event"
-            android:layout_width="@dimen/module_v2x_road_event_icon_width"
-            android:layout_height="@dimen/module_v2x_road_event_icon_height"
-            android:layout_marginLeft="@dimen/module_v2x_road_event_icon_margin_left"
-            android:scaleType="fitXY"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:miv_failureHolder="@drawable/v2x_icon_live_logo"
-            app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
-            app:miv_placeHolder="@drawable/v2x_icon_live_logo"
-            app:miv_topLeftRadius="@dimen/dp_20" />
-
-        <LinearLayout
-            android:id="@+id/ll_event"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/iv_event"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/tv_event"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/module_v2x_road_event_icon_margin_left"
-                android:layout_marginRight="@dimen/module_v2x_road_event_icon_margin_left"
-                android:maxWidth="@dimen/dp_480"
-                android:textColor="@color/v2x_white_color"
-                android:textSize="@dimen/module_v2x_road_event_text_size" />
-
-            <ImageView
-                android:id="@+id/iv_play"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/module_v2x_road_event_icon_margin_left"
-                android:layout_marginTop="@dimen/module_v2x_road_event_icon_play_margin_top"
-                android:src="@drawable/icon_play"
-                android:visibility="gone" />
-        </LinearLayout>
-
-
-        <TextView
-            android:id="@+id/tv_line"
-            android:layout_width="@dimen/dp_0_5"
-            android:layout_height="@dimen/dp_70"
-            android:alpha="0.3"
-            android:background="@color/v2x_line_color"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tv_play"
-            app:layout_constraintStart_toEndOf="@+id/ll_event"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/tv_play"
-            android:layout_width="@dimen/module_v2x_road_event_height"
-            android:layout_height="@dimen/module_v2x_road_event_height"
-            android:gravity="center"
-            android:text="播放"
-            android:textColor="@color/v2x_event_play_text"
-            android:textSize="@dimen/module_v2x_road_event_text_play_text_size"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
deleted file mode 100644
index 644113fcf9..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/dp_40"
-    android:paddingBottom="@dimen/dp_40">
-
-    <Button
-        android:id="@+id/event_share_load_status"
-        android:layout_width="@dimen/v2x_share_btn_width"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:background="@drawable/module_dw_common_corner_bkg_light"
-        android:gravity="center"
-        android:paddingTop="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_12"
-        android:text="查看更早记录"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_34" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_ugc.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_ugc.xml
deleted file mode 100644
index e465d4f012..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_ugc.xml
+++ /dev/null
@@ -1,58 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingEnd="@dimen/dp_62">
-
-    <ImageView
-        android:id="@+id/ivEventTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/dp_31"
-        android:src="@drawable/v_to_x_event_ugc_fenglu"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvEventUgcTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_50"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/module_v2x_event_help_title_text_size"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventTypeIcon"
-        app:layout_constraintEnd_toStartOf="@+id/ivEventReportTrue"
-        app:layout_constraintStart_toEndOf="@id/ivEventTypeIcon"
-        app:layout_constraintTop_toTopOf="@+id/ivEventTypeIcon"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="你刚路过的路段堵不堵？您可以直接对我说拥赌、或者不堵。" />
-
-
-    <ImageView
-        android:id="@+id/ivEventReportTrue"
-        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/v2x_selector_icon_report_true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ivEventReportErr"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/ivEventReportErr"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:src="@drawable/v2x_selector_icon_report_err"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
deleted file mode 100644
index 5e22e301ec..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
+++ /dev/null
@@ -1,91 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlContent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_62"
-    android:paddingTop="@dimen/dp_42"
-    android:paddingEnd="@dimen/dp_62"
-    android:paddingBottom="@dimen/dp_42"
-    app:roundLayoutRadius="@dimen/dp_40"
-    tools:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/ivIconP"
-        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"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="@dimen/v2x_driving_width"
-        android:layout_height="@dimen/v2x_driving_heigt"
-        android:layout_marginStart="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/bg_fatigue_driving"
-        android:gravity="center"
-        android:text="@string/recommended_Parking"
-        android:textColor="@color/v2x_item_white"
-        android:textSize="@dimen/v2x_recommond_route_size"
-        app:layout_constraintBottom_toTopOf="@+id/tvAddress"
-        app:layout_constraintStart_toEndOf="@+id/ivIconP"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_15"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:layout_marginBottom="@dimen/dp_20"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/module_v2x_event_parking_text_size"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tvAddressDistance"
-        app:layout_constraintStart_toStartOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        tools:text="停车场｜服务区地址" />
-
-    <TextView
-        android:id="@+id/tvAddressDistance"
-        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/module_v2x_event_help_distance_text_size"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
-        app:layout_constraintEnd_toStartOf="@+id/ivToNav"
-        app:layout_constraintTop_toTopOf="@+id/ivToNav"
-        tools:text="300m"
-        android:visibility="invisible"/>
-
-    <ImageView
-        android:id="@+id/ivToNav"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:visibility="invisible"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:src="@drawable/selector_nav_btn"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/ivClose"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/ivClose"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:src="@drawable/v2x_selector_icon_report_err"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help.xml
deleted file mode 100644
index 69457d9ee3..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ /dev/null
@@ -1,121 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_62"
-    android:paddingTop="@dimen/dp_42"
-    android:paddingEnd="@dimen/dp_62"
-    android:paddingBottom="@dimen/dp_42"
-    tools:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        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_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/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/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"
-            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/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/module_v2x_event_help_title_text_size"
-            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/tvFaultHelpEventTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:alpha="0.59"
-            android:textColor="@color/v2x_FFF_999"
-            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发布求助信息" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <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/module_v2x_event_help_distance_text_size"
-        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/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:visibility="gone"
-        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>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
deleted file mode 100644
index 76ea453a96..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
+++ /dev/null
@@ -1,115 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/module_v2x_fault_help_width"
-    android:layout_height="@dimen/module_v2x_fault_help_height"
-    android:layout_marginTop="@dimen/dp_8"
-    android:background="@drawable/bg_v2x_event_bg"
-    tools:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/module_v2x_fault_help_height"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/ivFaultHelpHead"
-            android:layout_width="@dimen/module_v2x_fault_help_height"
-            android:layout_height="@dimen/module_v2x_fault_help_height"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.0"
-            app:miv_failureHolder="@drawable/icon_default_user_head"
-            app:miv_overlayImageId="@drawable/icon_default_user_head"
-            app:miv_placeHolder="@drawable/icon_default_user_head" />
-
-        <TextView
-            android:id="@+id/tvImgTextContent"
-            android:layout_width="@dimen/module_v2x_fault_help_img_content_width"
-            android:layout_height="@dimen/module_v2x_fault_help_img_content_height"
-            android:layout_marginTop="15dp"
-            android:background="@drawable/bg_v2x_event_type_orange_vr"
-            android:gravity="center"
-            android:paddingTop="2dp"
-            android:paddingBottom="@dimen/dp_5"
-            android:text="求助"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_v2x_fault_help_img_content_text_size"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/ivFaultHelpHead"
-            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_24"
-            android:layout_marginTop="@dimen/module_v2x_fault_help_name_margin_top"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/module_v2x_fault_help_name_text_size"
-            android:textStyle="bold"
-            app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_goneMarginStart="@dimen/dp_22"
-            tools:text="车主昵称" />
-
-        <TextView
-            android:id="@+id/tvFaultHelpEventTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_24"
-            android:layout_marginBottom="@dimen/module_v2x_fault_help_time_margin_bottom"
-            android:alpha="0.59"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/module_v2x_fault_help_time_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-            tools:text="15:30发布求助信息" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <TextView
-        android:id="@+id/tvFaultHelpDistance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_42"
-        android:layout_marginRight="@dimen/dp_42"
-        android:gravity="center_vertical"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/module_v2x_fault_help_distance_text_size"
-        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
-        tools:text="300M" />
-
-    <ImageView
-        android:id="@+id/ivFaultHelpEventCall"
-        android:layout_width="@dimen/module_v2x_fault_help_event_call_width"
-        android:layout_height="@dimen/module_v2x_fault_help_event_call_width"
-        android:layout_marginRight="@dimen/dp_40"
-        android:src="@drawable/v2x_event_icon_tel_vr"
-        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_fault_help_event_call_width"
-        android:layout_height="@dimen/module_v2x_fault_help_event_call_width"
-        android:layout_marginRight="@dimen/module_v2x_fault_help_event_navi_margin_right"
-        android:src="@drawable/v2x_event_icon_daohang_vr"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
deleted file mode 100644
index 1a0f011c8c..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
+++ /dev/null
@@ -1,89 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlContent"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_62"
-    android:paddingTop="@dimen/dp_42"
-    android:paddingEnd="@dimen/dp_62"
-    android:paddingBottom="@dimen/dp_42">
-
-    <ImageView
-        android:id="@+id/ivIconP"
-        android:layout_width="@dimen/module_v2x_event_icon_size"
-        android:layout_height="@dimen/module_v2x_event_icon_size"
-        android:src="@drawable/icon_illegal_parking"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        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/module_v2x_event_type_title_text_size"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/tvAddress"
-        app:layout_constraintStart_toEndOf="@+id/ivIconP"
-        app:layout_constraintTop_toTopOf="@+id/ivIconP" />
-
-    <TextView
-        android:id="@+id/tvAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_8"
-        android:layout_marginRight="@dimen/dp_30"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/v2x_FFF_333"
-        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"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
-
-    <TextView
-        android:id="@+id/tvIllegalNum"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:alpha="0.6"
-        android:gravity="center_vertical"
-        android:textColor="@color/v2x_FFF_666"
-        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"
-        tools:text="违章人数：10人" />
-
-    <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" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml
deleted file mode 100644
index 26cd521e09..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml
+++ /dev/null
@@ -1,104 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlContent"
-    android:layout_width="@dimen/dp_822"
-    android:layout_height="@dimen/dp_182"
-    android:layout_marginTop="@dimen/dp_8"
-    android:background="@drawable/v2x_tip_bg">
-
-    <ImageView
-        android:id="@+id/leftImageView"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginStart="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginBottom="@dimen/dp_42"
-        android:src="@drawable/bg_v2x_red_two_round_vr"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/ivIconP"
-        android:layout_width="@dimen/dp_100"
-        android:layout_height="@dimen/dp_100"
-        android:src="@drawable/icon_illegal_parking_vr"
-        app:layout_constraintBottom_toBottomOf="@+id/leftImageView"
-        app:layout_constraintEnd_toEndOf="@+id/leftImageView"
-        app:layout_constraintStart_toStartOf="@+id/leftImageView"
-        app:layout_constraintTop_toTopOf="@+id/leftImageView" />
-
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        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_40"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/leftImageView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.409" />
-
-    <TextView
-        android:id="@+id/tvAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_8"
-        android:layout_marginRight="@dimen/dp_30"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/module_v2x_event_title_text_size"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/tvAddressDistance"
-        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
-        app:layout_constraintStart_toStartOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
-
-    <TextView
-        android:id="@+id/tvIllegalNum"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:alpha="0.6"
-        android:gravity="center_vertical"
-        android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/module_v2x_event_sub_title_text_size"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@+id/tvAddress"
-        app:layout_constraintStart_toStartOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tvAddress"
-        tools:text="违章人数：10人" />
-
-    <com.mogo.eagle.core.function.v2x.events.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"
-        app:layout_constraintVertical_bias="0.463" />
-
-    <com.mogo.eagle.core.function.v2x.events.view.HeartUnLikeView
-        android:id="@+id/llIllegalParkingUnLike"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_60"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.463" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video.xml
deleted file mode 100644
index 9dd3d034d5..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video.xml
+++ /dev/null
@@ -1,37 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:clipToPadding="false">
-
-    <com.mogo.eagle.core.function.v2x.events.view.V2XLiveGSYVideoView
-        android:id="@+id/videoPlayer"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30" />
-
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivReportHead"
-        android:layout_width="@dimen/dp_80"
-        android:layout_height="@dimen/dp_80"
-        android:layout_marginEnd="@dimen/dp_31"
-        android:layout_marginBottom="@dimen/dp_14"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/videoPlayer"
-        app:layout_constraintEnd_toEndOf="@+id/videoPlayer"
-        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"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video_vr.xml
deleted file mode 100644
index 7f4a1d3b7a..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_live_video_vr.xml
+++ /dev/null
@@ -1,37 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/v2x_bg_pop_up"
-    android:clipToPadding="false">
-
-    <com.mogo.eagle.core.function.v2x.events.view.V2XLiveGSYVideoView
-        android:id="@+id/videoPlayer"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_window_height_vr_for_item"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_20" />
-
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivReportHead"
-        android:layout_width="@dimen/dp_80"
-        android:layout_height="@dimen/dp_80"
-        android:layout_marginEnd="@dimen/dp_31"
-        android:layout_marginBottom="@dimen/dp_14"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/videoPlayer"
-        app:layout_constraintEnd_toEndOf="@+id/videoPlayer"
-        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"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_event_detail.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
deleted file mode 100644
index f6dcc026c4..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
+++ /dev/null
@@ -1,127 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.mogo.eagle.core.widget.RoundLayout
-        android:id="@+id/rlRoadEventList"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_push_img_height"
-        android:background="@drawable/v2x_alert_window_bg"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30">
-
-        <com.mogo.eagle.core.widget.RoundLayout
-            android:id="@+id/rlRoadEventImg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:roundLayoutRadius="@dimen/dp_30">
-
-            <com.mogo.service.imageloader.MogoImageView
-                android:id="@+id/ivImg"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="fitXY"
-                app:actualImageScaleType="fitXY" />
-
-        </com.mogo.eagle.core.widget.RoundLayout>
-    </com.mogo.eagle.core.widget.RoundLayout>
-
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivReportHead"
-        android:layout_width="@dimen/dp_80"
-        android:layout_height="@dimen/dp_80"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/dp_31"
-        android:layout_marginBottom="@dimen/dp_14"
-        app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventList"
-        app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-        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" />
-
-    <View
-        android:id="@+id/guideline1"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="@dimen/module_v2x_search_marginLeft"
-        android:layout_marginEnd="@dimen/module_v2x_operation_panel_share_goneMarginRight"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventList"
-        app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-        app:layout_constraintStart_toStartOf="@+id/rlRoadEventList" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_25"
-        app:layout_constraintBottom_toBottomOf="@+id/guideline1"
-        app:layout_constraintStart_toStartOf="@+id/guideline1"
-        app:layout_constraintTop_toTopOf="@+id/guideline1">
-
-        <ImageView
-            android:id="@+id/ivRoadReportTrue"
-            android:layout_width="@dimen/dp_123"
-            android:layout_height="@dimen/dp_123"
-            android:layout_marginStart="@dimen/dp_25"
-            android:padding="@dimen/dp_10"
-            android:src="@drawable/icon_report_true"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/ivRoadReportErr"
-            android:layout_width="@dimen/dp_123"
-            android:layout_height="@dimen/dp_123"
-            android:padding="@dimen/dp_10"
-            android:src="@drawable/icon_report_err"
-            android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/ivRoadReportTrue"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/ivRoadCallChart"
-            android:layout_width="@dimen/dp_123"
-            android:layout_height="@dimen/dp_123"
-            android:padding="@dimen/dp_10"
-            android:src="@drawable/selector_talk_btn"
-            android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/ivRoadReportErr"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/ivRoadEventNav"
-            android:layout_width="@dimen/dp_123"
-            android:layout_height="@dimen/dp_123"
-            android:padding="@dimen/dp_10"
-            android:src="@drawable/selector_nav_btn"
-            android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/ivRoadCallChart"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <ImageView
-            android:id="@+id/ivRoadEventLike"
-            android:layout_width="@dimen/dp_123"
-            android:layout_height="@dimen/dp_123"
-            android:padding="@dimen/dp_10"
-            android:src="@drawable/v2x_event_icon_zan"
-            android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/ivRoadEventNav"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video.xml
deleted file mode 100644
index 2ea320afbc..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-    android:clipToPadding="false">
-
-    <include
-        android:id="@+id/liveVideo"
-        layout="@layout/item_v2x_live_video"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <ImageView
-        android:id="@+id/pushVideoClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/module_common_close_selector" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml
deleted file mode 100644
index 87cf9c95f0..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_see_live_window_height_vr"
-    android:layout_marginTop="@dimen/module_v2x_event_window_top_margin_vr"
-    android:clipToPadding="false">
-
-    <include
-        android:id="@+id/liveVideo"
-        layout="@layout/item_v2x_live_video_vr"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentEnd="true" />
-
-    <ImageView
-        android:id="@+id/pushVideoClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/module_v2x_vr_close" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_recommend_route.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_recommend_route.xml
deleted file mode 100644
index bd5e97b589..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_recommend_route.xml
+++ /dev/null
@@ -1,75 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlContent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/v2x_alert_window_bg"
-
-    app:roundLayoutRadius="@dimen/dp_40"
-    tools:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/ivIconP"
-        android:layout_width="@dimen/module_v2x_fatigue_driving_window_height_ground"
-        android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
-        android:src="@drawable/v2x_icon_route"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="@dimen/v2x_driving_width"
-        android:layout_height="@dimen/v2x_driving_heigt"
-        android:layout_marginStart="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_56"
-        android:background="@drawable/bg_fatigue_driving"
-        android:gravity="center"
-        android:text="@string/recommended_route"
-        android:textColor="@color/v2x_item_white"
-        android:textSize="@dimen/v2x_recommond_route_size"
-        app:layout_constraintBottom_toTopOf="@+id/tvAddress"
-        app:layout_constraintStart_toEndOf="@+id/ivIconP"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_15"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:layout_marginBottom="@dimen/dp_56"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/module_v2x_event_parking_text_size"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/ivToNav"
-        app:layout_constraintStart_toStartOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        tools:text="前往 xxx" />
-
-
-    <ImageView
-        android:id="@+id/ivToNav"
-        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/v2x_to_nav"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/ivClose"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/ivClose"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:layout_marginEnd="@dimen/dp_62"
-        android:src="@drawable/v2x_selector_icon_report_err"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
deleted file mode 100644
index 23a3d497b3..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
+++ /dev/null
@@ -1,50 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/v2x_video_window_height_content"
-    android:clipToPadding="false">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvRoadEventList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:overScrollMode="never"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/item_v2x_live_video" />
-
-    <TextView
-        android:id="@+id/tvEventStubClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginRight="@dimen/dp_20"
-        android:background="@drawable/bg_count_down"
-        android:paddingLeft="@dimen/dp_12"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="30s"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_30"
-        app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_130"
-        android:layout_height="@dimen/dp_46"
-        android:layout_alignParentEnd="true"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:src="@drawable/v2x_icon_event_live_top"
-        app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml
deleted file mode 100644
index a0ee2aa753..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml
+++ /dev/null
@@ -1,50 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_366"
-    android:clipToPadding="false">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvRoadEventList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:overScrollMode="never"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/item_v2x_live_video_vr" />
-
-    <TextView
-        android:id="@+id/tvEventStubClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginRight="@dimen/dp_20"
-        android:background="@drawable/bg_count_down"
-        android:paddingLeft="@dimen/dp_12"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="30s"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_30"
-        app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
-
-    <ImageView
-        android:layout_width="@dimen/dp_130"
-        android:layout_height="@dimen/dp_46"
-        android:layout_alignParentEnd="true"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:src="@drawable/v2x_icon_event_live_top"
-        app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml
deleted file mode 100644
index fc9227f505..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ /dev/null
@@ -1,106 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlContent"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_v2x_event_list_item">
-
-    <ImageView
-        android:id="@+id/ivIconP"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:src="@drawable/icon_illegal_parking"
-        app:layout_constraintRight_toLeftOf="@+id/tvAddress"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        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/share_item_address"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
-        app:layout_constraintStart_toStartOf="@id/tagEventType"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
-
-    <TextView
-        android:id="@+id/tvIllegalNum"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:alpha="0.6"
-        android:gravity="center_vertical"
-        android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/dp_26"
-        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/tagEventType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_40"
-        android:layout_marginTop="@dimen/dp_12"
-        android:layout_marginBottom="@dimen/dp_36"
-        android:background="@drawable/bg_v2x_event_type_read"
-        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/panel_list_item_title_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvIllegalNum" />
-
-    <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/panel_list_item_title_size"
-        app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
-        app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tagEventType" />
-
-    <com.mogo.eagle.core.function.v2x.events.view.HeartLikeView
-        android:id="@+id/llIllegalParkingLike"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/dp_40"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
-        app:layout_constraintTop_toTopOf="parent"
-        app:showGrayBack="true" />
-
-    <com.mogo.eagle.core.function.v2x.events.view.HeartUnLikeView
-        android:id="@+id/llIllegalParkingUnLike"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/dp_40"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
deleted file mode 100644
index 88ccac06e9..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
+++ /dev/null
@@ -1,132 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlContent"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_v2x_event_list_item">
-
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivFaultHelpHead"
-        android:layout_width="@dimen/module_v2x_history_event_icon_size"
-        android:layout_height="@dimen/module_v2x_history_event_icon_size"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/dp_40"
-        android:layout_marginEnd="@dimen/dp_31"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:miv_borderColor="#3381A4DC"
-        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_5" />
-
-    <TextView
-        android:id="@+id/tvFaultHelpName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_30"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/share_item_address"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginStart="@dimen/dp_22"
-        tools:text="车主昵称" />
-
-    <TextView
-        android:id="@+id/tvFaultHelpEventTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_17"
-        android:alpha="0.59"
-        android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/dp_26"
-        app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
-        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
-        tools:text="15:30发布求助信息" />
-
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_11"
-        android:layout_marginBottom="@dimen/dp_36"
-        android:background="@drawable/bg_v2x_event_type_orange"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        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_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@+id/tvFaultHelpName"
-        app:layout_constraintTop_toBottomOf="@+id/tvFaultHelpEventTime" />
-
-    <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" />
-
-    <TextView
-        android:id="@+id/tvFaultHelpDistance"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_33"
-        android:layout_marginTop="@dimen/dp_5"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_40"
-        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tvFaultHelpEventTime"
-        tools:text="300米" />
-
-    <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/module_common_selector_call"
-        android:visibility="gone"
-        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:layout_marginRight="@dimen/dp_40"
-        android:src="@drawable/selector_nav_history"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_crossroad_live_video.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_crossroad_live_video.xml
deleted file mode 100644
index f44d61602f..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_crossroad_live_video.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundLayout 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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#3B4577"
-    android:gravity="center"
-    app:roundLayoutRadius="@dimen/dp_30"
-    tools:layout_height="@dimen/module_v2x_event_see_live_window_height">
-
-    <ImageView
-        android:layout_width="@dimen/dp_110"
-        android:layout_height="@dimen/dp_110"
-        android:layout_centerInParent="true"
-        android:src="@drawable/v2x_icon_live_logo" />
-
-    <com.mogo.eagle.core.function.v2x.events.view.V2XCrossRoadVideoView
-        android:id="@+id/videoPlayer"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_20" />
-
-    <ImageView
-        android:id="@+id/ivVideoPlayingSign"
-        android:layout_width="@dimen/dp_130"
-        android:layout_height="@dimen/dp_48"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginEnd="@dimen/dp_20"
-        android:src="@drawable/v2x_icon_event_live_top"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/tvCountDown"
-        android:layout_width="@dimen/dp_76"
-        android:layout_height="@dimen/dp_48"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/v2x_shape_bg_count_down_corner_14"
-        android:gravity="center"
-        android:text="s"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_30"
-        android:visibility="gone" />
-
-</com.mogo.eagle.core.widget.RoundLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video.xml
deleted file mode 100644
index f45e60eafa..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-    android:background="#3D4053"
-    android:gravity="center"
-    app:roundLayoutRadius="@dimen/dp_30">
-
-    <ImageView
-        android:layout_width="@dimen/dp_110"
-        android:layout_height="@dimen/dp_110"
-        android:layout_centerInParent="true"
-        android:src="@drawable/v2x_icon_live_logo" />
-
-    <com.mogo.eagle.core.function.v2x.events.view.CarZegoLiveVideoView
-        android:id="@+id/videoPlayer"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_20" />
-
-    <ImageView
-        android:id="@+id/ivVideoPlayingSign"
-        android:layout_width="@dimen/dp_130"
-        android:layout_height="@dimen/dp_48"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginEnd="@dimen/dp_20"
-        android:src="@drawable/v2x_icon_event_live_top"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/tvCountDown"
-        android:layout_width="@dimen/dp_76"
-        android:layout_height="@dimen/dp_48"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/v2x_shape_bg_count_down_corner_14"
-        android:gravity="center"
-        android:text="s"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_30"
-        android:visibility="gone" />
-
-</com.mogo.eagle.core.widget.RoundLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video_vr.xml
deleted file mode 100644
index 6169926726..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_see_frontcar_live_video_vr.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#3D4053"
-    android:gravity="center"
-    app:roundLayoutRadius="@dimen/dp_30">
-
-    <ImageView
-        android:layout_width="@dimen/dp_110"
-        android:layout_height="@dimen/dp_110"
-        android:layout_centerInParent="true"
-        android:src="@drawable/v2x_icon_live_logo" />
-
-    <com.mogo.eagle.core.function.v2x.events.view.CarZegoLiveVideoView
-        android:id="@+id/videoPlayer"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_window_height_vr_for_item"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_20" />
-
-    <ImageView
-        android:id="@+id/ivVideoPlayingSign"
-        android:layout_width="@dimen/dp_130"
-        android:layout_height="@dimen/dp_48"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginEnd="@dimen/dp_20"
-        android:src="@drawable/v2x_icon_event_live_top"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/tvCountDown"
-        android:layout_width="@dimen/dp_76"
-        android:layout_height="@dimen/dp_48"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/v2x_shape_bg_count_down_corner_14"
-        android:gravity="center"
-        android:text="s"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_30"
-        android:visibility="gone" />
-
-</com.mogo.eagle.core.widget.RoundLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml
deleted file mode 100644
index a2641258f0..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_v2x_optimal_speed_marker.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="1dp"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-
-    <ImageView
-        android:id="@+id/ivIcon"
-        android:layout_width="@dimen/module_service_marker_bubble_width"
-        android:layout_height="@dimen/module_service_marker_bubble_height"
-        android:layout_gravity="center"
-        android:src="@drawable/v2x_obu_traffic_light_pop" />
-
-    <ImageView
-        android:id="@+id/ivCar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/v2x_obu_green_point" />
-</LinearLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/vr_window_top_tips.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/vr_window_top_tips.xml
deleted file mode 100644
index 0dc3e11030..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/vr_window_top_tips.xml
+++ /dev/null
@@ -1,38 +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:layout_width="wrap_content"
-    android:layout_marginStart="@dimen/dp_190"
-    android:layout_height="wrap_content"
-    android:background="@drawable/v2x_front_warning_bg"
-    android:paddingStart="@dimen/dp_28"
-    android:paddingTop="@dimen/dp_20"
-    android:paddingEnd="@dimen/dp_28"
-    android:paddingBottom="@dimen/dp_20">
-
-    <ImageView
-        android:id="@+id/warning_type_image"
-        android:layout_width="@dimen/module_v2x_event_warning_type_image_size"
-        android:layout_height="@dimen/module_v2x_event_warning_type_image_size"
-        android:src="@drawable/icon_warning_v2x_optimal_route"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/warning_content_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginRight="@dimen/dp_20"
-        android:text="为您推荐最优路线"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/module_v2x_event_warning_type_text_size"
-        app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/warning_type_image"
-        app:layout_constraintTop_toTopOf="@+id/warning_type_image" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_animation.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_animation.xml
deleted file mode 100644
index 28bc512ec5..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_animation.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="@dimen/module_main_v2x_animation_width">
-
-    <com.mogo.eagle.core.widget.RoundLayout
-        android:id="@+id/rlRoadEventList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="@dimen/dp_30"
-        app:roundLayoutRadius="@dimen/dp_28">
-
-        <com.mogo.eagle.core.widget.TextureVideoView
-            android:id="@+id/vvCarAnimation"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/live_video_progress_bar_loading_color"
-            android:clickable="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </com.mogo.eagle.core.widget.RoundLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_carforhelp_detail.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_carforhelp_detail.xml
deleted file mode 100644
index 00031a8426..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_carforhelp_detail.xml
+++ /dev/null
@@ -1,63 +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:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/module_v2x_car_for_help_width"
-        android:layout_height="@dimen/module_v2x_car_for_help_height"
-        android:layout_marginTop="@dimen/dp_8"
-        android:background="@drawable/bg_v2x_event_bg"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/iv_event"
-            android:layout_width="@dimen/module_v2x_car_for_help_icon_width"
-            android:layout_height="@dimen/module_v2x_car_for_help_icon_height"
-            android:layout_marginLeft="@dimen/dp_30"
-            android:scaleType="fitXY"
-            android:src="@drawable/icon_car_for_help"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_event"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxWidth="@dimen/module_v2x_car_for_help_event_maxwidth"
-            android:paddingLeft="@dimen/dp_40"
-            android:paddingRight="@dimen/dp_40"
-            android:text="正在为您发起求助"
-            android:textColor="@color/v2x_white_color"
-            android:textSize="@dimen/module_v2x_car_for_help_event_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/iv_event"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="@dimen/dp_0_5"
-            android:layout_height="@dimen/dp_72"
-            android:alpha="0.3"
-            android:background="@color/v2x_line_color"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tv_cancel"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_cancel"
-            android:layout_width="@dimen/module_v2x_car_for_help_height"
-            android:layout_height="@dimen/module_v2x_car_for_help_height"
-            android:gravity="center"
-            android:text="取消"
-            android:textColor="@color/v2x_car_for_help_cancel"
-            android:textSize="@dimen/module_v2x_car_for_help_cancel_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_fault_help.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_fault_help.xml
deleted file mode 100644
index 750b3305cb..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_fault_help.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView 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/rvRoadEventList"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:overScrollMode="never"
-    tools:itemCount="1"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    tools:listitem="@layout/item_v2x_fault_help" />
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_push_event_detail.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_push_event_detail.xml
deleted file mode 100644
index b8244cb9c5..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_push_event_detail.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView 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/rvRoadEventList"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_window_height_ground"
-    android:orientation="horizontal"
-    android:overScrollMode="never"
-    android:padding="@dimen/module_v2x_widow_top_gaps"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    tools:listitem="@layout/item_v2x_push_event_detail" />
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout.xml
deleted file mode 100644
index 98bddcdc78..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/rlRoadEventList"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/v2x_video_window_height_content"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:layout_margin="@dimen/dp_3">
-
-    <com.mogo.eagle.core.widget.RoundLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:roundLayoutRadius="@dimen/dp_26">
-
-        <com.mogo.module.v2x.view.SimpleCoverVideoPlayer
-            android:id="@+id/roadVideoView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:clickable="true" />
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/thumbnail_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/v2x_bg_big_image_dark"
-            android:scaleType="fitXY"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/window_video_play"
-            android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_100"
-            android:layout_centerInParent="true"
-            android:src="@drawable/v2x_icon_event_play"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/roadVideoClose"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_20"
-            android:src="@drawable/module_common_close_selector" />
-    </com.mogo.eagle.core.widget.RoundLayout>
-
-</FrameLayout>
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout_vr.xml
deleted file mode 100644
index 0c7085d84a..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_road_video_layout_vr.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/rlRoadEventList"
-    android:layout_width="@dimen/dp_700"
-    android:layout_height="@dimen/dp_394"
-    android:layout_alignParentRight="true"
-    android:layout_margin="@dimen/dp_3"
-    android:background="@drawable/v2x_bg_video_tip_vr">
-
-    <com.mogo.eagle.core.widget.RoundLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:roundLayoutRadius="@dimen/dp_20">
-
-        <com.mogo.module.v2x.view.SimpleCoverVideoPlayer
-            android:id="@+id/roadVideoView"
-            android:layout_width="@dimen/dp_700"
-            android:layout_height="@dimen/dp_394"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:clickable="true" />
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/thumbnail_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/v2x_bg_big_image_dark"
-            android:scaleType="fitXY"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/window_video_play"
-            android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_100"
-            android:layout_centerInParent="true"
-            android:src="@drawable/v2x_icon_event_play"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/roadVideoClose"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_20"
-            android:src="@drawable/module_common_close_selector_vr" />
-    </com.mogo.eagle.core.widget.RoundLayout>
-
-</RelativeLayout>
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video.xml
deleted file mode 100644
index 2b73411810..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-    android:layout_marginTop="@dimen/dp_8"
-    android:clipToPadding="false">
-
-    <include
-        android:id="@+id/liveVideo"
-        layout="@layout/item_v2x_see_frontcar_live_video"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <ImageView
-        android:id="@+id/liveVideoClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone"
-        android:src="@drawable/module_v2x_vr_close" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video_vr.xml
deleted file mode 100644
index e32b21290f..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_carlive_video_vr.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_see_live_window_height_vr"
-    android:layout_marginTop="@dimen/module_v2x_event_window_top_margin_vr"
-    android:clipToPadding="false">
-
-    <include
-        android:id="@+id/liveVideo"
-        layout="@layout/item_v2x_see_frontcar_live_video_vr"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <ImageView
-        android:id="@+id/liveVideoClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_v2x_event_window_close_distance"
-        android:layout_marginTop="@dimen/module_v2x_event_window_close_distance"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone"
-        android:src="@drawable/module_v2x_vr_close" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_crossroadlive_video.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_crossroadlive_video.xml
deleted file mode 100644
index 02a8789b35..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_see_crossroadlive_video.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rlRoadEventDetail"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-    android:clipToPadding="false">
-
-    <include
-        android:id="@+id/liveVideo"
-        layout="@layout/item_v2x_see_crossroad_live_video"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml
deleted file mode 100644
index 759382f950..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml
+++ /dev/null
@@ -1,55 +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:layout_width="wrap_content"
-    android:layout_height="@dimen/module_v2x_brake_tip_height"
-    android:layout_marginTop="@dimen/dp_20"
-    android:layout_gravity="center_horizontal"
-    android:background="@drawable/v2x_front_warning_bg">
-<!--    @dimen/module_v2x_brake_tip_width-->
-    <ImageView
-        android:id="@+id/ivObuTypeIcon"
-        android:layout_width="@dimen/module_v2x_brake_image_width"
-        android:layout_height="@dimen/module_v2x_brake_image_width"
-        android:layout_marginStart="@dimen/module_v2x_brake_image_margin_left"
-        android:src="@drawable/icon_warning_v2x_emergency_brake"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvObuType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        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="@color/v2x_white"
-        android:textSize="@dimen/dp_24"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/tvObuDesc"
-        app:layout_constraintLeft_toRightOf="@+id/ivObuTypeIcon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-    <TextView
-        android:id="@+id/tvObuDesc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/module_v2x_brake_image_margin_right"
-        android:layout_marginTop="@dimen/dp_10"
-        android:text="前车急刹"
-        android:textColor="@color/v2x_white"
-        android:textSize="@dimen/dp_32"
-        android:paddingRight="@dimen/module_v2x_brake_image_margin_left"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@+id/tvObuType"
-        app:layout_constraintTop_toBottomOf="@+id/tvObuType" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_test_console.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_test_console.xml
deleted file mode 100644
index 874e77dc9f..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_test_console.xml
+++ /dev/null
@@ -1,495 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:paddingStart="@dimen/module_main_v2x_animation_width">
-
-    <LinearLayout
-        android:id="@+id/flTestPanel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/dp_150"
-        android:paddingEnd="@dimen/dp_100">
-
-        <com.google.android.flexbox.FlexboxLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="@dimen/dp_10"
-            android:orientation="horizontal"
-            app:alignContent="flex_start"
-            app:alignItems="center"
-            app:flexDirection="row"
-            app:flexWrap="wrap"
-            app:justifyContent="flex_start">
-
-            <Button
-                android:id="@+id/btnTriggerOpen"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_50"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:background="#FFF"
-                android:padding="@dimen/dp_10"
-                android:text="隐藏测试按钮面板"
-                android:textColor="#000"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnClearRoadEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_50"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:background="#6BCF23"
-                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" />
-
-            <ToggleButton
-                android:id="@+id/btnTriggerVR"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_50"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:background="#6BCF23"
-                android:padding="@dimen/dp_10"
-                android:textColor="#FFFFFF"
-                android:textOff="开启VR模式"
-                android:textOn="关闭VR模式"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-        </com.google.android.flexbox.FlexboxLayout>
-
-        <com.google.android.flexbox.FlexboxLayout
-            android:id="@+id/flTestPanelShunNormal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            app:alignContent="flex_start"
-            app:alignItems="center"
-            app:flexDirection="row"
-            app:flexWrap="wrap"
-            app:justifyContent="flex_start"
-            tools:visibility="visible">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#000000"
-                android:orientation="horizontal"
-                android:padding="@dimen/dp_10"
-                android:text="常规功能模拟"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                android:textStyle="bold" />
-
-            <Button
-                android:id="@+id/btnTriggerRoadEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#673AB7"
-                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" />
-
-
-            <Button
-                android:id="@+id/btnTriggerFatigueDrivingEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#DF4019"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerSeekHelpEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#C712E6"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerParkEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#2651A6"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerEventUgc"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#58FF5F"
-                android:padding="@dimen/dp_10"
-                android:text="触发事件UGC"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                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:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerTrafficSearch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#3196E2"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerRecommendRouteEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#3100E2"
-                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>
-
-
-        <com.google.android.flexbox.FlexboxLayout
-            android:id="@+id/flTestPanelShunYi"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            app:alignContent="flex_start"
-            app:alignItems="center"
-            app:flexDirection="row"
-            app:flexWrap="wrap"
-            app:justifyContent="flex_start"
-            tools:visibility="visible">
-
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#000000"
-                android:orientation="horizontal"
-                android:padding="@dimen/dp_10"
-                android:text="顺义模拟推送"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                android:textStyle="bold" />
-
-            <Button
-                android:id="@+id/btnTriggerWarningEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#FF0606"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerPushEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#1EBD85"
-                android:padding="@dimen/dp_10"
-                android:text="触发H5推送事件"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnTriggerPushLiveCarEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#5E096C"
-                android:padding="@dimen/dp_10"
-                android:text="触发H5推送直播事件"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnTriggerAnimationEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#C6BE2C"
-                android:padding="@dimen/dp_10"
-                android:text="H5推送触发V2X动画"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnFrontCarLiveEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#C6BE2C"
-                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" />
-
-            <Button
-                android:id="@+id/btnXINGLiveEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#3BDCC9"
-                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>
-
-        <com.google.android.flexbox.FlexboxLayout
-            android:id="@+id/flTestPanelVR"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            app:alignContent="flex_start"
-            app:alignItems="center"
-            app:flexDirection="row"
-            app:flexWrap="wrap"
-            app:justifyContent="flex_start"
-            tools:visibility="visible">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#000000"
-                android:orientation="horizontal"
-                android:padding="@dimen/dp_10"
-                android:text="VR鹰眼计划推送模拟"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                android:textStyle="bold" />
-
-            <Button
-                android:id="@+id/btnTriggerRearVIPCarTip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#B85B53"
-                android:padding="@dimen/dp_10"
-                android:text="后方VIP车辆提示"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnTriggerVehicleBrakes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#E91E63"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerRearDangerousVehicles"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#9C27B0"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerReverseVehicleRoutePrediction"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#3F51B5"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerVIPLightChange"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#2196F3"
-                android:padding="@dimen/dp_10"
-                android:text="VIP变灯"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnTriggerObstacleDetour"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#00BCD4"
-                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" />
-
-            <Button
-                android:id="@+id/btnAdasDataWarn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#8BC34A"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerPedestrianWarning"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#009688"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerCongestedRouteRecommendation"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#4CAF50"
-                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" />
-
-            <Button
-                android:id="@+id/btnTriggerDoubleFlash"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#8BC34A"
-                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>
-
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index e148ff30d4..9cb9c16e12 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Looper;
 import android.view.MotionEvent;
 
 import androidx.annotation.NonNull;
@@ -105,11 +106,10 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
 
     @Override
     public Resources getResources() {
-        Resources resources = super.getResources();
-        Configuration configuration = resources.getConfiguration();
-        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
-        AutoSizeCompat.autoConvertDensityOfGlobal(resources);
-        return resources;
+        if ( Looper.myLooper() == Looper.getMainLooper()) {
+            AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources());
+        }
+        return super.getResources();
     }
 
 }
diff --git a/libraries/map-usbcamera/src/main/res/layout/dialog_camera.xml b/libraries/map-usbcamera/src/main/res/layout/dialog_camera.xml
index 3d2564346e..0d799d6deb 100644
--- a/libraries/map-usbcamera/src/main/res/layout/dialog_camera.xml
+++ b/libraries/map-usbcamera/src/main/res/layout/dialog_camera.xml
@@ -26,6 +26,7 @@
         android:id="@id/android:empty"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textSize="36dp"
         android:text="@string/no_device" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/libraries/map-usbcamera/src/main/res/layout/listitem_device.xml b/libraries/map-usbcamera/src/main/res/layout/listitem_device.xml
index 903baff653..0ac831a8cd 100644
--- a/libraries/map-usbcamera/src/main/res/layout/listitem_device.xml
+++ b/libraries/map-usbcamera/src/main/res/layout/listitem_device.xml
@@ -5,6 +5,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
 	android:minHeight="@dimen/list_height_min"
-    android:textSize="@dimen/list_font_size" >
+    android:textSize="36dp" >
 
 </CheckedTextView>
\ No newline at end of file
diff --git a/libraries/mogo-adas-other/src/main/res/layout/dialog_adas_permission_long_background_running.xml b/libraries/mogo-adas-other/src/main/res/layout/dialog_adas_permission_long_background_running.xml
index 33d71621f4..d16ac2d339 100644
--- a/libraries/mogo-adas-other/src/main/res/layout/dialog_adas_permission_long_background_running.xml
+++ b/libraries/mogo-adas-other/src/main/res/layout/dialog_adas_permission_long_background_running.xml
@@ -15,6 +15,7 @@
             android:id="@+id/hint_battery"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="24dp"
             android:text="电池优化：优化"
             android:textColor="#000000" />
 
@@ -23,6 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
+            android:textSize="24dp"
             android:text="关闭" />
     </LinearLayout>
 
@@ -30,6 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
+        android:textSize="24dp"
         android:text="开启池优化功能，会影响熄屏或休眠后网络连接"
         android:textColor="#696969" />
 </LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
index 003c48eb44..b41027ac59 100644
--- a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
+++ b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml
@@ -11,8 +11,8 @@
 
     <ImageView
         android:id="@+id/iv_camera_traffic"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
         android:src="@drawable/module_camera_real_time_traffic" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout.xml b/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout.xml
index 84370e2cf2..98bc1b8e9e 100644
--- a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout.xml
+++ b/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout.xml
@@ -27,8 +27,8 @@
 
     <ImageView
         android:id="@+id/ivCar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_20"
+        android:layout_height="@dimen/dp_20"
         android:layout_marginTop="@dimen/module_service_marker_dot_marginTop"
         android:src="@drawable/icon_map_marker_location_yellow" />
 </LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout_info.xml b/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout_info.xml
index 1c62626bf9..66e4ee91dc 100644
--- a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout_info.xml
+++ b/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout_info.xml
@@ -67,8 +67,8 @@
 
         <ImageView
             android:id="@+id/ivCar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
             android:src="@drawable/icon_map_marker_location_yellow" />
     </LinearLayout>
 
diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_vr_layout.xml b/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_vr_layout.xml
index a3b6c3b2bb..16e7129a17 100644
--- a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_vr_layout.xml
+++ b/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_vr_layout.xml
@@ -27,8 +27,8 @@
 
     <ImageView
         android:id="@+id/ivCar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_20"
+        android:layout_height="@dimen/dp_12"
         android:layout_marginTop="@dimen/module_service_marker_dot_marginTop"
         android:src="@drawable/icon_map_marker_location_yellow_vr" />
 </LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_car.xml b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_car.xml
deleted file mode 100644
index eb830f921a..0000000000
--- a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_car.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-
-    <ImageView
-        android:id="@+id/module_commons_marker_car_model"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</FrameLayout>
\ No newline at end of file