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

---
 .../com/yunbao/common/manager/IMLoginManager.java  |  3 +--
 .../manager/imrongcloud/RongcloudIMManager.java    |  3 ---
 .../main/res/layout/rc_conversationlist_item.xml   |  6 +++---
 .../imrongcloud/ConversationIMListManager.java     |  8 ++++++--
 .../utils/PDLiveCustomConversationProvider.java    |  6 ++++++
 .../main/utils/PDSightMessageItemProvider.java     | 14 ++++++++++++++
 .../main/res/layout/view_system_message_item.xml   |  2 +-
 7 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 main/src/main/java/com/yunbao/main/utils/PDSightMessageItemProvider.java

diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
index ba9dadc38..4752cd0d7 100644
--- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
@@ -124,8 +124,7 @@ public class IMLoginManager extends BaseCacheManager {
      * 退出登录
      */
     public void logout() {
-        //添加融云连接状态监听
-        RongcloudIMManager.removeIMStatusListener();
+
         //删除用户登录信息
         deleteByKey(KEY_USER_INFO);
         //用户对象置空
diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
index 3a39d861d..1e8bb70d4 100644
--- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
@@ -156,9 +156,6 @@ public class RongcloudIMManager {
         RongIM.setConnectionStatusListener(connectionStatusListener);
     }
 
-    public static void removeIMStatusListener() {
-        RongIM.setConnectionStatusListener(null);
-    }
 
     /**
      * 监听 IM 连接状态，可根据连接状态进行不同业务处理
diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml
index 0257ae7e1..7fc2a176c 100644
--- a/live/src/main/res/layout/rc_conversationlist_item.xml
+++ b/live/src/main/res/layout/rc_conversationlist_item.xml
@@ -87,10 +87,10 @@
 
                 <ImageView
                     android:id="@+id/rc_conversation_unread_bg"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:layout_centerInParent="true"
-                    app:srcCompat="@mipmap/rc_unread_count_bg_normal" />
+                    app:srcCompat="@drawable/rc_unread_count_bg_normal" />
 
                 <TextView
                     android:id="@+id/rc_conversation_unread_count"
diff --git a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java
index 2c5dc36c6..a53691cba 100644
--- a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java
+++ b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java
@@ -24,11 +24,13 @@ import com.yunbao.main.activity.PDLiveConversationListActivity;
 import com.yunbao.main.dialog.ConversationPopuwWindow;
 import com.yunbao.main.utils.PDLiveCustomConversationProvider;
 import com.yunbao.main.utils.PDLiveMessageProcessor;
+import com.yunbao.main.utils.PDSightMessageItemProvider;
 
 import io.rong.imkit.RongIM;
 import io.rong.imkit.config.ConversationListBehaviorListener;
 import io.rong.imkit.config.RongConfigCenter;
 import io.rong.imkit.conversation.extension.RongExtensionManager;
+import io.rong.imkit.conversation.messgelist.provider.SightMessageItemProvider;
 import io.rong.imkit.conversationlist.model.BaseUiConversation;
 import io.rong.imkit.conversationlist.provider.PrivateConversationProvider;
 import io.rong.imkit.userinfo.RongUserInfoManager;
@@ -59,6 +61,8 @@ public class ConversationIMListManager {
         providerManager.replaceProvider(PrivateConversationProvider.class, new PDLiveCustomConversationProvider());
         //注册小视频模块
         RongExtensionManager.getInstance().registerExtensionModule(new SightExtensionModule());
+        //自定义小视频消息模板
+        RongConfigCenter.conversationConfig().replaceMessageProvider(SightMessageItemProvider.class, new PDSightMessageItemProvider());
         //会话列表监听事件
         RongIM.setConversationListBehaviorListener(listener);
     }
@@ -138,7 +142,7 @@ public class ConversationIMListManager {
                         } else {
                             userNiceName = userBean.getUserNiceName();
                         }
-                        if (!TextUtils.isEmpty(userNiceName)&&!TextUtils.isEmpty(userBean.getAvatar())){
+                        if (!TextUtils.isEmpty(userNiceName) && !TextUtils.isEmpty(userBean.getAvatar())) {
                             UserInfo userInfo = new UserInfo(userId, userNiceName, Uri.parse(userBean.getAvatar()));
                             //使用空白字段存储自己服务器用户的所有的信息
                             userInfo.setExtra(GsonUtils.toJson(userBean));
@@ -161,7 +165,7 @@ public class ConversationIMListManager {
             //非指导员都可以点击
             UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(targetId);
             IMLoginModel model = new Gson().fromJson(userInfo.getExtra(), IMLoginModel.class);
-            if (!TextUtils.equals(model.getIsAdmin(),"1")){
+            if (!TextUtils.equals(model.getIsAdmin(), "1")) {
                 RouteUtil.forwardUserHome(mContext, targetId, 0);
             }
 
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 838117957..faa70c118 100644
--- a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
+++ b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
@@ -5,6 +5,8 @@ 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.yunbao.main.R;
 
 import java.util.List;
@@ -43,6 +45,10 @@ 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){
+            Glide.with(holder.getContext()).asDrawable().load(R.mipmap.rc_unread_count_bg_normal).into(conversationUnread);
+        }
 
         readReceipt.setVisibility(View.VISIBLE);
         if (RongConfigCenter.featureConfig().isReadReceiptConversationType(Conversation.ConversationType.PRIVATE) &&
diff --git a/main/src/main/java/com/yunbao/main/utils/PDSightMessageItemProvider.java b/main/src/main/java/com/yunbao/main/utils/PDSightMessageItemProvider.java
new file mode 100644
index 000000000..aec6675cf
--- /dev/null
+++ b/main/src/main/java/com/yunbao/main/utils/PDSightMessageItemProvider.java
@@ -0,0 +1,14 @@
+package com.yunbao.main.utils;
+
+import io.rong.imkit.conversation.messgelist.provider.SightMessageItemProvider;
+
+/**
+ * 自定义小视频消息模板
+ */
+public class PDSightMessageItemProvider extends SightMessageItemProvider {
+    public PDSightMessageItemProvider() {
+        super();
+        //添加小视频已读回执
+        mConfig.showReadState = true;
+    }
+}
diff --git a/main/src/main/res/layout/view_system_message_item.xml b/main/src/main/res/layout/view_system_message_item.xml
index ce395f302..b878ff8fe 100644
--- a/main/src/main/res/layout/view_system_message_item.xml
+++ b/main/src/main/res/layout/view_system_message_item.xml
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/red_point"
-        android:layout_width="23dp"
+        android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_below="@id/time"
         android:layout_alignParentRight="true"