diff --git a/.idea/misc.xml b/.idea/misc.xml
index 707ee6e613..2dc54c489f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml
index 5b12d6e39c..c9efac23e8 100644
--- a/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">78px</dimen>
     <dimen name="module_apps_navigator_icon_height">78px</dimen>
     <dimen name="module_apps_navigator_icon_divider">17px</dimen>
-    <dimen name="module_apps_voice_icon_width">78px</dimen>
-    <dimen name="module_apps_voice_icon_height">78px</dimen>
+    <dimen name="module_apps_voice_icon_width">70px</dimen>
+    <dimen name="module_apps_voice_icon_height">70px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
index 993c7c44b2..e4753b0f9d 100644
--- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">140px</dimen>
     <dimen name="module_apps_navigator_icon_height">140px</dimen>
     <dimen name="module_apps_navigator_icon_divider">30px</dimen>
-    <dimen name="module_apps_voice_icon_width">120px</dimen>
-    <dimen name="module_apps_voice_icon_height">120px</dimen>
+    <dimen name="module_apps_voice_icon_width">110px</dimen>
+    <dimen name="module_apps_voice_icon_height">110px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml
index b31ac60e8f..531b3a851b 100644
--- a/modules/mogo-module-apps/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml
@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">140px</dimen>
     <dimen name="module_apps_navigator_icon_height">140px</dimen>
     <dimen name="module_apps_navigator_icon_divider">30px</dimen>
-    <dimen name="module_apps_voice_icon_width">120px</dimen>
-    <dimen name="module_apps_voice_icon_height">120px</dimen>
+    <dimen name="module_apps_voice_icon_width">110px</dimen>
+    <dimen name="module_apps_voice_icon_height">110px</dimen>
 </resources>
\ No newline at end of file
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 fd6377a2e2..5bf3a1c9ae 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
@@ -39,6 +39,7 @@ import com.mogo.module.common.map.MapCenterPointStrategy;
 import com.mogo.module.common.map.Scene;
 import com.mogo.module.extensions.ExtensionsModuleConst;
 import com.mogo.module.extensions.R;
+import com.mogo.module.extensions.navi.NaviInfoView;
 import com.mogo.module.extensions.utils.TopViewAnimHelper;
 import com.mogo.module.share.ShareControl;
 import com.mogo.service.IMogoServiceApis;
@@ -85,7 +86,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
 
     private View mMove2CurrentLocation;
 
-//    private NaviInfoView mNaviInfo;
+    private NaviInfoView mNaviInfo;
     private TextView mExitNavi;
 
 
@@ -264,6 +265,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
         if(rootView!=null) {
             TopViewAnimHelper.getInstance().init(rootView);
         }
+        TopViewAnimHelper.getInstance().setIMogoMapUIController( mMApUIController );
 
         mExitNavi = findViewById( R.id.module_entrance_id_exit_navi );
         mExitNavi.setOnClickListener( view -> {
@@ -324,6 +326,9 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
                 ResourcesHelper.getDimensionPixelSize( getContext(), R.dimen.module_map_display_overview_right_margin ),
                 ResourcesHelper.getDimensionPixelSize( getContext(), R.dimen.module_map_display_overview_bottom_margin )
         );
+
+        mNaviInfo = new NaviInfoView();
+        mNaviInfo.inflate( rootView );
     }
 
     private static final String AUTONAVI_STANDARD_BROADCAST_RECV = "AUTONAVI_STANDARD_BROADCAST_RECV";
@@ -394,27 +399,29 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
         if ( naviinfo == null ) {
             return;
         }
-//        mNaviInfo.notifyChanged( naviinfo );
+        mNaviInfo.notifyChanged( naviinfo );
     }
 
     @Override
     public void onStartNavi() {
-//        mNaviInfo.setVisibility( View.VISIBLE );
+        TopViewAnimHelper.getInstance().showNaviView();
         mExitNavi.setVisibility( View.VISIBLE );
         mMApUIController.changeMapMode( mCameraMode.isSelected() ? EnumMapUI.NorthUP_2D : EnumMapUI.CarUp_2D );
         MapCenterPointStrategy.setMapCenterPointBySceneAndDelay( mMApUIController, Scene.NAVI, 500, () -> {
             return !mMogoNavi.isNaviing();
         } );
         mDisplayOverview.setVisibility( View.VISIBLE );
+        mCameraMode.setVisibility( View.VISIBLE );
         mApis.getAnalyticsApi().track( "Navigation_begin", new HashMap<>() );
     }
 
     @Override
     public void onStopNavi() {
-//        mNaviInfo.setVisibility( View.GONE );
+        TopViewAnimHelper.getInstance().hideNaviView();
         mExitNavi.setVisibility( View.GONE );
         mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
         mDisplayOverview.setVisibility( View.GONE );
+        mCameraMode.setVisibility( View.GONE );
         MapCenterPointStrategy.setMapCenterPointByScene( mMApUIController, Scene.AIMLESS );
     }
 
