diff --git a/gradle.properties b/gradle.properties
index 477e0b1fd1..d3f9b6fffd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -68,7 +68,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
 # v2x
 MOGO_MODULE_V2X_VERSION=1.0.7
 # 媒体卡片
-MOGO_MODULE_MEDIA_VERSION=1.0.4.3
+MOGO_MODULE_MEDIA_VERSION=1.0.4.4
 # 推送
 MOGO_MODULE_PUSH_VERSION=1.0.1
 # 广告资源位
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
index 82dd3d7976..f863039ccd 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
@@ -2,8 +2,11 @@ package com.mogo.module.apps;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -35,6 +38,10 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
     @Override
     protected void onCreate( @Nullable Bundle savedInstanceState ) {
         overridePendingTransition( R.anim.module_apps_anim_enter, 0);
+        getWindow().addFlags( WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ) {
+            getWindow().setStatusBarColor( Color.BLACK );
+        }
         super.onCreate( savedInstanceState );
     }
 
diff --git a/modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml b/modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml
index 3c91cb81a9..a1038a702d 100644
--- a/modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml
@@ -8,7 +8,7 @@
         android:startColor="#5CC1FF" />
 
     <corners
-        android:bottomLeftRadius="@dimen/dp_20"
+        android:bottomLeftRadius="@dimen/dp_30"
         />
 </shape>
 
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml
index 5d90ff43e3..d570e1ef36 100644
--- a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml
@@ -5,7 +5,7 @@
         android:angle="180"
         android:endColor="#50526E"
         android:startColor="#333F4057" />
-    <corners android:bottomRightRadius="@dimen/dp_20"/>
+    <corners android:bottomRightRadius="@dimen/dp_30"/>
 
 </shape>
 
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml
index 37f8498d8c..f4bb94cb0a 100644
--- a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-  <corners android:radius="@dimen/dp_20" />
+  <corners android:radius="@dimen/dp_30" />
   <solid android:color="#3F4057" />
 </shape>
 
diff --git a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
index ae4839f484..bec43b7c93 100644
--- a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
+++ b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#7f000000"
     android:layout_gravity="center">
 
     <androidx.constraintlayout.widget.ConstraintLayout
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 5bf3a1c9ae..158bc0dbed 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
@@ -7,6 +7,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -478,10 +479,12 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
                 return;
             }
             if ( isTrue ) {
-                mDisplayOverviewText.setText( "退出\n全览" );
+                mDisplayOverviewText.setText( "退出全览" );
+                mDisplayOverviewText.setTextSize( TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize( R.dimen.module_ext_display_overview_textSize ) );
                 mCameraMode.setVisibility( View.GONE );
             } else {
                 mDisplayOverviewText.setText( "全览" );
+                mDisplayOverviewText.setTextSize( TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize( R.dimen.module_ext_display_overview_textSize_large ) );
                 mCameraMode.setVisibility( View.VISIBLE );
             }
         }
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_bkg.xml
index c364a86f0c..c3a0d13b70 100644
--- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_bkg.xml
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_bkg.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <corners android:radius="@dimen/module_ext_common_corner" />
-            <solid android:color="#F2000000" />
+            <solid android:color="#E6000000" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
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 178a974615..d61d074b76 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
@@ -15,19 +15,20 @@
         app:layout_constraintRight_toRightOf="parent" />
 
     <androidx.constraintlayout.widget.Group
+        android:id="@+id/naviGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/naviGroup"
         android:visibility="gone"
-        app:constraint_referenced_ids="module_map_id_navi_next_info_road,module_map_id_navi_next_info_turn_info,module_map_id_navi_bg,module_map_id_navi_next_info_road_turn_icon,module_map_id_navi_next_info_distance,module_map_id_navi_next_info_distance_unit,remainDistanceGroup,remainTimeGroup,arriveTimeGroup" />
+        app:constraint_referenced_ids="module_map_id_navi_next_info_road,module_map_id_navi_next_info_turn_info,module_map_id_navi_bg,module_map_id_navi_next_info_road_turn_icon,module_map_id_navi_next_info_distance,module_map_id_navi_next_info_distance_unit,remainDistanceGroup,remainTimeGroup,arriveTimeGroup"
+        tools:visibility="visible" />
 
     <View
         android:id="@+id/module_map_id_navi_bg"
         android:layout_width="@dimen/module_ext_navi_info_panel_width"
         android:layout_height="@dimen/module_ext_navi_info_panel_height"
-        app:layout_constraintTop_toBottomOf="@id/module_entrance_id_top_container"
+        android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
         app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container"
-        android:background="@drawable/module_ext_dw_navi_info_panel_bkg" />
+        app:layout_constraintTop_toBottomOf="@id/module_entrance_id_top_container" />
 
     <ImageView
         android:id="@+id/module_map_id_navi_next_info_road_turn_icon"
@@ -44,7 +45,8 @@
         android:id="@+id/module_map_id_navi_next_info_distance"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_52"
+        android:layout_marginStart="@dimen/module_map_id_navi_next_info_distance_marginStart"
+        android:layout_marginTop="@dimen/module_map_id_navi_next_info_distance_marginTop"
         android:text="53"
         android:textColor="#F1F1F1"
         android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_textSize"
@@ -81,11 +83,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/module_ext_navi_next_info_road_marginTop"
+        android:layout_marginBottom="@dimen/module_map_id_navi_next_info_road_marginBottom"
         android:ellipsize="end"
         android:maxLines="1"
         android:text="北三环东路辅路"
         android:textColor="#F1F1F1"
         android:textSize="@dimen/module_ext_navi_info_panel_next_info_road_textSize"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_next_info_road_turn_icon"
         app:layout_constraintLeft_toLeftOf="@id/module_map_id_navi_next_info_distance" />
 
