diff --git a/main-extensions/mogo-module-main-independent/src/main/res/values-xhdpi-1920x1000/dimens.xml b/main-extensions/mogo-module-main-independent/src/main/res/values-xhdpi-1920x1000/dimens.xml
new file mode 100644
index 0000000000..c436f9daca
--- /dev/null
+++ b/main-extensions/mogo-module-main-independent/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_main_entrance_fragment_container_marginLeft">635px</dimen>
+    <dimen name="module_main_header_fragment_container_marginLeft">366px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
index 0d4a626e29..5c67f3141e 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -6,6 +6,7 @@ import android.transition.AutoTransition;
 import android.transition.Transition;
 import android.transition.TransitionManager;
 import android.util.ArrayMap;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
@@ -394,6 +395,11 @@ public class TopViewAnimHelper {
                         constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
                                 R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
                                 computeNaviMarginTop(params.height));
+
+                        // 动态改变相关字体大小
+                        tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
+                        tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
+
                     }
                     constraintSet.applyTo(topMotionLayout);
                     ivTurnIcon.getLayoutParams().height =
@@ -487,6 +493,9 @@ public class TopViewAnimHelper {
                 remainDistanceGroup.setVisibility(View.VISIBLE);
                 remainTimeGroup.setVisibility(View.VISIBLE);
                 arriveTimeGroup.setVisibility(View.VISIBLE);
+                tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
+                tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
+
             }
             constraintSet.clone(topMotionLayout);
 
@@ -547,6 +556,9 @@ public class TopViewAnimHelper {
             remainDistanceGroup.setVisibility(View.VISIBLE);
             remainTimeGroup.setVisibility(View.VISIBLE);
             arriveTimeGroup.setVisibility(View.VISIBLE);
+            tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
+            tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
+
             // 调整约束
             constraintSet.clone(topMotionLayout);
             constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
@@ -576,6 +588,8 @@ public class TopViewAnimHelper {
             remainDistanceGroup.setVisibility(View.GONE);
             remainTimeGroup.setVisibility(View.GONE);
             arriveTimeGroup.setVisibility(View.GONE);
+            tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
+            tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
             // 调整约束
             constraintSet.clone(topMotionLayout);
             constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
@@ -655,7 +669,7 @@ public class TopViewAnimHelper {
     }
 
     private float getDimen(int resId) {
-        return (int) topMotionLayout.getContext().getResources().getDimension(resId);
+        return (int) topMotionLayout.getContext().getResources().getDimensionPixelSize(resId);
     }
 
     private int computeNaviMarginTop(int height) {
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index bae7449c91..542e47991f 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -202,7 +202,7 @@
     <androidx.constraintlayout.widget.Group
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:visibility="visible"
         app:constraint_referenced_ids="btnDebugCtrlNaviView,btnDebugCtrlSubView,btnDebugCtrlTopView"
         android:id="@+id/groupTopViewDebug" />
 
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 169a5f6e4e..0e3d697760 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -89,9 +89,11 @@
     <dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">40px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">60px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize_small">50px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">10px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize_small">30px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index 059f8fb764..b1e5bf7240 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -89,9 +89,11 @@
     <dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">40px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">60px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize_small">50px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">10px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize_small">30px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index a55c7a34a9..3b7a570ba8 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -91,9 +91,11 @@
     <dimen name="module_ext_navi_info_panel_turn_icon_marginTop">13px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">20px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">32px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize_small">32px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">7px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">5px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">22px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize_small">22px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_road_textSize">18px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px
     </dimen>
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index c3a6b4463d..bcb2744c24 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -43,12 +43,10 @@
     <!--快捷操作浮层-->
     <FrameLayout
         android:id="@+id/module_main_id_entrance_fragment_container"
-        android:layout_width="@dimen/module_main_entrance_fragment_container_width"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="right"
-        android:paddingRight="@dimen/module_main_entrance_fragment_container_padding"
-        android:paddingBottom="@dimen/module_main_entrance_fragment_container_padding"
-        android:paddingTop="@dimen/module_main_entrance_fragment_container_padding" />
+        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
+        android:padding="@dimen/module_main_entrance_fragment_container_padding" />
 
     <FrameLayout
         android:id="@+id/module_main_id_event_panel_fragment_container"