Commit 9411cf30 by yang.kai

feat: 无可用时间ui调整,增加埋点

parent ddb1c4a8
......@@ -10,7 +10,7 @@ ext {
"m-fm" : "0.0.30.04",
"m-user" : "0.0.61.82",
"m-home" : "0.0.22.84",
"m-im" : "0.0.20.75",
"m-im" : "0.0.20.77",
"m-dynamic" : "0.0.7.35",
"m-article" : "0.0.0.10",
......@@ -93,7 +93,7 @@ ext {
"m-fm" : "0.0.30.07",
"m-user" : "0.0.61.82",
"m-home" : "0.0.22.83",
"m-im" : "0.0.20.75",
"m-im" : "0.0.20.77",
"m-dynamic" : "0.0.7.35",
"m-article" : "0.0.0.8",
......
package com.yidianling.im.bean
/**
* Created by Ykai on 2021/12/29.
*/
data class BusyBean(
val success:Boolean
)
......@@ -305,6 +305,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
}
@SuppressLint("CheckResult")
private void initView() {
if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 3) {
//助理
......@@ -397,6 +398,14 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
//初始化私聊页面配置
initDefaultConfig();
// 获取专家是否在繁忙状态
ServiceImpl.Companion.getInstance().queryDoctorIsBusy(ActionHandlerStorage.getL(sessionId).getInfo().doctorId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(res -> {
isBusy = res.data.getSuccess();
}, throwable -> {
});
}
@SuppressLint("CheckResult")
......@@ -870,13 +879,6 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
//初始化聊天顶部快捷菜单
@SuppressLint("CheckResult")
private void initMenu() {
ServiceImpl.Companion.getInstance().queryDoctorIsBusy(ActionHandlerStorage.getL(sessionId).getInfo().doctorId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(res -> {
isBusy = res.data;
}, throwable -> {
});
rela_zixun.setOnClickListener(view -> {
if (sessionId != null && ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getInfo() != null) {
if (expertConsultServiceListDialog == null) {
......
......@@ -3,6 +3,7 @@ package com.yidianling.uikit.custom.http
import com.ydl.ydlcommon.base.config.YDL_DOMAIN
import com.ydl.ydlcommon.base.config.YDL_DOMAIN_JAVA
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.yidianling.im.bean.BusyBean
import com.yidianling.uikit.custom.http.response.*
import com.yidianling.uikit.custom.http.response.question.QuestionsInfoBean
import io.reactivex.Observable
......@@ -81,7 +82,7 @@ interface ServiceApi {
//查询咨询师是否在繁忙状态
@GET("counselor/doctor/v1/doctor/isBusy")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun queryDoctorIsBusy(@Query("id") doctorId: String): Observable<BaseAPIResponse<Boolean>>
fun queryDoctorIsBusy(@Query("id") doctorId: String): Observable<BaseAPIResponse<BusyBean>>
//获取输入框的hint内容
@GET("systemconfig/get-chat-view-config")
......
......@@ -3,6 +3,7 @@ package com.yidianling.uikit.custom.http
import com.alibaba.fastjson.JSON
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlnet.YDLHttpUtils
import com.yidianling.im.bean.BusyBean
import com.yidianling.im.http.ImRetrofitApi
import com.yidianling.uikit.custom.http.response.*
import com.yidianling.uikit.custom.http.response.question.QuestionsInfoBean
......@@ -120,7 +121,7 @@ class ServiceImpl private constructor() {
/**
* 查询咨询师是否在繁忙状态
*/
fun queryDoctorIsBusy(doctorId: String): Observable<BaseAPIResponse<Boolean>>{
fun queryDoctorIsBusy(doctorId: String): Observable<BaseAPIResponse<BusyBean>>{
return YDLHttpUtils.obtainApi(ServiceApi::class.java).queryDoctorIsBusy(doctorId)
}
......
......@@ -7,6 +7,7 @@ import android.widget.LinearLayout
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.config.HttpConfig
import com.yidianling.avchatkit.common.log.LogUtil
import com.yidianling.im.R
import com.yidianling.uikit.custom.http.response.ServiceItemBean
import com.yidianling.uikit.custom.widget.expertConsultService.callback.ConsultServiceViewCallback
......
......@@ -55,10 +55,7 @@ class ExpertConsultServiceListDialog(val mContext: Context, val mList: List<Serv
typeList.add(item.cateName)
}
mConsultServiceListView =
ExpertConsultServiceView(
mContext
)
mConsultServiceListView = ExpertConsultServiceView(mContext,mIsBusy)
(mConsultServiceListView as ExpertConsultServiceView).setDataAndClick(typeList, mList, object : ConsultServiceViewCallback {
override fun onCloseClick() {
......@@ -95,7 +92,7 @@ class ExpertConsultServiceListDialog(val mContext: Context, val mList: List<Serv
ActionCountUtils.baiDuCountSign3("ydl_user_product_page","remind_add_click",toUid,ActionHandlerStorage.getL(toUid).info.name,"")
dismiss()
}
},mIsBusy)
})
mViewList.add(mConsultServiceListView as View)
......
......@@ -4,6 +4,7 @@ import android.content.Context
import android.util.AttributeSet
import android.view.View
import android.widget.LinearLayout
import com.yidianling.avchatkit.common.log.LogUtil
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.im.R
import com.yidianling.uikit.custom.http.response.ServiceItemBean
......@@ -28,8 +29,9 @@ class ExpertConsultServiceView : LinearLayout {
}
}
constructor(context: Context) : super(context) {
constructor(context: Context,isBusy: Boolean) : super(context) {
mContext = context
mIsBusy = isBusy
initView()
}
......@@ -73,11 +75,9 @@ class ExpertConsultServiceView : LinearLayout {
fun setDataAndClick(
typeList: ArrayList<String>,
allServiceList: List<ServiceItemBean>,
listener: ConsultServiceViewCallback?,
isBusy:Boolean
listener: ConsultServiceViewCallback?
) {
mListener = listener
mIsBusy = isBusy
consult_service_dialog_close.setOnClickListener {
mListener?.onCloseClick()
}
......@@ -90,10 +90,7 @@ class ExpertConsultServiceView : LinearLayout {
mTypeList.addAll(typeList)
mContext?.let {
mTypeList.forEachIndexed { index, str ->
val item =
ExpertConsultServiceTypeItemView(
mContext!!
)
val item = ExpertConsultServiceTypeItemView(mContext!!)
item.setData(str, index == typeSelectedIndex)
item.setOnClickListener {
typeSelectedIndex = index
......@@ -116,6 +113,7 @@ class ExpertConsultServiceView : LinearLayout {
* 刷新服务列表数据
*/
private fun selectTypeServiceList() {
LogUtil.e("isBusy1","$mIsBusy")
expert_consult_service_service_list.removeAllViews()
if (mServiceList.size != 0) {
val lastList: ArrayList<ServiceItemBean.ProductsBean> = ArrayList()
......
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