From 10b1916b8de505d22b22f976af8aeeb7d0839a2e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 12 Jun 2020 10:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8B=AC=E7=AB=8Bapp?= =?UTF-8?q?=E4=BF=9D=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/libs/persistentlib.jar | Bin 0 -> 8581 bytes app/src/main/AndroidManifest.xml | 13 +++++++++++++ .../com/mogo/launcher/MogoApplication.java | 9 +++++++++ .../mogo-module-main-independent/build.gradle | 4 ++-- .../mogo-module-main-launcher/build.gradle | 4 ++-- .../module/main/service/MogoMainService.java | 17 ++++++++++------- 7 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 app/libs/persistentlib.jar diff --git a/app/build.gradle b/app/build.gradle index bda52bb550..46c7c43370 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -88,7 +88,7 @@ android { // 是否使用自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true' // 是否作为 launcher 运行 - buildConfigField 'boolean', 'IS_LAUNCHER', 'false' + buildConfigField 'boolean', 'IS_LAUNCHER', 'true' } // f系列-分体机全系列,未细分 f8xx{ diff --git a/app/libs/persistentlib.jar b/app/libs/persistentlib.jar new file mode 100644 index 0000000000000000000000000000000000000000..7a6ce17de123d5aa323da24239d54383d6c3128b GIT binary patch literal 8581 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 literal 0 HcmV?d00001 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 88bec3f449..ccf3dd8248 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,19 @@ android:supportsRtl="true" android:theme="@style/AppTheme.App" tools:replace="android:label"> + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index b88728dc57..d50f474f69 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -1,6 +1,7 @@ package com.mogo.launcher; import android.content.Context; +import android.content.Intent; import android.util.Log; import androidx.multidex.MultiDex; @@ -14,6 +15,7 @@ import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; +import com.mogo.module.main.service.MogoMainService; import com.mogo.module.media.MediaConstants; import com.mogo.module.service.ServiceConst; import com.mogo.module.tanlu.constant.TanluConstants; @@ -22,6 +24,7 @@ import com.mogo.service.MogoServicePaths; import com.mogo.service.connection.IMogoSocketManager; import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; +import com.zhidao.boot.persistent.lib.PersistentManager; /** * @author congtaowang @@ -67,6 +70,12 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) ); // 暂时去掉推送 // MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); + + if (!DebugConfig.isLauncher()) { + PersistentManager.getInstance().initManager(this); + Intent intent = new Intent( this, MogoMainService.class ); + startService( intent ); + } Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" ); } diff --git a/main-extensions/mogo-module-main-independent/build.gradle b/main-extensions/mogo-module-main-independent/build.gradle index e2cf94d684..7d208f4876 100644 --- a/main-extensions/mogo-module-main-independent/build.gradle +++ b/main-extensions/mogo-module-main-independent/build.gradle @@ -41,9 +41,9 @@ dependencies { implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - implementation rootProject.ext.dependencies.modulemain + api rootProject.ext.dependencies.modulemain } else { - implementation project(":modules:mogo-module-main") + api project(":modules:mogo-module-main") } } diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle index ac9a48e993..4b878becc8 100644 --- a/main-extensions/mogo-module-main-launcher/build.gradle +++ b/main-extensions/mogo-module-main-launcher/build.gradle @@ -41,10 +41,10 @@ dependencies { implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - implementation rootProject.ext.dependencies.modulemain + api rootProject.ext.dependencies.modulemain api rootProject.ext.dependencies.moduleapps } else { - implementation project(":modules:mogo-module-main") + api project(":modules:mogo-module-main") api project(':modules:mogo-module-apps') } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java index b367177ad7..c280d8bf9d 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java @@ -37,6 +37,16 @@ class MogoMainService extends Service implements IMogoLocationListener { */ private IMogoLocationClient mLocationClient; + @Override + public void onCreate() { + Logger.d( TAG, "基本服务启动" ); + mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation(); + initAndStartLocation(); + initGpsSimulatorListener(); + loadBaseModules(); + startTanluService(); + initADAS(); + } @Nullable @Override @@ -46,13 +56,6 @@ class MogoMainService extends Service implements IMogoLocationListener { @Override public int onStartCommand( Intent intent, int flags, int startId ) { - Logger.d( TAG, "基本服务启动" ); - mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation(); - initAndStartLocation(); - initGpsSimulatorListener(); - loadBaseModules(); - startTanluService(); - initADAS(); return START_STICKY; }