From 49ff2e7d448ad4a5b919c59fb64404a1e568f0db Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Fri, 27 Mar 2020 17:15:28 +0800
Subject: [PATCH] wait continue

---
 .../authprovider/biz/IMogoAuthorizeController.kt     |  8 ++++++++
 .../authprovider/biz/MogoAuthorizeManagerImpl.kt     | 10 +++++-----
 .../authprovider/invoke/IMogoAuthorizeInvoke.kt      |  2 +-
 .../authprovider/launcher/MogoMainAuthorize.kt       |  4 +++-
 .../module/authorize/util/SharedPreferenceUtil.kt    | 12 ++++++------
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt
index 3f0c24f96b..7b2bb767eb 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/IMogoAuthorizeController.kt
@@ -1,5 +1,6 @@
 package com.mogo.module.authorize.authprovider.biz
 
+import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN
 import com.mogo.module.authorize.authprovider.invoke.IMogoAuthorizeContentListener
 import com.mogo.module.authorize.model.BaseResponse
 import com.mogo.module.authorize.model.IMogoAuthorizeModel
@@ -53,6 +54,10 @@ open class IMogoAuthorizeController {
         }
     }
 
+    private fun realInvokeAuthorizeContent(){
+
+    }
+
     private inline fun getAuthorizeContentListener(tag: String, blockSuccess: ((IMogoAuthorizeContentListener) -> Unit), blockNull: (() -> Unit)) {
         val authorizeContentListener = MogoAuthorizeRegisterHandler.getAuthorizeContentListener(tag)
         if (authorizeContentListener != null) {
@@ -62,4 +67,7 @@ open class IMogoAuthorizeController {
         }
     }
 
+    fun updateAgreementAndAuthorization(agreementType: Int) {
+        invokeAuthorizeContent(AUTHORIZE_TYPE_LAUNCHER_MAIN, agreementType)
+    }
 }
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
index 9f331bc92f..00850bc66f 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
@@ -11,16 +11,16 @@ open abstract class MogoAuthorizeManagerImpl : IMogoAuthorizeInvoke {
 
     private val baseController: IMogoAuthorizeController by lazy { IMogoAuthorizeController() }
 
-    override fun needAuthorize(): Boolean {
-
-        return needAuthorization()
+    override fun needAuthorize(tag: String): Boolean {
+        val type = AuthorizeProxy.getAuthorizeType(tag)
+        return needAuthorization(type)
     }
 
     override fun invokeAuthorizeContent(tag: String) {
         //todo 后面动态代理统一处理校验问题
-        Logger.d("invokeAuthorizeContent","tag:$tag")
+        Logger.d("invokeAuthorizeContent", "tag:$tag")
         val agreementType = AuthorizeProxy.getAuthorizeType(tag)
-        Logger.d("invokeAuthorizeContent","agreementType:$agreementType")
+        Logger.d("invokeAuthorizeContent", "agreementType:$agreementType")
         baseController.invokeAuthorizeContent(tag, agreementType)
     }
 
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/IMogoAuthorizeInvoke.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/IMogoAuthorizeInvoke.kt
index cf02f66f73..dad969b47e 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/IMogoAuthorizeInvoke.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/IMogoAuthorizeInvoke.kt
@@ -8,7 +8,7 @@ interface IMogoAuthorizeInvoke : IMogoAuthorizeRegister {
     /**
      * 是否需要授权
      */
-    fun needAuthorize(): Boolean
+    fun needAuthorize(tag:String): Boolean
 
     /**
      * 获取授权内容
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 af33c45ed5..3da7bf1d9c 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
@@ -6,6 +6,7 @@ import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeManagerImpl
 import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeRegisterHandler
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN
 import com.mogo.module.authorize.fragment.AuthorizeFragment
+import com.mogo.module.authorize.model.proxy.AuthorizeProxy
 import com.mogo.module.authorize.util.SharedPreferenceUtil.hasAuth
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
@@ -60,7 +61,8 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog
             onError.invoke("invoke should be in main thread")
             return
         }
-        if (hasAuth()) {
+        val type = AuthorizeProxy.getAuthorizeType(tag)
+        if (hasAuth(type)) {
             onError.invoke("already authorize,do not repeat operation")
             return
         }
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt
index 68dc8a288d..050c3b812e 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/SharedPreferenceUtil.kt
@@ -7,15 +7,15 @@ object SharedPreferenceUtil {
 
     private const val HAS_AUTH = "HAS_AUTH"
 
-    fun needAuthorization(): Boolean {
-        return !hasAuth()
+    fun needAuthorization(type: Int): Boolean {
+        return !hasAuth(type)
     }
 
-    fun hasAuth(): Boolean {
-        return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(HAS_AUTH, false)
+    fun hasAuth(type: Int): Boolean {
+        return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(HAS_AUTH + type, false)
     }
 
-    fun setAuthorizeStatus() {
-        SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putBoolean(HAS_AUTH, true)
+    fun setAuthorizeStatus(type: Int) {
+        SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putBoolean(HAS_AUTH + type, true)
     }
 }
\ No newline at end of file