From 307858f9aabec801727abd521b737080fc9367c0 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 11 Nov 2020 16:57:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=80=A6=E5=90=88=E9=97=AE=E9=A2=98=202.=20?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=A7=84=E5=88=92=E6=A8=A1=E5=9D=97=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=85=B3=E7=B3=BB=203.=20=E8=A7=A3=E5=86=B3=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E5=B7=A6=E4=BE=A7=E9=81=AE=E7=BD=A9=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +- app/functions/perform.gradle | 6 + .../com/mogo/commons/AbsMogoApplication.java | 17 +- .../com/mogo/commons/debug/DebugConfig.java | 13 ++ .../main/launcher/MainLauncherActivity.java | 4 +- .../mogo/module/common/MogoModulePaths.java | 5 + .../extensions/ExtensionsModuleConst.java | 8 +- .../entrance/EntrancePresenter.java | 5 +- .../extensions/entrance/EntranceProvider.java | 4 +- .../extensions/utils/ExtensionsConfig.java | 20 -- .../drawable/module_ext_frame_anim_voice.xml | 207 ------------------ modules/mogo-module-main/build.gradle | 6 - .../com/mogo/module/main/MainActivity.java | 1 - .../module/main/cards/MogoModulesManager.java | 5 +- .../module_main_dw_left_frame_bkg_light.xml | 2 +- 15 files changed, 44 insertions(+), 265 deletions(-) delete mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml diff --git a/app/build.gradle b/app/build.gradle index 19b4d87013..2cfe6a5847 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -339,13 +339,14 @@ dependencies { implementation rootProject.ext.dependencies.modulemedia implementation rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.modulesplash + implementation rootProject.ext.dependencies.mogoservice implementation rootProject.ext.dependencies.moduleV2x implementation rootProject.ext.dependencies.moduleshare - implementation rootProject.ext.dependencies.tanluupload implementation rootProject.ext.dependencies.mogomonitor implementation rootProject.ext.dependencies.mogomoduleback implementation rootProject.ext.dependencies.guideshow + implementation rootProject.ext.dependencies.moduleextensions } else { implementation project(':foudations:mogo-commons') implementation project(':modules:mogo-module-common') @@ -354,13 +355,14 @@ dependencies { implementation project(':modules:mogo-module-media') implementation project(':modules:mogo-module-service') implementation project(':modules:mogo-module-splash') + implementation project(':modules:mogo-module-service') implementation project(':modules:mogo-module-v2x') implementation project(':modules:mogo-module-share') - implementation project(':libraries:tanlulib') implementation project(':modules:mogo-module-monitor') implementation project(':modules:mogo-module-back') implementation project(':modules:mogo-module-guide') + implementation project(':modules:mogo-module-extensions') } apply from: "./functions/perform.gradle" diff --git a/app/functions/perform.gradle b/app/functions/perform.gradle index a708b71fe9..97017f2a5f 100644 --- a/app/functions/perform.gradle +++ b/app/functions/perform.gradle @@ -4,8 +4,14 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { launcherImplementation rootProject.ext.dependencies.modulemainlauncher independentImplementation rootProject.ext.dependencies.modulemainindependent + + // 仅launcher需要引入该模块 + launcherImplementation rootProject.ext.dependencies.moduleapps } else { launcherImplementation project(':main-extensions:mogo-module-main-launcher') independentImplementation project(':main-extensions:mogo-module-main-independent') + + // 仅launcher需要引入该模块 + launcherImplementation project(':modules:mogo-module-apps') } } \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index fa21e41563..257e880764 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -143,16 +143,13 @@ public class AbsMogoApplication extends Application { NetConfig.instance().setSignaturePrefix( Constants.SIGN_PREFIX ) .setPublicParams( ParamsUtil.getStaticParams() ) .setHostnameVerifier( new AllAllowedHostnameVerifier() ) - .addNetworkInterceptor( new Interceptor() { - @Override - public Response intercept( Chain chain ) throws IOException { - Request original = chain.request(); - Request request = original.newBuilder() - .header( "token", SpStorage.getTicket() ) - .method( original.method(), original.body() ) - .build(); - return chain.proceed( request ); - } + .addNetworkInterceptor( chain -> { + Request original = chain.request(); + Request request = original.newBuilder() + .header( "token", SpStorage.getTicket() ) + .method( original.method(), original.body() ) + .build(); + return chain.proceed( request ); } ) .setLoggable( DebugConfig.isDebug() ); } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 22e8be6829..a65367ae5a 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -282,4 +282,17 @@ public class DebugConfig { public static boolean isIsSupportLauncherCardRefreshStrategy() { return isSupportLauncherCardRefreshStrategy; } + + /** + * 是否需要刷新个人信息 + */ + private static boolean needRequestUserInfo = false; + + public static void setNeedRequestUserInfo( boolean needRequestUserInfo ) { + DebugConfig.needRequestUserInfo = needRequestUserInfo; + } + + public static boolean isNeedRequestUserInfo() { + return needRequestUserInfo; + } } 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 872b5f804f..5241b250a2 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 @@ -8,8 +8,8 @@ import android.view.View; import androidx.annotation.Nullable; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.uicontroller.EnumMapUI; -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; @@ -26,7 +26,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); - ExtensionsConfig.setNeedRequestUserInfo( true ); + DebugConfig.setNeedRequestUserInfo( true ); } @Override diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java index bf8dcba003..9faa90e816 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java @@ -31,6 +31,11 @@ public class MogoModulePaths { @Keep public static final String PATH_MODULE_APPS = "/appslist/ui"; + /** + * 快捷操作入口：定位、 + */ + public static final String PATH_ENTRANCE = "/extension/entrance"; + /** * 添加卡片模块 * diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index 9a563f521d..2ee73f87a3 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -7,13 +7,7 @@ package com.mogo.module.extensions; * 描述 */ public class ExtensionsModuleConst { - - /** - * 快捷操作入口：定位、 - */ - public static final String PATH_ENTRANCE = "/extension/entrance"; - - + public static final String TYPE = "extension"; public static final String TYPE_ENTRANCE = "entrance"; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 6f1b8824f4..efb20d7e2b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -7,6 +7,7 @@ import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.Presenter; import com.mogo.commons.network.Utils; import com.mogo.module.common.MogoApisHandler; @@ -18,12 +19,10 @@ import com.mogo.module.extensions.net.UserInfoNetApiServices; import com.mogo.module.extensions.userinfo.UserInfo; import com.mogo.module.extensions.userinfo.UserInfoConstant; import com.mogo.module.extensions.userinfo.UserInfoResponse; -import com.mogo.module.extensions.utils.ExtensionsConfig; import com.mogo.module.extensions.weather.Phenomena; import com.mogo.module.extensions.weather.WeatherCallback; import com.mogo.module.extensions.weather.WeatherInfo; import com.mogo.module.extensions.weather.WeatherModel; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoMsgCenter; @@ -103,7 +102,7 @@ public class EntrancePresenter extends Presenter implements Weathe if (userInfo != null) { mView.renderUserInfo(userInfo); } - if(ExtensionsConfig.needRequestUserInfo()){ + if( DebugConfig.isNeedRequestUserInfo()){ // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java index b3bbc3bed7..ef10d199d4 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java @@ -12,7 +12,7 @@ import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.module.extensions.ExtensionsModuleConst; +import com.mogo.module.common.MogoModulePaths; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; @@ -23,7 +23,7 @@ import com.mogo.service.module.ModuleType; *

* 描述 */ -@Route( path = ExtensionsModuleConst.PATH_ENTRANCE ) +@Route( path = MogoModulePaths.PATH_ENTRANCE ) public class EntranceProvider implements IMogoModuleProvider { EntranceFragment mFragment; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java deleted file mode 100644 index 5a30481123..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.module.extensions.utils; - -/** - * 个性化config - * - * @author tongchenfei - */ -public class ExtensionsConfig { - public static final String NEED_REQUEST_USER_INFO = "NEED_REQUEST_USER_INFO"; - - private static boolean needRequestUserInfo = false; - - public static boolean needRequestUserInfo() { - return needRequestUserInfo; - } - - public static void setNeedRequestUserInfo(boolean needRequestUserInfo) { - ExtensionsConfig.needRequestUserInfo = needRequestUserInfo; - } -} diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml deleted file mode 100644 index f4844fcff0..0000000000 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index cec34c9537..f5ebe77146 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -48,21 +48,15 @@ dependencies { api rootProject.ext.dependencies.modulecommon api rootProject.ext.dependencies.modulemap api rootProject.ext.dependencies.mogoserviceapi - api rootProject.ext.dependencies.mogoservice api rootProject.ext.dependencies.moduleservice - api rootProject.ext.dependencies.moduleapps - api rootProject.ext.dependencies.moduleextensions compileOnly rootProject.ext.dependencies.skinsupport } else { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") api project(':modules:mogo-module-common') api project(':modules:mogo-module-map') - api project(':modules:mogo-module-service') api project(':services:mogo-service-api') api project(':services:mogo-service') - api project(':modules:mogo-module-apps') - api project(':modules:mogo-module-extensions') compileOnly project(':skin:mogo-skin-support') } } 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 b4629ddcc8..c251ad3729 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 @@ -223,7 +223,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme } 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 ); MogoModulesManager.getInstance().loadEventPanelModule( R.id.module_main_id_event_panel_fragment_container ); MogoModulesManager.getInstance().loadLeftPanelModule( R.id.module_main_id_left_panel_fragment_container ); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 7d548c7b94..7b24eaced0 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -6,12 +6,9 @@ import android.content.Context; import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.launcher.ARouter; -import com.alibaba.idst.nls.internal.utils.L; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; -import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.main.MainActivity; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.utils.ResourcesHelper; @@ -123,7 +120,7 @@ public class MogoModulesManager implements MogoModulesHandler { @Override public void loadEntrancesModule( int containerId ) { IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance() - .build( ExtensionsModuleConst.PATH_ENTRANCE ) + .build( MogoModulePaths.PATH_ENTRANCE ) .navigation( getContext() ); addFragment( provider, containerId ); } diff --git a/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml b/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml index 8127025226..2b0d61818b 100644 --- a/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml +++ b/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file