Merge pull request #337 from Dongshanxu/master

修复空消息问题修复下拉消息重复问题
netease-kit · Jun 21, 2022 · fa61daf · fa61daf
2 parents f46cf9d + 0e6e1ca
commit fa61daf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/NEKitChat/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ChatViewController.swift b/NEKitChat/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ChatViewController.swift
@@ -533,7 +533,9 @@ extension ChatViewController {
             print("dropDownRemoteRefresh messages count ", messages?.count as Any)
 
             weakSelf?.tableView.reloadData()
-            weakSelf?.tableView.scrollToRow(at: IndexPath(row:count, section: 0), at: .top, animated: false)
+            if count>0 {
+                weakSelf?.tableView.scrollToRow(at: IndexPath(row:count, section: 0), at: .top, animated: false)
+            }
             weakSelf?.tableView.mj_header?.endRefreshing()
         }
 

diff --git a/NEKitChat/NEKitChatUI/NEKitChatUI/Classes/Chat/ViewModel/ChatViewModel.swift b/NEKitChat/NEKitChatUI/NEKitChatUI/Classes/Chat/ViewModel/ChatViewModel.swift
@@ -224,6 +224,9 @@ public class ChatViewModel: NSObject, ChatRepoMessageDelegate, NIMChatManagerDel
     //查询更多本地历史消息
     public func getMoreMessageHistory(_ completion: @escaping (Error?,NSInteger, [MessageModel]?) -> Void) {
 
+        if messages.count > 0 {
+            self.oldMsg = messages.last?.message
+        }
         weak var weakSelf = self
         ChatProvider.shared.getMessageHistory(session: self.session, message: self.oldMsg, limit: messagPageNum) { [weak self] error, messages in
             if let messageArray = messages, messageArray.count > 0 {