Merge branch 'feature/daoyi_xj' of…

Merge branch 'feature/daoyi_xj' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/daoyi_xj

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
 
     ydl_app = [
             appName      : "心理咨询壹点灵",

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt

@@ -227,11 +227,15 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 super.onScrollStateChanged(recyclerView, newState)
                 hideSoftInput()
                 if (newState == RecyclerView.SCROLL_STATE_DRAGGING || newState == RecyclerView.SCROLL_STATE_SETTLING) {
+                    //滚动
+                    ConsultAssistantDialogUtils.INSTANCE.hideAssistantActivity()
                     sIsScrolling = true
                     if (!this@ExpertSearchActivity.isFinishing) {
 //                        GlideApp.with(this@ExpertSearchActivity).pauseRequests()
                     }
                 } else if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    //没有滚动
+                    ConsultAssistantDialogUtils.INSTANCE.fitRequest(this@ExpertSearchActivity, "doctor_list", true)
                     if (sIsScrolling) {
                         if (!this@ExpertSearchActivity.isFinishing) {
 //                            GlideApp.with(this@ExpertSearchActivity).resumeRequests()
@@ -1003,7 +1007,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
             }
             filterPopupWindow.isClippingEnabled = false
             filterPopupWindow.showAtLocation(viewSep2.rootView, Gravity.TOP + Gravity.RIGHT, 0, 0)
-            ConsultAssistantDialogUtils.INSTANCE.hide()
+            ConsultAssistantDialogUtils.INSTANCE.hideAssistantActivity()
             filterPopupWindow.onFilterConfirmListener = this
             updateFilterTextViewStatus(tvFilter, FILTER_STATUS_OPEN)
 //            viewDim.visibility = View.VISIBLE

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

@@ -180,8 +180,12 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
                 hideSoftInput()
                 if (newState == RecyclerView.SCROLL_STATE_DRAGGING || newState == RecyclerView.SCROLL_STATE_SETTLING) {
                     sIsScrolling = true
+                    //滚动
+                    hideConsultAssistantDialog()
 
                 } else if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    //没有滚动
+                    showConsultAssistantDialog()
                     if (sIsScrolling) {
 
                     }

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

@@ -192,13 +192,20 @@ class ConsultAssistantDialogUtils private constructor() {
 
 
     /**
-     * 咨询师列表页隐藏
+     * 咨询师列表页Fragment隐藏
      */
     fun hide() {
         consultAssistantFragmentDialog?.hide()
     }
 
     /**
+     * 咨询师列表页Fragment隐藏
+     */
+    fun hideAssistantActivity() {
+        consultAssistantActivityDialog?.hide()
+    }
+
+    /**
      * 释放本单例所有资源(咨询师列表fragmnet在MainActivity，
      * 且在MainActivity销毁的时候，会先执行咨询师列表fragmnet
      * 的ondeatroy，所以这边直接在该专家咨询列表碎片执行该方法）