From 483b7c694d8a67eb411b8ff27d7c870f7d702d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 21 Oct 2021 18:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81Kotlin=EF=BC=8C=E8=A7=A3=E5=86=B3ARout?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/gradle.xml                              |  1 -
 .idea/misc.xml                                |  1 +
 app/build.gradle                              |  1 -
 core/mogo-core-data/build.gradle              |  3 ++
 .../core/data/constants/MogoServicePaths.java | 22 --------------
 libraries/map-autonavi/build.gradle           | 22 ++++++++++++--
 .../map/impl/automap/navi/MogoMapApi.java     | 13 ++++----
 libraries/mogo-map-api/build.gradle           | 20 +++++++++++--
 libraries/mogo-map/build.gradle               | 18 ++++++++++-
 .../mogo-module-main-launcher/build.gradle    | 22 ++++++++++----
 modules.txt                                   |  1 -
 modules/mogo-module-apps/build.gradle         | 28 ++++++++++-------
 .../applaunch/InternalFunctionLauncher.java   | 11 -------
 modules/mogo-module-back/build.gradle         | 24 +++++++++------
 modules/mogo-module-extensions/build.gradle   | 27 ++++++++++++-----
 .../extensions/entrance/EntranceFragment.java |  4 ---
 .../mogo-module-left-panel-noop/build.gradle  | 25 +++++++++-------
 modules/mogo-module-left-panel/build.gradle   | 27 ++++++++++-------
 .../com/mogo/module/main/SchemeIntent.java    | 30 ++-----------------
 .../com/mogo/module/map/MapPresenter.java     | 10 -------
 modules/mogo-module-monitor/build.gradle      | 21 +++++++++----
 modules/mogo-module-push-base/build.gradle    | 13 ++++----
 modules/mogo-module-push-noop/build.gradle    | 11 ++++---
 modules/mogo-module-push/build.gradle         | 16 ++++++----
 modules/mogo-module-search/build.gradle       | 11 ++++---
 modules/mogo-module-share/build.gradle        | 24 +++++++++------
 modules/mogo-module-v2x/build.gradle          | 20 ++++++++-----
 .../mogo/module/v2x/alarm/V2XAlarmServer.java |  2 +-
 modules/mogo-module-widgets/build.gradle      | 24 ++++++++++-----
 modules/tanlulib/build.gradle                 | 28 ++++++++++-------
 .../com/mogo/service/IMogoServiceApis.java    | 21 ++-----------
 services/mogo-service/build.gradle            | 22 +++++++++-----
 .../mogo/service/impl/MogoServiceApis.java    |  9 ------
 settings.gradle                               |  1 -
 test/crashreport-bugly/build.gradle           | 27 +++++++++++------
 test/crashreport-noop/build.gradle            | 25 +++++++++++-----
 test/crashreport-upgrade/build.gradle         | 26 ++++++++++------
 test/crashreport/build.gradle                 | 23 +++++++++-----
 tts/tts-base/build.gradle                     | 20 +++++++++----
 tts/tts-di/build.gradle                       | 21 +++++++++----
 tts/tts-noop/build.gradle                     | 21 ++++++++-----
 tts/tts-zhi/build.gradle                      | 20 +++++++++----
 42 files changed, 416 insertions(+), 300 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97a9cb7d46..dd543deb69 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -58,7 +58,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-push" />
             <option value="$PROJECT_DIR$/modules/mogo-module-push-base" />
             <option value="$PROJECT_DIR$/modules/mogo-module-push-noop" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-search" />
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
             <option value="$PROJECT_DIR$/modules/mogo-module-share" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f33eb56f53..0e6c457a5d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -33,6 +33,7 @@
         <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="0.25" />
         <entry key="modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml" value="0.3026041666666667" />
         <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" />
