From c28ddf92000104115b843f9e4d67e9d7f57d45b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Mar 2020 16:35:52 +0800 Subject: [PATCH] fix bug ui --- .../authprovider/biz/MogoAuthorizeManagerImpl.kt | 1 + .../invoke/AuthorizeInvokerConstant.kt | 1 + .../authprovider/launcher/MogoMainAuthorize.kt | 16 ---------------- .../authorize/model/proxy/AuthorizeProxy.kt | 5 ++++- .../authorize/util/SharedPreferenceUtil.kt | 5 ++++- .../res/layout/module_authorize_fragment.xml | 4 ++-- 6 files changed, 12 insertions(+), 20 deletions(-) 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 4e4a08930b..9f331bc92f 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 @@ -12,6 +12,7 @@ open abstract class MogoAuthorizeManagerImpl : IMogoAuthorizeInvoke { private val baseController: IMogoAuthorizeController by lazy { IMogoAuthorizeController() } override fun needAuthorize(): Boolean { + return needAuthorization() } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/AuthorizeInvokerConstant.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/AuthorizeInvokerConstant.kt index c98a4b995d..af3930f91b 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/AuthorizeInvokerConstant.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/invoke/AuthorizeInvokerConstant.kt @@ -6,6 +6,7 @@ class AuthorizeInvokerConstant { const val AUTHORIZE_TYPE_LAUNCHER_MAIN = "AUTHORIZE_TYPE_LAUNCHER_MAIN" //launcher const val AUTHORIZE_TYPE_LAUNCHER_SHARE_NOVELTY = "AUTHORIZE_TYPE_LAUNCHER_SHARE_NOVELTY" //launcher 新鲜事分享 const val AUTHORIZE_TYPE_LAUNCHER_SHARE_MUSIC = "AUTHORIZE_TYPE_LAUNCHER_SHARE_MUSIC" //launcher 音乐分享 + const val AUTHORIZE_TYPE_LAUNCHER_SHARE = "AUTHORIZE_TYPE_LAUNCHER_SHARE" //launcher 我要分享 const val AUTHORIZE_TYPE_TAN_LU = "AUTHORIZE_TYPE_TAN_LU" //探路 const val AUTHORIZE_TYPE_CALL_CHAT = "AUTHORIZE_TYPE_CALL_CHAT" //车聊聊 const val AUTHORIZE_TYPE_NOVELTY = "AUTHORIZE_TYPE_NOVELTY" //新鲜事 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 63e4424f65..af33c45ed5 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 @@ -100,20 +100,4 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog pop.invoke() } - fun authorizeSuccess(tag: String) { - val listener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) - if (listener == null) { - Logger.d(TAG, "authorizeSuccess,but listener is null ") - } - listener!!.authorizeSuccess() - } - - fun authorizeFailed(tag: String, errorMsg: String) { - val listener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) - if (listener == null) { - Logger.d(TAG, "authorizeFailed,but listener is null ") - } - listener!!.authorizeFailed(errorMsg) - } - } \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/proxy/AuthorizeProxy.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/proxy/AuthorizeProxy.kt index 65ad9ea34d..799259266a 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/proxy/AuthorizeProxy.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/proxy/AuthorizeProxy.kt @@ -3,6 +3,7 @@ package com.mogo.module.authorize.model.proxy import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_AUXILIARY_DRIVING import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_CALL_CHAT import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN +import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_SHARE import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_SHARE_MUSIC import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_SHARE_NOVELTY import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_NOVELTY @@ -21,7 +22,8 @@ class AuthorizeProxy { return when (authorizeName) { AUTHORIZE_TYPE_LAUNCHER_MAIN, AUTHORIZE_TYPE_LAUNCHER_SHARE_NOVELTY, - AUTHORIZE_TYPE_LAUNCHER_SHARE_MUSIC -> 0 + AUTHORIZE_TYPE_LAUNCHER_SHARE_MUSIC, + AUTHORIZE_TYPE_LAUNCHER_SHARE -> 0 AUTHORIZE_TYPE_TAN_LU -> 1 AUTHORIZE_TYPE_CALL_CHAT -> 2 AUTHORIZE_TYPE_NOVELTY -> 3 @@ -35,6 +37,7 @@ class AuthorizeProxy { LAUNCHER_MAIN(0, AUTHORIZE_TYPE_LAUNCHER_MAIN), LAUNCHER_SHARE_NOVELTY(0, AUTHORIZE_TYPE_LAUNCHER_SHARE_NOVELTY), LAUNCHER_SHARE_MUSIC(0, AUTHORIZE_TYPE_LAUNCHER_SHARE_MUSIC), + LAUNCHER_SHARE(0, AUTHORIZE_TYPE_LAUNCHER_SHARE), CALL_CHAT(1, AUTHORIZE_TYPE_TAN_LU), TANLU(2, AUTHORIZE_TYPE_CALL_CHAT), NOVELTY(3, AUTHORIZE_TYPE_NOVELTY), 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 1817218390..68dc8a288d 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,7 +7,7 @@ object SharedPreferenceUtil { private const val HAS_AUTH = "HAS_AUTH" - fun needAuthorization():Boolean{ + fun needAuthorization(): Boolean { return !hasAuth() } @@ -15,4 +15,7 @@ object SharedPreferenceUtil { return SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(HAS_AUTH, false) } + fun setAuthorizeStatus() { + SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).putBoolean(HAS_AUTH, true) + } } \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml index df1463e347..68244747c6 100644 --- a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml +++ b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml @@ -101,7 +101,7 @@ android:layout_marginRight="@dimen/dp_330" android:layout_marginBottom="@dimen/dp_90" android:background="@drawable/module_authorize_shape_drak_top_corner" - android:visibility="visible" + android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -134,7 +134,7 @@ android:layout_width="0px" android:layout_height="0px" android:layout_marginBottom="@dimen/dp_160" - android:scrollbarSize="@dimen/dp_11" + android:scrollbarSize="@dimen/dp_207" android:scrollbarThumbVertical="@drawable/module_authorize_scrollbar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent"