From f0e1e8d99508940ed9f93b473f3d4189032fbc44 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 7 Sep 2022 13:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=AC=E8=A9=A6=E5=95=8F=E9=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/event/MessageIMEvent.java  | 10 ++++++++++
 .../manager/imrongcloud/MessageIMManager.java    |  2 +-
 common/src/main/res/values/strings.xml           |  2 +-
 .../live/activity/PDLIiveChatActivity.java       | 16 +---------------
 .../live/views/LiveAudienceViewHolder.java       |  2 +-
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/event/MessageIMEvent.java b/common/src/main/java/com/yunbao/common/event/MessageIMEvent.java
index 39aeed9f9..c26ad14fa 100644
--- a/common/src/main/java/com/yunbao/common/event/MessageIMEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/MessageIMEvent.java
@@ -7,6 +7,16 @@ import com.yunbao.common.bean.BaseModel;
  */
 public class MessageIMEvent extends BaseModel {
     private int number = 0;
+    private int message = 0;
+
+    public int getMessage() {
+        return message;
+    }
+
+    public MessageIMEvent setMessage(int message) {
+        this.message = message;
+        return this;
+    }
 
     public int getNumber() {
         return number;
diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java
index c5ff92f16..8d3554fdd 100644
--- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java
@@ -181,7 +181,7 @@ public class MessageIMManager {
     //整合未读消息数目并且发送出去
     private final Runnable essagesRunnable = () -> {
         number = imNumber + systemNumber;
-        EventBus.getDefault().post(new MessageIMEvent().setNumber(number));
+        EventBus.getDefault().post(new MessageIMEvent().setNumber(number).setMessage(imNumber));
     };
 
     /**
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 1a3164a28..c14cd2757 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -146,7 +146,7 @@
     <string name="im_type_voide">[語音]</string>
     <string name="im_type_location">[位置]</string>
     <string name="im_msg">消息</string>
-    <string name="message">信息中心</string>
+    <string name="message">消息中心</string>
     <string name="im_msg_ignore_unread">忽略未讀</string>
     <string name="im_msg_ignore_unread_2">已忽略未讀消息</string>
     <string name="im_msg_send_failed">消息發送失敗</string>
diff --git a/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java b/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
index a57ef0f4d..fc92c0311 100644
--- a/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
@@ -109,21 +109,7 @@ public class PDLIiveChatActivity extends FragmentActivity {
      */
     private void initData() {
         IMLoginManager.get(mContext).checkInstructor();
-//        //获取系统消息列表
-//        ImHttpUtil.getImUserInfo("", new HttpCallback() {
-//            @Override
-//            public void onSuccess(int code, String msg, String[] info) {
-//                if (code == 0) {
-//                    container.post(new Runnable() {
-//                        @Override
-//                        public void run() {
-//                            List<ImUserBean> listUserBean = JSON.parseArray(Arrays.toString(info), ImUserBean.class);
-//                            addSystemMessagesView(listUserBean);
-//                        }
-//                    });
-//                }
-//            }
-//        });
+
         //刷新列表内用户信息
         addUserInfoProvider();
 
diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
index f978d3171..3a96bd73d 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
@@ -439,7 +439,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     public void onMessageIMEvent(MessageIMEvent event) {
         //判断消息中心红点是否已经展示，如果已经展示并且未读消息大于0则不再执行之后的逻辑
-        int number = event.getNumber();
+        int number = event.getMessage();
         if (v_msg_redpoint.getVisibility() == View.VISIBLE && number > 0 || SpUtil.getInstance().getBooleanValue("private_chat_message_switch")) return;
         if (number > 0) {
             v_msg_redpoint.setVisibility(View.VISIBLE);