diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 29508a207e..bfb66cffe1 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -241,6 +241,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             } else {
                 mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D);
             }
+//            mCameraMode.setSelected(!mCameraMode.isSelected());
+//            mCameraMode.setText(getString(mCameraMode.isSelected() ? R.string.mode_car_up :
+//                    R.string.mode_north_up));
         });
 
 
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 9359557453..37ba24720c 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
@@ -379,13 +379,14 @@ public class TopViewAnimHelper {
                         // 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()
                         // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
                         constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
-                                ivTurnIcon.getId(), ConstraintSet.BOTTOM,(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
-//                        constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP,
-//                                ivTurnIcon.getId(), ConstraintSet.TOP);
+                                ivTurnIcon.getId(), ConstraintSet.BOTTOM);
+                        constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+                                naviBg.getId(), ConstraintSet.LEFT,
+                                (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_marginLeft));
 //                        constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
                         constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
                                 tvNextDistance.getId(), ConstraintSet.BOTTOM,
-                                (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_6));
+                                (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom_small));
                         constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                                 R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
                                 (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
@@ -400,10 +401,8 @@ public class TopViewAnimHelper {
                                 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));
+                        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);
@@ -453,10 +452,8 @@ 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));
+                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);
@@ -472,6 +469,9 @@ public class TopViewAnimHelper {
                 // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
                 constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
 //                constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
+                constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+                        naviBg.getId(), ConstraintSet.LEFT,
+                        (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_marginLeft));
                 constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
                         ivTurnIcon.getId(), ConstraintSet.BOTTOM,
                         (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom));
@@ -502,7 +502,6 @@ public class TopViewAnimHelper {
             Logger.d(TAG, "hide top setMapCenterPointByScene: " + scene);
             MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene);
         }
-//        }
     }
 
     public void showNaviView() {
@@ -518,18 +517,18 @@ 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));
+            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);
 //            constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
+            constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+                    naviBg.getId(), ConstraintSet.LEFT,
+                    (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_marginLeft));
             constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(),
-                    ConstraintSet.BOTTOM,
-                    (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom));
+                    ConstraintSet.BOTTOM);
             constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                     tvNextDistance.getId(), ConstraintSet.LEFT,
                     0);
@@ -553,19 +552,19 @@ 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));
+            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,
-                    ivTurnIcon.getId(), ConstraintSet.BOTTOM,
-                    (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
+                    ivTurnIcon.getId(), ConstraintSet.BOTTOM);
+            constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+                    naviBg.getId(), ConstraintSet.LEFT,
+                    (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_marginLeft));
 //            constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
             constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
                     tvNextDistance.getId(), ConstraintSet.BOTTOM,
-                    (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_6));
+                    (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom_small));
             constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                     R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
                     (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
diff --git a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
index 431f1560b1..97dc87283c 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
@@ -187,7 +187,7 @@
         android:id="@+id/module_map_id_arrive_time_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_95"
+        android:layout_marginEnd="@dimen/module_ext_navi_extra_info_margin_right"
         android:src="@drawable/module_ext_ic_navi_info3"
         app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time"
         app:layout_constraintRight_toRightOf="@+id/module_map_id_navi_bg"
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 0e3d697760..ad9dc6d8fb 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
@@ -39,7 +39,7 @@
     <dimen name="module_ext_operation_panel_move2_height">120px</dimen>
     <dimen name="module_ext_operation_panel_share_width">120px</dimen>
     <dimen name="module_ext_operation_panel_share_height">120px</dimen>
-    <dimen name="module_ext_operation_panel_share_marginBottom">40px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">30px</dimen>
     <dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
@@ -84,7 +84,7 @@
     <dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_small_width">70px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_small_height">70px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">24px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">56px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_small_marginLeft">83px</dimen>
     <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>
@@ -103,6 +103,7 @@
     <dimen name="module_ext_voice_msg_padding_left">36px</dimen>
     <dimen name="module_ext_voice_msg_padding_right">36px</dimen>
     <dimen name="module_ext_voice_msg_icon_margin_left">-2px</dimen>
+    <dimen name="module_ext_navi_extra_info_margin_right">95px</dimen>
 
     <dimen name="module_ext_weather_bkg_corner">30px</dimen>
     <dimen name="module_ext_weather_container_paddingLeft">40px</dimen>
@@ -138,6 +139,7 @@
     <dimen name="module_entrance_id_uploading_height">90px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginTop">6dp</dimen>
     <dimen name="module_map_id_navi_next_info_road_marginBottom">15px</dimen>
+    <dimen name="module_map_id_navi_next_info_road_marginBottom_small">4px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginStart">10px</dimen>
     <dimen name="module_ext_display_overview_icon_marginTop">20px</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 b1e5bf7240..7423964cdd 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
@@ -39,7 +39,7 @@
     <dimen name="module_ext_operation_panel_move2_height">120px</dimen>
     <dimen name="module_ext_operation_panel_share_width">120px</dimen>
     <dimen name="module_ext_operation_panel_share_height">120px</dimen>
-    <dimen name="module_ext_operation_panel_share_marginBottom">40px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">30px</dimen>
     <dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
@@ -84,7 +84,7 @@
     <dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_small_width">70px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_small_height">70px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">24px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">56px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_small_marginLeft">83px</dimen>
     <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>
@@ -103,6 +103,7 @@
     <dimen name="module_ext_voice_msg_padding_left">36px</dimen>
     <dimen name="module_ext_voice_msg_padding_right">36px</dimen>
     <dimen name="module_ext_voice_msg_icon_margin_left">-2px</dimen>
+    <dimen name="module_ext_navi_extra_info_margin_right">95px</dimen>
 
     <dimen name="module_ext_weather_bkg_corner">30px</dimen>
     <dimen name="module_ext_weather_container_paddingLeft">40px</dimen>
@@ -138,6 +139,7 @@
     <dimen name="module_entrance_id_uploading_height">90px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginTop">6dp</dimen>
     <dimen name="module_map_id_navi_next_info_road_marginBottom">15px</dimen>
+    <dimen name="module_map_id_navi_next_info_road_marginBottom_small">4px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginStart">10px</dimen>
     <dimen name="module_ext_display_overview_icon_marginTop">20px</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 3b7a570ba8..26b9b2c5fe 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -40,7 +40,7 @@
     <dimen name="module_ext_operation_panel_move2_height">66px</dimen>
     <dimen name="module_ext_operation_panel_share_width">66px</dimen>
     <dimen name="module_ext_operation_panel_share_height">66px</dimen>
-    <dimen name="module_ext_operation_panel_share_marginBottom">21px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">16px</dimen>
     <dimen name="module_ext_operation_panel_share_textSize">16px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginBottom">34.5px</dimen>
     <dimen name="module_ext_operation_panel_share_goneMarginRight">20px</dimen>
@@ -82,25 +82,26 @@
     <!--    module_map_layout_navi_info_panel.xml-->
     <dimen name="module_ext_navi_info_panel_width">544px</dimen>
     <dimen name="module_ext_navi_info_panel_height">117px</dimen>
-    <dimen name="module_ext_navi_info_panel_small_height">60px</dimen>
+    <dimen name="module_ext_navi_info_panel_small_height">80px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_width">85px</dimen>
     <dimen name="module_ext_navi_info_panel_turn_icon_height">85px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_small_width">38px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_small_height">38px</dimen>
-    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">13px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_width">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_height">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">30px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_marginLeft">44px</dimen>
     <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_textSize_small">28px</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_distance_unit_textSize_small">16px</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>
+    <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">15px</dimen>
-    <dimen name="module_ext_navi_info_turn_icon_margin_bottom">5px</dimen>
+    <dimen name="module_ext_navi_info_turn_icon_margin_bottom">13px</dimen>
+    <dimen name="module_ext_navi_extra_info_margin_right">58px</dimen>
 
     <dimen name="module_ext_voice_msg_padding_top">9px</dimen>
     <dimen name="module_ext_voice_msg_padding_bottom">9px</dimen>
@@ -142,6 +143,7 @@
     <dimen name="module_entrance_id_uploading_height">58px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginTop">3dp</dimen>
     <dimen name="module_map_id_navi_next_info_road_marginBottom">10px</dimen>
+    <dimen name="module_map_id_navi_next_info_road_marginBottom_small">4px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginStart">6px</dimen>
     <dimen name="module_ext_display_overview_icon_marginTop">10px</dimen>