From 621e2a94b5d0359a37b484bd7c89ab071a7a99bd Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Mar 2020 15:18:30 +0800 Subject: [PATCH 1/4] add log --- .../com/mogo/module/authorize/fragment/AuthorizePresenter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dccfd29d9c..bd841a51f1 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 @@ -89,7 +89,7 @@ class AuthorizePresenter : Presenter, AuthorizeContract. mogoAuthShow.resetShowStatus() invokeTag?.let { MogoAuthorizeRegisterHandler.getAuthorizeContentListener(it)?.requestContentFailed("user exit authorize --- onDestroy") - MogoAuthorizeRegisterHandler.getAuthorizeListener(it)?.authorizeFailed("user exit authorize by back press") + MogoAuthorizeRegisterHandler.getAuthorizeListener(it)?.authorizeFailed("user exit authorize --- onDestroy") } } } \ No newline at end of file From f65c42a7ea409fcc4ac3699676877c4134bb45f3 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Mar 2020 15:29:11 +0800 Subject: [PATCH 2/4] fix bug of twice callBack --- .../com/mogo/module/authorize/fragment/AuthorizePresenter.kt | 1 + 1 file changed, 1 insertion(+) 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 bd841a51f1..2a9d8e8705 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 @@ -80,6 +80,7 @@ class AuthorizePresenter : Presenter, AuthorizeContract. } private fun closeAuthorizeView() { + invokeTag = null mogoAuthShow.hideAuthorizeView() } From 98a3e87eeb0e4d5223bab670cf460ce22308774d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 30 Mar 2020 15:30:08 +0800 Subject: [PATCH 3/4] opt log --- .../com/mogo/module/extensions/entrance/EntranceFragment.java | 2 +- .../com/mogo/module/extensions/entrance/EntrancePresenter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 62e245ee7b..9757894684 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -316,7 +316,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent @Override public void authorizeFailed( String errorMsg ) { - Log.e( TAG, "authorizeFailed --------> errorMsg = " + errorMsg ); + Log.e( TAG, "authorizeFailed --------> errorMsg = " + errorMsg + " >> isClickShare = " + isClickShare); } @Override 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 d5945ccce5..efb63a9d5a 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 @@ -37,7 +37,7 @@ public class EntrancePresenter extends Presenter { private Context mContext; private IMogoAnalytics mAnalytics; - private static final String TAG = "EntrancePresenter"; + private static final String TAG = "EntranceFragment"; private IMogoIntentManager mogoIntentManager; private IMogoAuthorizeModuleManager mIMogoAuthorizeModuleManager; private String mVoiceCmdType; //一级命令 From c987e593cf1f95196845e4ab2ef640242ac6df00 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Mar 2020 16:46:31 +0800 Subject: [PATCH 4/4] fix bug --- .../java/com/mogo/module/apps/AppsPresenter.java | 5 +++-- .../module/apps/applaunch/CardAppLauncher.java | 4 ++-- .../module/apps/applaunch/GuideShowLauncher.java | 3 ++- .../java/com/mogo/module/guide/GuideBizManager.kt | 14 +++++--------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java index 53e4c9d5ce..3f2da676e7 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java @@ -45,8 +45,9 @@ public class AppsPresenter extends Presenter { super(view); mCardManager = (IMogoCardManager) ARouter.getInstance().build(MogoServicePaths.PATH_CARD_MANAGER).navigation(getContext()); CardAppLauncher cardAppLauncher = new CardAppLauncher(this, mCardManager); - cardAppLauncher.setNext(new GuideShowLauncher()); - cardAppLauncher.setNext(new AppLauncher()); + GuideShowLauncher guideShowLauncher = new GuideShowLauncher(); + cardAppLauncher.setNext(guideShowLauncher); + guideShowLauncher.setNext(new AppLauncher()); mLauncher = cardAppLauncher; } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/CardAppLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/CardAppLauncher.java index fb0906f4c4..ef97b83c59 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/CardAppLauncher.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/CardAppLauncher.java @@ -37,8 +37,8 @@ public class CardAppLauncher extends BaseAppLauncher { public void launch( Context context, AppInfo appInfo ) { if ( sCardApps.containsKey( appInfo.getPackageName() ) ) { mCardManager.switch2( sCardApps.get( appInfo.getPackageName() ) ); - mAppsPresenter.exit(); - } else { + + } else { mAppsPresenter.exit(); if ( getNext() != null ) { getNext().launch( context, appInfo ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java index 57b57acfd4..9900106230 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java @@ -1,5 +1,6 @@ package com.mogo.module.apps.applaunch; +import android.app.Activity; import android.content.Context; import com.mogo.module.apps.AppServiceHandler; @@ -16,7 +17,7 @@ public class GuideShowLauncher extends BaseAppLauncher { @Override public void launch(Context context, AppInfo appInfo) { if (appInfo != null && APP_INFO_NAME_GUIDE_SHOW.equals(appInfo.getName())) { - AppServiceHandler.getMogoGuideShow().playGuideVideo((s) -> { + AppServiceHandler.getMogoGuideShow().playGuideVideo((Activity) context,(s) -> { Logger.d(TAG, s); return Unit.INSTANCE; }); 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 a16cc90d6b..844c08116a 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 @@ -2,7 +2,6 @@ package com.mogo.module.guide import com.alibaba.android.arouter.launcher.ARouter import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant -import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager import com.mogo.module.guide.fragment.GuideFragment @@ -11,7 +10,6 @@ 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 { @@ -49,14 +47,12 @@ object GuideBizManager { } fun invokeAuthorize() { - UiThreadHandler.postDelayed({ - val authorizeInvoke = ARouter.getInstance().build(AuthorizeConstant.PROVIDER_MODULE).navigation() - if (authorizeInvoke is IMogoAuthorizeModuleManager) { - if (authorizeInvoke.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { - authorizeInvoke.invokeAuthorizeForShow() - } + 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