feat:修改心理咨询马甲包不默认勾选不要登录

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.59.40",
             "m-fm"            : "0.0.30.00",
-            "m-user"          : "0.0.60.41",
+            "m-user"          : "0.0.60.42",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.18.30",
             "m-dynamic"       : "0.0.7.13",

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -435,16 +435,24 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         }
         //微信登录
         iv_weixin.setOnClickListener {
-
-            mPresenter.loginByThird(this, SHARE_MEDIA.WEIXIN)
+            if (iv_select_protocol.visibility == View.VISIBLE && !isAgreeProtocol){
+                ToastUtil.toastShort("请您先同意壹点灵《用户使用协议》、《隐私保护政策》，才能登录使用")
+                return@setOnClickListener
+            }else{
+                mPresenter.loginByThird(this, SHARE_MEDIA.WEIXIN)
+            }
         }
         //QQ 登录
         iv_qq.setOnClickListener {
-
-            val config = UMShareConfig()
-            config.isNeedAuthOnGetUserInfo(true)
-            UMShareAPI.get(this).setShareConfig(config)
-            mPresenter.loginByThird(this, SHARE_MEDIA.QQ)
+            if (iv_select_protocol.visibility == View.VISIBLE && !isAgreeProtocol){
+                ToastUtil.toastShort("请您先同意壹点灵《用户使用协议》、《隐私保护政策》，才能登录使用")
+                return@setOnClickListener
+            }else{
+                val config = UMShareConfig()
+                config.isNeedAuthOnGetUserInfo(true)
+                UMShareAPI.get(this).setShareConfig(config)
+                mPresenter.loginByThird(this, SHARE_MEDIA.QQ)
+            }
         }
         ll_country.setOnClickListener {
             val intent = Intent(this, CountryListActivity::class.java)