@@ -113,6 +117,7 @@
         android:text="3599"
         android:textColor="#F1F1F1"
         android:textSize="@dimen/module_ext_remaining_distance_textSize"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/module_map_id_remaining_distance_notice"
         app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance_icon"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_remaining_distance_icon" />
@@ -162,6 +167,7 @@
         android:text="3599"
         android:textColor="#F1F1F1"
         android:textSize="@dimen/module_ext_remaining_time_textSize"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time_notice"
         app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time_icon"
         app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_time_icon" />
@@ -211,6 +217,7 @@
         android:text="3599"
         android:textColor="#F1F1F1"
         android:textSize="@dimen/module_ext_arrive_time_textSize"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time_notice"
         app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time_icon"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_arrive_time_icon" />
@@ -236,9 +243,10 @@
         android:gravity="center_horizontal"
         android:paddingTop="@dimen/dp_14"
         android:text="@string/mode_north_up"
-        android:visibility="gone"
         android:textColor="@color/white"
         android:textSize="@dimen/module_ext_north_textSize"
+        android:textStyle="bold"
+        android:visibility="gone"
         app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
         app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" />
@@ -250,9 +258,10 @@
         android:layout_height="@dimen/module_ext_button_height"
         android:layout_marginTop="@dimen/module_ext_camera_button_marginTop"
         android:background="@drawable/module_ext_dw_common_corner_bkg"
-        android:gravity="center"
         android:orientation="vertical"
+        android:gravity="center_horizontal"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg">
 
@@ -260,16 +269,18 @@
             android:id="@+id/module_ext_id_display_overview_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/module_ext_display_overview_icon_marginTop"
             android:src="@drawable/module_ext_ic_display_overview" />
 
         <TextView
             android:id="@+id/module_ext_id_display_overview_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_7"
+            android:layout_marginTop="@dimen/dp_5"
             android:text="全览"
             android:textColor="@color/white"
-            android:textSize="@dimen/module_ext_display_overview_textSize" />
+            android:textSize="@dimen/module_ext_display_overview_textSize_large"
+            android:textStyle="bold" />
     </LinearLayout>
 
     <LinearLayout
@@ -305,21 +316,22 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:text="@string/module_map_str_upload_road_condition"
-            tools:visibility="gone"
             android:textColor="#FFFFFF"
-            android:textSize="@dimen/module_ext_operation_panel_share_textSize" />
+            android:textSize="@dimen/module_ext_operation_panel_share_textSize"
+            android:textStyle="bold"
+            tools:visibility="gone" />
 
         <ImageView
             android:id="@+id/module_entrance_id_uploading"
             android:layout_width="@dimen/module_entrance_id_uploading_width"
             android:layout_height="@dimen/module_entrance_id_uploading_height"
-            android:gravity="center"
             android:layout_gravity="center"
-            tools:visibility="visible"
+            android:gravity="center"
             android:scaleType="fitCenter"
             android:src="@drawable/module_ext_ic_uploading_00010"
             android:textColor="#FFFFFF"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:visibility="visible" />
     </FrameLayout>
 
     <LinearLayout
@@ -339,6 +351,7 @@
             android:text="前方\n实况"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/module_ext_navi_exit_textSize"
+            android:textStyle="bold"
             android:visibility="gone" />
 
         <TextView
@@ -351,6 +364,7 @@
             android:text="取消\n求助"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/module_ext_navi_exit_textSize"
+            android:textStyle="bold"
             android:visibility="gone" />
 
         <TextView
@@ -363,6 +377,7 @@
             android:text="@string/module_ext_str_exit_navi"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/module_ext_navi_exit_textSize"
+            android:textStyle="bold"
             android:visibility="gone" />
     </LinearLayout>
 
diff --git a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
index e2f012b564..4b12bf8642 100644
--- a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
@@ -119,18 +119,23 @@
     <dimen name="module_map_navi_next_info_road_turn_marginRight">8px</dimen>
 
     <!-- 导航查看全程显示范围-->
-    <dimen name="module_map_display_overview_left_margin">534px</dimen>
-    <dimen name="module_map_display_overview_top_margin">100px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">68px</dimen>
-    <dimen name="module_map_display_overview_right_margin">32px</dimen>
+    <dimen name="module_map_display_overview_left_margin">526px</dimen>
+    <dimen name="module_map_display_overview_top_margin">150px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">15px</dimen>
+    <dimen name="module_map_display_overview_right_margin">82px</dimen>
     <dimen name="module_ext_common_corner">16px</dimen>
     <dimen name="module_ext_north_goneMarginTop">142px</dimen>
     <dimen name="module_ext_button_width">66px</dimen>
     <dimen name="module_ext_button_height">66px</dimen>
     <dimen name="module_ext_camera_button_marginTop">16px</dimen>
-    <dimen name="module_ext_display_overview_textSize">14px</dimen>
+    <dimen name="module_ext_display_overview_textSize">12px</dimen>
+    <dimen name="module_ext_display_overview_textSize_large">14px</dimen>
     <dimen name="module_ext_north_textSize">14px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_next_step_textSize">18px</dimen>
     <dimen name="module_entrance_id_uploading_width">58px</dimen>
     <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_distance_marginStart">6px</dimen>
+    <dimen name="module_ext_display_overview_icon_marginTop">10px</dimen>
 </resources>
\ No newline at end of file
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 173199225f..6492e48a25 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
@@ -116,19 +116,24 @@
     <dimen name="module_map_navi_next_info_road_turn_marginRight">15px</dimen>
 
     <!-- 导航查看全程显示范围-->