@@ -471,7 +478,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
                 return;
             }
             if ( isTrue ) {
-                mDisplayOverviewText.setText( "退出全览" );
+                mDisplayOverviewText.setText( "退出\n全览" );
                 mCameraMode.setVisibility( View.GONE );
             } else {
                 mDisplayOverviewText.setText( "全览" );
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
index 700c23d406..13101f2587 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
@@ -1,13 +1,8 @@
 package com.mogo.module.extensions.navi;
 
-import android.content.Context;
-import android.util.AttributeSet;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
 import com.mogo.map.impl.amap.utils.IconTypeUtils;
 import com.mogo.map.navi.MogoNaviInfo;
 
@@ -20,19 +15,7 @@ import java.util.Calendar;
  * <p>
  * 描述
  */
-public abstract class BaseNaviInfoView extends RelativeLayout {
-
-    public BaseNaviInfoView( Context context ) {
-        this( context, null );
-    }
-
-    public BaseNaviInfoView( Context context, @Nullable AttributeSet attrs ) {
-        this( context, attrs, 0 );
-    }
-
-    public BaseNaviInfoView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) {
-        super( context, attrs, defStyleAttr );
-    }
+public abstract class BaseNaviInfoView {
 
     public void notifyChanged( MogoNaviInfo naviInfo ) {
 
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java
index c15abd7991..59970e730e 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java
@@ -1,13 +1,9 @@
 package com.mogo.module.extensions.navi;
 
-import android.content.Context;
-import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.module.extensions.R;
 
@@ -30,27 +26,17 @@ public class NaviInfoView extends BaseNaviInfoView {
     private TextView remainingTimeUnit;
     private TextView arriveTime;
 
-    public NaviInfoView( Context context ) {
-        this( context, null );
-    }
+    public void inflate(View view){
+        turnIcon = view.findViewById( R.id.module_map_id_navi_next_info_road_turn_icon );
+        distance = view.findViewById( R.id.module_map_id_navi_next_info_distance );
+        distanceUnit = view.findViewById( R.id.module_map_id_navi_next_info_distance_unit );
+        nextRoad = view.findViewById( R.id.module_map_id_navi_next_info_road );
 
-    public NaviInfoView( Context context, @Nullable AttributeSet attrs ) {
-        this( context, attrs, 0 );
-    }
-
-    public NaviInfoView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) {
-        super( context, attrs, defStyleAttr );
-        View.inflate( context, R.layout.module_map_layout_navi_info_panel, this );
-        turnIcon = findViewById( R.id.module_map_id_navi_next_info_road_turn_icon );
-        distance = findViewById( R.id.module_map_id_navi_next_info_distance );
-        distanceUnit = findViewById( R.id.module_map_id_navi_next_info_distance_unit );
-        nextRoad = findViewById( R.id.module_map_id_navi_next_info_road );
-
-        remainingDistance = findViewById( R.id.module_map_id_remaining_distance );
-        remainingDistanceUnit = findViewById( R.id.module_map_id_remaining_distance_unit );
-        remainingTime = findViewById( R.id.module_map_id_remaining_time );
-        remainingTimeUnit = findViewById( R.id.module_map_id_remaining_time_unit );
-        arriveTime = findViewById( R.id.module_map_id_arrive_time );
+        remainingDistance = view.findViewById( R.id.module_map_id_remaining_distance );
+        remainingDistanceUnit = view.findViewById( R.id.module_map_id_remaining_distance_unit );
+        remainingTime = view.findViewById( R.id.module_map_id_remaining_time );
+        remainingTimeUnit = view.findViewById( R.id.module_map_id_remaining_time_unit );
+        arriveTime = view.findViewById( R.id.module_map_id_arrive_time );
     }
 
     @Override
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 fc61c6281f..178a974615 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
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/module_entrance_id_top_motion_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -71,7 +72,7 @@
         android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
         android:text="左转进入"
         android:textColor="#7FF1F1F1"
-        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
+        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_next_step_textSize"
         app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance_unit"
         app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance_unit" />
 
@@ -235,6 +236,7 @@
         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"
         app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition"
@@ -250,7 +252,7 @@
         android:background="@drawable/module_ext_dw_common_corner_bkg"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="visible"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg">
 
@@ -292,6 +294,7 @@
         android:layout_width="@dimen/module_ext_operation_panel_share_width"
         android:layout_height="@dimen/module_ext_operation_panel_share_height"
         android:layout_marginBottom="@dimen/module_ext_operation_panel_share_marginBottom"
+        android:background="@drawable/module_ext_dw_upload_road_condition_bkg"
         app:layout_constraintBottom_toTopOf="@+id/module_entrance_id_move2_current_location"
         app:layout_constraintRight_toRightOf="@+id/module_entrance_id_move2_current_location"
         app:layout_goneMarginBottom="@dimen/module_ext_operation_panel_share_goneMarginBottom">
@@ -300,20 +303,22 @@
             android:id="@+id/module_entrance_id_upload"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/module_ext_dw_upload_road_condition_bkg"
             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" />
 
         <ImageView
             android:id="@+id/module_entrance_id_uploading"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/module_ext_dw_upload_road_condition_bkg"
+            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:scaleType="fitCenter"
+            android:src="@drawable/module_ext_ic_uploading_00010"
             android:textColor="#FFFFFF"
-            android:textSize="@dimen/module_ext_operation_panel_share_textSize"
             android:visibility="gone" />
     </FrameLayout>
 
@@ -334,7 +339,7 @@
             android:text="前方\n实况"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/module_ext_navi_exit_textSize"
-            android:visibility="visible" />
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/module_entrance_id_button2"
@@ -346,7 +351,7 @@
             android:text="取消\n求助"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/module_ext_navi_exit_textSize"
-            android:visibility="visible" />
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/module_entrance_id_exit_navi"
@@ -358,7 +363,7 @@
             android:text="@string/module_ext_str_exit_navi"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/module_ext_navi_exit_textSize"
-            android:visibility="visible" />
+            android:visibility="gone" />
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel_2.xml b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel_2.xml
deleted file mode 100644
index 729703ad4e..0000000000
--- a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel_2.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:layoutDescription="@xml/module_ext_top_motion"
-    android:layout_width="@dimen/module_ext_navi_info_panel_width"
-    android:layout_height="@dimen/module_ext_navi_info_panel_height"
-    android:background="@drawable/module_ext_dw_navi_info_panel_bkg">
-
-    <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"
-        android:background="@drawable/module_ext_dw_navi_info_panel_bkg" />
-
-    <ImageView
-        android:id="@+id/module_map_id_navi_next_info_road_turn_icon"
-        android:layout_width="@dimen/module_ext_navi_info_panel_turn_icon_width"
-        android:layout_height="@dimen/module_ext_navi_info_panel_turn_icon_height"
-        android:layout_marginStart="@dimen/module_ext_navi_info_panel_turn_icon_marginLeft"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
-        android:src="@drawable/ic_11" />
-
-    <TextView
-        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:textColor="#F1F1F1"
-        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_textSize"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_road_turn_icon"
-        app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_next_info_road_turn_icon"
-        android:text="53" />
-
-    <TextView
-        android:id="@+id/module_map_id_navi_next_info_distance_unit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
-        android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
-        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance"
-        app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance"
-        android:text="米" />
-
-    <TextView
-        android:id="@+id/module_map_id_navi_next_info_turn_info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
-        android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
-        android:textColor="#7FF1F1F1"
-        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
-        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance_unit"
-        app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance_unit"
-        android:text="左转进入" />
-
-    <TextView
-        android:id="@+id/module_map_id_navi_next_info_road"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_ext_navi_next_info_road_marginTop"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="#F1F1F1"
-        android:textSize="@dimen/module_ext_navi_info_panel_next_info_road_textSize"
-        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"
-        android:text="北三环东路辅路" />
-
-    <!--remain distance-->
-    <ImageView
-        android:id="@+id/module_map_id_remaining_distance_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_117"
-        android:src="@drawable/module_ext_ic_navi_info1"
-        app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_distance"
-        app:layout_constraintRight_toLeftOf="@id/module_map_id_remaining_time_icon"
-        app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-    <TextView
-        android:id="@+id/module_map_id_remaining_distance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#F1F1F1"
-        android:textSize="@dimen/module_ext_remaining_distance_textSize"
-        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"
-        android:text="3599" />
-
-    <TextView
-        android:id="@+id/module_map_id_remaining_distance_unit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#F1F1F1"
-        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
-        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_distance"
-        app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_distance"
-        android:text="km" />
-
-    <TextView
-        android:id="@+id/module_map_id_remaining_distance_notice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="剩余"
-        android:textColor="#7FFFFFFF"
-        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
-        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance"
-        app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_distance" />
-
-    <!--remain time-->
-    <ImageView
-        android:id="@+id/module_map_id_remaining_time_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_117"
-        android:src="@drawable/module_ext_ic_navi_info2"
-        app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time"
-        app:layout_constraintRight_toLeftOf="@id/module_map_id_arrive_time_icon"
-        app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-    <TextView
-        android:id="@+id/module_map_id_remaining_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#F1F1F1"
-        android:textSize="@dimen/module_ext_remaining_time_textSize"
-        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"
-        android:text="3599" />
-
-    <TextView
-        android:id="@+id/module_map_id_remaining_time_unit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#F1F1F1"
-        android:textSize="@dimen/module_ext_remaining_time_unit_textSize"
-        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_time"
-        app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_time"
-        android:text="km" />
-
-    <TextView
-        android:id="@+id/module_map_id_remaining_time_notice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="时间"
-        android:textColor="#7FFFFFFF"
-        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
-        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time"
-        app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_time" />
-
-    <!--arrive time-->
-    <ImageView
-        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: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"
-        app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-    <TextView
-        android:id="@+id/module_map_id_arrive_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#F1F1F1"
-        android:textSize="@dimen/module_ext_arrive_time_textSize"
-        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"
-        android:text="3599" />
-
-    <TextView
-        android:id="@+id/module_map_id_arrive_time_notice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="到达"
-        android:textColor="#7FFFFFFF"
-        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
-        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
-        app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time"
-        app:layout_constraintTop_toBottomOf="@id/module_map_id_arrive_time" />
-</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
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 6ee10cc338..e2f012b564 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
@@ -90,8 +90,8 @@
     <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">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">40px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">15px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">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>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">15px</dimen>
@@ -130,4 +130,7 @@
     <dimen name="module_ext_camera_button_marginTop">16px</dimen>
     <dimen name="module_ext_display_overview_textSize">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>
 </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 b936d0a5eb..173199225f 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
@@ -127,5 +127,8 @@
     <dimen name="module_ext_camera_button_marginTop">30px</dimen>
     <dimen name="module_ext_display_overview_textSize">22px</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>
 
 </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 d4922bc498..dbd4d79f5a 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -124,5 +124,8 @@
     <dimen name="module_ext_camera_button_marginTop">30px</dimen>
     <dimen name="module_ext_display_overview_textSize">22px</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>
 
 </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 08a1055bcc..a35cb8952b 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
@@ -4,10 +4,7 @@
         <shape>
             <gradient android:angle="0"
                 android:type="linear"
-                android:endColor="#11000000"
-                android:centerY="0.5"
-                android:centerX="0.5"
-                android:centerColor="#99000000"
+                android:endColor="#00000000"
                 android:startColor="#000000" />
         </shape>
     </item>
diff --git a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml
index 0ba4ec9f22..c6ee43fbfb 100644
--- a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <!--    module_main_activity_main.xml-->
-    <dimen name="module_main_map_left_shadow_frame_width">300px</dimen>
+    <dimen name="module_main_map_left_shadow_frame_width">200px</dimen>
     <dimen name="module_main_card_container_marginTop">8px</dimen>
     <dimen name="module_main_card_container_width">352px</dimen>
     <dimen name="module_main_card_container_height">370px</dimen>
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
index ee84bb8039..4d1f9fdb5b 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    module_main_activity_main.xml-->
-    <dimen name="module_main_map_left_shadow_frame_width">300px</dimen>
+    <dimen name="module_main_map_left_shadow_frame_width">200px</dimen>
     <dimen name="module_main_card_container_marginTop">10px</dimen>
     <dimen name="module_main_card_container_width">660px</dimen>
     <dimen name="module_main_card_container_height">690px</dimen>
diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml
index af1335b972..878f4eb149 100644
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    module_main_activity_main.xml-->
-    <dimen name="module_main_map_left_shadow_frame_width">150px</dimen>
+    <dimen name="module_main_map_left_shadow_frame_width">110px</dimen>
     <dimen name="module_main_card_container_marginTop">10px</dimen>
     <dimen name="module_main_card_container_width">660px</dimen>
     <dimen name="module_main_card_container_height">690px</dimen>
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 4e85df77c6..a8cd717cde 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -18,6 +18,7 @@ import com.mogo.module.common.entity.MarkerOnlineCar;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.common.entity.MarkerShareMusic;
 import com.mogo.module.common.entity.MarkerShowEntity;
+import com.mogo.module.common.utils.CarSeries;
 import com.mogo.module.service.MarkerServiceHandler;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.service.Utils;
@@ -147,8 +148,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
             if ( !mogoMarker.isDestroyed() ) {
                 mogoMarker.setInfoWindowAdapter( UserDataMarkerInfoWindowAdapter.getInstance( mContext ) );
                 mogoMarker.showInfoWindow();
-                MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus( TAG, true, false );
-                MarkerServiceHandler.getMapUIController().moveToCenter( mogoMarker.getPosition() );
                 Logger.d( TAG, "打开info window" );
             }
         } else {
@@ -169,6 +168,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                 mogoMarker.setToTop();
             }
         }
+        MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus( TAG, true, false );
+        MarkerServiceHandler.getMapUIController().moveToCenter( mogoMarker.getPosition(), CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X );
     }
 
     // 折叠气泡
diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
index 319576c88d..cb9fef8112 100644
--- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
+++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
@@ -6,6 +6,7 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
+    android:padding="1px"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <FrameLayout
@@ -18,7 +19,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:scaleType="fitXY"
             android:src="@drawable/bg_map_marker_dark" />
 
         <ImageView
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 215c7ac295..60e1764d48 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
@@ -6,9 +6,10 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
+    android:padding="1px"
     android:paddingStart="@dimen/dp_5"
     android:paddingEnd="@dimen/dp_5"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" >
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clMarkerContent"
@@ -17,7 +18,7 @@
         android:background="@drawable/bg_map_marker_yellow_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" >
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivUserHead"
@@ -59,7 +60,7 @@
             app:layout_constraintStart_toEndOf="@+id/ivUserHead"
             app:layout_constraintTop_toTopOf="@+id/ivUserHead"
             tools:text="诗一样的女子" />
-    </androidx.constraintlayout.widget.ConstraintLayout >
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -68,7 +69,7 @@
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="@+id/clMarkerContent"
         app:layout_constraintStart_toStartOf="@+id/clMarkerContent"
-        app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" >
+        app:layout_constraintTop_toBottomOf="@+id/clMarkerContent">
 
         <ImageView
             android:id="@+id/ivReverseTriangle"
@@ -81,6 +82,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/icon_map_marker_location_yellow" />
-    </LinearLayout >
+    </LinearLayout>
 
-</LinearLayout >
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file