+        <entry key="modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml" value="0.1515625" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml" value="0.184" />
diff --git a/app/build.gradle b/app/build.gradle
index 768f77a866..1dd61be66d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -190,7 +190,6 @@ dependencies {
         implementation project(':foudations:mogo-aicloud-services-sdk')
         implementation project(':foudations:mogo-commons')
         implementation project(':modules:mogo-module-common')
-        implementation project(':modules:mogo-module-search')
         implementation project(':modules:mogo-module-authorize')
         implementation project(':modules:mogo-module-service')
         implementation project(':modules:mogo-module-v2x')
diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle
index cc2dce2943..b806033fe3 100644
--- a/core/mogo-core-data/build.gradle
+++ b/core/mogo-core-data/build.gradle
@@ -48,6 +48,9 @@ dependencies {
 
     implementation rootProject.ext.dependencies.gson
 
+    implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     if (Boolean.valueOf(RELEASE)) {
 
     } else {
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
index 7566e44b60..e8d0a6250f 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
@@ -124,28 +124,6 @@ public class MogoServicePaths {
     @Deprecated
     public static final String PATH_ADDRESS_MANAGER = "/addressmanager/api";
 
-    /**
-     * 导航搜索模块管理
-     */
-    @Keep
-    @Deprecated
-    public static final String PATH_SEARCH_MANAGER = "/searchmanager/api";
-
-    /**
-     * 基础设置参数管理
-     */
-    @Keep
-    @Deprecated
-    public static final String PATH_SETTING_MANAGER = "/settingmanager/api";
-
-
-    /**
-     * 搜索module管理中心
-     */
-    @Keep
-    @Deprecated
-    public static final String PATH_SERACH_CENTER = "/searchcenter/api";
-
     /**
      * 大而全数据管理中心
      */
diff --git a/libraries/map-autonavi/build.gradle b/libraries/map-autonavi/build.gradle
index 4e7f6f5255..41c65a0ab3 100644
--- a/libraries/map-autonavi/build.gradle
+++ b/libraries/map-autonavi/build.gradle
@@ -1,4 +1,10 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -10,7 +16,15 @@ android {
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
 
     buildTypes {
@@ -28,6 +42,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+
+    implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+    
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
         implementation rootProject.ext.dependencies.mogomapapi
diff --git a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/MogoMapApi.java b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/MogoMapApi.java
index b776f80279..1fe1f6f714 100644
--- a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/MogoMapApi.java
+++ b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/MogoMapApi.java
@@ -3,22 +3,21 @@ package com.mogo.map.impl.automap.navi;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.map.IMogoMapApiBuilder;
 
-public
 /**
  * @author congtaowang
  * @since 2020/12/10
- *
+ * <p>
  * 描述
  */
-class MogoMapApi {
+public class MogoMapApi {
 
     private static IMogoMapApiBuilder sApiBuilder;
 
     public static IMogoMapApiBuilder getApiBuilder() {
-        if ( sApiBuilder == null ) {
-            synchronized ( AutoNaviClient.class ) {
-                if ( sApiBuilder == null ) {
-                    sApiBuilder = ARouter.getInstance().navigation( IMogoMapApiBuilder.class );
+        if (sApiBuilder == null) {
+            synchronized (AutoNaviClient.class) {
+                if (sApiBuilder == null) {
+                    sApiBuilder = ARouter.getInstance().navigation(IMogoMapApiBuilder.class);
                 }
             }
         }
diff --git a/libraries/mogo-map-api/build.gradle b/libraries/mogo-map-api/build.gradle
index dac2b70e1a..cedaa041fb 100644
--- a/libraries/mogo-map-api/build.gradle
+++ b/libraries/mogo-map-api/build.gradle
@@ -1,4 +1,10 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -11,6 +17,13 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
 
     buildTypes {
@@ -31,7 +44,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation rootProject.ext.dependencies.androidxappcompat
-    api rootProject.ext.dependencies.arouter
+
+    implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
     } else {
diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle
index 6891d56a23..08c76a948a 100644
--- a/libraries/mogo-map/build.gradle
+++ b/libraries/mogo-map/build.gradle
@@ -1,4 +1,10 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -11,6 +17,14 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
 
     buildTypes {
@@ -24,7 +38,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle
index 26dc22b75a..077d93ef3f 100644
--- a/main-extensions/mogo-module-main-launcher/build.gradle
+++ b/main-extensions/mogo-module-main-launcher/build.gradle
@@ -1,4 +1,10 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -11,12 +17,14 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
+
     }
 
     buildTypes {
@@ -38,8 +46,10 @@ dependencies {
 
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.modulemain
         implementation rootProject.ext.dependencies.mogooch
diff --git a/modules.txt b/modules.txt
index 4694fc9807..cafd9dbae7 100644
--- a/modules.txt
+++ b/modules.txt
@@ -37,7 +37,6 @@
 :modules:mogo-module-authorize
 :modules:mogo-module-share
 :modules:mogo-module-extensions
-:modules:mogo-module-search
 :modules:mogo-module-v2x
 :modules:mogo-module-back
 :modules:mogo-module-main
diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle
index 09d0589305..42eb26e4a6 100644
--- a/modules/mogo-module-apps/build.gradle
+++ b/modules/mogo-module-apps/build.gradle
@@ -1,7 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -12,14 +15,15 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
 
     buildTypes {
@@ -44,9 +48,11 @@ dependencies {
 
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.material
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.androidxrecyclerview
 
     if (Boolean.valueOf(RELEASE)) {
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java
index 8a948631fb..cb59fc03d1 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java
@@ -34,17 +34,6 @@ public class InternalFunctionLauncher extends BaseAppLauncher {
     @Override
     public void launch( Context context, AppInfo appInfo ) {
         switch ( appInfo.getPackageName() ) {
-            case "com.autonavi.amapauto":
-                if ( CustomNaviInterrupter.getInstance().interrupt() ) {
-                    try {
-                        launch( context, AppEnum.AUTO_NAVI.getPkg() );
-                    } catch ( Exception e ) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    AppServiceHandler.getApis().getSearchManagerApi().showSearch();
-                }
-                break;
             case "com.mogo.launcher.applist":
                 AppsListActivity.start( mContext );
                 break;
diff --git a/modules/mogo-module-back/build.gradle b/modules/mogo-module-back/build.gradle
index b1872c2b30..37537d4b72 100644
--- a/modules/mogo-module-back/build.gradle
+++ b/modules/mogo-module-back/build.gradle
@@ -1,7 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -14,10 +17,11 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -41,8 +45,10 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxccorektx
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
 
diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle
index 29c1bede68..e4b3761eba 100644
--- a/modules/mogo-module-extensions/build.gradle
+++ b/modules/mogo-module-extensions/build.gradle
@@ -1,5 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -10,14 +15,18 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
+
     }
 
     buildTypes {
@@ -45,8 +54,10 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxcardview
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
     implementation rootProject.ext.dependencies.livesdk
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 395a2d6cd4..d5aa339496 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
@@ -320,10 +320,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         groupUserHead.setVisibility(DebugConfig.isLauncher() ? View.VISIBLE : View.GONE);
 
         if (DebugConfig.isDebug()) {
-            mMove2CurrentLocation.setOnLongClickListener(view -> {
-                mApis.getSearchManagerApi().goSettings();
-                return true;
-            });
 
             mUploadRoadCondition.setOnLongClickListener(view -> {
                 mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog();
diff --git a/modules/mogo-module-left-panel-noop/build.gradle b/modules/mogo-module-left-panel-noop/build.gradle
index 151da29806..a2bcf8b2b6 100644
--- a/modules/mogo-module-left-panel-noop/build.gradle
+++ b/modules/mogo-module-left-panel-noop/build.gradle
@@ -1,8 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -13,14 +15,15 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
 
     buildTypes {
diff --git a/modules/mogo-module-left-panel/build.gradle b/modules/mogo-module-left-panel/build.gradle
index 7bc81cb895..96a1d3386e 100644
--- a/modules/mogo-module-left-panel/build.gradle
+++ b/modules/mogo-module-left-panel/build.gradle
@@ -1,8 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -13,14 +15,15 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
 
     buildTypes {
@@ -46,8 +49,10 @@ dependencies {
     implementation rootProject.ext.dependencies.kotlinstdlibjdk7
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
 
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
index 74dfa6c12b..3a301518e1 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
@@ -6,12 +6,10 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.CommonUtils;
-import com.mogo.utils.TipToast;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 
@@ -112,7 +110,7 @@ public class SchemeIntent implements IMogoStatusChangedListener {
                 delay = 5_000L;
             }
             mNextIntent = new IntentWrapper(intent, delay);
-            if ( mApis.getLauncherApi() != null ) {
+            if (mApis.getLauncherApi() != null) {
                 mApis.getLauncherApi().backToLauncher(mContext);
             }
             return;
@@ -151,11 +149,8 @@ public class SchemeIntent implements IMogoStatusChangedListener {
         if (TextUtils.isEmpty(type)) {
             return;
         }
-        Log.d("语音打开事件面板type",type);
+        Log.d("语音打开事件面板type", type);
         switch (type) {
-            case TYPE_NAVI:
-                handleNaviIntent(target);
-                break;
             case TYPE_LAUNCH:
                 handleLaunchIntent(target);
                 break;
@@ -191,27 +186,6 @@ public class SchemeIntent implements IMogoStatusChangedListener {
                 target.getQueryParameter("keywords"));
     }
 
-    private void handleNaviIntent(Uri naviUri) {
-        if (mApis == null) {
-            return;
-        }
-        String lon = naviUri.getQueryParameter("lon");
-        String lat = naviUri.getQueryParameter("lat");
-
-        try {
-            double dlon = Double.valueOf(lon);
-            double dlat = Double.valueOf(lat);
-            if (mApis.getMapServiceApi().getNavi(mContext).isNaviing()) {
-                mApis.getMapServiceApi().getNavi(mContext).naviTo(new MogoLatLng(dlat, dlon));
-            } else {
-                mApis.getSearchManagerApi().calculatePath(new MogoLatLng(dlat, dlon));
-            }
-        } catch (Exception e) {
-            TipToast.shortTip("目的地异常，不能导航");
-            Logger.e(TAG, e, "error.");
-        }
-    }
-
     private void handleLaunchIntent(Uri uri) {
         String type = uri.getQueryParameter("channelType");
         Map<String, Object> properties = new HashMap<>();
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
index f9e75d48c3..96e1d723f8 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
@@ -13,7 +13,6 @@ import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.commons.voice.VoicePreemptType;
-import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.IMogoNaviListener2;
 import com.mogo.map.navi.MogoNaviConfig;
@@ -29,7 +28,6 @@ import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.launcher.IMogoLauncher;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
 import com.mogo.utils.AppUtils;
@@ -57,12 +55,10 @@ public class MapPresenter extends Presenter< MapView > implements
     private IMogoServiceApis mApis;
     private IMogoMapService mMogoMapService;
     private IMogoIntentManager mMogoIntentManager;
-    private IMogoSearchManager mSearchManager;
     private IMogoRefreshStrategyController mRefreshStrategyController;
     private IMogoStatusManager mStatusManager;
     private IMogoRegisterCenter mRegisterCenter;
     private IMogoLauncher mLauncher;
-    private IMogoSearchManager mMogoSearchManager;
     private Rect mDisplayOverviewBounds;
 
 
@@ -141,9 +137,6 @@ public class MapPresenter extends Presenter< MapView > implements
         if ( mLauncher != null ) {
             mLauncher.backToLauncher( getContext() );
         }
-        if ( !mMogoMapService.getNavi( getContext() ).isNaviing() && !mStatusManager.isSearchUIShow() ) {
-            mSearchManager.showSearch();
-        }
         AIAssist.getInstance( getContext() ).speakTTSVoice( "已打开" );
     }
 
@@ -155,7 +148,6 @@ public class MapPresenter extends Presenter< MapView > implements
         if ( mLauncher != null ) {
             mLauncher.backToLauncher( getContext() );
         }
-        mMogoSearchManager.calculatePath( new MogoLatLng( lat, lon ) );
     }
 
     @Override
@@ -260,13 +252,11 @@ public class MapPresenter extends Presenter< MapView > implements
         mApis = MogoApisHandler.getInstance().getApis();
         mMogoMapService = mApis.getMapServiceApi();
         mMogoIntentManager = mApis.getIntentManagerApi();
-        mSearchManager = mApis.getSearchManagerApi();
         mRefreshStrategyController = mApis.getRefreshStrategyControllerApi();
         mStatusManager = mApis.getStatusManagerApi();
         mRegisterCenter = mApis.getRegisterCenterApi();
         mRegisterCenter.registerMogoNaviListener( TAG, this );
         mLauncher = mApis.getLauncherApi();
-        mMogoSearchManager = mApis.getSearchManagerApi();
 
         IMogoNavi mogoNavi = mMogoMapService.getNavi( getContext() );
         mogoNavi.setCalculatePathDisplayBounds( new Rect(
diff --git a/modules/mogo-module-monitor/build.gradle b/modules/mogo-module-monitor/build.gradle
index 02099054e3..dd32feb186 100644
--- a/modules/mogo-module-monitor/build.gradle
+++ b/modules/mogo-module-monitor/build.gradle
@@ -1,5 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -12,9 +17,11 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -37,8 +44,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     if (Boolean.valueOf(RELEASE)) {
         compileOnly rootProject.ext.dependencies.modulecommon
     } else {
diff --git a/modules/mogo-module-push-base/build.gradle b/modules/mogo-module-push-base/build.gradle
index 3f5839e3b9..e6a23cb457 100644
--- a/modules/mogo-module-push-base/build.gradle
+++ b/modules/mogo-module-push-base/build.gradle
@@ -1,12 +1,15 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
 
-
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
diff --git a/modules/mogo-module-push-noop/build.gradle b/modules/mogo-module-push-noop/build.gradle
index c8d6872f33..f065577936 100644
--- a/modules/mogo-module-push-noop/build.gradle
+++ b/modules/mogo-module-push-noop/build.gradle
@@ -1,7 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
diff --git a/modules/mogo-module-push/build.gradle b/modules/mogo-module-push/build.gradle
index b98b69977a..bee5da857d 100644
--- a/modules/mogo-module-push/build.gradle
+++ b/modules/mogo-module-push/build.gradle
@@ -1,7 +1,11 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
@@ -44,9 +48,11 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // 小智语音，免唤醒词等服务
     implementation rootProject.ext.dependencies.androidxconstraintlayout
-    implementation rootProject.ext.dependencies.arouter
     implementation rootProject.ext.dependencies.aiassist
+
+    implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.androidxrecyclerview
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.kotlinstdlibjdk7
diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle
index edccd474df..576ce92e32 100644
--- a/modules/mogo-module-search/build.gradle
+++ b/modules/mogo-module-search/build.gradle
@@ -1,7 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     // buildToolsVersion rootProject.ext.android.buildToolsVersion
diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle
index 969b011485..03b2aa4bf9 100644
--- a/modules/mogo-module-share/build.gradle
+++ b/modules/mogo-module-share/build.gradle
@@ -1,8 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -14,11 +16,13 @@ android {
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
+        consumerProguardFiles "consumer-rules.pro"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -42,8 +46,10 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxrecyclerview
     implementation rootProject.ext.dependencies.androidxccorektx
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
     implementation rootProject.ext.dependencies.mogoaicloudtanlu
diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle
index 0bde78a634..3291e374e4 100644
--- a/modules/mogo-module-v2x/build.gradle
+++ b/modules/mogo-module-v2x/build.gradle
@@ -1,8 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -15,9 +17,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
         ndk {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
index 447f67d811..a48a47d484 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -219,7 +219,7 @@ public class V2XAlarmServer {
                             //中度
                             case "MODERATE":
                                 //Logger.e(MODULE_NAME, "驾驶疲劳程度: 中度");
-                                warningParkPoi(location, onFatigueDrivingListener, drivingShowEntity, levelListBean);
+                                //warningParkPoi(location, onFatigueDrivingListener, drivingShowEntity, levelListBean);
                                 break;
                             //重度
                             case "SEVERE":
diff --git a/modules/mogo-module-widgets/build.gradle b/modules/mogo-module-widgets/build.gradle
index 6aa04d8dc4..f5922ed7b3 100644
--- a/modules/mogo-module-widgets/build.gradle
+++ b/modules/mogo-module-widgets/build.gradle
@@ -1,6 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -13,11 +17,13 @@ android {
 
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
+        consumerProguardFiles 'consumer-rules.pro'
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -42,8 +48,10 @@ dependencies {
 
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
 
diff --git a/modules/tanlulib/build.gradle b/modules/tanlulib/build.gradle
index 3042b2a8ee..065e652fe6 100644
--- a/modules/tanlulib/build.gradle
+++ b/modules/tanlulib/build.gradle
@@ -1,8 +1,11 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -13,14 +16,16 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
 
     buildTypes {
@@ -65,6 +70,7 @@ dependencies {
 
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.mogoaicloudtanlu
     
 
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
index 6f84d6f8ed..51f5b38be2 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
@@ -120,20 +120,6 @@ public interface IMogoServiceApis extends IProvider {
      */
     IMogoRegisterCenter getRegisterCenterApi();
 
-    /**
-     * 搜搜页面操作设置
-     *
-     * @return
-     */
-    IMogoSearchManager getSearchManagerApi();
-
-    /**
-     * 导航设置页面
-     *
-     * @return
-     */
-    IMogoSettingManager getSettingManagerApi();
-
     /**
      * 网络接口api
      *
@@ -182,7 +168,6 @@ public interface IMogoServiceApis extends IProvider {
     IMogoRefreshStrategyController getRefreshStrategyControllerApi();
 
 
-
     /**
      * 桌面控制接口
      *
@@ -304,9 +289,9 @@ public interface IMogoServiceApis extends IProvider {
     IMogoMapFrameController getMapFrameControllerApi();
 
 
-    /*
-     *V2X
-     * */
+    /**
+     * V2X
+     */
     IV2XProvider getV2XListenerManager();
 
     /**
diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle
index cad99d5620..84b214cfbe 100644
--- a/services/mogo-service/build.gradle
+++ b/services/mogo-service/build.gradle
@@ -1,5 +1,11 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -13,10 +19,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
 
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -39,7 +46,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.adasapi
     implementation rootProject.ext.dependencies.adasconfigapi
     if (Boolean.valueOf(RELEASE)) {
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
index 9f9533bb56..485fe630d4 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
@@ -136,15 +136,6 @@ public class MogoServiceApis implements IMogoServiceApis {
         return getApiInstance(IMogoRegisterCenter.class, MogoServicePaths.PATH_REGISTER_CENTER);
     }
 
-    @Override
-    public IMogoSearchManager getSearchManagerApi() {
-        return getApiInstance(IMogoSearchManager.class, MogoServicePaths.PATH_SEARCH_MANAGER);
-    }
-
-    @Override
-    public IMogoSettingManager getSettingManagerApi() {
-        return getApiInstance(IMogoSettingManager.class, MogoServicePaths.PATH_SETTING_MANAGER);
-    }
 
     @Override
     public IMogoWindowManager getWindowManagerApi() {
diff --git a/settings.gradle b/settings.gradle
index 4fc0f073ab..f778afe314 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -61,7 +61,6 @@ include ':modules:mogo-module-adas'
 include ':modules:mogo-module-map'
 include ':modules:mogo-module-common'
 include ':modules:mogo-module-main'
-include ':modules:mogo-module-search'
 include ':modules:mogo-module-share'
 include ':modules:mogo-module-service'
 include ':modules:mogo-module-back'
diff --git a/test/crashreport-bugly/build.gradle b/test/crashreport-bugly/build.gradle
index 9c042db3df..1b82597d08 100644
--- a/test/crashreport-bugly/build.gradle
+++ b/test/crashreport-bugly/build.gradle
@@ -1,5 +1,11 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -10,17 +16,19 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-
         ndk {
             // 设置支持的SO库架构
             abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -36,8 +44,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.crashreport
diff --git a/test/crashreport-noop/build.gradle b/test/crashreport-noop/build.gradle
index 04c8ec70cb..303ebced94 100644
--- a/test/crashreport-noop/build.gradle
+++ b/test/crashreport-noop/build.gradle
@@ -1,5 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -10,17 +15,20 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
 
         ndk {
             // 设置支持的SO库架构
             abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -36,8 +44,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.crashreport
diff --git a/test/crashreport-upgrade/build.gradle b/test/crashreport-upgrade/build.gradle
index 595f9600d6..49344ebef8 100644
--- a/test/crashreport-upgrade/build.gradle
+++ b/test/crashreport-upgrade/build.gradle
@@ -1,5 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -9,17 +14,19 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-
         ndk {
             // 设置支持的SO库架构
             abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -35,8 +42,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.crashreport
diff --git a/test/crashreport/build.gradle b/test/crashreport/build.gradle
index 958563797e..d1d0775962 100644
--- a/test/crashreport/build.gradle
+++ b/test/crashreport/build.gradle
@@ -1,5 +1,11 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -11,11 +17,13 @@ android {
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
+        consumerProguardFiles 'consumer-rules.pro'
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -31,8 +39,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogoutils
diff --git a/tts/tts-base/build.gradle b/tts/tts-base/build.gradle
index 33c33d627e..6984a00cbb 100644
--- a/tts/tts-base/build.gradle
+++ b/tts/tts-base/build.gradle
@@ -1,5 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -14,9 +19,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -37,8 +44,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
\ No newline at end of file
diff --git a/tts/tts-di/build.gradle b/tts/tts-di/build.gradle
index c18e63eb3f..6d1a227ca2 100644
--- a/tts/tts-di/build.gradle
+++ b/tts/tts-di/build.gradle
@@ -1,5 +1,11 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
+
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -14,9 +20,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -37,8 +45,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.ttsbase
diff --git a/tts/tts-noop/build.gradle b/tts/tts-noop/build.gradle
index caae249d60..7fc24fc3d1 100644
--- a/tts/tts-noop/build.gradle
+++ b/tts/tts-noop/build.gradle
@@ -1,6 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
-
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     // buildToolsVersion rootProject.ext.android.buildToolsVersion
@@ -14,9 +18,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -37,8 +43,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.ttsbase
diff --git a/tts/tts-zhi/build.gradle b/tts/tts-zhi/build.gradle
index 6c10fe8722..b789e22b49 100644
--- a/tts/tts-zhi/build.gradle
+++ b/tts/tts-zhi/build.gradle
@@ -1,5 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -13,9 +18,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
             }
         }
     }
@@ -36,8 +43,9 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.androidxappcompat
+
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     api rootProject.ext.dependencies.aiassist
     api rootProject.ext.dependencies.aiassistReplace