-    <dimen name="module_map_display_overview_left_margin">952px</dimen>
-    <dimen name="module_map_display_overview_top_margin">170px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">122px</dimen>
-    <dimen name="module_map_display_overview_right_margin">61px</dimen>
+    <dimen name="module_map_display_overview_left_margin">950px</dimen>
+    <dimen name="module_map_display_overview_top_margin">270px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">30px</dimen>
+    <dimen name="module_map_display_overview_right_margin">150px</dimen>
     <dimen name="module_ext_north_goneMarginTop">240px</dimen>
     <dimen name="module_ext_common_corner">30px</dimen>
     <dimen name="module_ext_button_width">120px</dimen>
     <dimen name="module_ext_button_height">120px</dimen>
     <dimen name="module_ext_camera_button_marginTop">30px</dimen>
     <dimen name="module_ext_display_overview_textSize">22px</dimen>
+    <dimen name="module_ext_display_overview_textSize_large">28px</dimen>
     <dimen name="module_ext_north_textSize">28px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_next_step_textSize">30px</dimen>
     <dimen name="module_entrance_id_uploading_width">90px</dimen>
     <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_distance_marginStart">10px</dimen>
+    <dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
 
 </resources>
\ No newline at end of file
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 dbd4d79f5a..c61cb347c0 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -113,19 +113,24 @@
     <dimen name="module_map_navi_next_info_road_turn_marginRight">15px</dimen>
 
     <!-- 导航查看全程显示范围-->
-    <dimen name="module_map_display_overview_left_margin">952px</dimen>
-    <dimen name="module_map_display_overview_top_margin">170px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">122px</dimen>
-    <dimen name="module_map_display_overview_right_margin">61px</dimen>
+    <dimen name="module_map_display_overview_left_margin">950px</dimen>
+    <dimen name="module_map_display_overview_top_margin">270px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">30px</dimen>
+    <dimen name="module_map_display_overview_right_margin">150px</dimen>
     <dimen name="module_ext_common_corner">30px</dimen>
     <dimen name="module_ext_north_goneMarginTop">240px</dimen>
     <dimen name="module_ext_button_width">120px</dimen>
     <dimen name="module_ext_button_height">120px</dimen>
     <dimen name="module_ext_camera_button_marginTop">30px</dimen>
     <dimen name="module_ext_display_overview_textSize">22px</dimen>
+    <dimen name="module_ext_display_overview_textSize_large">28px</dimen>
     <dimen name="module_ext_north_textSize">28px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_next_step_textSize">30px</dimen>
     <dimen name="module_entrance_id_uploading_width">90px</dimen>
     <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_distance_marginStart">10px</dimen>
+    <dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml
index a35cb8952b..bf95c3f61e 100644
--- a/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml
+++ b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml
@@ -2,10 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <gradient android:angle="0"
-                android:type="linear"
-                android:endColor="#00000000"
-                android:startColor="#000000" />
+            <gradient android:angle="0" android:centerColor="#7f000000" android:endColor="#00000000" android:startColor="#000000" android:type="linear" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml
index bcf618205a..6733552430 100644
--- a/modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml
@@ -6,8 +6,8 @@
     <dimen name="module_map_calculate_path_display_overview_right_margin">80px</dimen>
 
     <!-- 导航查看全程显示范围-->
-    <dimen name="module_map_display_overview_left_margin">534px</dimen>
-    <dimen name="module_map_display_overview_top_margin">100px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">68px</dimen>
-    <dimen name="module_map_display_overview_right_margin">32px</dimen>
+    <dimen name="module_map_display_overview_left_margin">526px</dimen>
+    <dimen name="module_map_display_overview_top_margin">150px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">15px</dimen>
+    <dimen name="module_map_display_overview_right_margin">82px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml
index 2d58420a11..1c72cd5442 100644
--- a/modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml
@@ -6,8 +6,8 @@
     <dimen name="module_map_calculate_path_display_overview_right_margin">80px</dimen>
 
     <!-- 导航查看全程显示范围-->
-    <dimen name="module_map_display_overview_left_margin">952px</dimen>
-    <dimen name="module_map_display_overview_top_margin">170px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">122px</dimen>
-    <dimen name="module_map_display_overview_right_margin">61px</dimen>
+    <dimen name="module_map_display_overview_left_margin">950px</dimen>
+    <dimen name="module_map_display_overview_top_margin">270px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">30px</dimen>
+    <dimen name="module_map_display_overview_right_margin">150px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-map/src/main/res/values/dimens.xml b/modules/mogo-module-map/src/main/res/values/dimens.xml
index 4cf55c67a5..8967e403d1 100644
--- a/modules/mogo-module-map/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-map/src/main/res/values/dimens.xml
@@ -6,8 +6,8 @@
     <dimen name="module_map_calculate_path_display_overview_bottom_margin">61px</dimen>
     <dimen name="module_map_calculate_path_display_overview_right_margin">80px</dimen>
     <!-- 导航查看全程显示范围-->
-    <dimen name="module_map_display_overview_left_margin">952px</dimen>
-    <dimen name="module_map_display_overview_top_margin">170px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">122px</dimen>
-    <dimen name="module_map_display_overview_right_margin">61px</dimen>
+    <dimen name="module_map_display_overview_left_margin">950px</dimen>
+    <dimen name="module_map_display_overview_top_margin">270px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">30px</dimen>
+    <dimen name="module_map_display_overview_right_margin">150px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
index 821c7aafa5..b06ddec62c 100644
--- a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
+++ b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
@@ -3,500 +3,459 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:clickable="true"
     android:background="#2D2E3D"
+    android:clickable="true"
     android:orientation="vertical"
 
     >
-  <RelativeLayout
-      android:id="@+id/rl_navi_setting_title"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/dp_80"
-      android:layout_marginLeft="@dimen/dp_60"
-      android:layout_gravity="center_horizontal"
-      android:layout_marginTop="@dimen/dp_30"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      >
 
