Commit 12fece28 by konghaorui

补充测评搜索/测评首页 arouter 名称、升级版本号

parent 6e43276f
ext { ext {
kotlin_version = "1.3.21" kotlin_version = "1.3.21"
dev_mode = false dev_mode = true
ydl_app = [ ydl_app = [
appName : "心理咨询壹点灵", appName : "心理咨询壹点灵",
...@@ -46,12 +46,12 @@ ext { ...@@ -46,12 +46,12 @@ ext {
"m-consultant" : "0.0.58.4", "m-consultant" : "0.0.58.4",
"m-fm" : "0.0.29.8", "m-fm" : "0.0.29.8",
"m-user" : "0.0.60.2", "m-user" : "0.0.60.2",
"m-home" : "0.0.20.4", "m-home" : "0.0.20.6",
"m-im" : "0.0.17.1", "m-im" : "0.0.17.1",
"m-dynamic" : "0.0.7.6", "m-dynamic" : "0.0.7.6",
"m-muse" : "0.0.28.11", "m-muse" : "0.0.28.11",
"m-tests" : "0.0.24.2", "m-tests" : "0.0.24.3",
"m-course" : "0.0.42.2", "m-course" : "0.0.42.2",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
......
...@@ -145,7 +145,7 @@ class YdlHomeAdapter(private val mContext: Context, ...@@ -145,7 +145,7 @@ class YdlHomeAdapter(private val mContext: Context,
return HomeAssuageGriefViewHolder(HomeAssuageGriefView(mContext, homeEvent),viewType) return HomeAssuageGriefViewHolder(HomeAssuageGriefView(mContext, homeEvent),viewType)
} }
//测试模块 //测试模块
HomeViewConfig.getOrder().testIndex -> { HomeViewConfig.getOrder().testsIndex -> {
return HomeTestViewHolder(HomeTestView(mContext, homeEvent),viewType) return HomeTestViewHolder(HomeTestView(mContext, homeEvent),viewType)
} }
//心灵*电台模块 //心灵*电台模块
......
...@@ -45,7 +45,7 @@ class HomeViewConfig { ...@@ -45,7 +45,7 @@ class HomeViewConfig {
/** /**
* 测试模块 * 测试模块
*/ */
var testIndex :Int? = 5 var testsIndex :Int? = 5
/** /**
* 解忧*问答模块 * 解忧*问答模块
*/ */
......
...@@ -95,7 +95,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract ...@@ -95,7 +95,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
homeList.add( homeList.add(
getHomeItemFromTempData( getHomeItemFromTempData(
homeTestBean, homeTestBean,
HomeViewConfig.getOrder().testIndex!! HomeViewConfig.getOrder().testsIndex!!
) )
) )
} }
...@@ -148,7 +148,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract ...@@ -148,7 +148,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
if (HomeViewConfig.getOrder().confideIndex!=null){ if (HomeViewConfig.getOrder().confideIndex!=null){
mergeArrays.add(confideObservable) mergeArrays.add(confideObservable)
} }
if (HomeViewConfig.getOrder().testIndex!=null){ if (HomeViewConfig.getOrder().testsIndex!=null){
mergeArrays.add(testObservable) mergeArrays.add(testObservable)
} }
if (HomeViewConfig.getOrder().dynamicIndex!=null){ if (HomeViewConfig.getOrder().dynamicIndex!=null){
...@@ -248,7 +248,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract ...@@ -248,7 +248,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
HomeViewConfig.getOrder().courseIndex -> { HomeViewConfig.getOrder().courseIndex -> {
homeBean.courseBean = dataBean.courseBean homeBean.courseBean = dataBean.courseBean
} }
HomeViewConfig.getOrder().testIndex -> { HomeViewConfig.getOrder().testsIndex -> {
homeBean.testListBean = dataBean.testListBean homeBean.testListBean = dataBean.testListBean
} }
HomeViewConfig.getOrder().dynamicIndex -> { HomeViewConfig.getOrder().dynamicIndex -> {
...@@ -293,7 +293,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract ...@@ -293,7 +293,7 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
item.courseBean = item.courseBean =
if (dataBean.isRealEmpty || dataBean !is HomeCourseBean) homeTempData.courseBean else dataBean if (dataBean.isRealEmpty || dataBean !is HomeCourseBean) homeTempData.courseBean else dataBean
} }
HomeViewConfig.getOrder().testIndex -> { HomeViewConfig.getOrder().testsIndex -> {
item.testListBean = item.testListBean =
if (dataBean.isRealEmpty || dataBean !is HomeTestBean) homeTempData.testListBean else dataBean.testItemList if (dataBean.isRealEmpty || dataBean !is HomeTestBean) homeTempData.testListBean else dataBean.testItemList
} }
......
...@@ -51,7 +51,7 @@ import kotlinx.android.synthetic.ydl.home_fragment.* ...@@ -51,7 +51,7 @@ import kotlinx.android.synthetic.ydl.home_fragment.*
* @date 2019/02/12 * @date 2019/02/12
*/ */
@Route(path = "/home/home") @Route(path = "/home/home")
class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>(), open class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>(),
IHomeContract.View, IHomeContract.View,
SwipeRefreshLayout.OnRefreshListener { SwipeRefreshLayout.OnRefreshListener {
...@@ -100,7 +100,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>() ...@@ -100,7 +100,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
// val homeViewOrder = HomeViewConfig.HomeViewOrder() // val homeViewOrder = HomeViewConfig.HomeViewOrder()
// //
// homeViewOrder.bannerIndex = -1 // homeViewOrder.bannerIndex = -1
// homeViewOrder.testIndex = 1 // homeViewOrder.testsIndex = 1
// homeViewOrder.consultIndex = 2 // homeViewOrder.consultIndex = 2
// homeViewOrder.footerIndex = 3 // homeViewOrder.footerIndex = 3
// //
...@@ -136,7 +136,9 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>() ...@@ -136,7 +136,9 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
} }
open fun initRvListener() { open fun initRvListener() {
home_module_fragment_recycler.addOnScrollListener(homeEvent?.onPageScroll(view_rl_top_bg)) if (HomeViewConfig.getOrder().bannerIndex!=-1){
home_module_fragment_recycler.addOnScrollListener(homeEvent?.onPageScroll(view_rl_top_bg))
}
scrollListner = HomeConfideRecyleSuspendListener() scrollListner = HomeConfideRecyleSuspendListener()
home_module_fragment_recycler.addOnScrollListener(scrollListner) home_module_fragment_recycler.addOnScrollListener(scrollListner)
setSuspendListener() setSuspendListener()
......
...@@ -9,7 +9,7 @@ import org.json.JSONObject ...@@ -9,7 +9,7 @@ import org.json.JSONObject
* flutter版测评首页 * flutter版测评首页
* Created by xj on 2019/11/19. * Created by xj on 2019/11/19.
*/ */
@Route(path = "/ceshi/home") @Route(path = "/tests/home")
class NewTestHomeActivity : BaseFlutterActivity() { class NewTestHomeActivity : BaseFlutterActivity() {
override fun initialRoute(): String { override fun initialRoute(): String {
return "test/home" return "test/home"
......
...@@ -10,7 +10,7 @@ import io.flutter.view.FlutterView ...@@ -10,7 +10,7 @@ import io.flutter.view.FlutterView
* flutter版测评首页 * flutter版测评首页
* Created by xj on 2019/11/19. * Created by xj on 2019/11/19.
*/ */
@Route(path = "/tests/home") @Route(path = "/tests/home_fragment")
class NewTestHomeFragment : BaseFlutterFragment() { class NewTestHomeFragment : BaseFlutterFragment() {
override fun initChannelPlugin(flutterView: FlutterView) { override fun initChannelPlugin(flutterView: FlutterView) {
var statusBarHeight = StatusBarUtils.getStatusBarHeight(context); var statusBarHeight = StatusBarUtils.getStatusBarHeight(context);
......
...@@ -15,6 +15,7 @@ import android.view.inputmethod.InputMethodManager ...@@ -15,6 +15,7 @@ import android.view.inputmethod.InputMethodManager
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import cn.lankton.flowlayout.FlowLayout import cn.lankton.flowlayout.FlowLayout
import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.ydlcommon.adapter.MyBaseAdapter import com.ydl.ydlcommon.adapter.MyBaseAdapter
import com.ydl.ydlcommon.base.BaseMvpActivity import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.bean.StatusBarOptions import com.ydl.ydlcommon.bean.StatusBarOptions
...@@ -32,7 +33,7 @@ import de.greenrobot.event.EventBus ...@@ -32,7 +33,7 @@ import de.greenrobot.event.EventBus
import kotlinx.android.synthetic.main.tests_activity_test_search.* import kotlinx.android.synthetic.main.tests_activity_test_search.*
import kotlinx.android.synthetic.main.tests_item_hot_search.view.* import kotlinx.android.synthetic.main.tests_item_hot_search.view.*
@Route(path ="/tests/search")
class TestSearchActivity : BaseMvpActivity<TestSearchView, TestSearchPresenter>(), TestSearchView, View.OnClickListener { class TestSearchActivity : BaseMvpActivity<TestSearchView, TestSearchPresenter>(), TestSearchView, View.OnClickListener {
private var isFirstLoad = true private var isFirstLoad = true
......
...@@ -17,7 +17,7 @@ interface IYDLRouterConstant{ ...@@ -17,7 +17,7 @@ interface IYDLRouterConstant{
//课程列表页 //课程列表页
const val ROUTER_COURSE_LIST = ROUTER_BASE+"course/list" const val ROUTER_COURSE_LIST = ROUTER_BASE+"course/list"
//测评频道首页 //测评频道首页
const val ROUTER_TEST_HOME = ROUTER_BASE + "ceshi/home" const val ROUTER_TEST_HOME = ROUTER_BASE + "tests/home"
//测评列表页 //测评列表页
const val ROUTER_TEST_LIST = ROUTER_BASE + "ceshi/list" const val ROUTER_TEST_LIST = ROUTER_BASE + "ceshi/list"
//咨询列表页(专家服务搜索页面) //咨询列表页(专家服务搜索页面)
......
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