From 80f03bdcba82c4478dfe25ea03305e88ab88ed07 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Mon, 27 Feb 2023 21:48:02 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E6=B6=88=E6=81=AF=E9=A0=81=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/ui/im/MessageListPanelEx.java       | 10 ++++++-
 .../im/msgholder/HallMsgViewHolder.java       | 27 ++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java b/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java
index 136403003..09fc008b2 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java
@@ -777,7 +777,7 @@ public class MessageListPanelEx {
 
     private class MessageLoader implements BaseFetchLoadAdapter.RequestLoadMoreListener, BaseFetchLoadAdapter.RequestFetchMoreListener {
 
-        private int loadMsgCount = NimUIKitImpl.getOptions().messageCountLoadOnce;
+        private int loadMsgCount = getLoadMsgCount();
 
         private QueryDirectionEnum direction = null;
 
@@ -855,6 +855,13 @@ public class MessageListPanelEx {
             }
         }
 
+        private int getLoadMsgCount(){
+            if(TextUtils.isEmpty(recordId)){
+                return NimUIKitImpl.getOptions().messageCountLoadOnce;
+            }else {
+                return 50;
+            }
+        }
 
         /**
          * 私聊聊天信息数（发起私聊限制需要用到）
@@ -939,6 +946,7 @@ public class MessageListPanelEx {
             }
 
             firstLoad = false;
+            loadMsgCount = NimUIKitImpl.getOptions().messageCountLoadOnce;
         }
 
         private void doScrollToPosition() {
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
index 1a2548b95..af720e174 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
@@ -227,11 +227,11 @@ public class HallMsgViewHolder extends MsgViewHolderBase {
         });
         stvReject.setOnClickListener(view -> {
             RefuseApplyDialog dialog = new RefuseApplyDialog(context);
-            if(info.getUrl().contains("hall/dealInvite")){
+            if (info.getUrl().contains("hall/dealInvite")) {
                 dialog.setIsInvite(false);
                 dialog.setTitleMsg(context.getString(R.string.refuse_invite));
                 dialog.setTipMsg(context.getString(R.string.sure_to_refuse_room_join_apply));
-            }else {
+            } else {
                 dialog.setIsInvite(true);
                 dialog.setTitleMsg(context.getString(R.string.refuse_apply));
                 dialog.setTipMsg(context.getString(R.string.sure_to_refuse_user_join_room));
@@ -240,9 +240,9 @@ public class HallMsgViewHolder extends MsgViewHolderBase {
                 @Override
                 public void onOk(Boolean isCheck) {
                     RefuseApplyDialog.OnActionListener.super.onOk(isCheck);
-                    if(isCheck) {
+                    if (isCheck) {
                         handleApply(info, second, -1);
-                    }else {
+                    } else {
                         handleApply(info, second, 0);
                     }
                 }
@@ -260,6 +260,25 @@ public class HallMsgViewHolder extends MsgViewHolderBase {
                     @Override
                     public void onErrorMsg(String error) {
                         SingleToastUtil.showToast(error);
+                        if (error.equals("消息已過期")) {
+                            info.setType(HallImMsgInfo.MSG_TYPE_OUT_OF_DATE);
+                            setMsgTypeView(info, second);
+                            Map<String, Object> localExtension = HallImMsgInfo.convertToMap(info);
+                            message.setLocalExtension(localExtension);
+                            updateMessageToLocal(info);
+                            if (second == CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE) {
+                                EventBus.getDefault().post(new HallInfoChangeEvent());
+                            }
+                        } else if (error.equals("消息已處理")) {
+                            info.setType(HallImMsgInfo.MSG_TYPE_HAS_HANDLE);
+                            setMsgTypeView(info, second);
+                            Map<String, Object> localExtension = HallImMsgInfo.convertToMap(info);
+                            message.setLocalExtension(localExtension);
+                            updateMessageToLocal(info);
+                            if (second == CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE) {
+                                EventBus.getDefault().post(new HallInfoChangeEvent());
+                            }
+                        }
                     }
 
                     @Override