-
-    <ImageView
-        android:id="@+id/iv_back"
-        android:layout_width="@dimen/dp_80"
-        android:layout_height="@dimen/dp_80"
-        android:layout_centerVertical="true"
-        android:src="@mipmap/icon_back"
-        />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_toRightOf="@id/iv_back"
-        android:text="@string/navi_setting"
-        android:textColor="@color/white"
-        android:textSize="@dimen/txt_title"
-        />
-
-  </RelativeLayout>
-
-
-  <ScrollView
-    android:layout_width="match_parent"
-      android:paddingRight="@dimen/module_search_dp_160"
-      android:paddingLeft="@dimen/module_search_dp_160"
-    app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title"
-    app:layout_constraintBottom_toBottomOf="parent"
-    android:layout_height="0dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <RelativeLayout
+        android:id="@+id/rl_navi_setting_title"
         android:layout_width="match_parent"
-        android:paddingBottom="@dimen/module_search_dp_150"
-        android:layout_height="wrap_content">
+        android:layout_height="@dimen/dp_80"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginLeft="@dimen/dp_60"
+        android:layout_marginTop="@dimen/dp_30"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-  <LinearLayout
-      android:layout_width="@dimen/module_search_180dp"
-      android:layout_height="@dimen/module_search_dp_120"
-      android:layout_marginTop="@dimen/dp_24"
-      android:background="@drawable/shape_round_gray"
-      android:orientation="horizontal"
-      android:gravity="center_vertical"
-      android:id="@+id/ll_navi_sound"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/tv_navi_sound"
-      >
-
-
-    <ImageView
-        android:layout_width="0dp"
-        android:id="@+id/iv_sound_minus"
-        android:src="@mipmap/icon_navi_sound_low"
-        android:layout_height="match_parent"
-        android:scaleType="center"
-        android:layout_weight="1"
-        />
-    <View
-        android:layout_width="@dimen/dp_3"
-        android:layout_height="@dimen/dp_71"
-        android:background="@color/white_10"
-        />
-
-    <ImageView
-        android:layout_width="0dp"
-        android:scaleType="center"
-
-        android:id="@+id/iv_sound_plus"
-        android:src="@mipmap/icon_navi_sound_plus"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        />
-
-
-  </LinearLayout>
-
-
-  <ImageView
-      android:layout_width="@dimen/dp_80"
-      app:layout_constraintTop_toTopOf="@id/ll_navi_sound"
-      app:layout_constraintBottom_toBottomOf="@id/ll_navi_sound"
-      app:layout_constraintLeft_toRightOf="@id/ll_navi_sound"
-      android:layout_height="@dimen/dp_80"
-      android:src="@mipmap/icon_sound_low"
-      android:id="@+id/iv_navi_sound_low"
-      android:layout_marginLeft="@dimen/dp_40"
-      />
-
-  <ImageView
-      android:layout_width="@dimen/dp_80"
-      android:src="@mipmap/icon_sound_high"
-      android:id="@+id/iv_navi_sound_high"
-      app:layout_constraintTop_toTopOf="@id/ll_navi_sound"
-      app:layout_constraintBottom_toBottomOf="@id/ll_navi_sound"
-      app:layout_constraintRight_toRightOf="@id/ll_navi_path"
-      android:layout_height="@dimen/dp_80"
-      android:layout_marginLeft="@dimen/dp_40"
-      />
-
-
-
-  <SeekBar
-      android:id="@+id/sb_navi_volume_progress"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:splitTrack="false"
-      android:layout_marginLeft="@dimen/dp_40"
-      android:layout_marginRight="@dimen/dp_40"
-      android:maxHeight="@dimen/dp_11"
-      android:progressDrawable="@drawable/shape_seek_bar"
-      android:thumb="@mipmap/icon_pb_thumb"
-      android:progress="30"
-      app:layout_constraintLeft_toRightOf="@id/iv_navi_sound_low"
-      app:layout_constraintRight_toLeftOf="@id/iv_navi_sound_high"
-      app:layout_constraintTop_toTopOf="@id/iv_navi_sound_low"
-      app:layout_constraintBottom_toBottomOf="@id/iv_navi_sound_low"
-
-      />
-
-
-
-  <LinearLayout
-      android:id="@+id/ll_navi_path"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="26dp"
-      android:layout_marginTop="@dimen/dp_12"
-      android:orientation="horizontal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/tv_navi_prefer"
-      >
-
-    <CheckBox
-        android:id="@+id/rb_navi_jam"
-        android:layout_marginRight="20dp"
-        android:checked="true"
-        android:text="@string/navi_prefer_jam"
-        style="@style/rb_setting"
-        />
-
-
-    <CheckBox
-        android:id="@+id/rb_navi_fee"
-        android:layout_marginRight="20dp"
-        android:text="@string/navi_prefer_fee"
-        style="@style/rb_setting"
-        />
-
-
-    <CheckBox
-        android:id="@+id/rb_navi_no_high_way"
-        android:layout_marginRight="20dp"
-        android:text="@string/navi_prefer_no_high_way"
-        style="@style/rb_setting"
-        />
-
-
-    <CheckBox
-        android:id="@+id/rb_navi_high_way"
-        android:text="@string/navi_prefer_high_way"
-        style="@style/rb_setting"
-        />
-  </LinearLayout>
-
-
-
-
-  <TextView
-      android:id="@+id/tv_navi_sound"
-      android:layout_width="wrap_content"
-      android:layout_height="@dimen/module_search_txt_setting_width"
-      android:layout_marginTop="@dimen/dp_32"
-      android:text="@string/navi_setting_sound"
-      android:textColor="@color/white_80"
-      android:textSize="@dimen/txt_normal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/ll_navi_path"
-      />
-
-
-  <TextView
-      android:id="@+id/tv_navi_prefer"
-      android:layout_width="wrap_content"
-      android:layout_height="@dimen/module_search_txt_setting_width"
-      android:layout_marginTop="@dimen/dp_40"
-      android:text="@string/preference_navi"
-      android:textColor="@color/white_80"
-      android:textSize="@dimen/txt_normal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      />
-
-
-
-  <TextView
-      android:id="@+id/tv_navi_sound_type"
-      android:layout_width="wrap_content"
-      android:layout_height="@dimen/module_search_txt_setting_width"
-      android:layout_marginTop="@dimen/dp_40"
-      android:text="@string/preference_navi_sound_type"
-      android:textColor="@color/white_80"
-      android:textSize="@dimen/txt_normal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/ll_navi_sound"
-      />
-
-
-
-
-  <RadioGroup
-      android:id="@+id/rg_navi_sound_type"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="26dp"
-      android:layout_marginTop="@dimen/dp_12"
-      android:orientation="horizontal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/tv_navi_sound_type"
-      >
-
-    <RadioButton
-        android:id="@+id/rb_navi_detail"
-        android:layout_marginRight="20dp"
-        android:checked="true"
-        android:text="@string/navi_prefer_detail"
-        style="@style/rb_setting"
-        />
-
-
-    <RadioButton
-        android:id="@+id/rb_navi_draft"
-        android:text="@string/navi_prefer_draft"
-        style="@style/rb_setting"
-        />
-
-  </RadioGroup>
-
-
-
-
-
-  <TextView
-      android:id="@+id/tv_navi_day_night"
-      android:layout_width="wrap_content"
-      android:layout_height="@dimen/module_search_txt_setting_width"
-      android:layout_marginTop="@dimen/dp_40"
-      android:text="@string/preference_navi_day_mode"
-      android:textColor="@color/white_80"
-      android:textSize="@dimen/txt_normal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/rg_navi_sound_type"
-      />
-
-
-
-
-  <RadioGroup
-      android:id="@+id/rg_navi_day_night"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="26dp"
-      android:layout_marginTop="@dimen/dp_12"
-      android:orientation="horizontal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/tv_navi_day_night"
-      >
-
-    <RadioButton
-        android:id="@+id/rb_navi_day"
-        android:layout_marginRight="20dp"
-        android:checked="true"
-        android:text="@string/navi_prefer_day"
-        style="@style/rb_setting"
-        />
-
-
-    <RadioButton
-        android:id="@+id/rb_navi_night"
-        android:layout_marginRight="20dp"
-
-        android:text="@string/navi_prefer_night"
-        style="@style/rb_setting"
-        />
-
-    <RadioButton
-        android:id="@+id/rb_navi_auto"
-        android:text="@string/navi_prefer_auto"
-        style="@style/rb_setting"
-        />
-
-  </RadioGroup>
-
-
-
-      <TextView
-          android:id="@+id/aimlessMode"
-          android:layout_width="wrap_content"
-          android:layout_height="@dimen/module_search_txt_setting_width"
-          android:layout_marginTop="@dimen/dp_40"
-          android:text="@string/module_search_aimless_mode_anchor"
-          android:textColor="@color/white_80"
-          android:textSize="@dimen/txt_normal"
-          app:layout_constraintTop_toBottomOf="@id/rg_navi_day_night"
-          app:layout_constraintLeft_toLeftOf="parent"
-          />
-
-      <RadioGroup
-          android:id="@+id/aimlessModeGroup"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="26dp"
-          android:layout_marginTop="@dimen/dp_12"
-          android:orientation="horizontal"
-          app:layout_constraintLeft_toLeftOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/aimlessMode"
-          >
-
-        <RadioButton
-            android:id="@+id/aimlessModeClose"
-            android:layout_marginRight="20dp"
-            android:checked="true"
-            android:text="@string/module_search_aimless_mode_close"
-            style="@style/rb_setting"
-            />
-
-
-        <RadioButton
-            android:id="@+id/aimlessModeOpen"
-            android:layout_marginRight="20dp"
-            android:text="@string/module_search_aimless_mode_open"
-            style="@style/rb_setting"
-            />
-
-      </RadioGroup>
-
-      <TextView
-          android:id="@+id/tv_navi_address"
-          android:layout_width="wrap_content"
-          android:layout_height="@dimen/module_search_txt_setting_width"
-          android:layout_marginTop="@dimen/dp_40"
-          android:text="@string/preference_navi_address"
-          android:textColor="@color/white_80"
-          android:textSize="@dimen/txt_normal"
-          app:layout_constraintTop_toBottomOf="@id/aimlessModeGroup"
-          app:layout_constraintLeft_toLeftOf="parent"
-          />
-
-
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:orientation="horizontal"
-          android:id="@+id/ll_navi_set_home"
-          android:gravity="center_vertical"
-          android:layout_marginTop="@dimen/dp_24"
-          android:background="@drawable/shape_round_gray_margin"
-          app:layout_constraintTop_toBottomOf="@id/tv_navi_address"
-          android:layout_height="@dimen/dp_120">
 
         <ImageView
