From 121f8083dce759ef981f5cb479fdf019383534f1 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Mar 2020 22:24:07 +0800 Subject: [PATCH 1/3] fix bug and add voice wakeupCmd --- .../authprovider/biz/MogoAuthorizeProvider.kt | 4 ++-- .../launcher/MogoAuthorizeMainController.kt | 20 +++++++++++-------- .../authorize/fragment/AuthorizeFragment.kt | 1 + .../mogo/module/authorize/voice/VoiceUtil.kt | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt index 8522ade69c..e3850d1c71 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt @@ -11,8 +11,8 @@ import com.mogo.map.marker.IMogoMarkerClickListener import com.mogo.map.navi.IMogoNaviListener import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant.Companion.PATH_AGREEMENT_FRAGMENT import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant.Companion.PATH_AGREEMENT_MODULE_NAME +import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow -import com.mogo.module.authorize.util.SharedPreferenceUtil.hasAuth import com.mogo.module.authorize.util.SharedPreferenceUtil.hasGuide import com.mogo.service.module.IMogoModuleLifecycle import com.mogo.service.module.IMogoModuleProvider @@ -63,7 +63,7 @@ class MogoAuthorizeProvider : IMogoModuleProvider { } override fun init(context: Context?) { - if (hasGuide() && !hasAuth(0)) { + if (hasGuide() && mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { mogoAuthShow.invokeAuthorizeForShow() } else { Logger.d(TAG, "wait for guide invoke") diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoAuthorizeMainController.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoAuthorizeMainController.kt index 88c03cf851..0a0e3f31b9 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoAuthorizeMainController.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoAuthorizeMainController.kt @@ -16,15 +16,11 @@ object MogoAuthorizeMainController : IMogoAuthorizeController() { @Synchronized fun agreeAuthorize(tag: String, agrId: Long, onSuccess: (() -> Unit), onError: ((String) -> Unit)) { - val acquireAuthListener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) + updateAuthorize(agrId, AGREEMENT_EFFECT, { - if (acquireAuthListener != null) { - setAuthorizeStatus(tag.toAuthorizeType(), true) - acquireAuthListener.authorizeSuccess() - onSuccess.invoke() - } else { - Logger.d(TAG, "agreeAuthorize --- can not find listener by this tag :$tag ") - } + authorizeSuccess(tag) + setAuthorizeStatus(tag.toAuthorizeType(), true) + onSuccess.invoke() }, { val errorMsg = it ?: "agreeAuthorize failed,please check network" authorizeFailed(tag, errorMsg) @@ -67,4 +63,12 @@ object MogoAuthorizeMainController : IMogoAuthorizeController() { } } + private fun authorizeSuccess(tag: String) { + val acquireAuthListener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) + if (acquireAuthListener != null) { + acquireAuthListener.authorizeSuccess() + } else { + Logger.d(TAG, "agreeAuthorize --- can not find listener by this tag :$tag ") + } + } } \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt index 7d2dcb8258..7e919f996d 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt @@ -93,6 +93,7 @@ class AuthorizeFragment(private val invokeTag: String) : MvpFragment Date: Sat, 28 Mar 2020 18:54:43 +0800 Subject: [PATCH 2/3] add guide show model --- app/build.gradle | 2 ++ app/src/main/java/com/mogo/launcher/MogoApplication.java | 3 +++ config.gradle | 2 ++ gradle.properties | 4 ++++ 4 files changed, 11 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 182f07c5f6..4146c63e4f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,6 +98,8 @@ dependencies { // implementation rootProject.ext.dependencies.moduledemo2 implementation rootProject.ext.dependencies.carcallprovider implementation rootProject.ext.dependencies.carcall + implementation rootProject.ext.dependencies.guideshowprovider + implementation rootProject.ext.dependencies.guideshow implementation rootProject.ext.dependencies.modulemedia implementation rootProject.ext.dependencies.modulefreshnews,{ exclude group:'com.mogo.module',module:'module-onlinecar' diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 73f7b17c6e..c9c51f6503 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -15,6 +15,7 @@ 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; @@ -51,6 +52,8 @@ 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)); MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); diff --git a/config.gradle b/config.gradle index 42749665e5..e3d37b397e 100644 --- a/config.gradle +++ b/config.gradle @@ -96,6 +96,8 @@ ext { moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", carcall : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}", carcallprovider : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}", + guideshow : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}", + guideshowprovider : "com.mogo.module.guideshow:module-guideshow-provider:${MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION}", // 在线车辆 moduleonlinecar : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}", // V2X diff --git a/gradle.properties b/gradle.properties index 79610a7704..4abdde39cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -55,6 +55,10 @@ MOGO_MODULE_TANLU_VERSION=1.0.3-SNAPSHOT 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_PROVIDER_VERSION=1.0.1-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.2-SNAPSHOT # v2x From a4243e6340b7809c388aac0a19f827059724cdcd Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 29 Mar 2020 17:49:02 +0800 Subject: [PATCH 3/3] fix bug of no callBack when exit authorize --- .../com/mogo/module/authorize/fragment/AuthorizePresenter.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 27a398d1fa..f767588254 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 @@ -2,6 +2,7 @@ package com.mogo.module.authorize.fragment import androidx.lifecycle.LifecycleOwner import com.mogo.commons.mvp.Presenter +import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeRegisterHandler import com.mogo.module.authorize.authprovider.invoke.IMogoAuthorizeContentListener import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow import com.mogo.module.authorize.model.bean.Agreement @@ -86,8 +87,8 @@ class AuthorizePresenter : Presenter, AuthorizeContract. super.onDestroy(owner) Logger.d(TAG, "onDestroy invokeTag : $invokeTag") invokeTag?.let { - mogoAuthShow.unregisterInvokeAuthorizeContentListener(it) - mogoAuthShow.unregisterAuthorizeListener(it) + MogoAuthorizeRegisterHandler.getAuthorizeContentListener(it)?.requestContentFailed("user exit authorize by back press") + MogoAuthorizeRegisterHandler.getAuthorizeListener(it)?.authorizeFailed("user exit authorize by back press") } } } \ No newline at end of file