Commit 21de161c by 徐健

用户端首页组件化基本完成,剩余一个RouterManager待修改

parent 7743929c
...@@ -86,9 +86,9 @@ public class DemoAppLifecycles implements IAppLifecycles { ...@@ -86,9 +86,9 @@ public class DemoAppLifecycles implements IAppLifecycles {
//数据埋点初始化--一定要放在主进程中 //数据埋点初始化--一定要放在主进程中
YdlBuryPointUtil.init(application); YdlBuryPointUtil.init(application);
if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)){ if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)){
YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830"); // YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830");
}else { }else {
YDLavManager.Companion.getInstances().init(application, "13b1536698f64905a1e7e5bb978ba821"); // YDLavManager.Companion.getInstances().init(application, "13b1536698f64905a1e7e5bb978ba821");
} }
//bugly //bugly
......
...@@ -24,7 +24,7 @@ modular { ...@@ -24,7 +24,7 @@ modular {
groupId = "com.ydl" groupId = "com.ydl"
artifactId = "m-consultant-api" artifactId = "m-consultant-api"
//开发时注释掉版本号,发布api时打开 //开发时注释掉版本号,发布api时打开
version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"] //version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
// API 层打包时需要引入的依赖 // API 层打包时需要引入的依赖
apiDependencies { apiDependencies {
implementation "com.google.code.gson:gson:2.8.2" implementation "com.google.code.gson:gson:2.8.2"
......
...@@ -70,6 +70,7 @@ dependencies { ...@@ -70,6 +70,7 @@ dependencies {
//开发时使用 //开发时使用
implementation modularPublication('com.ydl:m-consultant-api') implementation modularPublication('com.ydl:m-consultant-api')
implementation modularPublication('com.ydl:m-user-api') implementation modularPublication('com.ydl:m-user-api')
implementation modularPublication('com.ydl:m-tests-api')
implementation project(':ydl-webview') implementation project(':ydl-webview')
implementation project(':ydl-media') implementation project(':ydl-media')
implementation project(":ydl-platform") implementation project(":ydl-platform")
......
...@@ -34,6 +34,7 @@ import com.yidianling.home.constract.IHomeContract ...@@ -34,6 +34,7 @@ import com.yidianling.home.constract.IHomeContract
import com.yidianling.home.model.bean.* import com.yidianling.home.model.bean.*
import com.yidianling.router.RouterManager import com.yidianling.router.RouterManager
import com.yidianling.router.im.IMRequestCallback import com.yidianling.router.im.IMRequestCallback
import com.yidianling.tests.api.service.ITestsApiService
import com.yidianling.user.api.service.IUserService import com.yidianling.user.api.service.IUserService
import de.greenrobot.event.EventBus import de.greenrobot.event.EventBus
import org.json.JSONObject import org.json.JSONObject
...@@ -339,6 +340,7 @@ class HomeImpl : IHomeEvent { ...@@ -339,6 +340,7 @@ class HomeImpl : IHomeEvent {
.putExtra(IYDLRouterConstant.EXTRA_TOUID, doctorId!!) .putExtra(IYDLRouterConstant.EXTRA_TOUID, doctorId!!)
.putExtra(IYDLRouterConstant.EXTRA_USERTYPE, "1")) .putExtra(IYDLRouterConstant.EXTRA_USERTYPE, "1"))
} }
//todo xj
RouterManager.getImRouter().createTextMessage(doctorId, "你好,我想找你倾诉,请尽快上线私聊我,我在等你。", object : IMRequestCallback<Void> { RouterManager.getImRouter().createTextMessage(doctorId, "你好,我想找你倾诉,请尽快上线私聊我,我在等你。", object : IMRequestCallback<Void> {
override fun onSuccess(aVoid: Void?) { override fun onSuccess(aVoid: Void?) {
(mContext as BaseActivity).dismissProgressDialog() (mContext as BaseActivity).dismissProgressDialog()
...@@ -572,7 +574,7 @@ class HomeImpl : IHomeEvent { ...@@ -572,7 +574,7 @@ class HomeImpl : IHomeEvent {
val uri = Uri.parse(linkUrl) val uri = Uri.parse(linkUrl)
if ("ceshi" == uri.host) { if ("ceshi" == uri.host) {
val id = uri.getQueryParameter("id") val id = uri.getQueryParameter("id")
RouterManager.getTestsRouter()?.testDetailH5(id) ModularServiceManager.provide(ITestsApiService::class.java).testDetailH5(id)
} }
} else if (linkUrl.startsWith("http")) { } else if (linkUrl.startsWith("http")) {
YDLRouterManager.router(IYDLRouterConstant.ROUTER_H5_H5, YDLRouterManager.router(IYDLRouterConstant.ROUTER_H5_H5,
...@@ -580,7 +582,7 @@ class HomeImpl : IHomeEvent { ...@@ -580,7 +582,7 @@ class HomeImpl : IHomeEvent {
} else if (linkUrl.contains("ceshi/detail?")) { } else if (linkUrl.contains("ceshi/detail?")) {
val routerParamsUrls = YDLRouterParamsUrls(linkUrl) val routerParamsUrls = YDLRouterParamsUrls(linkUrl)
val jsonObject = JSONObject(routerParamsUrls.getParams()) val jsonObject = JSONObject(routerParamsUrls.getParams())
RouterManager.getTestsRouter()?.testDetailH5(jsonObject.getString("id").toString()); ModularServiceManager.provide(ITestsApiService::class.java).testDetailH5(jsonObject.getString("id").toString())
} else { } else {
YDLRouterManager.router(linkUrl) YDLRouterManager.router(linkUrl)
} }
......
...@@ -78,7 +78,7 @@ class HomeConsultBean: HomeItemBaseBean { ...@@ -78,7 +78,7 @@ class HomeConsultBean: HomeItemBaseBean {
var hUrl: String? = null var hUrl: String? = null
var share: ShareBean? = null var share: ShareBean? = null
var isHiddenXcx: String? = null var isHiddenXcx: String? = null
var tags: ArrayList<String>? = null var tags: String? = null
class ShareBean { class ShareBean {
/** /**
......
package com.yidianling.home.model.bean package com.yidianling.home.model.bean
import com.yidianling.router.consultant.Keyworks import com.yidianling.consultant.bean.Keyworks
/** /**
* Created by haorui on 2019/2/14. * Created by haorui on 2019/2/14.
......
...@@ -21,7 +21,6 @@ import com.yidianling.home.utils.HomeLogPrinter ...@@ -21,7 +21,6 @@ import com.yidianling.home.utils.HomeLogPrinter
import com.yidianling.common.tools.LogUtil import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxAppTool import com.yidianling.common.tools.RxAppTool
import com.yidianling.consultant.api.IConsultantService import com.yidianling.consultant.api.IConsultantService
import com.yidianling.router.RouterManager
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
...@@ -171,8 +170,7 @@ class HomePresenterImpl : SimplePresenter<IHomeContract.View>() { ...@@ -171,8 +170,7 @@ class HomePresenterImpl : SimplePresenter<IHomeContract.View>() {
} }
homeList.add(HomePagerDataBean(YdlHomeViewHolderConstract.BUTTON_BANNER_VIEW)) homeList.add(HomePagerDataBean(YdlHomeViewHolderConstract.BUTTON_BANNER_VIEW))
//保存热门搜索列表 //保存热门搜索列表
it.keywordData?.let { ModularServiceManager.provide(IConsultantService::class.java) } it.keywordData?.let { ModularServiceManager.provide(IConsultantService::class.java).setHotSearch(it) }
it.keywordData?.let { RouterManager.getConsultantRouter()?.setHotSearch(it) }
}, },
HomeModelImpl.consultRequest(mConsultType).map { HomeModelImpl.consultRequest(mConsultType).map {
//首页咨询数据 //首页咨询数据
...@@ -255,7 +253,7 @@ class HomePresenterImpl : SimplePresenter<IHomeContract.View>() { ...@@ -255,7 +253,7 @@ class HomePresenterImpl : SimplePresenter<IHomeContract.View>() {
YdlHomeViewHolderConstract.PAGER_BANNER_VIEW -> { YdlHomeViewHolderConstract.PAGER_BANNER_VIEW -> {
homeBean.headerBean = dataBean.headerBean homeBean.headerBean = dataBean.headerBean
dataBean.headerBean?.keywordData?.let { dataBean.headerBean?.keywordData?.let {
RouterManager.getConsultantRouter()?.setHotSearch(it) ModularServiceManager.provide(IConsultantService::class.java).setHotSearch(it)
} }
} }
YdlHomeViewHolderConstract.CONSULT_VIEW -> { YdlHomeViewHolderConstract.CONSULT_VIEW -> {
......
...@@ -39,7 +39,6 @@ import com.yidianling.home.presenter.HomePresenterImpl ...@@ -39,7 +39,6 @@ import com.yidianling.home.presenter.HomePresenterImpl
import com.yidianling.home.ui.view.CouponDialog import com.yidianling.home.ui.view.CouponDialog
import com.yidianling.home.utils.Double11ActivityManagerUtils import com.yidianling.home.utils.Double11ActivityManagerUtils
import com.yidianling.home.utils.HomeAnimUtils import com.yidianling.home.utils.HomeAnimUtils
import com.yidianling.router.RouterManager
import com.yidianling.user.api.service.IUserService import com.yidianling.user.api.service.IUserService
import kotlinx.android.synthetic.ydl.home_module_fragment.* import kotlinx.android.synthetic.ydl.home_module_fragment.*
......
...@@ -18,7 +18,6 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager ...@@ -18,7 +18,6 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.ydl.ydl_router.manager.YDLRouterManager import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.modular.ModularServiceManager import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.IYDLRouterConstant import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlcommon.utils.MoonUtil import com.ydl.ydlcommon.utils.MoonUtil
import com.ydl.ydlcommon.utils.Utils import com.ydl.ydlcommon.utils.Utils
import com.yidianling.common.tools.RxDeviceTool import com.yidianling.common.tools.RxDeviceTool
......
...@@ -48,7 +48,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent: ...@@ -48,7 +48,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
//设置名称 //设置名称
tv_consult_name.text = bean.doctorName tv_consult_name.text = bean.doctorName
//咨询师标签 //咨询师标签
tag_view.initData(bean.tags) tag_view.initData(StringUtils.strToList(bean.tags))
//设置向TA倾诉人数 //设置向TA倾诉人数
setConfideNum(bean) setConfideNum(bean)
//设置接通率文案 //设置接通率文案
......
...@@ -24,7 +24,7 @@ modular { ...@@ -24,7 +24,7 @@ modular {
groupId = "com.ydl" groupId = "com.ydl"
artifactId = "m-tests-api" artifactId = "m-tests-api"
//开发时注释掉版本号,发布api时打开 //开发时注释掉版本号,发布api时打开
version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"] // version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
// API 层打包时需要引入的依赖 // API 层打包时需要引入的依赖
apiDependencies { apiDependencies {
implementation "com.google.code.gson:gson:2.8.2" implementation "com.google.code.gson:gson:2.8.2"
......
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