-            android:layout_marginLeft="@dimen/dp_40"
-            android:src="@mipmap/icon_navi_go_home"
+            android:id="@+id/iv_back"
             android:layout_width="@dimen/dp_80"
-            android:layout_height="@dimen/dp_80"/>
+            android:layout_height="@dimen/dp_80"
+            android:layout_centerVertical="true"
+            android:src="@mipmap/icon_back" />
 
         <TextView
-            android:id="@+id/tv_navi_home_address"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:text="@string/navi_set_home"
-            android:textSize="@dimen/dp_40"
-            android:textColor="@color/white_80"
-            android:layout_marginLeft="@dimen/dp_32"
-            android:layout_height="wrap_content"/>
-
-
-        <TextView
-            android:id="@+id/tv_navi_clear_home_address"
             android:layout_width="wrap_content"
-            android:text="@string/navi_clear"
-            android:textSize="@dimen/dp_40"
-            android:textColor="@color/txt_blue"
-            android:layout_marginRight="@dimen/dp_88"
-            android:layout_marginLeft="@dimen/dp_32"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_toRightOf="@id/iv_back"
+            android:text="@string/navi_setting"
+            android:textColor="@color/white"
+            android:textSize="@dimen/txt_title" />
 
-      </LinearLayout>
+    </RelativeLayout>
 
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:overScrollMode="never"
+        android:paddingLeft="@dimen/module_search_dp_160"
+        android:paddingRight="@dimen/module_search_dp_160"
+        android:scrollbars="none"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title">
 
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:orientation="horizontal"
-          android:id="@+id/ll_navi_set_company"
-          android:gravity="center_vertical"
-          android:layout_marginTop="@dimen/dp_40"
-          app:layout_constraintTop_toBottomOf="@id/ll_navi_set_home"
-          android:background="@drawable/shape_round_gray_margin"
-          android:layout_height="@dimen/dp_120">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/module_search_dp_150">
 
