Merge pull request #55 from zjc19891106/main

HIM-18142

Author: lixm1988

Example/EaseChatUIKit.xcodeproj/xcuserdata/zhujichao1.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>EaseChatUIKit_Example.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

Sources/EaseChatUIKit/Classes/UI/Components/Contact/Controllers/NewContactRequestController.swift

@@ -57,8 +57,14 @@ import UIKit
     }
 
     @objc open func requestProfiles() {
+        var userIds = [String]()
+        for user in self.datas {
+            if let userCache = ChatUIKitContext.shared?.userCache?[user.userId],!userCache.nickname.isEmpty {
+                continue
+            }
+            userIds.append(user.userId)
+        }
         if ChatUIKitContext.shared?.userProfileProvider != nil {
-            let userIds = self.datas.map { $0.userId }
             Task(priority: .background) {
                 let profiles = await ChatUIKitContext.shared?.userProfileProvider?.fetchProfiles(profileIds: userIds) ?? []
                 for profile in profiles {
@@ -73,7 +79,7 @@ import UIKit
             }
         } else {
             if ChatUIKitContext.shared?.userProfileProviderOC != nil {
-                ChatUIKitContext.shared?.userProfileProviderOC?.fetchProfiles(profileIds: self.datas.map { $0.userId }, completion: { [weak self] profiles in
+                ChatUIKitContext.shared?.userProfileProviderOC?.fetchProfiles(profileIds: userIds, completion: { [weak self] profiles in
                     for profile in profiles {
                         if let info = self?.datas.first(where: { $0.userId == profile.id }) {
                             info.nickname = profile.nickname

Sources/EaseChatUIKit/Classes/UI/Components/Contact/Views/ContactView.swift

@@ -215,7 +215,9 @@ extension ContactView: UITableViewDelegate,UITableViewDataSource {
     }
 
     public func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
-        
+        if !self.firstRefresh {
+            self.requestDisplayInfo()
+        }
     }
 
     public func scrollViewDidScroll(_ scrollView: UIScrollView) {
@@ -337,8 +339,14 @@ extension ContactView: IContactListDriver {
 
         if self.firstRefresh {
             self.firstRefresh = false
+            var unknownInfoIds = [String]()
+            for info in infos {
+                if info.nickname.isEmpty || info.avatarURL.isEmpty {
+                    unknownInfoIds.append(info.id)
+                }
+            }
             for eventHandle in self.eventsDelegates.allObjects {
-                eventHandle.onContactListEndScrollNeededDisplayInfos(ids: infos.map({ $0.id }))
+                eventHandle.onContactListEndScrollNeededDisplayInfos(ids: unknownInfoIds)
             }
         }
         let tuple = ContactSorter.sort(contacts: self.rawData)

Sources/EaseChatUIKit/Classes/UI/Components/Conversation/ViewModel/ConversationViewModel.swift

@@ -152,8 +152,14 @@ extension ConversationViewModel: ConversationListActionEventsDelegate {
         for id in ids {
             if let conversation = ChatClient.shared().chatManager?.getConversationWithConvId(id) {
                 if conversation.type == .chat {
+                    if let userCache = ChatUIKitContext.shared?.userCache?[id],!userCache.nickname.isEmpty {
+                        continue
+                    }
                     privateChats.append(id)
                 } else {
+                    if let groupCache = ChatUIKitContext.shared?.groupCache?[id],!groupCache.nickname.isEmpty {
+                        continue
+                    }
                     groupChats.append(id)
                 }
             }
@@ -438,7 +444,7 @@ extension ConversationViewModel: ConversationServiceListener {
             self.driver?.refreshList(infos: items)
 
             if infos.count < 11 || self.firstLoadConversation {
-                let requestCount = items.count < 11 ? (items.count - 1):10
+                let requestCount = items.count < 11 ? items.count:10
                 if requestCount > 0 {
                     self.requestDisplayProfiles(ids: items.prefix(upTo: requestCount).map({ $0.id }))
                     self.firstLoadConversation = false