1.倾诉模块，登录接入优先一键登录功能

config.gradle

@@ -5,8 +5,8 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.91",
-            "m-consultant"    : "0.0.59.64",
+            "m-confide"       : "0.0.48.92",
+            "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.00",
             "m-user"          : "0.0.60.91",
             "m-home"          : "0.0.22.52",
@@ -88,8 +88,8 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.48.91",
-            "m-consultant"    : "0.0.59.44",
+            "m-confide"       : "0.0.48.92",
+            "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.23.5",
             "m-user"          : "0.0.60.91",
             "m-home"          : "0.0.22.52",
@@ -97,7 +97,7 @@ ext {
             "m-dynamic"       : "0.0.1.7",
 
             "m-muse"          : "0.0.20.7",
-            "m-tests"         : "0.0.18.1",
+            "m-tests"         : "0.0.24.9",
             "m-course"        : "0.0.34.10",
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.6",

m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

@@ -439,8 +439,7 @@ class ExpertSearchAdapter(
                         )
                     }
                     //判断是否已登录
-                    if (!ConsultantIn.getUserImpl().isLogin()) {
-                        TempH5RouteUtils.tempH5Route(IYDLRouterConstant.ROUTER_MINE_LOGIN)
+                    if (!ConsultantIn.getUserImpl().loginByOneKeyLogin(context,true)) {
                         return@setOnClickListener
                     }
 

m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt

@@ -207,9 +207,7 @@ class ConsultAssistantDialogUtils private constructor() {
                                 ActionCountUtils.count("app_consult_list_page|app_consult_list_daoyi_entry_click")
                                 YdlBuryPointUtil.sendClick("assistant_list_click")
                                 // 咨询师列表页面且未登录情况下，跳转登录页面
-                                if (!ConsultantIn.isLogin()) {
-                                    ConsultantIn.toLogin(activity)
-                                } else {
+                                if (ConsultantIn.loginByOneKeyLogin(activity,true)) {
                                     //获取用户uid
                                     getConsultAssistantUid(origin,activity,6)
                                 }
@@ -229,9 +227,7 @@ class ConsultAssistantDialogUtils private constructor() {
                                 ActionCountUtils.count("app_consult_list_page|app_consult_list_daoyi_entry_click")
                                 YdlBuryPointUtil.sendClick("assistant_list_click")
                                 // 咨询师列表页面且未登录情况下，跳转登录页面
-                                if (!ConsultantIn.isLogin()) {
-                                    ConsultantIn.toLogin(activity)
-                                } else {
+                                if (ConsultantIn.loginByOneKeyLogin(activity,true)) {
                                     //获取用户uid
                                     getConsultAssistantUid(origin,activity,6)
                                 }

m-consultant/src/main/java/com/yidianling/consultant/modular/utils/ConsultAssistantEntryUtils.kt

@@ -33,9 +33,7 @@ class ConsultAssistantEntryUtils {
                 "$location"
             )
 
-            if (!ConsultantIn.isLogin()) {
-                ConsultantIn.toLogin(activity)
-            } else {
+            if (ConsultantIn.loginByOneKeyLogin(activity,true)) {
                 // 请求接口获取咨询助理的uid
                 SearchApi.getSearchApi().getConsultAssistantUidRequest(location,ffrom2)
                     .subscribeOn(Schedulers.io())

m-consultant/src/main/java/com/yidianling/consultant/router/ConsultantIn.kt

@@ -51,4 +51,12 @@ object ConsultantIn {
         activity.startActivity(ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity))
     }
 
+    /**
+     * 调用优先使用一键登录，并返回调用时的登录状态，
+     * @param isOpenDialog true:一键登录使用弹窗展示 false:一键登录使用全屏模式
+     * @return true：已登录，不触发登录跳转，false：未登录，优先一键登录
+     * */
+    fun loginByOneKeyLogin(context: Context, isOpenDialog: Boolean) :Boolean{
+        return getUserService().loginByOneKeyLogin(context,isOpenDialog)
+    }
 }
\ No newline at end of file