课程\fm

config.gradle

@@ -43,7 +43,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.18",
-            "m-consultant"    : "0.0.26",
+            "m-consultant"    : "0.0.27",
             "m-course"        : "0.0.17",
             "m-fm"            : "0.0.15",
             "m-muse"          : "0.0.11",

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

@@ -6,6 +6,7 @@ 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
@@ -35,14 +36,12 @@ class ConsultAssistantDialogUtils private constructor() {
             "home_index" -> {
                 if (ConsultantIn.isLogin() &&
                         ConsultantIn.getUserImpl().getUserInfo()?.user_type == 1
-                /** WalleChannelReader.getChannel(BaseApp.Companion.getApp()) == "android_huawei" */
                         ) {
                     shouldShowDialog(activity, origin)
                 }
             }
             "doctor_list" -> {
                 if (ConsultantIn.getUserImpl().getUserInfo()?.user_type == 1
-                /** WalleChannelReader.getChannel(BaseApp.Companion.getApp()) == "android_huawei" */
                         ) {
                     shouldShowDialog(activity, origin)
                 }
@@ -109,8 +108,8 @@ class ConsultAssistantDialogUtils private constructor() {
                 override fun run() {
                     Observable.just(1).observeOn(AndroidSchedulers.mainThread())
                             .subscribe {
-                                showDialog(activity)
                                 expertSearchPageHasShown = true
+                                showDialog(activity)
                             }
                 }
             }, 5000)
@@ -127,8 +126,13 @@ class ConsultAssistantDialogUtils private constructor() {
         consultAssistantDialog = null
         consultAssistantDialog = ConsultAssistantDialog(activity, object : ConsultAssistantDialog.OnConsultAssistantClickListener {
             override fun onClickAction() {
-                //获取用户uid
-                getConsultAssistantUid(activity)
+                // 咨询师列表页面且未登录情况下，跳转登录页面
+                if (expertSearchPageHasShown && !ConsultantIn.isLogin()) {
+                    ConsultantIn.toLogin(activity)
+                }else {
+                    //获取用户uid
+                    getConsultAssistantUid(activity)
+                }
             }
 
         })

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

@@ -36,4 +36,8 @@ object ConsultantIn {
         return ModularServiceManager.provide(IUserService::class.java)
     }
 
+    fun toLogin(activity: Activity) {
+        ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity)
+    }
+
 }
\ No newline at end of file

m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchActicity.kt

@@ -17,6 +17,7 @@ import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.bean.ShareData
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
 import com.ydl.ydlcommon.router.IYDLRouterConstant
+import com.yidianling.common.tools.RxKeyboardTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.course.CourseConstants
 import com.yidianling.course.R
@@ -111,6 +112,8 @@ class CourseSearchActivity : BaseActivity(), CourseSearchAdapter.OnItemClick, IC
                 loadCourseList(true)
             }
         })
+
+        RxKeyboardTool.showSoftInput(this,)
     }
 
     /**

m-course/src/main/java/com/yidianling/course/widget/SearchBarView.kt

@@ -9,6 +9,7 @@ import android.util.AttributeSet
 import android.view.Gravity
 import android.view.View
 import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.ydl.ydl_router.manager.YDLRouterManager
@@ -157,6 +158,11 @@ class SearchBarView : LinearLayout {
         searchCallBack = mSearchCallback
     }
 
+    fun getEditText():EditText{
+        return common_search_bar_edit_text
+    }
+
+
     interface SearchCallBack {
         fun clickSearchBtn(str: String) //设置监听（跳转逻辑已在组件内部实现，该方法主要用于回调点击键盘搜索按钮事件）