-        <ImageView
-            android:layout_marginLeft="@dimen/dp_40"
-            android:src="@mipmap/icon_navi_go_company"
-            android:layout_width="@dimen/dp_80"
-            android:layout_height="@dimen/dp_80"/>
-
-        <TextView
-            android:id="@+id/tv_navi_company_address"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:text="@string/navi_set_company"
-            android:textSize="@dimen/dp_40"
-            android:textColor="@color/white_80"
-            android:layout_marginLeft="@dimen/dp_32"
-            android:layout_height="wrap_content"/>
+            <LinearLayout
+                android:id="@+id/ll_navi_sound"
+                android:layout_width="@dimen/module_search_180dp"
+                android:layout_height="@dimen/module_search_dp_120"
+                android:layout_marginTop="@dimen/dp_24"
+                android:background="@drawable/shape_round_gray"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_navi_sound">
 
 
-        <TextView
-            android:id="@+id/tv_navi_clear_company_address"
-            android:layout_width="wrap_content"
-            android:text="@string/navi_clear"
-            android:textSize="@dimen/dp_40"
-            android:textColor="@color/txt_blue"
-            android:layout_marginRight="@dimen/dp_88"
-            android:layout_marginLeft="@dimen/dp_32"
-            android:layout_height="wrap_content"/>
+                <ImageView
+                    android:id="@+id/iv_sound_minus"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:scaleType="center"
+                    android:src="@mipmap/icon_navi_sound_low" />
 
-      </LinearLayout>
+                <View
+                    android:layout_width="@dimen/dp_3"
+                    android:layout_height="@dimen/dp_71"
+                    android:background="@color/white_10" />
+
+                <ImageView
+                    android:id="@+id/iv_sound_plus"
+                    android:layout_width="0dp"
+
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:scaleType="center"
+                    android:src="@mipmap/icon_navi_sound_plus" />
 
 
-      <TextView
-          android:id="@+id/tv_navi_simulator"
-          android:layout_width="wrap_content"
-          android:layout_height="@dimen/module_search_txt_setting_width"
-          android:layout_marginTop="@dimen/dp_40"
-          android:text="调试模式"
-          android:textColor="@color/white_80"
-          android:textSize="@dimen/txt_normal"
-          app:layout_constraintTop_toBottomOf="@id/ll_navi_set_company"
-          app:layout_constraintLeft_toLeftOf="parent"
-          />
+            </LinearLayout>
 
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:orientation="horizontal"
-          android:id="@+id/ll_navi_simulator"
-          android:layout_height="wrap_content"
-          android:gravity="center_vertical"
-          android:layout_marginTop="@dimen/dp_40"
-          app:layout_constraintTop_toBottomOf="@id/tv_navi_simulator">
 
-        <ToggleButton
-            android:id="@+id/tb_navi"
-            android:textOn="模拟导航开"
-            android:textOff="模拟导航关"
-            android:checked="false"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:textColor="@color/white_80"
-            android:textSize="@dimen/module_search_txt_setting_width"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            <ImageView
+                android:id="@+id/iv_navi_sound_low"
+                android:layout_width="@dimen/dp_80"
+                android:layout_height="@dimen/dp_80"
+                android:layout_marginLeft="@dimen/dp_40"
+                android:src="@mipmap/icon_sound_low"
+                app:layout_constraintBottom_toBottomOf="@id/ll_navi_sound"
+                app:layout_constraintLeft_toRightOf="@id/ll_navi_sound"
+                app:layout_constraintTop_toTopOf="@id/ll_navi_sound" />
 
-        <ToggleButton
-            android:id="@+id/tb_gps"
-            android:layout_marginLeft="50dp"
-            android:checked="false"
-            android:textOn="模拟GPS开"
-            android:textOff="模拟GPS关"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:textColor="@color/white_80"
-            android:textSize="@dimen/module_search_txt_setting_width"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            <ImageView
+                android:id="@+id/iv_navi_sound_high"
+                android:layout_width="@dimen/dp_80"
+                android:layout_height="@dimen/dp_80"
+                android:layout_marginLeft="@dimen/dp_40"
+                android:src="@mipmap/icon_sound_high"
+                app:layout_constraintBottom_toBottomOf="@id/ll_navi_sound"
+                app:layout_constraintRight_toRightOf="@id/ll_navi_path"
+                app:layout_constraintTop_toTopOf="@id/ll_navi_sound" />
 
-      </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <SeekBar
+                android:id="@+id/sb_navi_volume_progress"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_40"
+                android:layout_marginRight="@dimen/dp_40"
+                android:maxHeight="@dimen/dp_11"
+                android:progress="30"
+                android:progressDrawable="@drawable/shape_seek_bar"
+                android:splitTrack="false"
+                android:thumb="@mipmap/icon_pb_thumb"
+                app:layout_constraintBottom_toBottomOf="@id/iv_navi_sound_low"
+                app:layout_constraintLeft_toRightOf="@id/iv_navi_sound_low"
+                app:layout_constraintRight_toLeftOf="@id/iv_navi_sound_high"
+                app:layout_constraintTop_toTopOf="@id/iv_navi_sound_low"
 
-  </ScrollView>
+                />
+
+
+            <LinearLayout
+                android:id="@+id/ll_navi_path"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_12"
+                android:layout_marginBottom="26dp"
+                android:orientation="horizontal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_navi_prefer">
+
+                <CheckBox
+                    android:id="@+id/rb_navi_jam"
+                    style="@style/rb_setting"
+                    android:layout_marginRight="20dp"
+                    android:checked="true"
+                    android:text="@string/navi_prefer_jam" />
+
+
+                <CheckBox
+                    android:id="@+id/rb_navi_fee"
+                    style="@style/rb_setting"
+                    android:layout_marginRight="20dp"
+                    android:text="@string/navi_prefer_fee" />
+
+
+                <CheckBox
+                    android:id="@+id/rb_navi_no_high_way"
+                    style="@style/rb_setting"
+                    android:layout_marginRight="20dp"
+                    android:text="@string/navi_prefer_no_high_way" />
+
+
+                <CheckBox
+                    android:id="@+id/rb_navi_high_way"
+                    style="@style/rb_setting"
+                    android:text="@string/navi_prefer_high_way" />
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/tv_navi_sound"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/module_search_txt_setting_width"
+                android:layout_marginTop="@dimen/dp_32"
+                android:text="@string/navi_setting_sound"
+                android:textColor="@color/white_80"
+                android:textSize="@dimen/txt_normal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/ll_navi_path" />
+
+
+            <TextView
+                android:id="@+id/tv_navi_prefer"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/module_search_txt_setting_width"
+                android:layout_marginTop="@dimen/dp_40"
+                android:text="@string/preference_navi"
+                android:textColor="@color/white_80"
+                android:textSize="@dimen/txt_normal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+            <TextView
+                android:id="@+id/tv_navi_sound_type"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/module_search_txt_setting_width"
+                android:layout_marginTop="@dimen/dp_40"
+                android:text="@string/preference_navi_sound_type"
+                android:textColor="@color/white_80"
+                android:textSize="@dimen/txt_normal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/ll_navi_sound" />
+
+
+            <RadioGroup
+                android:id="@+id/rg_navi_sound_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_12"
+                android:layout_marginBottom="26dp"
+                android:orientation="horizontal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_navi_sound_type">
+
+                <RadioButton
+                    android:id="@+id/rb_navi_detail"
+                    style="@style/rb_setting"
+                    android:layout_marginRight="20dp"
+                    android:checked="true"
+                    android:text="@string/navi_prefer_detail" />
+
+
+                <RadioButton
+                    android:id="@+id/rb_navi_draft"
+                    style="@style/rb_setting"
+                    android:text="@string/navi_prefer_draft" />
+
+            </RadioGroup>
+
+
+            <TextView
+                android:id="@+id/tv_navi_day_night"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/module_search_txt_setting_width"
+                android:layout_marginTop="@dimen/dp_40"
+                android:text="@string/preference_navi_day_mode"
+                android:textColor="@color/white_80"
+                android:textSize="@dimen/txt_normal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/rg_navi_sound_type" />
+
+
+            <RadioGroup
+                android:id="@+id/rg_navi_day_night"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_12"
+                android:layout_marginBottom="26dp"
+                android:orientation="horizontal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_navi_day_night">
+
+                <RadioButton
+                    android:id="@+id/rb_navi_day"
+                    style="@style/rb_setting"
+                    android:layout_marginRight="20dp"
+                    android:checked="true"
+                    android:text="@string/navi_prefer_day" />
+
+
+                <RadioButton
+                    android:id="@+id/rb_navi_night"
+                    style="@style/rb_setting"
+
+                    android:layout_marginRight="20dp"
+                    android:text="@string/navi_prefer_night" />
+
+                <RadioButton
+                    android:id="@+id/rb_navi_auto"
+                    style="@style/rb_setting"
+                    android:text="@string/navi_prefer_auto" />
+
+            </RadioGroup>
+
+
+            <TextView
+                android:id="@+id/aimlessMode"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/module_search_txt_setting_width"
+                android:layout_marginTop="@dimen/dp_40"
+                android:text="@string/module_search_aimless_mode_anchor"
+                android:textColor="@color/white_80"
+                android:textSize="@dimen/txt_normal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/rg_navi_day_night" />
+
+            <RadioGroup
+                android:id="@+id/aimlessModeGroup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_12"
+                android:layout_marginBottom="26dp"
+                android:orientation="horizontal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/aimlessMode">
+
+                <RadioButton
+                    android:id="@+id/aimlessModeClose"
+                    style="@style/rb_setting"
+                    android:layout_marginRight="20dp"
+                    android:checked="true"
+                    android:text="@string/module_search_aimless_mode_close" />
+
+
+                <RadioButton
+                    android:id="@+id/aimlessModeOpen"
+                    style="@style/rb_setting"
+                    android:layout_marginRight="20dp"
+                    android:text="@string/module_search_aimless_mode_open" />
+
+            </RadioGroup>
+
+            <TextView
+                android:id="@+id/tv_navi_address"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/module_search_txt_setting_width"
+                android:layout_marginTop="@dimen/dp_40"
+                android:text="@string/preference_navi_address"
+                android:textColor="@color/white_80"
+                android:textSize="@dimen/txt_normal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/aimlessModeGroup" />
+
+
+            <LinearLayout
+                android:id="@+id/ll_navi_set_home"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_120"
+                android:layout_marginTop="@dimen/dp_24"
+                android:background="@drawable/shape_round_gray_margin"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_navi_address">
+
+                <ImageView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="@dimen/dp_80"
+                    android:layout_marginLeft="@dimen/dp_40"
+                    android:src="@mipmap/icon_navi_go_home" />
+
+                <TextView
+                    android:id="@+id/tv_navi_home_address"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_32"
+                    android:layout_weight="1"
+                    android:text="@string/navi_set_home"
+                    android:textColor="@color/white_80"
+                    android:textSize="@dimen/dp_40" />
+
+
+                <TextView
+                    android:id="@+id/tv_navi_clear_home_address"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_32"
+                    android:layout_marginRight="@dimen/dp_88"
+                    android:text="@string/navi_clear"
+                    android:textColor="@color/txt_blue"
+                    android:textSize="@dimen/dp_40" />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/ll_navi_set_company"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_120"
+                android:layout_marginTop="@dimen/dp_40"
+                android:background="@drawable/shape_round_gray_margin"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/ll_navi_set_home">
+
+                <ImageView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="@dimen/dp_80"
+                    android:layout_marginLeft="@dimen/dp_40"
+                    android:src="@mipmap/icon_navi_go_company" />
+
+                <TextView
+                    android:id="@+id/tv_navi_company_address"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_32"
+                    android:layout_weight="1"
+                    android:text="@string/navi_set_company"
+                    android:textColor="@color/white_80"
+                    android:textSize="@dimen/dp_40" />
+
+
+                <TextView
+                    android:id="@+id/tv_navi_clear_company_address"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_32"
+                    android:layout_marginRight="@dimen/dp_88"
+                    android:text="@string/navi_clear"
+                    android:textColor="@color/txt_blue"
+                    android:textSize="@dimen/dp_40" />
+
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/tv_navi_simulator"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/module_search_txt_setting_width"
+                android:layout_marginTop="@dimen/dp_40"
+                android:text="调试模式"
+                android:textColor="@color/white_80"
+                android:textSize="@dimen/txt_normal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/ll_navi_set_company" />
+
+            <LinearLayout
+                android:id="@+id/ll_navi_simulator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_40"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_navi_simulator">
+
+                <ToggleButton
+                    android:id="@+id/tb_navi"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:textColor="@color/white_80"
+                    android:textOff="模拟导航关"
+                    android:textOn="模拟导航开"
+                    android:textSize="@dimen/module_search_txt_setting_width"
+                    app:layout_constraintLeft_toLeftOf="parent" />
+
+                <ToggleButton
+                    android:id="@+id/tb_gps"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="50dp"
+                    android:checked="false"
+                    android:textColor="@color/white_80"
+                    android:textOff="模拟GPS关"
+                    android:textOn="模拟GPS开"
+                    android:textSize="@dimen/module_search_txt_setting_width"
+                    app:layout_constraintLeft_toLeftOf="parent" />
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml
index a081fa12ab..4a805f7462 100644
--- a/modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml
@@ -45,6 +45,6 @@
     <dimen name="module_search_category_margin_bottom">96px</dimen>
     <dimen name="module_search_dp_104">56px</dimen>
     <dimen name="module_search_strategy_name_width" >100px</dimen>
