Commit 324e576c by upwork.021

feat: 专家标签高亮,组件升级

parent 98c42a4a
...@@ -6,7 +6,7 @@ ext { ...@@ -6,7 +6,7 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.65", "m-confide" : "0.0.49.65",
"m-consultant" : "0.0.60.16", "m-consultant" : "0.0.60.17",
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.62.04", "m-user" : "0.0.62.04",
"m-home" : "0.0.23.17", "m-home" : "0.0.23.17",
...@@ -93,7 +93,7 @@ ext { ...@@ -93,7 +93,7 @@ ext {
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.65", "m-confide" : "0.0.49.65",
"m-consultant" : "0.0.60.16", "m-consultant" : "0.0.60.17",
"m-fm" : "0.0.30.07", "m-fm" : "0.0.30.07",
"m-user" : "0.0.62.04", "m-user" : "0.0.62.04",
"m-home" : "0.0.23.17", "m-home" : "0.0.23.17",
......
...@@ -15,14 +15,9 @@ import com.ydl.webview.NewH5Activity ...@@ -15,14 +15,9 @@ import com.ydl.webview.NewH5Activity
import com.ydl.ydl_image.config.SimpleImageOpConfiger import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.module.GlideApp import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.base.config.HttpConfig import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.URLUtils import com.ydl.ydlcommon.utils.URLUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxImageTool
import com.yidianling.consultant.ExpertSearchActivity import com.yidianling.consultant.ExpertSearchActivity
import com.yidianling.consultant.IExpertSearchView import com.yidianling.consultant.IExpertSearchView
import com.yidianling.consultant.R import com.yidianling.consultant.R
...@@ -89,14 +84,18 @@ class ExpertSearchAdapter( ...@@ -89,14 +84,18 @@ class ExpertSearchAdapter(
holder.imgHead_online.visibility = View.GONE holder.imgHead_online.visibility = View.GONE
} else { } else {
//不是服务中且问询人数大于0 //不是服务中且问询人数大于0
if (itemBean.chatNum > 5) { when {
holder.chat_people_in_question.visibility = View.VISIBLE itemBean.chatNum > 5 -> {
holder.chat_people_in_question.text = "多人在问询" holder.chat_people_in_question.visibility = View.VISIBLE
} else if (itemBean.chatNum > 0) { holder.chat_people_in_question.text = "多人在问询"
holder.chat_people_in_question.visibility = View.VISIBLE }
holder.chat_people_in_question.text = "${itemBean.chatNum}人在问询" itemBean.chatNum > 0 -> {
} else { holder.chat_people_in_question.visibility = View.VISIBLE
holder.chat_people_in_question.visibility = View.GONE holder.chat_people_in_question.text = "${itemBean.chatNum}人在问询"
}
else -> {
holder.chat_people_in_question.visibility = View.GONE
}
} }
//可预约 //可预约
holder.imgHead_online_server.visibility = View.GONE holder.imgHead_online_server.visibility = View.GONE
...@@ -158,18 +157,22 @@ class ExpertSearchAdapter( ...@@ -158,18 +157,22 @@ class ExpertSearchAdapter(
} else { } else {
holder.imgFightEpidemicIcon.visibility = View.GONE holder.imgFightEpidemicIcon.visibility = View.GONE
//能力等级标签 //能力等级标签
if (1 == itemBean.abilityLevel) { when (itemBean.abilityLevel) {
//实习 1 -> {
holder.imgAbilityLevel.background = //实习
context.resources.getDrawable(R.drawable.consultant_expert_search_shixi) holder.imgAbilityLevel.background =
holder.imgAbilityLevel.visibility = View.VISIBLE context.resources.getDrawable(R.drawable.consultant_expert_search_shixi)
} else if (2 == itemBean.abilityLevel) { holder.imgAbilityLevel.visibility = View.VISIBLE
//新手 }
holder.imgAbilityLevel.background = 2 -> {
context.resources.getDrawable(R.drawable.consultant_expert_search_xinshou) //新手
holder.imgAbilityLevel.visibility = View.VISIBLE holder.imgAbilityLevel.background =
} else { context.resources.getDrawable(R.drawable.consultant_expert_search_xinshou)
holder.imgAbilityLevel.visibility = View.GONE holder.imgAbilityLevel.visibility = View.VISIBLE
}
else -> {
holder.imgAbilityLevel.visibility = View.GONE
}
} }
//活动图标 //活动图标
if (!TextUtils.isEmpty(itemBean.activityImg)) { if (!TextUtils.isEmpty(itemBean.activityImg)) {
...@@ -223,15 +226,18 @@ class ExpertSearchAdapter( ...@@ -223,15 +226,18 @@ class ExpertSearchAdapter(
holder.tvTeamCertifications.text = itemBean.teamCertifications holder.tvTeamCertifications.text = itemBean.teamCertifications
//咨询师标签 //咨询师标签
holder.ll_tags.removeAllViews() holder.ll_tags.removeAllViews()
if (!TextUtils.isEmpty(itemBean.tags)) { if (itemBean.tagList.isNotEmpty()){
val tagList = itemBean.tags!!.split("|") for (tag in itemBean.tagList){
for (tag in tagList) { val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_tag, holder.ll_tags, false)
if (!TextUtils.isEmpty(tag)) { view.tvTag.text = tag.tagName
val view = LayoutInflater.from(context) if (tag.isHigh==1){
.inflate(R.layout.consultant_item_tag, holder.ll_tags, false) view.tvTag.setBackgroundResource(R.drawable.consultant_bg_radius_line_eb892c)
view.tvTag.text = tag view.tvTag.setTextColor(ContextCompat.getColor(context,R.color.color_EB892C))
holder.ll_tags.addView(view) }else{
view.tvTag.setBackgroundResource(R.drawable.consultant_bg_radius_line_gray_1)
view.tvTag.setTextColor(ContextCompat.getColor(context,R.color.platform_color_E0E0E0))
} }
holder.ll_tags.addView(view)
} }
} }
//帮助人数 //帮助人数
......
...@@ -130,5 +130,15 @@ data class DoctorServiceItem( ...@@ -130,5 +130,15 @@ data class DoctorServiceItem(
/** /**
* 私聊按钮的文案(如果不为空则取这个字段的值,如果为空 则默认为:“私聊”) * 私聊按钮的文案(如果不为空则取这个字段的值,如果为空 则默认为:“私聊”)
*/ */
val chatBtnText: String? val chatBtnText: String?,
/**
* 新标签分类
*/
val tagList: ArrayList<TagBean>
)
data class TagBean(
val tagName:String?,
val isHigh:Int
) )
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="1dp"/>
<solid android:color="@color/color_1AEB892C" />
<stroke android:width="0.5dp" android:color="@color/color_EB892C"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="1dp"></corners> <corners android:radius="1dp"/>
<solid android:color="@color/platform_white" /> <solid android:color="@color/platform_white" />
<stroke android:width="0.5dp" android:color="@color/platform_color_E0E0E0"/> <stroke android:width="0.5dp" android:color="@color/platform_color_E0E0E0"/>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvTag" android:id="@+id/tvTag"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="14dp" android:layout_height="wrap_content"
android:background="@drawable/consultant_bg_radius_line_gray_1" android:background="@drawable/consultant_bg_radius_line_gray_1"
android:gravity="center" android:gravity="center"
android:paddingLeft="4dp" android:layout_marginEnd="6dp"
android:layout_marginRight="6dp" android:padding="3dp"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
android:paddingRight="4dp" android:textSize="10sp"
android:textSize="10dp" tools:text="恋爱情感" />
tools:text="恋爱情感" />
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
<!-- google color--> <!-- google color-->
<color name="consultant_color_FF9500">#FF9500</color> <color name="consultant_color_FF9500">#FF9500</color>
<!--app主要颜色--> <!--app主要颜色-->
<!--最后删除--> <!--最后删除-->
<!-- main bg color --> <!-- main bg color -->
<!-- session --> <!-- session -->
<!-- image picker --> <!-- image picker -->
<!-- contact --> <!-- contact -->
<!-- setting --> <!-- setting -->
<!--云信 end--> <!--云信 end-->
<!--动态--> <!--动态-->
<!--动态顶部title背景变色--> <!--动态顶部title背景变色-->
<color name="consultant_colorBg">#f5f5f5</color> <color name="consultant_colorBg">#f5f5f5</color>
<color name="color_EB892C">#EB892C</color>
</resources> <color name="color_1AEB892C">#1AEB892C</color>
</resources>
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