diff --git a/app/src/catholic/AndroidManifest.xml b/app/src/catholic/AndroidManifest.xml
index e84d902556..8fe77ba4ff 100644
--- a/app/src/catholic/AndroidManifest.xml
+++ b/app/src/catholic/AndroidManifest.xml
@@ -27,6 +27,7 @@
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER"/>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
diff --git a/config.gradle b/config.gradle
index 692a12e959..09aca032e8 100644
--- a/config.gradle
+++ b/config.gradle
@@ -142,7 +142,7 @@ ext {
             gpssimulatordebug        : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}",
             gpssimulatornoop         : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}",
 
-            adasapi                  : "com.zhidao.autopilot.support:adas:1.0.0-SNAPSHOT",
+            adasapi                  : "com.zhidao.autopilot.support:adas:1.0.0",
 
             // 个人中心的SDK
             personalsdk              : "com.zhidaoauto.person.info:data:1.0.1",
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index 81eaf23016..77457a07ae 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -70,33 +70,15 @@ public class AbsMogoApplication extends Application {
             ARouter.openLog();
         }
         ARouter.init( sApp );
-        TipToast.init( this, new TipToast.ToastViewGenerator() {
-            @Override
-            public View make( Context context, String message ) {
-                if ( TextUtils.isEmpty( message ) ) {
-                    return null;
-                }
-                View contentView = LayoutInflater.from( context ).inflate( R.layout.module_commons_layout_toast, null );
-                TextView txt = contentView.findViewById( R.id.module_commons_toast_msg );
-                txt.setText( message );
-                return contentView;
+        TipToast.init( this, ( ( context, message ) -> {
+            if ( TextUtils.isEmpty( message ) ) {
+                return null;
             }
-
-            @Override
-            public int gravity() {
-                return Gravity.TOP | Gravity.CENTER_HORIZONTAL;
-            }
-
-            @Override
-            public int yOffset() {
-                return sApp.getResources().getDimensionPixelSize( R.dimen.module_commons_toast_y_offset );
-            }
-
-            @Override
-            public int xOffset() {
-                return 0;
-            }
-        } );
+            View contentView = LayoutInflater.from( context ).inflate( R.layout.module_commons_layout_toast, null );
+            TextView txt = contentView.findViewById( R.id.module_commons_toast_msg );
+            txt.setText( message );
+            return contentView;
+        } ) );
     }
 
     /**
diff --git a/foudations/mogo-utils/build.gradle b/foudations/mogo-utils/build.gradle
index 2c08bfb9a3..bbd4970b27 100644
--- a/foudations/mogo-utils/build.gradle
+++ b/foudations/mogo-utils/build.gradle
@@ -20,6 +20,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
 }
 
 dependencies {
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java
index 540fa45017..ec457c6b04 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java
@@ -170,11 +170,17 @@ public final class TipToast {
     public interface ToastViewGenerator {
         View make( Context context, String message );
 
-        int gravity();
+        default int gravity() {
+            return Gravity.CENTER;
+        }
 
-        int yOffset();
+        default int yOffset() {
+            return 0;
+        }
 
-        int xOffset();
+        default int xOffset() {
+            return 0;
+        }
     }
 
 }
diff --git a/gradle.properties b/gradle.properties
index d5b42733d0..4b79721c7e 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.4
+MOGO_MODULE_MEDIA_VERSION=1.0.4.10
 # 推送
 MOGO_MODULE_PUSH_VERSION=1.0.1
 # 广告资源位
diff --git a/libraries/map-custom/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java b/libraries/map-custom/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java
new file mode 100644
index 0000000000..e5130dee9f
--- /dev/null
+++ b/libraries/map-custom/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java
@@ -0,0 +1,18 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.mogo.map.impl.amap;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.mogo.map.impl.amap";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
+  public static final String APPLICATION_ID = "com.mogo.map.impl.amap";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "";
+}
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 13101f2587..85faab6b7a 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
@@ -68,7 +68,7 @@ public abstract class BaseNaviInfoView {
     protected String getFormatSurplusTime( int seconds ) {
         if ( seconds > 60 * 60 ) {
             mFormatSurplusDistanceUnit = "h";
-            return String.format( "%.1f", ( ( float ) seconds ) / 60 * 60 );
+            return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) );
         }
 
         if ( seconds > 60 ) {
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 f39a8ea500..9a6c7dcab9 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
@@ -121,7 +121,7 @@
     <!-- 导航查看全程显示范围-->
     <dimen name="module_map_display_overview_left_margin">526px</dimen>
     <dimen name="module_map_display_overview_top_margin">200px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">30px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">83px</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>
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 ed09a45d46..a29ccd00e5 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
@@ -118,7 +118,7 @@
     <!-- 导航查看全程显示范围-->
     <dimen name="module_map_display_overview_left_margin">950px</dimen>
     <dimen name="module_map_display_overview_top_margin">320px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">60px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">150px</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>
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 8fab65ee54..45ce3e4886 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -115,7 +115,7 @@
     <!-- 导航查看全程显示范围-->
     <dimen name="module_map_display_overview_left_margin">950px</dimen>
     <dimen name="module_map_display_overview_top_margin">320px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">60px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">150px</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>
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 bf95c3f61e..719837b740 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,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <gradient android:angle="0" android:centerColor="#7f000000" android:endColor="#00000000" android:startColor="#000000" android:type="linear" />
+            <gradient android:angle="0" android:centerX="0.6" 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 6b90f6cb54..0877bf204c 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
@@ -8,6 +8,6 @@
     <!-- 导航查看全程显示范围-->
     <dimen name="module_map_display_overview_left_margin">526px</dimen>
     <dimen name="module_map_display_overview_top_margin">200px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">30px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">83px</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 7fd851667e..03f0f80ee1 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
@@ -8,6 +8,6 @@
     <!-- 导航查看全程显示范围-->
     <dimen name="module_map_display_overview_left_margin">950px</dimen>
     <dimen name="module_map_display_overview_top_margin">320px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">60px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">150px</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 a8d95c1148..4cab8fda7f 100644
--- a/modules/mogo-module-map/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-map/src/main/res/values/dimens.xml
@@ -8,6 +8,6 @@
     <!-- 导航查看全程显示范围-->
     <dimen name="module_map_display_overview_left_margin">950px</dimen>
     <dimen name="module_map_display_overview_top_margin">320px</dimen>
-    <dimen name="module_map_display_overview_bottom_margin">60px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">150px</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/java/com/mogo/module/navi/constants/SearchApisHolder.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
index 26fabf1bac..378ecf5802 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
@@ -31,100 +31,85 @@ public class SearchApisHolder {
     private static final String TAG = "SearchApisHolder";
 
     private static IMogoServiceApis sApis;
-    private static IMogoMapService sMapServiceApis;
-    private static IMogoMapUIController sUiControllerApis;
-    private static IMogoNavi sNaviApis;
-    private static IMogoMarkerManager sMarkerManagerApis;
-    private static IMogoFragmentManager sFragmentManagerApis;
-    private static IMogoAnalytics sAnalyticsApis;
-    private static IMogoLocationClient sLocationClientApis;
-    private static IMogoStatusManager sStatusManager;
-    private static IMogoRegisterCenter sRegisterCenterApis;
-    private static IMogoIntentManager sIntentManager;
     private static IGuideShowProvider sGuideShowApis;
-    private static IMogoSettingManager sSettingManager;
     private static IMogoGpsSimulatorManager sGpsSimulatorManager;
-    private static IMogoSearchManager sSearchManager;
 
     private static PersonalInfoManagerImpl mPersonalInfoManager;
 
     static {
         Logger.d( TAG, "static block init." );
         sApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
-        sMapServiceApis = sApis.getMapServiceApi();
-        sUiControllerApis = sMapServiceApis.getMapUIController();
-        sNaviApis = sMapServiceApis.getNavi( AbsMogoApplication.getApp() );
-        sMarkerManagerApis = sMapServiceApis.getMarkerManager( AbsMogoApplication.getApp() );
-        sFragmentManagerApis = sApis.getFragmentManagerApi();
-        sAnalyticsApis = sApis.getAnalyticsApi();
-        sLocationClientApis = sMapServiceApis.getSingletonLocationClient( AbsMogoApplication.getApp() );
-        sStatusManager = sApis.getStatusManagerApi();
-        sRegisterCenterApis = sApis.getRegisterCenterApi();
-        sIntentManager = sApis.getIntentManagerApi();
-        sSettingManager = sApis.getSettingManagerApi();
-        sSearchManager = sApis.getSearchManagerApi();
         sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
         sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
     }
 
     public static IMogoServiceApis getApis() {
+        if ( sApis == null ) {
+            sApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
+        }
         return sApis;
     }
 
     public static IMogoMapService getMapServiceApis() {
-        return sMapServiceApis;
+        return getApis().getMapServiceApi();
     }
 
     public static IMogoMapUIController getUiControllerApis() {
-        return sUiControllerApis;
+        return getMapServiceApis().getMapUIController();
     }
 
     public static IMogoNavi getNaviApis() {
-        return sNaviApis;
+        return getMapServiceApis().getNavi( AbsMogoApplication.getApp() );
     }
 
     public static IMogoMarkerManager getMarkerManager() {
-        return sMarkerManagerApis;
+        return getMapServiceApis().getMarkerManager( AbsMogoApplication.getApp() );
     }
 
     public static IMogoFragmentManager getFragmentManager() {
-        return sFragmentManagerApis;
+        return getApis().getFragmentManagerApi();
     }
 
     public static IMogoAnalytics getAnalyticsApis() {
-        return sAnalyticsApis;
+        return getApis().getAnalyticsApi();
     }
 
     public static IMogoLocationClient getLocationClientApis() {
-        return sLocationClientApis;
+        return getMapServiceApis().getSingletonLocationClient( AbsMogoApplication.getApp() );
     }
 
     public static IMogoStatusManager getStatusManager() {
-        return sStatusManager;
+        return getApis().getStatusManagerApi();
     }
 
     public static IMogoRegisterCenter getRegisterCenterApis() {
-        return sRegisterCenterApis;
+        return getApis().getRegisterCenterApi();
     }
 
     public static IMogoIntentManager getIntentManager() {
-        return sIntentManager;
+        return getApis().getIntentManagerApi();
     }
 
     public static IGuideShowProvider getGuideShowApis() {
+        if ( sGuideShowApis == null ) {
+            sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
+        }
         return sGuideShowApis;
     }
 
     public static IMogoSettingManager getSettingManager() {
-        return sSettingManager;
+        return getApis().getSettingManagerApi();
     }
 
     public static IMogoGpsSimulatorManager getGpsSimulatorManager() {
+        if ( sGpsSimulatorManager == null ) {
+            sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
+        }
         return sGpsSimulatorManager;
     }
 
     public static IMogoSearchManager getSearchManager() {
-        return sSearchManager;
+        return getApis().getSearchManagerApi();
     }
 
     public static PersonalInfoManagerImpl getPersonalInfoManager() {
diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
index 600aae8c77..e90b43bf36 100644
--- a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
+++ b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
@@ -3,140 +3,116 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/dp_60"
-    android:paddingLeft="@dimen/dp_60"
-    android:paddingRight="@dimen/dp_60"
-    android:paddingTop="@dimen/dp_40"
-    >
+    android:paddingLeft="@dimen/module_search_search_padding"
+    android:paddingTop="@dimen/module_search_search_paddingTop"
+    android:paddingRight="@dimen/module_search_search_padding"
+    android:paddingBottom="@dimen/module_search_search_padding">
 
 
-  <androidx.cardview.widget.CardView
-      android:id="@+id/cv_search_result"
-      android:layout_width="@dimen/module_search_dp_838"
-      app:cardPreventCornerOverlap="false"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      android:layout_marginTop="@dimen/dp_32"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/ll_navi_search"
-      app:cardBackgroundColor="#3F4057"
-      app:cardCornerRadius="@dimen/dp_16"
-      >
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_search_result"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/module_search_category_margin_bottom"
-        />
-
-
-
-    <ProgressBar
-        android:id="@+id/pb_path"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_gravity="bottom"
-        android:background="@drawable/shape_round_gray_bottom"
-        android:layout_height="@dimen/module_search_category_margin_bottom"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_gravity="bottom"
-        android:background="@color/white_10"
-        android:layout_height="1dp"
-        android:layout_marginBottom="@dimen/module_search_category_margin_bottom"/>
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_search_result"
+        android:layout_width="@dimen/module_search_dp_838"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/module_search_search_result_marginTop"
+        app:cardBackgroundColor="#3F4057"
+        app:cardCornerRadius="@dimen/dp_16"
+        app:cardPreventCornerOverlap="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ll_navi_search">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_search_result"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/module_search_category_margin_bottom" />
+
+        <ProgressBar
+            android:id="@+id/pb_path"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <TextView
+            android:id="@+id/tv_navi_navi"
+            style="@style/txt_btn"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/module_search_dp_104"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="@dimen/module_search_start_button"
+            android:layout_marginRight="@dimen/module_search_start_button"
+            android:layout_marginBottom="@dimen/module_search_start_button"
+            android:text="@string/navi_to_there" />
+    </androidx.cardview.widget.CardView>
 
 
+    <ImageView
+        android:id="@+id/iv_path_fail"
+        android:layout_width="@dimen/module_search_dp_120"
+        android:layout_height="@dimen/module_search_dp_120"
+        android:layout_marginTop="@dimen/dp_224"
+        android:src="@mipmap/icon_path_fail"
+        app:layout_constraintLeft_toLeftOf="@+id/cv_search_result"
+        app:layout_constraintRight_toRightOf="@+id/cv_search_result"
+        app:layout_constraintTop_toTopOf="@+id/cv_search_result" />
 
     <TextView
-        android:id="@+id/tv_navi_navi"
-        android:layout_gravity="bottom"
-        android:layout_width="match_parent"
-        android:layout_margin="@dimen/dp_40"
-        android:text="@string/navi_to_there"
-        android:layout_height="@dimen/module_search_dp_104"
-        style="@style/txt_btn"
-        />
-  </androidx.cardview.widget.CardView>
-
-
-
-
-  <ImageView
-      android:id="@+id/iv_path_fail"
-      app:layout_constraintLeft_toLeftOf="@+id/cv_search_result"
-      app:layout_constraintRight_toRightOf="@+id/cv_search_result"
-      app:layout_constraintTop_toTopOf="@+id/cv_search_result"
-      android:layout_width="@dimen/module_search_dp_120"
-      android:src="@mipmap/icon_path_fail"
-      android:layout_marginTop="@dimen/dp_224"
-      android:layout_height="@dimen/module_search_dp_120"/>
-
-  <TextView
-      android:id="@+id/tv_path_notice"
-      app:layout_constraintLeft_toLeftOf="@+id/cv_search_result"
-      app:layout_constraintRight_toRightOf="@+id/cv_search_result"
-      app:layout_constraintTop_toBottomOf="@+id/iv_path_fail"
-      android:layout_width="wrap_content"
-      android:textColor="@color/white"
-      android:text="路线计算失败"
-      android:textSize="@dimen/dp_44"
-      android:layout_marginTop="@dimen/dp_32"
-      android:layout_height="wrap_content"/>
-
-  <androidx.constraintlayout.widget.Group
-      android:layout_width="wrap_content"
-      android:id="@+id/group_path"
-      android:visibility="gone"
-      android:layout_height="wrap_content"
-    app:constraint_referenced_ids="iv_path_fail,tv_path_notice"/>
-
-  <LinearLayout
-      xmlns:tools="http://schemas.android.com/tools"
-      android:id="@+id/ll_navi_search"
-      android:layout_width="@dimen/module_search_dp_838"
-      android:layout_height="@dimen/module_search_et_hight"
-      android:background="@drawable/shape_round_gray"
-      android:gravity="center_vertical"
-      android:orientation="horizontal"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      tools:showIn="@layout/fragment_search"
-      >
-    <ImageView
-        android:layout_width="@dimen/module_search_iv_back_hight"
-        android:id="@+id/iv_navi_back"
-        android:layout_height="@dimen/module_search_iv_back_hight"
-        android:layout_marginLeft="@dimen/module_search_iv_back_margin_left"
-        android:layout_marginRight="@dimen/module_search_iv_back_margin_right"
-        android:src="@mipmap/icon_back"
-        />
-    <EditText
-        android:layout_width="0dp"
-        android:singleLine="true"
-        android:layout_marginRight="@dimen/module_search_btn_width"
-        android:id="@+id/et_navi_search"
-        android:background="@null"
+        android:id="@+id/tv_path_notice"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:enabled="false"
-        android:inputType="none"
-        android:textSize="@dimen/module_search_et_text_size"
-        android:imeOptions="actionDone"
-        android:hint="@string/hint_map_search"
+        android:layout_marginTop="@dimen/dp_32"
+        android:text="路线计算失败"
         android:textColor="@color/white"
-        android:textColorHint="@color/white_60"
-        />
+        android:textSize="@dimen/dp_44"
+        app:layout_constraintLeft_toLeftOf="@+id/cv_search_result"
+        app:layout_constraintRight_toRightOf="@+id/cv_search_result"
+        app:layout_constraintTop_toBottomOf="@+id/iv_path_fail" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group_path"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="iv_path_fail,tv_path_notice" />
+
+    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/ll_navi_search"
+        android:layout_width="@dimen/module_search_dp_838"
+        android:layout_height="@dimen/module_search_et_hight"
+        android:background="@drawable/shape_round_gray"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:showIn="@layout/fragment_search">
+
+        <ImageView
+            android:id="@+id/iv_navi_back"
+            android:layout_width="@dimen/module_search_iv_back_hight"
+            android:layout_height="@dimen/module_search_iv_back_hight"
+            android:layout_marginLeft="@dimen/module_search_iv_back_margin_left"
+            android:layout_marginRight="@dimen/module_search_iv_back_margin_right"
+            android:src="@mipmap/icon_back" />
+
+        <EditText
+            android:id="@+id/et_navi_search"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/module_search_btn_width"
+            android:layout_weight="1"
+            android:background="@null"
+            android:ellipsize="end"
+            android:enabled="false"
+            android:hint="@string/hint_map_search"
+            android:imeOptions="actionDone"
+            android:inputType="none"
+            android:singleLine="true"
+            android:textColor="@color/white"
+            android:textColorHint="@color/white_60"
+            android:textSize="@dimen/module_search_et_text_size" />
 
 
-  </LinearLayout>
-
+    </LinearLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml b/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml
index e33bc904af..e91d68af0e 100644
--- a/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml
+++ b/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml
@@ -3,46 +3,51 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="@dimen/module_search_choose_path_item_height"
     android:background="@drawable/selector_item_category_background"
-    android:layout_height="@dimen/dp_226">
+    tools:background="#000000">
 
 
     <TextView
         android:id="@+id/amap_calculate_item_strategy_name"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_48"
-        android:layout_marginLeft="@dimen/dp_40"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/module_search_calculate_item_strategy_name_marginLeft"
         android:background="@drawable/amap_calculate_navi_strategy_name_bkg"
         android:gravity="center"
-        android:paddingLeft="8.5dp"
-        android:paddingRight="8.5dp"
+        android:paddingLeft="@dimen/module_search_calculate_item_strategy_name_paddingLeft"
+        android:paddingTop="@dimen/module_search_calculate_item_strategy_name_paddingTop"
+        android:paddingRight="@dimen/module_search_calculate_item_strategy_name_paddingRight"
+        android:paddingBottom="@dimen/module_search_calculate_item_strategy_name_paddingBottom"
         android:textColor="#ccffffff"
-        app:layout_constraintVertical_chainStyle="packed"
+        android:textSize="@dimen/module_search_calculate_item_strategy_name_textSize"
         app:layout_constraintBottom_toTopOf="@+id/amap_calculate_item_strategy_time"
-        android:textSize="@dimen/sp_30"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
         tools:text="距离最短" />
 
     <TextView
         android:id="@+id/amap_calculate_item_strategy_time"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_70"
-        android:layout_marginTop="4.5dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/module_search_calculate_item_strategy_name_marginLeft"
+        android:layout_marginTop="@dimen/module_search_calculate_item_strategy_time_marginTop"
         android:textColor="@color/white"
-        android:textSize="@dimen/dp_50"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginLeft="@dimen/dp_40"
-        app:layout_constraintVertical_chainStyle="packed"
+        android:textSize="@dimen/module_search_calculate_item_strategy_time_textSize"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/amap_calculate_item_strategy_desc"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/amap_calculate_item_strategy_name"
+        app:layout_constraintVertical_chainStyle="packed"
         tools:text="40小时55分" />
 
     <View
         android:id="@+id/amap_calculate_item_strategy_divider"
         android:layout_width="1dp"
         android:layout_height="20dp"
-        android:layout_marginLeft="15dp"
+        android:layout_marginLeft="@dimen/module_search_calculate_item_strategy_divider_marginLeft"
+        android:layout_marginRight="@dimen/module_search_calculate_item_strategy_divider_marginLeft"
         android:background="@color/white_10"
         app:layout_constraintBottom_toBottomOf="@+id/amap_calculate_item_strategy_time"
         app:layout_constraintLeft_toRightOf="@+id/amap_calculate_item_strategy_time"
@@ -51,9 +56,9 @@
     <TextView
         android:id="@+id/amap_calculate_item_strategy_distance"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_70"
-        android:layout_marginLeft="15dp"
-        android:autoSizeMaxTextSize="25dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/module_search_calculate_item_strategy_divider_marginLeft"
+        android:autoSizeMaxTextSize="@dimen/module_search_calculate_item_strategy_time_textSize"
         android:autoSizeMinTextSize="18dp"
         android:autoSizeStepGranularity="1dp"
         android:autoSizeTextType="uniform"
@@ -61,7 +66,8 @@
         android:gravity="center"
         android:maxLines="1"
         android:textColor="@color/white"
-        android:textSize="@dimen/dp_50"
+        android:textSize="@dimen/module_search_calculate_item_strategy_time_textSize"
+        android:textStyle="bold"
         app:layout_constraintLeft_toRightOf="@+id/amap_calculate_item_strategy_divider"
         app:layout_constraintTop_toTopOf="@+id/amap_calculate_item_strategy_time"
         tools:text="2000.5公里" />
@@ -69,22 +75,22 @@
     <TextView
         android:id="@+id/amap_calculate_item_strategy_desc"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_42"
-        android:layout_marginTop="2dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_search_calculate_item_strategy_desc_marginTop"
         android:gravity="center"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:textColor="@color/white_80"
-        android:textSize="@dimen/dp_30"
+        android:textSize="@dimen/module_search_calculate_item_strategy_desc_textSize"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="@+id/amap_calculate_item_strategy_time"
         app:layout_constraintTop_toBottomOf="@+id/amap_calculate_item_strategy_time"
+        app:layout_constraintVertical_chainStyle="packed"
         tools:text="红绿灯4个 收费5元" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:background="#1a000000" />
+        android:layout_marginLeft="@dimen/module_search_calculate_item_strategy_name_marginLeft"
+        android:background="#1a000000"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/res/layout/item_search_category.xml b/modules/mogo-module-search/src/main/res/layout/item_search_category.xml
index b804455410..b92f2ef0d3 100644
--- a/modules/mogo-module-search/src/main/res/layout/item_search_category.xml
+++ b/modules/mogo-module-search/src/main/res/layout/item_search_category.xml
@@ -3,64 +3,63 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@drawable/selector_item_category_background"
     android:layout_height="@dimen/dp_180"
-    >
+    android:background="@drawable/selector_item_category_background"
+    tools:background="#000000">
 
-  <TextView
-      android:id="@+id/iv_position"
-      android:layout_marginLeft="@dimen/dp_32"
-      android:layout_width="@dimen/dp_80"
-      android:gravity="center"
-      android:text="1"
-      android:paddingBottom="@dimen/dp_10"
-      android:textColor="@color/white"
-      android:layout_height="@dimen/dp_80"
-      android:textSize="@dimen/txt_normal"
-      android:background="@drawable/selector_item_category_result"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      />
+    <TextView
+        android:id="@+id/iv_position"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
+        android:layout_marginLeft="@dimen/dp_32"
+        android:background="@drawable/selector_item_category_result"
+        android:gravity="center"
+        android:paddingBottom="@dimen/dp_10"
+        android:text="1"
+        android:textColor="@color/white"
+        android:textSize="@dimen/txt_normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-  <TextView
-      android:id="@+id/tv_position"
-      android:layout_width="0dp"
-      android:layout_height="@dimen/dp_70"
-      android:layout_marginLeft="@dimen/dp_30"
-      android:layout_marginTop="@dimen/dp_30"
-      android:gravity="center_vertical"
-      android:textColor="@color/white"
-      android:textSize="25sp"
-      app:layout_constraintLeft_toRightOf="@id/iv_position"
-      app:layout_constraintRight_toRightOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      />
+    <TextView
+        android:id="@+id/tv_position"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_70"
+        android:layout_marginLeft="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_30"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:textColor="@color/white"
+        android:textSize="25sp"
+        app:layout_constraintLeft_toRightOf="@id/iv_position"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
-  <TextView
-      android:id="@+id/tv_position_des"
-      android:layout_width="0dp"
-      android:layout_height="@dimen/dp_42"
-      android:layout_marginTop="@dimen/dp_8"
-      android:ellipsize="marquee"
-      android:singleLine="true"
-      android:textColor="@color/white_60"
-      android:textSize="@dimen/sp_30"
-      app:layout_constraintLeft_toLeftOf="@id/tv_position"
-      app:layout_constraintRight_toRightOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/tv_position"
-      />
+    <TextView
+        android:id="@+id/tv_position_des"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_42"
+        android:layout_marginTop="@dimen/dp_8"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textColor="@color/white_60"
+        android:textSize="@dimen/sp_30"
+        app:layout_constraintLeft_toLeftOf="@id/tv_position"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_position"
+        tools:text="内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容" />
 
-  <View
-      android:layout_width="0dp"
-      android:layout_height="@dimen/dp_2"
-      android:layout_marginRight="@dimen/dp_32"
-      android:layout_marginLeft="@dimen/dp_110"
-      android:background="@color/white_10"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintRight_toRightOf="parent"
-      />
+    <View
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_2"
+        android:layout_marginLeft="@dimen/dp_110"
+        android:layout_marginRight="@dimen/dp_32"
+        android:background="@color/white_10"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
 
 </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 4a805f7462..fc05233fe3 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
@@ -42,9 +42,25 @@
     <dimen name="module_search_dp_120">64px</dimen>
     <dimen name="module_search_txt_setting_width">24px</dimen>
     <dimen name="module_search_dp_838">446px</dimen>
-    <dimen name="module_search_category_margin_bottom">96px</dimen>
+    <dimen name="module_search_category_margin_bottom">83px</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">18px</dimen>
+    <dimen name="module_search_choose_path_item_height">111px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_textSize">16px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_marginLeft">20px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingLeft">12px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingRight">12px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingTop">2px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingBottom">2px</dimen>
+    <dimen name="module_search_calculate_item_strategy_time_textSize">22px</dimen>
+    <dimen name="module_search_calculate_item_strategy_time_marginTop">3px</dimen>
+    <dimen name="module_search_calculate_item_strategy_divider_marginLeft">16px</dimen>
+    <dimen name="module_search_calculate_item_strategy_desc_textSize">16px</dimen>
+    <dimen name="module_search_calculate_item_strategy_desc_marginTop">2px</dimen>
+    <dimen name="module_search_search_padding">32px</dimen>
+    <dimen name="module_search_search_paddingTop">34px</dimen>
+    <dimen name="module_search_search_result_marginTop">16px</dimen>
+    <dimen name="module_search_start_button">20px</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 e55d924738..6de848b620 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
@@ -39,9 +39,25 @@
     <dimen name="module_search_dp_120">120px</dimen>
     <dimen name="module_search_txt_setting_width">45px</dimen>
     <dimen name="module_search_dp_838">838px</dimen>
-    <dimen name="module_search_category_margin_bottom">184px</dimen>
+    <dimen name="module_search_category_margin_bottom">142px</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">32px</dimen>
+    <dimen name="module_search_choose_path_item_height">212px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_textSize">26px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_marginLeft">40px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingLeft">20px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingRight">20px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingTop">3px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingBottom">3px</dimen>
+    <dimen name="module_search_calculate_item_strategy_time_textSize">48px</dimen>
+    <dimen name="module_search_calculate_item_strategy_time_marginTop">14px</dimen>
+    <dimen name="module_search_calculate_item_strategy_divider_marginLeft">36px</dimen>
+    <dimen name="module_search_calculate_item_strategy_desc_textSize">30px</dimen>
+    <dimen name="module_search_calculate_item_strategy_desc_marginTop">3px</dimen>
+    <dimen name="module_search_search_padding">60px</dimen>
+    <dimen name="module_search_search_paddingTop">40px</dimen>
+    <dimen name="module_search_search_result_marginTop">32px</dimen>
+    <dimen name="module_search_start_button">40px</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 ada5a8de74..94a230bbcc 100644
--- a/modules/mogo-module-search/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-search/src/main/res/values/dimens.xml
@@ -42,10 +42,26 @@
   <dimen name="module_search_dp_120">120px</dimen>
   <dimen name="module_search_txt_setting_width">45px</dimen>
   <dimen name="module_search_dp_838">838px</dimen>
-  <dimen name="module_search_category_margin_bottom">184px</dimen>
+  <dimen name="module_search_category_margin_bottom">142px</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">32px</dimen>
+  <dimen name="module_search_choose_path_item_height">212px</dimen>
+  <dimen name="module_search_calculate_item_strategy_name_textSize">26px</dimen>
+  <dimen name="module_search_calculate_item_strategy_name_marginLeft">40px</dimen>
+  <dimen name="module_search_calculate_item_strategy_name_paddingLeft">20px</dimen>
+  <dimen name="module_search_calculate_item_strategy_name_paddingRight">20px</dimen>
+  <dimen name="module_search_calculate_item_strategy_name_paddingTop">3px</dimen>
+  <dimen name="module_search_calculate_item_strategy_name_paddingBottom">3px</dimen>
+  <dimen name="module_search_calculate_item_strategy_time_textSize">48px</dimen>
+  <dimen name="module_search_calculate_item_strategy_time_marginTop">14px</dimen>
+  <dimen name="module_search_calculate_item_strategy_divider_marginLeft">36px</dimen>
+  <dimen name="module_search_calculate_item_strategy_desc_textSize">30px</dimen>
+  <dimen name="module_search_calculate_item_strategy_desc_marginTop">3px</dimen>
+    <dimen name="module_search_search_padding">60px</dimen>
+  <dimen name="module_search_search_paddingTop">40px</dimen>
+  <dimen name="module_search_search_result_marginTop">32px</dimen>
+  <dimen name="module_search_start_button">40px</dimen>
 
 
 </resources>
\ No newline at end of file
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index ec82685aea..aa344adc0b 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -77,7 +77,7 @@ public class MogoADASController implements IMogoADASController {
             return;
         }
 
-        int delay = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 0 : 500;
+        int delay = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 0 : 100;
 
         UiThreadHandler.postDelayed( () -> {
             try {