diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
index f052794c40..5af7ed7006 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
@@ -54,7 +54,7 @@ public class TaxiPassengerServiceManager {
      * @return
      */
     private String getDriverAppSn(){
-        return CallerTelematicManager.INSTANCE.getServerToken();
+        return "X20202206092431156";
     }
 
     /**
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
index a5bf291a60..75ac0ab3d5 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
@@ -72,7 +72,7 @@
                 android:text="已到达"
                 android:layout_marginStart="@dimen/dp_41"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/sp_46"
+                android:textSize="@dimen/dp_46"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
@@ -126,7 +126,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/v_line"
                 android:layout_marginTop="@dimen/dp_52"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/sp_46"
+                android:textSize="@dimen/dp_46"
                 android:text="请对本次行程评分"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
@@ -222,7 +222,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:background="@drawable/taxi_p_comment_submit"
-                android:textSize="@dimen/sp_42"
+                android:textSize="@dimen/dp_42"
                 android:height="120dp"
                 android:layout_width="450dp"
                 android:layout_height="wrap_content"/>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
index 3a1e8f0ee6..dbac626998 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
@@ -29,7 +29,7 @@
         android:shadowRadius="40"
         android:text="@string/taxi_p_check_hello_text"
         android:textColor="@color/taxi_autopilot_text_color_normal"
-        android:textSize="@dimen/sp_120"
+        android:textSize="@dimen/dp_120"
         android:textStyle="bold"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -48,7 +48,7 @@
         android:shadowRadius="20"
         android:text="@string/taxi_p_check_hello_small_text"
         android:textColor="@color/taxi_autopilot_text_color_normal"
-        android:textSize="@dimen/sp_46"
+        android:textSize="@dimen/dp_46"
         app:layout_constraintStart_toStartOf="@+id/tv_hello"
         app:layout_constraintTop_toBottomOf="@+id/tv_hello" />
 
@@ -67,7 +67,7 @@
         android:paddingTop="@dimen/dp_20"
         android:paddingBottom="@dimen/dp_20"
         android:textColor="@color/taxi_autopilot_text_color_normal"
-        android:textSize="@dimen/sp_46"
+        android:textSize="@dimen/dp_46"
         app:layout_constraintStart_toStartOf="@+id/tv_welcome_message"
         app:layout_constraintTop_toBottomOf="@+id/tv_welcome_message" />
 
@@ -81,7 +81,7 @@
         android:maxLines="1"
         android:ellipsize="end"
         android:textColor="@color/taxi_autopilot_text_color_normal"
-        android:textSize="@dimen/sp_46"
+        android:textSize="@dimen/dp_46"
         app:layout_constraintEnd_toStartOf="@+id/och_shadow_layout"
         app:layout_constraintStart_toEndOf="@+id/iv_passenger_start_boll"
         app:layout_constraintTop_toBottomOf="@+id/tv_passenger_count" />
@@ -123,7 +123,7 @@
         android:ellipsize="end"
         tools:text="终 点 :  石鼓收费站"
         android:textColor="@color/taxi_autopilot_text_color_normal"
-        android:textSize="@dimen/sp_46"
+        android:textSize="@dimen/dp_46"
         app:layout_constraintBottom_toBottomOf="@+id/iv_passenger_end_boll"
         app:layout_constraintStart_toEndOf="@+id/iv_passenger_end_boll"
         app:layout_constraintEnd_toStartOf="@+id/och_shadow_layout"
@@ -201,7 +201,7 @@
                 android:layout_marginTop="@dimen/dp_129"
                 android:text="@string/taxi_p_check_input_phone_tail_title"
                 android:textColor="@color/taxi_p_check_keyboard_samll_mogo_color"
-                android:textSize="@dimen/sp_36"
+                android:textSize="@dimen/dp_36"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_taxi_number" />
 
@@ -271,7 +271,7 @@
                 android:background="@drawable/bg_taxi_p_keyboard_background"
                 android:text="@string/tv_delete"
                 style="@style/och_check_number_keyboard"
-                android:textSize="@dimen/sp_36"
+                android:textSize="@dimen/dp_36"
                 app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_submit"
                 app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_zero"
                 app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_nine" />
@@ -282,7 +282,7 @@
                 android:background="@drawable/bg_taxi_p_keyboard_submit_background"
                 android:text="确定"
                 android:textColor="@color/taxi_autopilot_text_color_normal"
-                android:textSize="@dimen/sp_36"
+                android:textSize="@dimen/dp_36"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_back"
                 app:layout_constraintTop_toTopOf="@+id/tv_taxi_passenger_number_nine" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e83cec1b84..078577e71e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,10 +20,10 @@
         tools:replace="android:label">
         <meta-data
             android:name="design_width_in_dp"
-            android:value="2560"/>
+            android:value="5120"/>
         <meta-data
             android:name="design_height_in_dp"
-            android:value="1600"/>
+            android:value="3200"/>
 
         <provider
             android:name="com.rousetime.android_startup.provider.StartupProvider"
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_dialog_check.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_dialog_check.xml
deleted file mode 100644
index 8b13014fe8..0000000000
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_dialog_check.xml
+++ /dev/null
@@ -1,43 +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_push_dialog_check_width"
-    android:layout_height="@dimen/module_push_dialog_check_height"
-    android:background="@drawable/module_push_dialog_check_background">
-
-    <ImageView
-        android:id="@+id/module_push_dialog_close"
-        android:layout_width="@dimen/module_push_dialog_close_width"
-        android:layout_height="@dimen/module_push_dialog_close_height"
-        android:layout_marginLeft="@dimen/module_push_dialog_close_margin"
-        android:layout_marginTop="@dimen/module_push_dialog_close_margin"
-        android:scaleType="fitXY"
-        android:src="@drawable/module_push_dialog_close"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/module_push_dialog_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_push_dialog_title_margin"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_push_dialog_title_size"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/module_push_dialog_content"
-        android:layout_width="@dimen/module_push_dialog_content_width"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_push_dialog_content_margin_top"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_push_dialog_content_size"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/module_push_dialog_title" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item.xml
deleted file mode 100644
index f6375db0f6..0000000000
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item.xml
+++ /dev/null
@@ -1,94 +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="@dimen/module_push_ui_height"
-    android:layout_marginTop="@dimen/module_push_ui_margin_top"
-    android:background="@drawable/module_push_item_background">
-
-    <com.mogo.module.push.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"
-        android:scaleType="fitXY"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:riv_corner_radius_bottom_left="@dimen/module_push_ui_image_corner"
-        app:riv_corner_radius_top_left="@dimen/module_push_ui_image_corner" />
-
-    <LinearLayout
-        android:id="@+id/module_push_app_icon_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin"
-        android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin"
-        android:gravity="center_vertical"
-        app:layout_constraintLeft_toRightOf="@+id/module_push_image"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin">
-
-        <TextView
-            android:id="@+id/module_push_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center_vertical|left"
-            android:maxWidth="@dimen/module_push_title_mix_width"
-            android:maxLength="25"
-            android:singleLine="true"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_push_ui_title_textSize"
-            app:layout_constrainedWidth="true"
-            tools:text="官方公告" />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/module_push_rl_content"
-        android:layout_width="@dimen/module_push_ui_content_width"
-        android:layout_height="@dimen/module_push_ui_content_height"
-        android:layout_marginTop="@dimen/module_push_ui_content_marginTop"
-        android:layout_marginBottom="@dimen/module_push_ui_content_marginBottom"
-        app:layout_constraintLeft_toLeftOf="@id/module_push_app_icon_title"
-        app:layout_constraintTop_toBottomOf="@id/module_push_app_icon_title">
-
-        <TextView
-            android:id="@+id/module_push_content"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:ellipsize="end"
-            android:maxLines="3"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_push_ui_title_text_size" />
-
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/module_push_line"
-        android:layout_width="@dimen/module_push_line_width"
-        android:layout_height="@dimen/module_push_line_height"
-        android:layout_marginLeft="@dimen/module_push_line_margin_left"
-        android:background="@color/module_push_item_line_color"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/module_push_rl_content"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/module_push_check"
-        android:layout_width="@dimen/module_push_check_width"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/module_push_check_margin"
-        android:layout_marginBottom="@dimen/module_push_check_margin"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center"
-        android:text="@string/module_push_check"
-        android:textColor="@color/module_push_check_color"
-        android:textSize="@dimen/module_push_check_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@+id/module_push_line"
-        app:layout_constraintRight_toRightOf="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-bindingcar/src/main/res/layout/module_push_item_origin.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_origin.xml
deleted file mode 100644
index 3b2d2dc278..0000000000
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_origin.xml
+++ /dev/null
@@ -1,145 +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="@dimen/module_push_ui_height"
-    android:background="@drawable/module_push_item_background_p">
-
-    <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"
-        android:layout_marginLeft="@dimen/module_push_ui_image_marLeft"
-        android:scaleType="fitXY"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:riv_corner_radius="@dimen/module_push_ui_image_corner" />
-
-    <LinearLayout
-        android:id="@+id/module_push_app_icon_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin"
-        android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/module_push_ui_app_icon_size"
-        app:layout_constraintRight_toLeftOf="@+id/module_push_progress_bar_frame"
-        app:layout_constraintLeft_toRightOf="@+id/module_push_image"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin">
-
-        <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"
-            android: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:ellipsize="end"
-            android:gravity="center_vertical|left"
-            android:maxWidth="@dimen/module_push_title_mix_width"
-            android:singleLine="true"
-            android:maxLength="25"
-            tools:text="标题标题标题标题标题标题标题"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_push_ui_title_textSize"
-            app:layout_constrainedWidth="true" />
-    </LinearLayout>
-
-
-    <RelativeLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="@dimen/module_push_ui_content_marginTop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@id/module_push_app_icon_title"
-        app:layout_constraintRight_toRightOf="@id/module_push_progress_bar_frame"
-        app:layout_constraintTop_toBottomOf="@id/module_push_app_icon_title">
-
-        <TextView
-            android:id="@+id/module_push_content"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:maxLines="3"
-            android:layout_above="@+id/module_push_buttons"
-            android:ellipsize="end"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/module_push_ui_title_text_size"
-            tools:text="文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内" />
-
-        <LinearLayout
-            android:id="@+id/module_push_buttons"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/module_push_button_height"
-            android:layout_alignParentBottom="true"
-            android:layout_marginTop="@dimen/module_push_button_margin_top"
-            android:layout_marginBottom="@dimen/module_push_button_margin_bottom"
-            android:gravity="center"
-            android:weightSum="2">
-
-            <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:enabled="true"
-                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>
-    </RelativeLayout>
-
-    <FrameLayout
-        android:id="@+id/module_push_progress_bar_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_push_progress_bar_frame_marginTop"
-        android:layout_marginEnd="@dimen/module_push_progress_bar_frame_marginEnd"
-        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"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <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>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_vertical.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_vertical.xml
deleted file mode 100644
index d7829a2fb7..0000000000
--- a/core/function-impl/mogo-core-function-bindingcar/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-bindingcar/src/main/res/layout/module_push_message_hisotry_fragment.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_hisotry_fragment.xml
deleted file mode 100644
index 15f8e2974e..0000000000
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_hisotry_fragment.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/module_push_panel_marginTop"
-    android:layout_marginBottom="@dimen/module_push_panel_marginBottom"
-    android:layout_marginRight="@dimen/module_push_panel_marginRight"
-    android:layout_marginLeft="@dimen/module_push_panel_marginRight"
-    android:paddingLeft="@dimen/module_push_panel_paddingLeft"
-    android:paddingRight="@dimen/module_push_panel_paddingLeft"
-    android:background="@drawable/module_push_message_background"
-    android:layout_gravity="center_vertical">
-
-    <TextView
-        android:id="@+id/module_push_id_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_push_activity_title_margin_top"
-        android:text="历史消息"
-        android:textColor="@color/module_push_panel_title_textColor"
-        android:textSize="@dimen/module_push_activity_title_text_size" />
-
-    <ImageView
-        android:id="@+id/module_push_id_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginTop="@dimen/module_push_activity_close_margin_top"
-        android:src="@drawable/module_push_close" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/module_push_id_recycler_view"
-        android:layout_width="match_parent"
-        android:overScrollMode="never"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/module_push_activity_recycler_view_margin_top" />
-
-    <TextView
-        android:id="@+id/module_push_id_not_data"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:text="@string/module_push_str_not_data"
-        android:textColor="@color/module_push_panel_title_textColor"
-        android:textSize="@dimen/module_push_activity_not_data_text_size" />
-
-    <TextView
-        android:id="@+id/module_push_id_clear"
-        android:layout_width="@dimen/module_push_content_only_height"
-        android:layout_height="@dimen/module_push_button_height"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="@dimen/module_push_activity_clear_margin_bottom"
-        android:background="@drawable/module_push_clear_bg"
-        android:gravity="center"
-        android:text="@string/module_push_str_clear"
-        android:textColor="@color/module_push_panel_title_textColor"
-        android:textSize="@dimen/module_push_title_text_size"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_item.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_item.xml
deleted file mode 100644
index a01bc6197c..0000000000
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_item.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.push.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"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/module_push_panel_paddingBottom">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_push_message_item_height">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/module_push_item_click"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/module_push_recycler_item_background">
-
-            <com.mogo.service.imageloader.MogoImageView
-                android:id="@+id/module_push_item_app_icon"
-                android:layout_width="@dimen/module_push_message_app_icon_size"
-                android:layout_height="@dimen/module_push_message_app_icon_size"
-                android:layout_marginStart="@dimen/module_push_message_margin_start"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/module_push_item_title"
-                android:layout_width="@dimen/module_push_item_content_width"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/module_push_image_margin_top"
-                android:layout_marginTop="@dimen/module_push_item_title_margin_top"
-                android:ellipsize="end"
-                android:gravity="left"
-                android:maxLines="1"
-                android:text="push title"
-                android:textColor="@color/module_push_item_title_textColor"
-                android:textSize="@dimen/module_push_title_text_size"
-                android:textStyle="bold"
-                app:layout_constraintLeft_toRightOf="@+id/module_push_item_app_icon"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_max="@dimen/module_push_item_content_width"
-                app:layout_goneMarginBottom="@dimen/module_push_item_title_gone_margin_bottom" />
-
-            <TextView
-                android:id="@+id/module_push_item_content"
-                android:layout_width="@dimen/module_push_item_content_width"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/module_push_item_content_margin_end"
-                android:ellipsize="end"
-                android:gravity="left"
-                android:maxLines="1"
-                android:textColor="@color/module_push_item_content_textColor"
-                android:textSize="@dimen/module_push_item_content_text_size"
-                app:layout_constraintStart_toStartOf="@+id/module_push_item_title"
-                app:layout_constraintTop_toBottomOf="@+id/module_push_item_title"
-                tools:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。" />
-
-            <com.mogo.service.imageloader.MogoImageView
-                android:id="@+id/module_push_item_image"
-                android:layout_width="@dimen/module_push_item_image_width"
-                android:layout_height="@dimen/module_push_item_image_height"
-                android:layout_marginEnd="@dimen/module_push_message_item_image_margin_end"
-                android:scaleType="centerCrop"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:miv_radius="@dimen/module_push_item_image_radius"
-                app:miv_shape="round" />
-
-            <TextView
-                android:id="@+id/module_push_item_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/module_push_item_time_textSize"
-                android:layout_marginEnd="@dimen/module_push_image_margin_top"
-                android:maxLines="1"
-                android:textColor="@color/module_push_item_time_textColor"
-                android:textSize="@dimen/module_push_massage_time_text_size"
-                app:layout_constraintLeft_toLeftOf="@+id/module_push_item_content"
-                app:layout_constraintTop_toBottomOf="@+id/module_push_item_content"
-                tools:text="3:20" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_push_button_margin_top">
-
-        <TextView
-            android:id="@+id/module_push_item_delete"
-            android:layout_width="@dimen/module_push_message_item_height"
-            android:layout_height="@dimen/module_push_message_item_height"
-            android:layout_marginStart="@dimen/module_push_button_margin_top"
-            android:background="@drawable/module_push_recycler_item_background"
-            android:gravity="center"
-            android:text="@string/module_push_str_delete"
-            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
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index 71cc1d4cc8..ed503b0deb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -99,6 +99,7 @@ import kotlinx.android.synthetic.main.fragment_hmi.*
 import kotlinx.android.synthetic.main.view_auto_pilot_check.view.*
 import kotlinx.android.synthetic.main.view_och_bus_operation.view.*
 import kotlinx.coroutines.*
+import me.jessyan.autosize.utils.AutoSizeUtils
 import mogo_msg.MogoReportMsg
 import record_cache.RecordPanelOuterClass
 import java.util.*
@@ -629,6 +630,8 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                     .setSidePattern(side)
                     .setGravity(gravity, offsetY = 70)
                     .setImmersionStatusBar(true)
+                    .setWindowHeight(AutoSizeUtils.dp2px(context,1100f))
+                    .setWindowWidth(AutoSizeUtils.dp2px(context,800f))
                     .setAnimator(object : DefaultAnimator() {
                         override fun enterAnim(
                             view: View,
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_title_bar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_title_bar.xml
index 89646685bf..aaf96d111f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_title_bar.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_title_bar.xml
@@ -8,7 +8,7 @@
         android:layout_gravity="center_vertical|left"
         android:layout_marginLeft="15dp"
         android:textColor="#337CC4"
-        android:textSize="14sp" />
+        android:textSize="@dimen/dp_24" />
 
     <TextView
         android:id="@+id/title"
@@ -17,8 +17,8 @@
 
     <ImageView
         android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_66"
+        android:layout_height="@dimen/dp_66"
         android:layout_gravity="center_vertical|right"
         android:layout_marginRight="15dp"
         android:scaleType="centerInside" />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml
index 30111b863a..dc841904bc 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml
@@ -138,7 +138,7 @@
                 android:layout_marginLeft="3dp"
                 android:text="@string/log_text_loading"
                 android:textColor="#666666"
-                android:textSize="14sp" />
+                android:textSize="@dimen/dp_24" />
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
@@ -155,7 +155,7 @@
         android:id="@+id/log_hint"
         style="@style/White"
         android:layout_width="match_parent"
-        android:layout_height="30dp"
+        android:layout_height="60dp"
         android:background="#337CC4"
         android:singleLine="true"
         android:text="@string/log_info"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
index fc426304f5..e8e3c08f6e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
@@ -76,9 +76,9 @@
 
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/main_bitmap_splash_icon"
+            android:layout_width="@dimen/dp_157"
+            android:layout_height="@dimen/dp_255"
+            android:background="@drawable/mogo_slogan"
             android:scaleType="centerCrop"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
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 1eb9dc6d34..359d1f4080 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
@@ -213,6 +213,7 @@
                 android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:textColor="#000"
+                android:padding="@dimen/dp_20"
                 android:textOff="开启美化模式"
                 android:textOn="关闭美化模式"
                 android:textSize="@dimen/dp_24" />
@@ -224,6 +225,7 @@
                 android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:textColor="#000"
+                android:padding="@dimen/dp_20"
                 android:textOff="开启雨天模式"
                 android:textOn="关闭雨天模式"
                 android:textSize="@dimen/dp_24" />
@@ -233,6 +235,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:textColor="#000"
                 android:textOff="开启感知优化模式"
@@ -248,16 +251,15 @@
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
                 android:textOff="魔戒控制"
-                android:textOn="魔戒控制" />
+                android:textOn="魔戒控制"
+                android:textSize="@dimen/dp_24" />
 
             <Button
                 android:id="@+id/btnOpenAllGestures"
                 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="开启手势滑动"
                 android:textSize="@dimen/dp_24"
                 android:visibility="gone"
@@ -271,6 +273,7 @@
                 android:layout_margin="@dimen/dp_10"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:text="重启IPC节点"
+                android:padding="@dimen/dp_20"
                 android:textSize="@dimen/dp_24" />
 
             <ToggleButton
@@ -282,7 +285,8 @@
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
                 android:textOff="设备绑定关系"
-                android:textOn="设备绑定关系" />
+                android:textOn="设备绑定关系"
+                android:textSize="@dimen/dp_24"/>
 
             <LinearLayout
                 android:id="@+id/deviceBindLayout"
@@ -311,7 +315,7 @@
                         android:paddingEnd="10dp"
                         android:text="复制"
                         android:textColor="#0000FF"
-                        android:textSize="14sp" />
+                        style="@style/DebugSettingText" />
 
                 </LinearLayout>
 
@@ -376,7 +380,8 @@
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
                 android:textOff="版本信息"
-                android:textOn="版本信息" />
+                android:textOn="版本信息"
+                style="@style/DebugSettingText"/>
 
             <LinearLayout
                 android:id="@+id/appVersionInfoLayout"
@@ -438,7 +443,7 @@
                         android:gravity="center"
                         android:text="复制"
                         android:textColor="#0000FF"
-                        android:textSize="14sp" />
+                        style="@style/DebugSettingText" />
 
                 </LinearLayout>
 
@@ -491,7 +496,8 @@
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
                 android:textOff="状态中心"
-                android:textOn="状态中心" />
+                android:textOn="状态中心"
+                style="@style/DebugSettingText"/>
 
             <LinearLayout
                 android:id="@+id/statusCenterLayout"
@@ -612,14 +618,16 @@
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
                 android:textOff="控制中心"
-                android:textOn="控制中心" />
+                android:textOn="控制中心"
+                android:textSize="@dimen/dp_24"/>
 
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swDevelopMode"
                 style="@style/DebugSettingText"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dp_50"
                 android:layout_gravity="end"
+                app:switchMinWidth="60dp"
                 android:text="开发者模式"
                 android:visibility="gone" />
 
@@ -650,7 +658,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:padding="@dimen/dp_5"
+                    android:padding="@dimen/dp_20"
                     android:text="录制Bag包"
                     android:textSize="@dimen/dp_24"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -713,7 +721,7 @@
                     android:layout_marginStart="@dimen/dp_10"
                     android:text="复制经纬度"
                     android:textColor="#0000FF"
-                    android:textSize="14sp"
+                    android:textSize="24dp"
                     app:layout_constraintTop_toBottomOf="@id/tvCarInfoCopy" />
 
                 <TextView
@@ -757,7 +765,8 @@
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
                     android:textOff="域控制器"
-                    android:textOn="域控制器" />
+                    android:textOn="域控制器"
+                    android:textSize="@dimen/dp_24"/>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/domainControllerLayout"
@@ -786,7 +795,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:padding="@dimen/dp_5"
+                        android:padding="@dimen/dp_20"
                         android:text="连接工控机"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
@@ -804,7 +813,7 @@
                         android:gravity="center"
                         android:text="192.168.1."
                         android:textColor="#1A1A1A"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotIP"
                         app:layout_constraintLeft_toRightOf="@id/btnSetAutopilotIP"
                         app:layout_constraintRight_toLeftOf="@id/btnDisconnectIpc"
@@ -816,8 +825,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="@dimen/dp_30"
                         android:gravity="center"
-                        android:paddingStart="@dimen/dp_15"
-                        android:paddingEnd="@dimen/dp_15"
+                        android:padding="@dimen/dp_20"
                         android:text="断开工控机连接"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotIP"
@@ -836,7 +844,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:padding="@dimen/dp_5"
+                        android:padding="@dimen/dp_20"
                         android:text="录制Bag包"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
@@ -924,7 +932,8 @@
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
                     android:textOff="车辆状态"
-                    android:textOn="车辆状态" />
+                    android:textOn="车辆状态"
+                    android:textSize="@dimen/dp_24" />
 
                 <LinearLayout
                     android:id="@+id/vehicleStateLayout"
@@ -969,7 +978,8 @@
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
                     android:textOff="OBU"
-                    android:textOn="OBU" />
+                    android:textOn="OBU"
+                    android:textSize="@dimen/dp_24" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/obuControllerLayout"
@@ -983,7 +993,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:padding="@dimen/dp_5"
+                        android:padding="@dimen/dp_20"
                         android:text="重置IP"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
@@ -1001,7 +1011,7 @@
                         android:gravity="center"
                         android:text="192.168.1.199"
                         android:textColor="#1A1A1A"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintBottom_toBottomOf="@id/btnSetObuIP"
                         app:layout_constraintLeft_toRightOf="@id/btnSetObuIP"
                         app:layout_constraintRight_toRightOf="parent"
@@ -1052,7 +1062,8 @@
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
                     android:textOff="鹰眼本地配置"
-                    android:textOn="鹰眼本地配置" />
+                    android:textOn="鹰眼本地配置"
+                    android:textSize="@dimen/dp_24"/>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/eagleEyeControllerLayout"
@@ -1089,7 +1100,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginEnd="@dimen/dp_10"
-                            android:padding="@dimen/dp_8"
+                            android:padding="@dimen/dp_20"
                             android:text="切换环境"
                             android:textColor="#1A1A1A"
                             android:textSize="@dimen/dp_24" />
@@ -1100,9 +1111,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="设置刹车加速度阈值"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
@@ -1176,7 +1185,7 @@
                         android:gravity="center"
                         android:hint="请输入司机屏IP"
                         android:textColor="#1A1A1A"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintBottom_toBottomOf="@id/btnConnectServerIp"
                         app:layout_constraintLeft_toRightOf="@id/btnConnectServerIp"
                         app:layout_constraintRight_toRightOf="parent"
@@ -1187,6 +1196,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/dp_10"
+                        android:padding="@dimen/dp_20"
                         android:textColor="#000"
                         android:textOff="开启异常上报提示"
                         android:textOn="关闭异常上报提示"
@@ -1204,7 +1214,8 @@
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
                     android:textOff="HMI控制"
-                    android:textOn="HMI控制" />
+                    android:textOn="HMI控制"
+                    android:textSize="@dimen/dp_24" />
 
                 <GridLayout
                     android:id="@+id/hmiControllerLayout"
@@ -1223,6 +1234,7 @@
                         android:gravity="center"
                         android:textOff="切换地图为「白天模式」"
                         android:textOn="切换地图为「夜间模式」"
+                        android:padding="@dimen/dp_20"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@+id/tbChangeCurrentCarIcon"
                         app:layout_constraintTop_toTopOf="@id/tbChangeCurrentCarIcon" />
@@ -1234,6 +1246,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="隐藏「脉速表」"
                         android:textOn="显示「脉速表」"
                         android:textSize="@dimen/dp_24" />
@@ -1245,6 +1258,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="隐藏「自动驾驶控制按钮」"
                         android:textOn="显示「自动驾驶控制按钮」"
                         android:textSize="@dimen/dp_24" />
@@ -1256,6 +1270,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="隐藏「视角切换按钮」"
                         android:textOn="显示「视角切换按钮」"
                         android:textSize="@dimen/dp_24" />
@@ -1267,6 +1282,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="隐藏「工具箱」"
                         android:textOn="显示「工具箱」"
                         android:textSize="@dimen/dp_24" />
@@ -1278,6 +1294,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="隐藏「小地图」"
                         android:textOn="显示「小地图」"
                         android:textSize="@dimen/dp_24" />
@@ -1289,6 +1306,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="关闭「转向灯控制」"
                         android:textOn="打开「转向灯控制」"
                         android:textSize="@dimen/dp_24" />
@@ -1300,6 +1318,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="关闭「刹车控制」"
                         android:textOn="打开「刹车控制」"
                         android:textSize="@dimen/dp_24" />
@@ -1311,6 +1330,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="关闭「SN绑定控制」"
                         android:textOn="打开「SN绑定控制」"
                         android:textSize="@dimen/dp_24" />
@@ -1322,6 +1342,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="打开「加速度面板」"
                         android:textOn="关闭「加速度面板」"
                         android:textSize="@dimen/dp_24" />
@@ -1333,6 +1354,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="开启「引导线动态效果」"
                         android:textOn="关闭「引导线动态效果」"
                         android:textSize="@dimen/dp_24" />
@@ -1348,7 +1370,7 @@
                         android:hint="过滤阈值"
                         android:paddingTop="5dp"
                         android:paddingBottom="5dp"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/dp_24"
                         android:visibility="gone"
                         tools:visibility="visible" />
 
@@ -1359,6 +1381,7 @@
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="设置加速度变化幅度过滤阈值"
                         android:textSize="@dimen/dp_24"
                         android:visibility="gone"
@@ -1376,7 +1399,8 @@
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
                     android:textOff="HD地图控制"
-                    android:textOn="HD地图控制" />
+                    android:textOn="HD地图控制"
+                    android:textSize="@dimen/dp_24"/>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/hdMapControllerLayout"
@@ -1393,6 +1417,7 @@
                         android:gravity="center"
                         android:text="切换 顶视角"
                         android:textSize="@dimen/dp_24"
+                        android:padding="@dimen/dp_20"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/changesight_back_btn"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -1403,6 +1428,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="切换 后方来车视角"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/changesight_top_btn"
@@ -1416,6 +1442,7 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="切换 十字路口视角"
+                        android:padding="@dimen/dp_20"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/changesight_far_btn"
@@ -1428,6 +1455,7 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="切换 远视角"
+                        android:padding="@dimen/dp_20"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/changesight_cross_btn"
                         app:layout_constraintRight_toRightOf="parent"
@@ -1440,6 +1468,7 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="恢复视角"
+                        android:padding="@dimen/dp_20"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="@id/changesight_cross_btn"
                         app:layout_constraintRight_toRightOf="@id/changesight_cross_btn"
@@ -1451,6 +1480,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="切换自车为「小巴车」"
                         android:textOn="切换自车为「出租车」"
                         android:textSize="@dimen/dp_24"
@@ -1464,6 +1494,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="绘制感知「小车」"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/tbChangeCurrentCarIcon"
@@ -1476,7 +1507,9 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="绘制感知「卡车」"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawBus"
                         app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon" />
@@ -1488,6 +1521,8 @@
                         android:layout_margin="2dp"
                         android:gravity="center"
                         android:text="绘制感知「大巴」"
+                        android:textSize="@dimen/dp_24"
+                        android:padding="@dimen/dp_20"
                         app:layout_constraintLeft_toRightOf="@id/btnDrawTruck"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tbChangeCurrentCarIcon" />
@@ -1498,7 +1533,9 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="绘制感知「自行车」"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawPedestrian"
                         app:layout_constraintTop_toBottomOf="@id/btnDrawTruck" />
@@ -1509,7 +1546,9 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="绘制感知「行人」"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/btnDrawBicycle"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/btnDrawTruck" />
@@ -1520,7 +1559,9 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="绘制感知「摩托」"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawUnknown"
                         app:layout_constraintTop_toBottomOf="@id/btnDrawBicycle" />
@@ -1531,7 +1572,9 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="绘制感知「未知」"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/btnDrawMotorcycle"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/btnDrawBicycle" />
@@ -1542,7 +1585,9 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="开启OBU融合"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnDrawObuTrolley"
                         app:layout_constraintTop_toBottomOf="@id/btnDrawMotorcycle" />
@@ -1553,7 +1598,9 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:text="绘制OBU「小车」"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/btnOpenObuFusion"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/btnDrawMotorcycle" />
@@ -1566,6 +1613,7 @@
                         android:gravity="center"
                         android:textOff="显示鹰眼感知"
                         android:textOn="关闭鹰眼感知"
+                        android:padding="@dimen/dp_20"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/tbIsDrawUnknownIdentifyData"
@@ -1579,6 +1627,7 @@
                         android:gravity="center"
                         android:textOff="显示「未知类型」感知"
                         android:textOn="关闭「未知类型」感知"
+                        android:padding="@dimen/dp_20"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/tbIsDrawIdentifyData"
                         app:layout_constraintRight_toRightOf="parent"
@@ -1589,7 +1638,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
-                        android:padding="@dimen/dp_10"
+                        android:padding="@dimen/dp_20"
                         android:textColor="#000"
                         android:textOff="强制绘制引导线"
                         android:textOn="强制绘制引导线"
@@ -1603,7 +1652,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
-                        android:padding="@dimen/dp_10"
+                        android:padding="@dimen/dp_20"
                         android:textColor="#000"
                         android:textOff="强制绘制路径规划"
                         android:textOn="强制绘制路径规划"
@@ -1620,6 +1669,7 @@
                         android:gravity="center"
                         android:textOff="开启模拟自动驾驶中"
                         android:textOn="关闭模拟自动驾驶中"
+                        android:padding="@dimen/dp_20"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="@id/tbIsDrawAutopilotTrajectoryData"
                         app:layout_constraintRight_toRightOf="@id/tbIsDrawAutopilotTrajectoryData"
@@ -1630,7 +1680,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
-                        android:padding="@dimen/dp_10"
+                        android:padding="@dimen/dp_20"
                         android:textColor="#000"
                         android:textOff="开启渲染点云数据"
                         android:textOn="关闭渲染点云数据"
@@ -1645,7 +1695,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
-                        android:padding="@dimen/dp_10"
+                        android:padding="@dimen/dp_20"
                         android:text="设置点云大小"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
@@ -1663,7 +1713,7 @@
                         android:gravity="center"
                         android:hint="请输入点云大小"
                         android:textColor="#1A1A1A"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintBottom_toBottomOf="@id/btnPointCloudSize"
                         app:layout_constraintLeft_toRightOf="@id/btnPointCloudSize"
                         app:layout_constraintRight_toRightOf="parent"
@@ -1675,7 +1725,7 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
                         android:gravity="center"
-                        android:padding="@dimen/dp_10"
+                        android:padding="@dimen/dp_20"
                         android:text="设置点云颜色"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
@@ -1691,9 +1741,10 @@
                         android:layout_marginBottom="@dimen/dp_10"
                         android:background="@drawable/debug_setting_edit_bg"
                         android:gravity="center"
+                        android:padding="@dimen/dp_10"
                         android:hint="请输入点云颜色"
                         android:textColor="#1A1A1A"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/dp_24"
                         app:layout_constraintBottom_toBottomOf="@id/btnPointCloudColor"
                         app:layout_constraintLeft_toRightOf="@id/btnPointCloudColor"
                         app:layout_constraintRight_toRightOf="parent"
@@ -1831,7 +1882,8 @@
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
                 android:textOff="日志中心"
-                android:textOn="日志中心" />
+                android:textOn="日志中心"
+                android:textSize="@dimen/dp_24" />
             <!--日志输出控制-->
             <LinearLayout
                 android:id="@+id/logcatCenterLayout"
@@ -1858,6 +1910,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
                         android:gravity="center"
                         android:textOff="关闭「鹰眼」Log"
                         android:textOn="打开「鹰眼」Log"
@@ -1868,6 +1921,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
                         android:gravity="center"
                         android:textOff="打开「ADAS」Log"
                         android:textOn="关闭「ADAS」Log"
@@ -1878,6 +1932,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
                         android:gravity="center"
                         android:textOff="展示日志过滤面板"
                         android:textOn="关闭日志过滤面板"
@@ -1888,6 +1943,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
                         android:gravity="center"
                         android:textOff="打开「网络」Log"
                         android:textOn="关闭「网络」Log"
@@ -1898,6 +1954,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
                         android:gravity="center"
                         android:textOff="打开「OBU」Log"
                         android:textOn="关闭「OBU」Log"
@@ -1908,6 +1965,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
                         android:gravity="center"
                         android:textOff="打开「HD-MAP」Log"
                         android:textOn="关闭「HD-MAP」Log"
@@ -2050,6 +2108,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
+                        android:padding="@dimen/dp_20"
                         android:textOff="开始抓取全量日志"
                         android:textOn="停止抓取全量日志"
                         android:textSize="@dimen/dp_24" />
@@ -2070,7 +2129,7 @@
                         android:minHeight="48dp"
                         android:padding="@dimen/dp_5"
                         android:textColor="#1A1A1A"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/dp_24" />
 
                 </LinearLayout>
 
@@ -2158,7 +2217,8 @@
                 android:drawableEnd="@drawable/icon_right"
                 android:padding="@dimen/dp_20"
                 android:textOff="应用包管理中心"
-                android:textOn="应用包管理中心" />
+                android:textOn="应用包管理中心"
+                android:textSize="@dimen/dp_24"/>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/apkCenterLayout"
@@ -2180,7 +2240,7 @@
                 <androidx.appcompat.widget.AppCompatEditText
                     android:id="@+id/etApkSearch"
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
+                    android:layout_height="50dp"
                     android:layout_marginStart="@dimen/dp_30"
                     android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_20"
@@ -2189,7 +2249,7 @@
                     android:gravity="center"
                     android:hint="请输入搜索关键字如版本号等"
                     android:textColor="#1A1A1A"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/dp_24"
                     app:layout_constraintBottom_toBottomOf="@id/ivApkSearch"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toLeftOf="@id/ivApkSearch"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
index 1a3e0229dc..30319d1e89 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
@@ -8,7 +8,7 @@
         android:id="@+id/tvAppVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="14sp"
+        android:textSize="@dimen/dp_28"
         android:textColor="#FFBEC6EF"
         />
 
@@ -16,7 +16,7 @@
         android:id="@+id/tvMapVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="14sp"
+        android:textSize="@dimen/dp_28"
         android:textColor="#FFBEC6EF"
         />
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
index 126073b23f..da5c3588b4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
@@ -11,7 +11,7 @@
     <style name="TitleBig">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">24dp</item>
+        <item name="android:textSize">@dimen/dp_48</item>
         <item name="android:textColor">#324456</item>
         <item name="android:gravity">center</item>
         <item name="android:textStyle">bold</item>
@@ -27,47 +27,47 @@
         <item name="android:gravity">center_vertical|left</item>
         <item name="android:textColor">#333333</item>
         <item name="android:textColorHint">#CCCCCC</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">@dimen/dp_24</item>
         <item name="android:background">@null</item>
         <item name="android:textCursorDrawable">@drawable/input_cursor</item>
     </style>
 
     <style name="RadioButton">
         <item name="android:gravity">center</item>
-        <item name="android:textSize">14dp</item>
+        <item name="android:textSize">@dimen/dp_24</item>
         <item name="android:textColor">#131313</item>
-        <item name="android:layout_height">34dp</item>
-        <item name="android:layout_width">70dp</item>
+        <item name="android:layout_height">68dp</item>
+        <item name="android:layout_width">140dp</item>
         <item name="android:button">@null</item>
         <item name="android:background">@drawable/radio_button_background</item>
     </style>
 
     <style name="RadioButton.Left">
         <item name="android:gravity">center</item>
-        <item name="android:textSize">14dp</item>
+        <item name="android:textSize">24dp</item>
         <item name="android:textColor">#131313</item>
-        <item name="android:layout_height">34dp</item>
-        <item name="android:layout_width">70dp</item>
+        <item name="android:layout_height">68dp</item>
+        <item name="android:layout_width">140dp</item>
         <item name="android:button">@null</item>
         <item name="android:background">@drawable/radio_button_background_left</item>
     </style>
 
     <style name="RadioButton.Middle">
         <item name="android:gravity">center</item>
-        <item name="android:textSize">14dp</item>
+        <item name="android:textSize">24dp</item>
         <item name="android:textColor">#131313</item>
-        <item name="android:layout_height">34dp</item>
-        <item name="android:layout_width">70dp</item>
+        <item name="android:layout_height">68dp</item>
+        <item name="android:layout_width">140dp</item>
         <item name="android:button">@null</item>
         <item name="android:background">@drawable/radio_button_background_middle</item>
     </style>
 
     <style name="RadioButton.Right">
         <item name="android:gravity">center</item>
-        <item name="android:textSize">14dp</item>
+        <item name="android:textSize">@dimen/dp_24</item>
         <item name="android:textColor">#131313</item>
-        <item name="android:layout_height">34dp</item>
-        <item name="android:layout_width">70dp</item>
+        <item name="android:layout_height">68dp</item>
+        <item name="android:layout_width">140dp</item>
         <item name="android:button">@null</item>
         <item name="android:background">@drawable/radio_button_background_right</item>
     </style>
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/PermissionsDialogUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/PermissionsDialogUtils.java
index 23cc37ddb1..dc3326bdf1 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/PermissionsDialogUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/PermissionsDialogUtils.java
@@ -8,6 +8,9 @@ import android.os.Build;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import com.mogo.eagle.core.utilcode.util.BaseAlertDialogBuilder;
+import com.mogo.eagle.core.utilcode.util.R;
+
 /**
  * @author xiaoyuzhou
  * @date 2021/7/22 4:57 下午
@@ -22,7 +25,7 @@ public class PermissionsDialogUtils {
      */
     public static void openAppDetails(Activity activity, String msg, int CODE_WINDOW) {
         if (mAlertDialog == null || !mAlertDialog.isShowing()) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+            BaseAlertDialogBuilder builder = new BaseAlertDialogBuilder(activity);
             if (TextUtils.isEmpty(msg)) {
                 builder.setMessage("请在 “应用信息 -> 权限” 中授予权限");
             } else {
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BaseAlertDialogBuilder.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BaseAlertDialogBuilder.java
new file mode 100644
index 0000000000..e26cab643a
--- /dev/null
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BaseAlertDialogBuilder.java
@@ -0,0 +1,45 @@
+package com.mogo.eagle.core.utilcode.util;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
+
+import me.jessyan.autosize.AutoSizeCompat;
+import me.jessyan.autosize.AutoSizeConfig;
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
+public class BaseAlertDialogBuilder extends AlertDialog.Builder {
+
+    /**
+     *
+     */
+    private static final float ALERT_BASE_WIDTH = 1280f;
+
+    public BaseAlertDialogBuilder(@NonNull Context context) {
+        super(adjustAutoSize(context));
+    }
+
+    public BaseAlertDialogBuilder(@NonNull Context context, int themeResId) {
+        super(adjustAutoSize(context), themeResId);
+    }
+
+    private static Context adjustAutoSize(Context context) {
+        return new ContextWrapper(context) {
+            private Resources mResources;
+
+            {
+                Resources oldResources = super.getResources();
+                mResources = new Resources(oldResources.getAssets(), oldResources.getDisplayMetrics(), oldResources.getConfiguration());
+            }
+
+            @Override
+            public Resources getResources() {
+                AutoSizeCompat.autoConvertDensityBaseOnWidth(mResources, ALERT_BASE_WIDTH);
+                return mResources;
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java
index 27cc9154d6..ac78d030c6 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.utilcode.util;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
@@ -909,5 +910,10 @@ public final class ToastUtils {
             int widthMaxSpec = MeasureSpec.makeMeasureSpec(UtilsBridge.getAppScreenWidth() - SPACING, MeasureSpec.AT_MOST);
             super.onMeasure(widthMaxSpec, heightMeasureSpec);
         }
+
+        @Override
+        public Resources getResources() {
+            return super.getResources();
+        }
     }
 }
\ No newline at end of file
diff --git a/core/mogo-core-utils/src/main/res/layout/utils_toast_view.xml b/core/mogo-core-utils/src/main/res/layout/utils_toast_view.xml
index 88f66910cd..92b3344651 100644
--- a/core/mogo-core-utils/src/main/res/layout/utils_toast_view.xml
+++ b/core/mogo-core-utils/src/main/res/layout/utils_toast_view.xml
@@ -67,6 +67,6 @@
         android:gravity="center"
         android:lineSpacingExtra="2dp"
         android:textColor="#DE000000"
-        android:textSize="14sp"
+        android:textSize="28dp"
         tools:text="This is long text." />
 </view>
\ No newline at end of file