sync (#422)

10.5.2 修复已知问题
netease-kit · Jan 8, 2025 · a19002d · a19002d
1 parent 956ee53
commit a19002d
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 56 deletions.
diff --git a/IMUIKitOC/IMUIKitOCExample/Podfile b/IMUIKitOC/IMUIKitOCExample/Podfile
@@ -10,19 +10,19 @@ target 'IMUIKitOCExample' do
   pod 'YXLogin', '1.1.0'
 
   # 基础库
-  pod 'NEChatKit', '10.5.1'
+  pod 'NEChatKit', '10.5.2'
 
   # UI 组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
-  pod 'NEChatUIKit', '10.5.1'
-  pod 'NEContactUIKit', '10.5.1'
-  pod 'NEConversationUIKit', '10.5.1'
-  pod 'NETeamUIKit', '10.5.1'
+  pod 'NEChatUIKit', '10.5.2'
+  pod 'NEContactUIKit', '10.5.2'
+  pod 'NEConversationUIKit', '10.5.2'
+  pod 'NETeamUIKit', '10.5.2'
 
   # 扩展库 - 地理位置组件
-  pod 'NEMapKit', '10.5.1'
+  pod 'NEMapKit', '10.5.2'
 
   # 扩展库 - AI 划词搜索
-  pod 'NEAISearchKit', '1.0.5'
+  pod 'NEAISearchKit', '10.5.2'
 
   # 扩展库 - 呼叫组件
   pod 'NERtcCallKit/NOS_Special', '3.1.0'
@@ -35,13 +35,13 @@ target 'IMUIKitOCExample' do
 
 
   # 如果需要查看UI部分源码请注释掉以上在线依赖，打开下面的本地依赖
-#   pod 'NEContactUIKit', :path => 'NEContactUIKit/NEContactUIKit.podspec'
-#   pod 'NEConversationUIKit', :path => 'NEConversationUIKit/NEConversationUIKit.podspec'
-#   pod 'NETeamUIKit', :path => 'NETeamUIKit/NETeamUIKit.podspec'
-#   pod 'NEChatUIKit', :path => 'NEChatUIKit/NEChatUIKit.podspec'
-#   pod 'NEMapKit', :path => 'NEMapKit/NEMapKit.podspec'
-#   pod 'NEAISearchKit', :path => 'NEAISearchKit/NEAISearchKit.podspec'
-#   pod 'NERtcCallUIKit', :path => 'NERtcCallUIKit/NERtcCallUIKit.podspec'
+#   pod 'NEContactUIKit', :path => '../../NEContactUIKit/NEContactUIKit.podspec'
+#   pod 'NEConversationUIKit', :path => '../../NEConversationUIKit/NEConversationUIKit.podspec'
+#   pod 'NETeamUIKit', :path => '../../NETeamUIKit/NETeamUIKit.podspec'
+#   pod 'NEChatUIKit', :path => '../../NEChatUIKit/NEChatUIKit.podspec'
+#   pod 'NEMapKit', :path => '../../NEMapKit/NEMapKit.podspec'
+#   pod 'NEAISearchKit', :path => '../../NEAISearchKit/NEAISearchKit.podspec'
+#   pod 'NERtcCallUIKit', :path => '../../NERtcCallUIKit/NERtcCallUIKit.podspec'
 
 
 end

diff --git a/NEAISearchKit/NEAISearchKit.podspec b/NEAISearchKit/NEAISearchKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NEAISearchKit'
-  s.version          = '1.0.5'
+  s.version          = '10.5.2'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/NEChatUIKit/NEChatUIKit.podspec b/NEChatUIKit/NEChatUIKit.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = 'NEChatUIKit'
-  s.version      = '10.5.1'
+  s.version      = '10.5.2'
   s.summary      = 'Chat Module of IM.'
 
   # This description is used to generate tags and improve search results.

diff --git a/NEChatUIKit/NEChatUIKit/Classes/Chat/ViewModel/ChatViewModel.swift b/NEChatUIKit/NEChatUIKit/Classes/Chat/ViewModel/ChatViewModel.swift
@@ -341,42 +341,40 @@ open class ChatViewModel: NSObject {
       self?.getMessageReceipts(messages: messageArray) { reloadIndexs, error in
         group.enter()
         self?.chatRepo.getPinnedMessageList(conversationId: conversationId) { [weak self] pinList, error in
-          if let pinList = pinList {
-            var userIds = pinList.map(\.operatorId)
-
-            // 群聊需要获取群昵称
-            userIds += self?.messages.compactMap { $0.message?.senderId } ?? []
-            group.enter()
-            self?.loadShowName(userIds, self?.sessionId) { [weak self] in
-
-              // 获取头像昵称
-              for model in self?.messages ?? [] {
-                if let uid = ChatMessageHelper.getSenderId(model.message),
-                   let fullName = self?.getShowName(uid) {
-                  let userFriend = ChatMessageHelper.getUserFromCache(uid)
-                  model.avatar = userFriend?.user?.avatar
-                  model.fullName = fullName
-                  model.shortName = NEFriendUserCache.getShortName(userFriend?.showName() ?? "")
-                }
+          var userIds = pinList?.map(\.operatorId) ?? []
 
-                for pin in pinList {
-                  if model.message?.messageClientId == pin.messageRefer?.messageClientId {
-                    model.isPined = true
-                    model.pinAccount = pin.operatorId
-                    model.pinShowName = self?.getShowName(pin.operatorId)
-                    break
-                  }
-                }
+          // 群聊需要获取群昵称
+          userIds += self?.messages.compactMap { $0.message?.senderId } ?? []
+          group.enter()
+          self?.loadShowName(userIds, self?.sessionId) { [weak self] in
+
+            // 获取头像昵称
+            for model in self?.messages ?? [] {
+              if let uid = ChatMessageHelper.getSenderId(model.message),
+                 let fullName = self?.getShowName(uid) {
+                let userFriend = ChatMessageHelper.getUserFromCache(uid)
+                model.avatar = userFriend?.user?.avatar
+                model.fullName = fullName
+                model.shortName = NEFriendUserCache.getShortName(userFriend?.showName() ?? "")
+              }
 
-                group.enter()
-                self?.loadReply(model) {
-                  group.leave()
+              for pin in pinList ?? [] {
+                if model.message?.messageClientId == pin.messageRefer?.messageClientId {
+                  model.isPined = true
+                  model.pinAccount = pin.operatorId
+                  model.pinShowName = self?.getShowName(pin.operatorId)
+                  break
                 }
               }
-              group.leave()
+
+              group.enter()
+              self?.loadReply(model) {
+                group.leave()
+              }
             }
             group.leave()
           }
+          group.leave()
         }
         group.leave()
       }

diff --git a/NEContactUIKit/NEContactUIKit.podspec b/NEContactUIKit/NEContactUIKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NEContactUIKit'
-  s.version          = '10.5.1'
+  s.version          = '10.5.2'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/NEConversationUIKit/NEConversationUIKit.podspec b/NEConversationUIKit/NEConversationUIKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NEConversationUIKit'
-  s.version          = '10.5.1'
+  s.version          = '10.5.2'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/NEMapKit/NEMapKit.podspec b/NEMapKit/NEMapKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NEMapKit'
-  s.version          = '10.5.1'
+  s.version          = '10.5.2'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/NETeamUIKit/NETeamUIKit.podspec b/NETeamUIKit/NETeamUIKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NETeamUIKit'
-  s.version          = '10.5.1'
+  s.version          = '10.5.2'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/Podfile b/Podfile
@@ -7,19 +7,19 @@ target 'app' do
   use_frameworks!
 
   # 基础库
-  pod 'NEChatKit', '10.5.1'
+  pod 'NEChatKit', '10.5.2'
 
   # UI 组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
-  pod 'NEChatUIKit', '10.5.1'
-  pod 'NEContactUIKit', '10.5.1'
-  pod 'NEConversationUIKit', '10.5.1'
-  pod 'NETeamUIKit', '10.5.1'
+  pod 'NEChatUIKit', '10.5.2'
+  pod 'NEContactUIKit', '10.5.2'
+  pod 'NEConversationUIKit', '10.5.2'
+  pod 'NETeamUIKit', '10.5.2'
 
   # 扩展库 - 地理位置组件
-  pod 'NEMapKit', '10.5.1'
+  pod 'NEMapKit', '10.5.2'
 
   # 扩展库 - AI 划词搜索
- pod 'NEAISearchKit', '1.0.5'
+ pod 'NEAISearchKit', '10.5.2'
 
   # 扩展库 - 呼叫组件
   pod 'NERtcCallKit/NOS_Special', '3.1.0'