Merge branch 'dev' into feature/test_home_pager

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

@@ -6,7 +6,6 @@ import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.dialog.ConsultAssistantDialog
 import com.yidianling.consultant.model.SearchApi
 import com.yidianling.consultant.router.ConsultantIn
-import com.yidianling.consultant.router.ConsultantRouterImp
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -41,12 +40,9 @@ class ConsultAssistantDialogUtils private constructor() {
                 }
             }
             "doctor_list" -> {
-                if (ConsultantIn.getUserImpl().getUserInfo()?.user_type == 1
-                        ) {
                 shouldShowDialog(activity, origin)
             }
         }
-        }
 
     }
 
@@ -77,7 +73,9 @@ class ConsultAssistantDialogUtils private constructor() {
     fun showFromYdlHome(activity: Activity) {
         consultAssistantDialogFromHomePage?.dismiss()
         consultAssistantDialogFromHomePage = null
-        consultAssistantDialogFromHomePage = ConsultAssistantDialog(activity, object : ConsultAssistantDialog.OnConsultAssistantClickListener {
+        consultAssistantDialogFromHomePage = ConsultAssistantDialog(
+            activity,
+            object : ConsultAssistantDialog.OnConsultAssistantClickListener {
                 override fun onClickAction() {
                     //获取用户uid
                     getConsultAssistantUid(activity)
@@ -124,12 +122,14 @@ class ConsultAssistantDialogUtils private constructor() {
     fun showDialog(activity: Activity) {
         consultAssistantDialog?.dismiss()
         consultAssistantDialog = null
-        consultAssistantDialog = ConsultAssistantDialog(activity, object : ConsultAssistantDialog.OnConsultAssistantClickListener {
+        consultAssistantDialog = ConsultAssistantDialog(
+            activity,
+            object : ConsultAssistantDialog.OnConsultAssistantClickListener {
                 override fun onClickAction() {
                     // 咨询师列表页面且未登录情况下，跳转登录页面
                     if (expertSearchPageHasShown && !ConsultantIn.isLogin()) {
                         ConsultantIn.toLogin(activity)
-                }else {
+                    } else {
                         //获取用户uid
                         getConsultAssistantUid(activity)
                     }