Merge pull request #59 from zjc19891106/main

callkit change

Author: lixm1988

EaseChatUIKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'EaseChatUIKit'
-  s.version          = '4.16.0'
+  s.version          = '4.16.1'
   s.summary          = 'A easy for use ChatUIKit.'
 
 # This description is used to generate tags and improve search results.

Example/EaseChatUIKit.xcodeproj/project.pbxproj

@@ -259,11 +259,13 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-EaseChatUIKit_Example/Pods-EaseChatUIKit_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/FLAnimatedImage/FLAnimatedImage.framework",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraInfra_iOS/aosl.framework/aosl",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/HyphenateChat/HyphenateChat.framework/HyphenateChat",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FLAnimatedImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/aosl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HyphenateChat.framework",
 			);

Sources/EaseChatUIKit/Classes/Service/Implement/ChatServiceImplement.swift

@@ -120,7 +120,7 @@ extension ChatServiceImplement: ChatService {
                 if error == nil,let messages = messages {
                     for message in messages {
                         if let dic = message.ext?["ease_chat_uikit_user_info"] as? Dictionary<String,Any> {
-                            if let user = ChatUIKitContext.shared?.chatCache?[message.from] as? ChatUserProfile,user.modifyTime < message.timestamp {
+                            if let user = ChatUIKitContext.shared?.userCache?[message.from] as? ChatUserProfile,user.modifyTime < message.timestamp {
                                 let user = ChatUserProfile()
                                 user.setValuesForKeys(dic)
                                 if user.id.isEmpty {

Sources/EaseChatUIKit/Classes/UI/Components/Chat/ViewModel/MessageEntity.swift

@@ -147,6 +147,9 @@ public let urlPreviewImageHeight = CGFloat(137)
         if message.body.type != .custom {
             return 8+(Appearance.chat.contentStyle.contains(.withNickName) ? 28:2)+(Appearance.chat.contentStyle.contains(.withReply) ? self.replySize.height:2)+self.bubbleSize.height+(Appearance.chat.contentStyle.contains(.withDateAndTime) ? 22:6)+self.topicContentHeight()+self.reactionContentHeight()
         } else {
+            if let body = self.message.body as? ChatCustomMessageBody,body.event == EaseChatUIKit_user_card_message {
+                return 8+(Appearance.chat.contentStyle.contains(.withNickName) ? 28:2)+(Appearance.chat.contentStyle.contains(.withReply) ? self.replySize.height:2)+self.bubbleSize.height+(Appearance.chat.contentStyle.contains(.withDateAndTime) ? 22:6)+self.topicContentHeight()+self.reactionContentHeight()
+            }
             return self.bubbleSize.height
         }
     }
@@ -849,6 +852,9 @@ extension ChatMessage {
         if chatUser?.nickname.isEmpty ?? true {
             chatUser?.nickname = cacheUser?.nickname ?? ""
         }
+        if from == ChatClient.shared().currentUsername ?? "",let currentUser = ChatUIKitContext.shared?.currentUser {
+            return currentUser
+        }
         if chatUser == nil,cacheUser != nil {
             return cacheUser
         }

Sources/EaseChatUIKit/Classes/UI/Components/Chat/ViewModel/MessageListViewModel.swift

@@ -890,16 +890,11 @@ extension MessageListViewModel: ChatResponseListener {
         - recallInfo: The recall information containing the recalled message.
      */
     @objc open func messageDidRecalled(recallInfo: RecallInfo) {
-        if let recallMessage = recallInfo.recallMessage,recallMessage.conversationId == self.to {
-            recallMessage.from = recallInfo.recallBy
-            self.recallAction(message: recallMessage)
-        } else {
-            if let recall = self.constructMessage(text: "recalled a message".chat.localize, type: .alert, extensionInfo: [:]) {
-                recall.messageId = recallInfo.recallMessageId
-                recall.timestamp = Int64(Date().timeIntervalSince1970*1000)
-                recall.from = recallInfo.recallBy
-                self.driver?.processMessage(operation: .recall, message: recall)
-            }
+        if let recall = self.constructMessage(text: "recalled a message".chat.localize, type: .alert, extensionInfo: [:]) {
+            recall.messageId = recallInfo.recallMessageId
+            recall.timestamp = Int64(Date().timeIntervalSince1970*1000)
+            recall.from = recallInfo.recallBy
+            self.driver?.processMessage(operation: .recall, message: recall)
         }
         self.pinDriver?.refresh(entities: self.showPinnedMessages())
     }

Sources/EaseChatUIKit/Classes/UI/Components/Chat/Views/MessageListView.swift

@@ -859,6 +859,14 @@ extension MessageListView: IMessageListViewDriver {
         }
     }
 
+    public func reloadCallMessage(message: ChatMessage) {
+        if let index = self.messages.firstIndex(where: { $0.message.messageId == message.messageId }) {
+            self.messages.replaceSubrange(index...index, with: [self.convertMessage(message: message)])
+            self.messageList.reloadRows(at: [IndexPath(row: index, section: 0)], with: .automatic)
+            self.messageList.scrollToRow(at: IndexPath(row: index, section: 0), at: .bottom, animated: true)
+        }
+    }
+    
     public func updateGroupMessageChatThreadChanged(message: ChatMessage) {
         if let index = self.messages.firstIndex(where: { $0.message.messageId == message.messageId }) {
             if let indexPath = self.messageList.indexPathsForVisibleRows?.first(where: { $0.row == index }),let entity = self.messages[safe: index] {

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

@@ -246,7 +246,7 @@ extension ContactView: UITableViewDelegate,UITableViewDataSource {
         if let visiblePaths = self.contactList.indexPathsForVisibleRows {
             for indexPath in visiblePaths {
                 if let item = self.contacts[safe: indexPath.section]?[safe: indexPath.row] {
-                    if item.nickname.isEmpty || item.avatarURL.isEmpty {
+                    if item.nickname.isEmpty, item.avatarURL.isEmpty {
                         unknownInfoIds.append(item.id)
                     }
                 }
@@ -321,14 +321,16 @@ extension ContactView: IContactListDriver {
     }
 
     public func refreshProfiles(infos: [ChatUserProfileProtocol]) {
-        for info in infos {
-            if let profile = self.rawData.first(where: { $0.id == info.id }) {
-                profile.nickname =  info.nickname.isEmpty ? info.id:info.nickname
-                profile.avatarURL = info.avatarURL
-                profile.remark = info.remark
+        for sectionData in self.contacts {
+            for item in sectionData {
+                if let profile = infos.first(where: { $0.id == item.id }) {
+                    item.nickname = profile.nickname.isEmpty ? profile.id:profile.nickname
+                    item.avatarURL = profile.avatarURL
+                    item.remark = profile.remark
+                    item.selected = profile.selected
+                }
             }
         }
-        self.refreshList(infos: self.rawData)
     }
 
     public func refreshList(infos: [ChatUserProfileProtocol]) {

Sources/EaseChatUIKit/Classes/UI/Components/Conversation/Controllers/SearchConversationsController.swift

@@ -90,14 +90,14 @@ import UIKit
             self.searchResults = self.datas.filter({ $0.nickname.lowercased().contains(self.searchText) || $0.id.lowercased().contains(self.searchText) || $0.remark.lowercased().contains(self.searchText)})
             self.searchList.reloadData()
         }
-        self.searchHeader.textFieldState = { [weak self] in
-            self?.active = $0 == .began
+        self.searchHeader.textFieldState = { [weak self] _ in
+//            self?.active = $0 == .began
         }
         self.searchHeader.actionClosure = { [weak self] in
-            self?.active = false
-            self?.searchText = ""
-            self?.searchList.reloadData()
             if $0 == .cancel {
+                self?.active = false
+                self?.searchText = ""
+                self?.searchList.reloadData()
                 self?.pop()
             }
         }