将所有模块支持Kotlin，解决ARout加载异常问题

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-21 18:28:01 +08:00
parent 05d917d805
commit 483b7c694d
42 changed files with 416 additions and 300 deletions
--- 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)) {
--- 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;
--- 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

--- 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
--- 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();
--- 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 {
--- 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

--- 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<>();
--- 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(
--- 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 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 {
--- 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":
--- 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

--- 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