From 121f8083dce759ef981f5cb479fdf019383534f1 Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Fri, 27 Mar 2020 22:24:07 +0800
Subject: [PATCH] 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<AuthorizeCo
 
     override fun onDestroy() {
         super.onDestroy()
+        Logger.d(TAG,"onDestroy")
         VoiceUtil.unregisterAll(context!!, this)
     }
 
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt
index b393c41670..e7785dbd6b 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt
@@ -23,8 +23,8 @@ object VoiceUtil {
     }
 
     //WakeUp Command (Intent)
-    const val VOICE_INTENT_AGREE = "system.application.operation" //同意
-    const val VOICE_INTENT_DISAGREE = "system.application.operation" //不同意
+    const val VOICE_INTENT_AGREE = "com.zhidao.agree" //同意
+    const val VOICE_INTENT_DISAGREE = "com.zhiao.disagree" //不同意
 
     //unWakeUp Command
     const val VOICE_REGISTER_AUTHORIZE_AGREE = "CMD_AUTHORIZATION_AGREE"