Commit cd67f17b by konghaorui

升级咨询版本号

parent 45b9b902
...@@ -84,13 +84,14 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>( ...@@ -84,13 +84,14 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
.navigation() .navigation()
} }
bt_to_consultant.setOnClickListener { bt_to_consultant.setOnClickListener {
// ARouter.getInstance() // ARouter.getInstance()
// .build("/consult/hot_search") // .build("/consult/hot_search")
// .withString( // .withString(
// HOT_SEARCH_DOCTOR_NAME, // HOT_SEARCH_DOCTOR_NAME,
// this.resources?.getString(R.string.platform_search_hint) // this.resources?.getString(R.string.platform_search_hint)
// ) // )
// .navigation() // .navigation()
FragmentContainerActivity.start(this, "ExpertSearchFragment")
} }
bt_to_music.setOnClickListener { bt_to_music.setOnClickListener {
FragmentContainerActivity.start(this) FragmentContainerActivity.start(this)
......
...@@ -7,7 +7,9 @@ import com.ydl.component.mvp.DemoContract ...@@ -7,7 +7,9 @@ import com.ydl.component.mvp.DemoContract
import com.ydl.component.mvp.DemoPresenter import com.ydl.component.mvp.DemoPresenter
import com.ydl.ydlcommon.bean.StatusBarOptions import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.mvp.lce.BaseLceActivity import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
import com.yidianling.consultant.ExpertSearchFragment
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import com.yidianling.home.ui.fragment.YdlHomeFragment
//import com.yidianling.dynamic.trendsHome.TrendsHomeFragment //import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
//import com.yidianling.home.ui.fragment.YdlHomeFragment //import com.yidianling.home.ui.fragment.YdlHomeFragment
import com.yidianling.im.ui.page.NewMultiMessageFragment import com.yidianling.im.ui.page.NewMultiMessageFragment
...@@ -65,9 +67,12 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra ...@@ -65,9 +67,12 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
if ("TrendsHomeFragment" == fragmentName) { if ("TrendsHomeFragment" == fragmentName) {
return TrendsHomeFragment() return TrendsHomeFragment()
} }
// if ("YdlHomeFragment" == fragmentName) { if ("YdlHomeFragment" == fragmentName) {
// return YdlHomeFragment() return YdlHomeFragment()
// } }
if ("ExpertSearchFragment" == fragmentName) {
return ExpertSearchFragment()
}
return PlayFragment() return PlayFragment()
} }
} }
...@@ -43,7 +43,7 @@ ext { ...@@ -43,7 +43,7 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.47", "m-confide" : "0.0.47",
"m-consultant" : "0.0.56", "m-consultant" : "0.0.56.1",
"m-fm" : "0.0.28", "m-fm" : "0.0.28",
"m-user" : "0.0.47", "m-user" : "0.0.47",
"m-home" : "0.0.18", "m-home" : "0.0.18",
......
...@@ -4,7 +4,6 @@ import android.annotation.SuppressLint ...@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
import android.text.TextUtils import android.text.TextUtils
import com.google.gson.Gson import com.google.gson.Gson
import com.ydl.ydlcommon.base.BaseApp import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.lifecycle.IActivityLifecycleable
import com.ydl.ydlcommon.data.http.RxUtils import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.mvp.base.SimplePresenter import com.ydl.ydlcommon.mvp.base.SimplePresenter
...@@ -12,7 +11,6 @@ import com.ydl.ydlcommon.utils.RxLifecycleUtils ...@@ -12,7 +11,6 @@ import com.ydl.ydlcommon.utils.RxLifecycleUtils
import com.ydl.ydlcommon.utils.YDLAsyncUtils import com.ydl.ydlcommon.utils.YDLAsyncUtils
import com.ydl.ydlcommon.utils.YDLCacheUtils import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.remind.HttpErrorUtils import com.ydl.ydlcommon.utils.remind.HttpErrorUtils
import com.yidianling.common.tools.ToastUtil
import com.yidianling.consultant.http.ExpertSearchDataManager 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
...@@ -134,10 +132,10 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() { ...@@ -134,10 +132,10 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
if (allFilter.others.isNotEmpty()) { if (allFilter.others.isNotEmpty()) {
sb.append("&others=").append(allFilter.others.map { it.key }.joinToString(",")) sb.append("&others=").append(allFilter.others.map { it.key }.joinToString(","))
} }
if (allFilter.showType.key != null) { // if (allFilter.showType.key != null) {
showType = allFilter.showType.key!! // showType = allFilter.showType.key!!
sb.append("&showType=").append(allFilter.showType.key!!) // sb.append("&showType=").append(allFilter.showType.key!!)
} // }
if(allFilter.title.isNotEmpty()){ if(allFilter.title.isNotEmpty()){
sb.append("&title=").append(allFilter.title.map { it.key }.joinToString(",")) sb.append("&title=").append(allFilter.title.map { it.key }.joinToString(","))
} }
...@@ -153,11 +151,12 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() { ...@@ -153,11 +151,12 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer { .subscribe(Consumer {
if (null != it.list && !it.list!!.isEmpty()) { if (null != it.list && !it.list!!.isEmpty()) {
if (showType == 0) { // if (showType == 0) {
mView.onDoctorListFetched(it.list!!, page, it.pages) // mView.onDoctorListFetched(it.list!!, page, it.pages)
} else { // } else {
mView.onServiceListFetched(it.list!!, page, it.pages) // mView.onServiceListFetched(it.list!!, page, it.pages)
} // }
mView.onDoctorListFetched(it.list!!, page, it.pages)
//更新缓存 只更新第一页的缓存 //更新缓存 只更新第一页的缓存
if (page == 1){ if (page == 1){
updateCache(showType,it) updateCache(showType,it)
......
...@@ -133,7 +133,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -133,7 +133,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun reset() { private fun reset() {
tempFilter.showType = filterData.showType[1] tempFilter.showType = filterData.showType[0]
tempFilter.ages.clear() tempFilter.ages.clear()
tempFilter.enquiries.clear() tempFilter.enquiries.clear()
tempFilter.others.clear() tempFilter.others.clear()
......
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