From 151ec43d8497884a19fe719158619c8f26bad1d7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Mar 2020 19:15:07 +0800 Subject: [PATCH] fix bug --- app/build.gradle | 2 ++ .../java/com/mogo/launcher/MogoApplication.java | 2 -- gradle.properties | 4 ++-- .../authprovider/launcher/MogoMainAuthorize.kt | 5 ++++- .../module/authorize/fragment/AuthorizePresenter.kt | 2 +- .../java/com/mogo/module/guide/GuideBizManager.kt | 13 ++++++++----- .../mogo/module/main/cards/MogoModulesManager.java | 1 + 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4146c63e4f..51c8e306a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,8 @@ import java.text.SimpleDateFormat apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' android { compileSdkVersion rootProject.ext.android.compileSdkVersion diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index c9c51f6503..54b2fe0c31 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -15,7 +15,6 @@ 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; -import com.mogo.module.guideshow.provider.GuideShowProviderConstant; import com.mogo.module.media.MediaConstants; import com.mogo.module.onlinecar.OnLineCarConstants; import com.mogo.module.push.PushUIConstants; @@ -52,7 +51,6 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME)); MogoModulePaths.addModule(new MogoModule(PATH_AGREEMENT_FRAGMENT, PATH_AGREEMENT_MODULE_NAME)); - MogoModulePaths.addModule(new MogoModule(GuideShowProviderConstant.PATH_GUIDE_SHOW_FRAGMENT, GuideShowProviderConstant.PATH_GUIDE_SHOW_MODULE_NAME)); //运营位卡片，需要默认显示，放在第一个加载 MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); diff --git a/gradle.properties b/gradle.properties index c4ea59c358..f57abdc671 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,9 +56,9 @@ CARCHATTING_VERSION=1.0.2.3-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.0.2.3-SNAPSHOT # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=1.0.0-SNAPSHOT +MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT # 视频引导接口 -MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.1-SNAPSHOT +MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.2-SNAPSHOT # v2x diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt index 7ef48e00df..1e6f5b82bc 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt @@ -57,6 +57,9 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog onError.invoke("launcher authorizeShowListener is null,must register in MainActivity") return } + if (tag.isNullOrBlank()) { + onError.invoke("tag is null,please invoke with tag") + } if (Thread.currentThread() != Looper.getMainLooper().thread) { onError.invoke("invoke should be in main thread") return @@ -83,7 +86,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog } } - fun resetShowStatus(){ + fun resetShowStatus() { showAuthorizeView = false } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt index 2a9d8e8705..deddb68445 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt @@ -26,7 +26,7 @@ class AuthorizePresenter : Presenter, AuthorizeContract. override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) Logger.d(TAG, "onCreate invokeTag:$invokeTag") - invokeAuthorizationContent(invokeTag!!) +// invokeAuthorizationContent(invokeTag!!) } override fun invokeAuthorizationContent(invokeTag: String) { diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt index 844c08116a..b69be8a14a 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt @@ -10,6 +10,7 @@ import com.mogo.module.guide.util.SharedPreferenceUtil.setGuideFinish import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths import com.mogo.service.fragmentmanager.FragmentDescriptor +import com.mogo.utils.UiThreadHandler import com.mogo.utils.logger.Logger object GuideBizManager { @@ -47,12 +48,14 @@ object GuideBizManager { } fun invokeAuthorize() { - val authorizeInvoke = ARouter.getInstance().build(AuthorizeConstant.PROVIDER_MODULE).navigation() - if (authorizeInvoke is IMogoAuthorizeModuleManager) { - if (authorizeInvoke.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { - authorizeInvoke.invokeAuthorizeForShow() + UiThreadHandler.postDelayed({ + val authorizeInvoke = ARouter.getInstance().build(AuthorizeConstant.PROVIDER_MODULE).navigation() + if (authorizeInvoke is IMogoAuthorizeModuleManager) { + if (authorizeInvoke.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { + authorizeInvoke.invokeAuthorizeForShow() + } } - } + }, 3000L) } } \ No newline at end of file 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 94c87acb14..2bc180fc34 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 @@ -111,6 +111,7 @@ public class MogoModulesManager implements MogoModulesHandler, final List< MogoModule > modules = MogoModulePaths.getModules(); if ( modules != null && !modules.isEmpty() ) { for ( MogoModule module : modules ) { + Logger.d(TAG,"module.getPath():" + module.getPath() + " name: " + module.getName()); IMogoModuleProvider provider = load( module.getPath() ); if ( provider != null ) { mModuleProviders.put( module, provider );