feat:亲子教育跳转专属导医队列，未完成

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

@@ -12,7 +12,7 @@ import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
 class ConsultAssistantCenterActivity : BaseActivity() {
     override fun initDataAndEvent() {
         supportActionBar?.hide()
-        ConsultAssistantDialogUtils.INSTANCE.getConsultAssistantUid(this,1)
+        ConsultAssistantDialogUtils.INSTANCE.getConsultAssistantUid("",this,1)
     }
 
     override fun layoutResId(): Int {

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

@@ -1333,6 +1333,10 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
             //显示主标题
             tvSubject.text = "主题"
         }
+        //如果是亲自教育类别----->点击咨询顾问---会跳转到一个只是亲自教育的导医队列中
+
+
+
         //判断主题选中，判断热门筛选中是否也有该主题
         Executors.newCachedThreadPool().execute {
             if (headData!!.highlighter.size > 0) {
@@ -1392,6 +1396,8 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
         }
         curPage = 1
         onScrollListener.resetState()
+
+
         getPresenter().fetchListData(allFilter, curPage)
         rvExperts.scrollToPosition(0)
     }

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

@@ -11,6 +11,7 @@ import com.ydl.ydlcommon.utils.RxLifecycleUtils
 import com.ydl.ydlcommon.utils.YDLAsyncUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.remind.HttpErrorUtils
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.consultant.http.ExpertSearchDataManager
 import com.yidianling.consultant.model.SearchApi
 import com.yidianling.consultant.model.bean.AllFilter
@@ -103,6 +104,12 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
 
     @SuppressLint("CheckResult")
     fun fetchListData(allFilter: AllFilter, page: Int) {
+        //如果是亲子教育则点击咨询顾问时，跳转专属亲自教育列表
+        if (allFilter.categories.size==1&&allFilter.categories[0].cateId==23){
+            LogUtil.e("aaaaaaaaaa"+allFilter.categories[0].cateId)
+            //
+
+        }
         var showType = 0
 
         val sb = StringBuffer()

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

@@ -8,6 +8,7 @@ import com.ydl.ydlcommon.data.http.ThrowableConsumer
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.ConsultAssistantCenterActivity
 import com.yidianling.consultant.constants.ConsultBIConstants
@@ -88,7 +89,7 @@ class ConsultAssistantDialogUtils private constructor() {
                     if (origin == "home_index") {
                         showFromYdlHome(activity)
                     } else if (origin == "doctor_list") {
-                        show(activity, fromActivity)
+                        show(activity, origin,fromActivity)
                     } else if (origin == "mine_index") {
                         showFromMine(activity)
                     }
@@ -112,7 +113,7 @@ class ConsultAssistantDialogUtils private constructor() {
                             ActionCountUtils.count("main_page|main_daoyi_entry_click")
                             YdlBuryPointUtil.sendClick("home_page_assistant_click")
                             ActionCountUtils.count(ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK, "1")
-                            getConsultAssistantUid(activity,1)
+                            getConsultAssistantUid("",activity,1)
                         }
 
                     })
@@ -145,7 +146,7 @@ class ConsultAssistantDialogUtils private constructor() {
                         override fun onClickAction() {
                             //获取用户uid
                             ActionCountUtils.count(ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK, "4")
-                            getConsultAssistantUid(activity,4)
+                            getConsultAssistantUid("",activity,4)
                         }
 
                     })
@@ -168,21 +169,21 @@ class ConsultAssistantDialogUtils private constructor() {
     /**
      * 咨询师列表页展示
      */
-    fun show(activity: Activity, fromActivity: Boolean = false) {
+    fun show(activity: Activity, origin:String,fromActivity: Boolean = false) {
         // 来自于fragment咨询师列表
         if (!fromActivity) {
             if (!expertSearchPageHasShown) {
                 expertSearchPageHasShown = true
-                showDialog(activity)
+                showDialog(origin,activity)
             } else {
-                showDialog(activity)
+                showDialog(origin,activity)
             }
         } else {// 来自于activity咨询师列表
             if (!expertSearchActivityPageHasShown) {
                 expertSearchActivityPageHasShown = true
-                showDialog(activity, true)
+                showDialog(origin,activity, true)
             } else {
-                showDialog(activity, true)
+                showDialog(origin,activity, true)
             }
         }
     }
@@ -190,7 +191,7 @@ class ConsultAssistantDialogUtils private constructor() {
     /**
      * 咨询师列表页展示浮层
      */
-    fun showDialog(activity: Activity, fromActivity: Boolean = false) {
+    fun showDialog(origin: String,activity: Activity, fromActivity: Boolean = false) {
         if (!fromActivity) {
             if (!activity.isFinishing) {
                 if (consultAssistantFragmentDialog == null) {
@@ -206,7 +207,7 @@ class ConsultAssistantDialogUtils private constructor() {
                                     ConsultantIn.toLogin(activity)
                                 } else {
                                     //获取用户uid
-                                    getConsultAssistantUid(activity,6)
+                                    getConsultAssistantUid(origin,activity,6)
                                 }
                             }
 
@@ -228,7 +229,7 @@ class ConsultAssistantDialogUtils private constructor() {
                                     ConsultantIn.toLogin(activity)
                                 } else {
                                     //获取用户uid
-                                    getConsultAssistantUid(activity,6)
+                                    getConsultAssistantUid(origin,activity,6)
                                 }
                             }
 
@@ -286,7 +287,13 @@ class ConsultAssistantDialogUtils private constructor() {
     //////////////////////////////////////  咨询师列表页面的展示隐藏逻辑 代码块end  ///////////////////////////////////////////////////
 
     @SuppressLint("CheckResult")
-    fun getConsultAssistantUid(activity: Activity,location:Int) {
+    fun getConsultAssistantUid(origin: String,activity: Activity,location:Int) {
+        if (origin=="doctor_list"){
+            LogUtil.e("是aaaaaaaaaaaaaaaaaaaaa")
+        }else{
+            LogUtil.e("不是aaaaaaaaaaaaaaaaaaaaa")
+        }
+
         ActionCountUtils.count(ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK, location.toString())
         // 请求接口获取咨询助理的uid
         SearchApi.getSearchApi().getConsultAssistantUidRequest(location)