-    <dimen name="module_search_marker_number_textSize">18dp</dimen>
+    <dimen name="module_search_marker_number_textSize">18px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml
index ed3dae2497..e55d924738 100644
--- a/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml
@@ -42,6 +42,6 @@
     <dimen name="module_search_category_margin_bottom">184px</dimen>
     <dimen name="module_search_dp_104">104px</dimen>
     <dimen name="module_search_strategy_name_width">154px</dimen>
-    <dimen name="module_search_marker_number_textSize">32dp</dimen>
+    <dimen name="module_search_marker_number_textSize">32px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/res/values/dimens.xml b/modules/mogo-module-search/src/main/res/values/dimens.xml
index ae0a7b7fe8..ada5a8de74 100644
--- a/modules/mogo-module-search/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-search/src/main/res/values/dimens.xml
@@ -45,7 +45,7 @@
   <dimen name="module_search_category_margin_bottom">184px</dimen>
   <dimen name="module_search_dp_104">104px</dimen>
   <dimen name="module_search_strategy_name_width" >154px</dimen>
-  <dimen name="module_search_marker_number_textSize">32dp</dimen>
+  <dimen name="module_search_marker_number_textSize">32px</dimen>
 
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java
index f964562c48..28cddde085 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java
@@ -16,7 +16,7 @@ import com.mogo.utils.logger.Logger;
  * @author congtaowang
  * @since 2020-05-27
  * <p>
- * 描述
+ * 调用 #mogo-module-service# 模块的样式打点
  */
 @Route( path = MogoServicePaths.PATH_MARKER_SERVICE )
 public class MogoMarkerServiceImpl implements IMogoMarkerService {
@@ -27,9 +27,9 @@ public class MogoMarkerServiceImpl implements IMogoMarkerService {
     @Override
     public IMogoMarker drawMarker( Object object ) {
         if ( object instanceof MarkerShowEntity ) {
-            return MarkerServiceHandler.drawMapMarker( ( ( MarkerShowEntity ) object ) );
+            return MarkerServiceHandler.getMapMarkerManager().drawMapMarker( ( ( MarkerShowEntity ) object ) );
         }
-        Logger.w(TAG, "object must instance of [com.mogo.module.common.entity.MarkerShowEntity]");
+        Logger.w( TAG, "object must instance of [com.mogo.module.common.entity.MarkerShowEntity]" );
         return null;
     }
 
diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_grey.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_grey.xml
index 67f37a98a6..9320416f62 100644
--- a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_grey.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_grey.xml
@@ -10,7 +10,7 @@
             <shape android:shape="rectangle" >
                 <size android:width="@dimen/dp_20"
                     android:height="@dimen/dp_20"/>
-                <solid android:color="#4D4F64" />
+                <solid android:color="#3F4057" />
             </shape >
         </rotate >
     </item >
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
index 60e1764d48..1917bf59ae 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
@@ -37,7 +37,7 @@
             android:layout_width="@dimen/dp_60"
             android:layout_height="@dimen/dp_60"
             android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginLeft="@dimen/dp_15"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"