From 8b9d10ca92c896e125a0dc8810b3ab689c3848e3 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 27 Jul 2022 18:48:22 +0800
Subject: [PATCH] 11111

---
 .../res/layout/rc_conversationlist_item.xml   | 40 +++++++++++++------
 .../PDLiveCustomConversationProvider.java     | 18 ++++++++-
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml
index 7fc2a176c..f4fee666b 100644
--- a/live/src/main/res/layout/rc_conversationlist_item.xml
+++ b/live/src/main/res/layout/rc_conversationlist_item.xml
@@ -28,32 +28,47 @@
 
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/rc_conversation_title"
-            style="@style/TextStyle.Alignment"
+        <LinearLayout
+            android:id="@+id/rc_conversation_linear"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
             android:layout_marginTop="@dimen/rc_margin_size_16"
             android:layout_marginEnd="@dimen/rc_margin_size_12"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:text="张三"
-            android:textColor="@color/rc_text_main_color"
-            android:textSize="16sp"
             app:layout_constraintEnd_toStartOf="@+id/rc_conversation_date"
             app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:gravity="center_vertical"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/rc_conversation_title"
+                style="@style/TextStyle.Alignment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="张三"
+                android:textColor="@color/rc_text_main_color"
+                android:textSize="16sp" />
+
+            <ImageView
+                android:id="@+id/img_new"
+                android:layout_width="wrap_content"
+                android:layout_height="18dp"
+                android:layout_marginStart="3dp"
+                android:visibility="visible" />
+        </LinearLayout>
+
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_marginStart="15dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             android:gravity="center_vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
-            app:layout_constraintTop_toBottomOf="@+id/rc_conversation_title">
+            app:layout_constraintTop_toBottomOf="@+id/rc_conversation_linear">
 
             <ImageView
                 android:id="@+id/rc_conversation_read_receipt"
@@ -129,13 +144,12 @@
             app:srcCompat="@drawable/rc_no_disturb" />
 
 
-
         <View
             android:layout_width="wrap_content"
             android:layout_height="0.5dp"
             android:layout_marginTop="71.5dp"
             android:background="@color/rc_divider_color"
-            app:layout_constraintStart_toStartOf="@id/rc_conversation_title"
+            app:layout_constraintStart_toStartOf="@id/rc_conversation_linear"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
index faa70c118..78480bbfb 100644
--- a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
+++ b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
@@ -1,12 +1,14 @@
 package com.yunbao.main.utils;
 
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
-import com.yunbao.common.glide.ImgLoader;
+import com.google.gson.Gson;
+import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.main.R;
 
 import java.util.List;
@@ -14,11 +16,13 @@ import java.util.List;
 import io.rong.imkit.config.RongConfigCenter;
 import io.rong.imkit.conversationlist.model.BaseUiConversation;
 import io.rong.imkit.conversationlist.provider.BaseConversationProvider;
+import io.rong.imkit.userinfo.RongUserInfoManager;
 import io.rong.imkit.widget.adapter.IViewProviderListener;
 import io.rong.imkit.widget.adapter.ViewHolder;
 import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
+import io.rong.imlib.model.UserInfo;
 import io.rong.message.RecallNotificationMessage;
 
 /**
@@ -46,10 +50,20 @@ public class PDLiveCustomConversationProvider extends BaseConversationProvider {
         super.bindViewHolder(holder, uiConversation, position, list, listener);
         ImageView readReceipt = holder.itemView.findViewById(com.yunbao.live.R.id.rc_conversation_read_receipt);
         ImageView conversationUnread = holder.itemView.findViewById(com.yunbao.live.R.id.rc_conversation_unread_bg);
-        if (conversationUnread!=null){
+        ImageView imgNew = holder.itemView.findViewById(com.yunbao.live.R.id.img_new);
+        if (conversationUnread != null) {
             Glide.with(holder.getContext()).asDrawable().load(R.mipmap.rc_unread_count_bg_normal).into(conversationUnread);
         }
+        if (imgNew != null) {
+            String targetId = uiConversation.mCore.getTargetId();
+            UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(targetId);
+            if (userInfo != null && !TextUtils.isEmpty(userInfo.getExtra())) {
+                IMLoginModel model = new Gson().fromJson(userInfo.getExtra(), IMLoginModel.class);
+                if (model != null && TextUtils.equals(model.getIsAdmin(), "1"))
+                    Glide.with(holder.getContext()).asDrawable().load("https://qny.shayucm.com/Instructors.png").into(imgNew);
+            }
 
+        }
         readReceipt.setVisibility(View.VISIBLE);
         if (RongConfigCenter.featureConfig().isReadReceiptConversationType(Conversation.ConversationType.PRIVATE) &&
                 uiConversation.mCore.getSenderUserId().equals(RongIMClient.getInstance().getCurrentUserId()) &&