From 0b26d689a5e5ad7c82dc8a552dd0dfff1d4afac5 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 14 Aug 2020 16:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AF=B9=E8=BF=94=E5=9B=9E=E6=A8=A1=E5=9D=97=E7=9A=84=E8=80=A6?= =?UTF-8?q?=E5=90=88=E5=85=B3=E7=B3=BB=EF=BC=8C=E5=B0=BD=E9=87=8F=E8=AE=A9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9C=A8application=E9=87=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=8A=A0=E8=BD=BD=E5=92=8C=E5=88=86=E9=85=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 ++ .../main/java/com/mogo/launcher/MogoApplication.java | 3 ++- .../module/main/launcher/MainLauncherActivity.java | 11 ----------- modules/mogo-module-main/build.gradle | 2 -- .../main/java/com/mogo/module/main/MainActivity.java | 8 -------- 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 011d1620a1..9141820b14 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -268,6 +268,7 @@ dependencies { implementation rootProject.ext.dependencies.moduletanluapi implementation rootProject.ext.dependencies.mogomonitor implementation rootProject.ext.dependencies.mogomodulewidgets + implementation rootProject.ext.dependencies.mogomoduleback } else { launcherImplementation project(':main-extensions:mogo-module-main-launcher') independentImplementation project(':main-extensions:mogo-module-main-independent') @@ -285,6 +286,7 @@ dependencies { implementation project(':libraries:mogo-tanlu-api') implementation project(':modules:mogo-module-monitor') implementation project(':modules:mogo-module-widgets') + implementation project(':modules:mogo-module-back') } apply from: "./functions/baseservices.gradle" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 99cd7e7447..9fe3dd3a05 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -12,6 +12,7 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.Utils; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; +import com.mogo.module.back.BackToLauncherConst; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; @@ -57,8 +58,8 @@ public class MogoApplication extends AbsMogoApplication { // MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME)); MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) ); - //运营位卡片，需要默认显示，放在第一个加载 if ( DebugConfig.isLauncher() ) { + MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) ); MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) ); } else { MogoModulePaths.addBaseModule( new MogoModule( MogoWidgetsProvider.PATH, MogoWidgetsProvider.NAME ) ); diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index a788b150f9..48700344f5 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -7,15 +7,10 @@ import android.view.View; import androidx.annotation.Nullable; -import com.mogo.module.back.BackToLauncherConst; -import com.mogo.module.common.MogoModule; -import com.mogo.module.common.MogoModulePaths; -import com.mogo.module.common.utils.CarSeries; import com.mogo.module.extensions.utils.ExtensionsConfig; import com.mogo.module.main.MainActivity; import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.service.intent.IMogoIntentListener; -import com.mogo.utils.logger.Logger; /** * 针对作为Launcher的情况，做个性化操作 @@ -32,12 +27,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis ExtensionsConfig.setNeedRequestUserInfo( true ); } - @Override - protected void addModule() { - super.addModule(); - MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) ); - } - @Override protected void loadContainerModules() { super.loadContainerModules(); diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index 15cea46fba..f900dbe293 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -50,7 +50,6 @@ dependencies { api rootProject.ext.dependencies.moduleservice api rootProject.ext.dependencies.moduleapps api rootProject.ext.dependencies.moduleextensions - api rootProject.ext.dependencies.mogomoduleback } else { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") @@ -61,7 +60,6 @@ dependencies { api project(':services:mogo-service') api project(':modules:mogo-module-apps') api project(':modules:mogo-module-extensions') - api project(':modules:mogo-module-back') } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 076535be25..7975e3c195 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -152,7 +152,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS ); // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 - addModule(); loadContainerModules(); MogoModulesManager.getInstance().loadModules(); mPresenter.delayOperations(); @@ -185,13 +184,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme startService( intent ); } - /** - * 添加模块 - */ - protected void addModule() { - - } - protected void loadContainerModules() { // MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container ); MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container );