From aaa68b7304437151e5a039d2332a413e1507e5b4 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 15 Jul 2020 16:22:02 +0800 Subject: [PATCH] upgrade push UI --- app/build.gradle | 9 ++++----- app/src/main/java/com/mogo/launcher/MogoApplication.java | 4 ++-- config.gradle | 3 +++ gradle.properties | 5 ++++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cd753934aa..70495e1b81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -188,16 +188,15 @@ dependencies { implementation rootProject.ext.dependencies.guideshowprovider implementation rootProject.ext.dependencies.guideshow - implementation rootProject.ext.dependencies.modulepush, { - exclude group: 'com.mogo.module', module: 'module-common' - } - implementation rootProject.ext.dependencies.moduleadcard - implementation rootProject.ext.dependencies.moduleV2x implementation rootProject.ext.dependencies.moduletanlu, { exclude group: 'com.mogo.module', module: 'module-share' } + implementation rootProject.ext.dependencies.modulepushbase + launcherImplementation rootProject.ext.dependencies.modulepush + independentImplementation rootProject.ext.dependencies.modulepushnoop + if (Boolean.valueOf(RELEASE)) { launcherImplementation rootProject.ext.dependencies.modulemainlauncher independentImplementation rootProject.ext.dependencies.modulemainindependent diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 1e39f4ff3e..d3efc6486b 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -15,7 +15,7 @@ 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.push.PushUIConstants; +import com.mogo.module.push.base.PushUIConstants; import com.mogo.module.service.ServiceConst; import com.mogo.module.tanlu.constant.TanluConstants; import com.mogo.module.v2x.V2XConst; @@ -64,7 +64,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_OBU,"moduleObu")); MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) ); - MogoModulePaths.addModule(new MogoModule( PushUIConstants.TAG, PushUIConstants.TAG)); + MogoModulePaths.addModule(new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME)); if (!DebugConfig.isLauncher()) { PersistentManager.getInstance().initManager(this); diff --git a/config.gradle b/config.gradle index f583d3297d..d06877548e 100644 --- a/config.gradle +++ b/config.gradle @@ -112,7 +112,10 @@ ext { moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}", modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}", modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}", + // push modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}", + modulepushbase : "com.mogo.module:module-push-base:${MOGO_MODULE_PUSH_BASE_VERSION}", + modulepushnoop : "com.mogo.module:module-push-noop:${MOGO_MODULE_PUSH_NOOP_VERSION}", //运营位卡片 moduleadcard : "com.mogo.module:module-adcard:${MOGO_MODULE_AD_CARD_VERSION}", //统一返回键 diff --git a/gradle.properties b/gradle.properties index d7637f9cc7..1fb989d112 100644 --- a/gradle.properties +++ b/gradle.properties @@ -75,7 +75,10 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.1.60-shunyi # 推送 -MOGO_MODULE_PUSH_VERSION=1.1.5 +# 推送 +MOGO_MODULE_PUSH_VERSION=1.1.5.6-shunyi +MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 +MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.5 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块