Commit 004471d5 by 霍志良

feat:亲子教育跳转专属导医队列接口对接

parent 73ebce75
...@@ -6,7 +6,7 @@ ext { ...@@ -6,7 +6,7 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.48.86", "m-confide" : "0.0.48.86",
"m-consultant" : "0.0.59.37", "m-consultant" : "0.0.59.38",
"m-fm" : "0.0.30.00", "m-fm" : "0.0.30.00",
"m-user" : "0.0.60.37", "m-user" : "0.0.60.37",
"m-home" : "0.0.22.33", "m-home" : "0.0.22.33",
......
...@@ -46,6 +46,7 @@ import com.yidianling.consultant.listener.OnFilterConfirmListener ...@@ -46,6 +46,7 @@ import com.yidianling.consultant.listener.OnFilterConfirmListener
import com.yidianling.consultant.listener.OnSortItemSelectedListener import com.yidianling.consultant.listener.OnSortItemSelectedListener
import com.yidianling.consultant.model.bean.* import com.yidianling.consultant.model.bean.*
import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils.Companion.REALATION_EDUCATION
import com.yidianling.consultant.router.ConsultantIn import com.yidianling.consultant.router.ConsultantIn
import com.yidianling.consultant.ui.view.AreaPopupWindow import com.yidianling.consultant.ui.view.AreaPopupWindow
import com.yidianling.consultant.ui.view.CategoryPopupWindow import com.yidianling.consultant.ui.view.CategoryPopupWindow
...@@ -1396,8 +1397,6 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres ...@@ -1396,8 +1397,6 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
} }
curPage = 1 curPage = 1
onScrollListener.resetState() onScrollListener.resetState()
getPresenter().fetchListData(allFilter, curPage) getPresenter().fetchListData(allFilter, curPage)
rvExperts.scrollToPosition(0) rvExperts.scrollToPosition(0)
} }
......
...@@ -16,6 +16,7 @@ import com.yidianling.consultant.http.ExpertSearchDataManager ...@@ -16,6 +16,7 @@ import com.yidianling.consultant.http.ExpertSearchDataManager
import com.yidianling.consultant.model.SearchApi import com.yidianling.consultant.model.SearchApi
import com.yidianling.consultant.model.bean.AllFilter import com.yidianling.consultant.model.bean.AllFilter
import com.yidianling.consultant.model.bean.ExpertSearchBean import com.yidianling.consultant.model.bean.ExpertSearchBean
import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer import io.reactivex.functions.Consumer
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
...@@ -104,12 +105,8 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() { ...@@ -104,12 +105,8 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
fun fetchListData(allFilter: AllFilter, page: Int) { fun fetchListData(allFilter: AllFilter, page: Int) {
//如果是亲子教育则点击咨询顾问时,跳转专属亲自教育列表 //是否亲子教育字段
if (allFilter.categories.size==1&&allFilter.categories[0].cateId==23){ ConsultAssistantDialogUtils.REALATION_EDUCATION = allFilter.categories.size==1&&allFilter.categories[0].cateId==23
LogUtil.e("aaaaaaaaaa"+allFilter.categories[0].cateId)
//
}
var showType = 0 var showType = 0
val sb = StringBuffer() val sb = StringBuffer()
......
...@@ -27,6 +27,7 @@ class ConsultAssistantDialogUtils private constructor() { ...@@ -27,6 +27,7 @@ class ConsultAssistantDialogUtils private constructor() {
companion object { companion object {
val INSTANCE by lazy { ConsultAssistantDialogUtils() } val INSTANCE by lazy { ConsultAssistantDialogUtils() }
var isSHowDesc=true var isSHowDesc=true
var REALATION_EDUCATION=false//是否跳转亲子教育字段,接口加ffrom2="learning"
} }
var consultAssistantDialogFromHomePage: ConsultAssistantDialog? = null // 首页展示的dialog var consultAssistantDialogFromHomePage: ConsultAssistantDialog? = null // 首页展示的dialog
...@@ -290,7 +291,12 @@ class ConsultAssistantDialogUtils private constructor() { ...@@ -290,7 +291,12 @@ class ConsultAssistantDialogUtils private constructor() {
fun getConsultAssistantUid(origin: String,activity: Activity,location:Int) { fun getConsultAssistantUid(origin: String,activity: Activity,location:Int) {
if (origin=="doctor_list"){ if (origin=="doctor_list"){
// 请求接口获取咨询助理的uid // 请求接口获取咨询助理的uid
getConsultAssistantUid(location, activity,"learning") if (REALATION_EDUCATION){
getConsultAssistantUid(location, activity,"learning")
}else{
getConsultAssistantUid(location, activity,null)
}
}else{ }else{
// 请求接口获取咨询助理的uid // 请求接口获取咨询助理的uid
getConsultAssistantUid(location, activity,null) getConsultAssistantUid(location, activity,null)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment