From 6c18b2f806a647c445ee64f8b916ccd1bb1b0bd1 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 10 Aug 2022 15:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,shouye=20ytuijian?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/rc_conversationlist_item.xml |   1 +
 live/src/main/res/mipmap-xhdpi/instructors.png   | Bin 0 -> 3429 bytes
 .../main/views/SearchResultsViewHolder.java      |   8 +++++---
 .../main/res/layout/view_search_results_item.xml |   4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 live/src/main/res/mipmap-xhdpi/instructors.png

diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml
index 9b88732e9..5ef66388e 100644
--- a/live/src/main/res/layout/rc_conversationlist_item.xml
+++ b/live/src/main/res/layout/rc_conversationlist_item.xml
@@ -30,6 +30,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="22dp"
                 android:layout_alignParentBottom="true"
+                android:src="@mipmap/instructors"
                 android:visibility="visible" />
         </RelativeLayout>
 
diff --git a/live/src/main/res/mipmap-xhdpi/instructors.png b/live/src/main/res/mipmap-xhdpi/instructors.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b36e5ed86b7a9e97b2d8193e22da3d56b9b32a4
GIT binary patch
literal 3429
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
Hu0mjfhse5Q

literal 0
HcmV?d00001

diff --git a/main/src/main/java/com/yunbao/main/views/SearchResultsViewHolder.java b/main/src/main/java/com/yunbao/main/views/SearchResultsViewHolder.java
index 3481e5f9b..710f6cecc 100644
--- a/main/src/main/java/com/yunbao/main/views/SearchResultsViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/SearchResultsViewHolder.java
@@ -19,6 +19,7 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.main.R;
 import com.yunbao.main.event.JumpUserHomeEvent;
+import com.yunbao.main.utils.WordsTypeUtil;
 
 public class SearchResultsViewHolder extends RecyclerView.ViewHolder {
     private ImageView avatar, isLive, sex, focusOn, contribute;
@@ -77,7 +78,7 @@ public class SearchResultsViewHolder extends RecyclerView.ViewHolder {
         } else {
             ImgLoader.displayAvatar(itemView.getContext(), R.mipmap.icon_sex_male_1, sex);
         }
-        nickName.setText(userNicenamehighlight(model.getUserNicename(),searchKey));
+        nickName.setText(userNicenamehighlight(model.getUserNicename(), searchKey));
         focusOn.setVisibility(TextUtils.equals(model.getIsattention(), "1") ? View.GONE : View.VISIBLE);
     }
 
@@ -96,9 +97,10 @@ public class SearchResultsViewHolder extends RecyclerView.ViewHolder {
     }
 
     private Spanned userNicenamehighlight(String context, String keyword) {
-        String keywordHtml = "</font><font color='#FF8D41'size='42px'>" + keyword + "</font><font color='#161616'size='42px'>";
+        String keywordHtml1 = "</font><font color='#FF8D41'size='42px'>" + WordsTypeUtil.changeSimplified(keyword) + "</font><font color='#161616'size='42px'>";
+        String keywordHtml2 = "</font><font color='#FF8D41'size='42px'>" + WordsTypeUtil.changeTraditional(keyword) + "</font><font color='#161616'size='42px'>";
         String contextHtml = "<font color='#161616'size='42px'>" + context + "</font>";
-        contextHtml = contextHtml.replace(keyword, keywordHtml);
+        contextHtml = contextHtml.replace(WordsTypeUtil.changeSimplified(keyword) ,keywordHtml1).replace(WordsTypeUtil.changeTraditional(keyword),keywordHtml2);
         return Html.fromHtml(contextHtml);
     }
 
diff --git a/main/src/main/res/layout/view_search_results_item.xml b/main/src/main/res/layout/view_search_results_item.xml
index 6b2a9f674..79cd9bcf1 100644
--- a/main/src/main/res/layout/view_search_results_item.xml
+++ b/main/src/main/res/layout/view_search_results_item.xml
@@ -80,9 +80,11 @@
                     <ImageView
                         android:id="@+id/change_batch"
                         android:layout_width="wrap_content"
+                        android:clickable="true"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical|right"
-                        android:background="@mipmap/icon_cange" />
+                        android:background="@mipmap/icon_cange"
+                        android:focusable="true" />
 
 
                     <TextView