feat: UI修改

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.48"
+        componentVersion = "0.3.0.48-lp-status"
     }
     repositories {
         mavenCentral()

m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

@@ -166,8 +166,9 @@ class ExpertSearchAdapter(
         //省市
         if (!TextUtils.isEmpty(itemBean.display_region)) {
             holder.tvCity.text = itemBean.display_region
+            holder.tvCity.visibility = View.VISIBLE
         } else {
-            holder.tvCity.text = ""
+            holder.tvCity.visibility = View.GONE
         }
         //咨询师tag
         holder.tvTeamCertifications.text = itemBean.title
@@ -184,38 +185,39 @@ class ExpertSearchAdapter(
 
         //咨询师标签
         holder.ll_tags.removeAllViews()
-        itemBean.feature_tags?.let { feature_tags ->
-            if (feature_tags.isNotEmpty()) {
-                for (tag in feature_tags) {
-                    val view = LayoutInflater.from(context)
-                        .inflate(R.layout.consultant_item_tag, holder.ll_tags, false)
-                    tag.tag_name.let { name ->
-                        if (name.length > 4) {
-                            view.tvTag.text = "${name.substring(0, 4)}…"
-                        } else {
-                            view.tvTag.text = name
-                        }
+        if (itemBean.feature_tags?.isNotEmpty() == true) {
+            holder.ll_tags.visibility = View.VISIBLE
+            for (tag in itemBean.feature_tags) {
+                val view = LayoutInflater.from(context)
+                    .inflate(R.layout.consultant_item_tag, holder.ll_tags, false)
+                tag.tag_name.let { name ->
+                    if (name.length > 4) {
+                        view.tvTag.text = "${name.substring(0, 4)}…"
+                    } else {
+                        view.tvTag.text = name
                     }
-                    if (tag.is_highlight) {
-                        view.tvTag.setBackgroundResource(R.drawable.consultant_bg_radius_line_eb892c)
-                        view.tvTag.setTextColor(
-                            ContextCompat.getColor(
-                                context,
-                                R.color.color_EB892C
-                            )
+                }
+                if (tag.is_highlight) {
+                    view.tvTag.setBackgroundResource(R.drawable.consultant_bg_radius_line_eb892c)
+                    view.tvTag.setTextColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.color_EB892C
                         )
-                    } else {
-                        view.tvTag.setBackgroundResource(R.drawable.consultant_bg_radius_line_gray_1)
-                        view.tvTag.setTextColor(
-                            ContextCompat.getColor(
-                                context,
-                                R.color.platform_color_666666
-                            )
+                    )
+                } else {
+                    view.tvTag.setBackgroundResource(R.drawable.consultant_bg_radius_line_gray_1)
+                    view.tvTag.setTextColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.color_1c1f28_50
                         )
-                    }
-                    holder.ll_tags.addView(view)
+                    )
                 }
+                holder.ll_tags.addView(view)
             }
+        } else {
+            holder.ll_tags.visibility = View.GONE
         }
 
         //价格
@@ -239,7 +241,7 @@ class ExpertSearchAdapter(
         } else {
             //私聊状态：1.上线；2.离线；3.忙碌中
             when (itemBean.chat_status) {
-                2 -> {
+                2, 3 -> {
                     holder.tvChat.text = "留 言"
                     holder.card_chat.setCardBackgroundColor(
                         ContextCompat.getColor(
@@ -248,15 +250,6 @@ class ExpertSearchAdapter(
                         )
                     )
                 }
-                3 -> {
-                    holder.tvChat.text = "忙 碌"
-                    holder.card_chat.setCardBackgroundColor(
-                        ContextCompat.getColor(
-                            context,
-                            R.color.color_f28e6b
-                        )
-                    )
-                }
                 else -> {
                     holder.tvChat.text = "私 聊"
                     holder.card_chat.setCardBackgroundColor(

m-consultant/src/main/res/drawable/consultant_bg_radius_line_gray_1.xml

@@ -3,6 +3,8 @@
 
     <corners android:radius="1dp"/>
     <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/color_1c1f28_20" />
 
 </shape>
\ No newline at end of file

m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml

@@ -40,7 +40,7 @@
                 android:paddingTop="3dp"
                 android:paddingBottom="2dp"
                 android:textColor="@color/white"
-                android:textSize="11dp"
+                android:textSize="9dp"
                 tools:text="现在有空" />
         </RelativeLayout>
 
@@ -54,7 +54,7 @@
         android:layout_marginStart="@dimen/platform_dp_12"
         android:gravity="center_vertical"
         android:textColor="@color/color_1C1F28"
-        android:textSize="@dimen/platform_dp_18"
+        android:textSize="@dimen/platform_dp_16"
         android:textStyle="bold"
         app:layout_constraintLeft_toRightOf="@id/cv_head_view"
         app:layout_constraintTop_toTopOf="@id/cv_head_view"
@@ -97,7 +97,7 @@
         android:ellipsize="end"
         android:lines="1"
         android:textColor="@color/color_1c1f28_60"
-        android:textSize="@dimen/platform_dp_12"
+        android:textSize="@dimen/platform_dp_13"
         app:layout_constraintLeft_toLeftOf="@id/tvName"
         app:layout_constraintTop_toBottomOf="@id/tvName"
         tools:text="一级婚姻家庭咨询师，二级心理咨询师二级心理咨询师二级心理咨询师" />
@@ -125,7 +125,7 @@
         android:layout_height="wrap_content"
         android:text="经验"
         android:textColor="@color/color_1c1f28_60"
-        android:textSize="@dimen/platform_dp_12"
+        android:textSize="@dimen/platform_dp_13"
         app:layout_constraintBaseline_toBaselineOf="@id/tvSaleDurationForMonth"
         app:layout_constraintLeft_toRightOf="@id/tvSaleDurationForMonth" />
 
@@ -135,7 +135,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/platform_dp_12"
+        android:layout_marginStart="@dimen/platform_dp_13"
         android:textColor="@color/color_1C1F28"
         android:textSize="@dimen/platform_dp_12"
         app:layout_constraintBaseline_toBaselineOf="@id/tvSaleDurationForMonth"
@@ -148,7 +148,7 @@
         android:layout_gravity="center_vertical"
         android:text="口碑"
         android:textColor="@color/color_1c1f28_60"
-        android:textSize="@dimen/platform_dp_12"
+        android:textSize="@dimen/platform_dp_13"
         app:layout_constraintBaseline_toBaselineOf="@id/tv_zixunOrderNum"
         app:layout_constraintLeft_toRightOf="@id/tv_zixunOrderNum" />
 
@@ -171,6 +171,7 @@
         android:layout_alignTop="@+id/tvName"
         android:textColor="@color/color_ef8a4a"
         android:layout_marginTop="12dp"
+        app:layout_goneMarginTop="10dp"
         android:textSize="@dimen/platform_dp_14"
         app:layout_constraintLeft_toLeftOf="@id/tvName"
         app:layout_constraintTop_toBottomOf="@id/ll_tags"

m-consultant/src/main/res/layout/consultant_item_tag.xml

@@ -4,10 +4,13 @@
     android:id="@+id/tvTag"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_marginEnd="8dp"
     android:background="@drawable/consultant_bg_radius_line_gray_1"
     android:gravity="center"
-    android:layout_marginEnd="6dp"
-    android:padding="3dp"
-    android:textColor="@color/platform_color_666666"
-    android:textSize="10sp"
+    android:paddingLeft="4dp"
+    android:paddingTop="2dp"
+    android:paddingRight="4dp"
+    android:paddingBottom="3dp"
+    android:textColor="@color/color_1c1f28_50"
+    android:textSize="11sp"
     tools:text="恋爱情感" />

m-consultant/src/main/res/values/colors.xml

@@ -27,7 +27,9 @@
     <color name="color_EB892C">#EB892C</color>
     <color name="color_1AEB892C">#1AEB892C</color>
     <color name="color_1c1f28_60">#a61c1f28</color>
+    <color name="color_1c1f28_50">#801c1f28</color>
     <color name="color_1c1f28_40">#661c1f28</color>
+    <color name="color_1c1f28_20">#331c1f28</color>
     <color name="color_ef8a4a">#EF8A4A</color>
     <color name="color_f6f6f7">#f6f6f7</color>
     <color name="color_6ec8f9">#6ec8f9</color>

m-im/src/main/java/com/yidianling/im/helper/IMChatUtil.kt

@@ -566,7 +566,7 @@ object IMChatUtil {
                                             )
                                         )
                                     } else if (status == 4 || status == 5) { //服务中
-                                        tb.setMinTitleText("服务中")
+                                        tb.setMinTitleText("忙碌")
                                         tb.setMinTitleColor(
                                             ContextCompat.getColor(
                                                 context,