Merge pull request #390 from zsw666/master

v10.2.0

NEChatUIKit/NEChatUIKit.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = 'NEChatUIKit'
-  s.version      = '10.1.0'
+  s.version      = '10.2.0'
   s.summary      = 'Chat Module of IM.'
 
   # This description is used to generate tags and improve search results.
@@ -48,6 +48,6 @@ TODO: Add long description of the pod here.
   s.dependency 'MJRefresh'
   s.dependency 'SDWebImageWebPCoder'
   s.dependency 'SDWebImageSVGKitPlugin'
-  s.dependency 'lottie-ios','2.5.3'
+  s.dependency 'lottie-ios','4.4.0'
 
 end

NEChatUIKit/NEChatUIKit/Assets/FunChatUIKit.xcassets/Chat/fun_top_message_Image.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "fun_top_message_Image@2x.png",
+      "filename" : "fun_top_message_image@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "fun_top_message_Image@3x.png",
+      "filename" : "fun_top_message_image@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/operation/op_ai_word.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/operation/op_top.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/operation/op_untop.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NormalChatUIKit.xcassets/Chat/top_message_Image.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "top_message_Image@2x.png",
+      "filename" : "top_message_image@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "top_message_Image@3x.png",
+      "filename" : "top_message_image@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

NEChatUIKit/NEChatUIKit/Assets/en.lproj/Localizable.strings

@@ -103,6 +103,8 @@
 "message_reedit" = "reedit";
 "message_revoke_confirm" = "Wether to recall this message";
 "message_delete_confirm"="Wether to delete this message";
+"collection_delete_confirm"="Wether to delete this collection";
+"delete_collection_success"="delete success";
 
 
 //MARK: toast
@@ -219,3 +221,5 @@
 "chat_collection_p2p_tip"="From Chat with %@";
 
 "chat_collection_team_tip"="From %@ ";
+
+"collection_limit"="The number of favorites has reached the limit value";

NEChatUIKit/NEChatUIKit/Assets/zh-Hans.lproj/Localizable.strings

@@ -99,6 +99,8 @@
 "message_reedit" = "重新编辑";
 "message_revoke_confirm" = "确认要撤回该消息吗？";
 "message_delete_confirm"="确认要删除该消息吗？";
+"collection_delete_confirm"="确认要删除该收藏吗？";
+"delete_collection_success"="删除成功";
 
 
 //MARK: toast
@@ -216,3 +218,5 @@
 "chat_collection_p2p_tip"="来自于 与%@的会话";
 
 "chat_collection_team_tip"="来自于 %@";
+
+"collection_limit"="收藏数已达到限制值";

NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift

@@ -632,7 +632,6 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
 
       if let ms = weakSelf?.viewModel.messages, ms.count > 0 {
         weakSelf?.tableViewReload()
-        weakSelf?.hasFirstLoadData = true
         if weakSelf?.viewModel.isHistoryChat == true,
            let num = weakSelf?.tableView.numberOfRows(inSection: 0),
            index < num, index >= 0 {
@@ -654,6 +653,7 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
       } else if let err = error {
         weakSelf?.showErrorToast(err)
       }
+
       weakSelf?.loadDataFinish()
     }
   }
@@ -1767,6 +1767,7 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
   //  record
   open func recordAudio(_ filePath: String?, didBeganWithError error: Error?) {
     print("[record] sdk Began error:\(error?.localizedDescription ?? "")")
+    stopPlay()
   }
 
   open func recordAudio(_ filePath: String?, didCompletedWithError error: Error?) {
@@ -2241,7 +2242,11 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
 
     viewModel.collectMessage(operationModel, title ?? "") { [weak self] error in
       if error != nil {
-        self?.showToast(chatLocalizable("failed_operation"))
+        if error?.code == collectionLimitCode {
+          self?.showToast(chatLocalizable("collection_limit"))
+        } else {
+          self?.showToast(chatLocalizable("failed_operation"))
+        }
       } else {
         self?.showToast(chatLocalizable("collection_success"))
       }
@@ -2323,7 +2328,7 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
   open func tableView(_ tableView: UITableView,
                       cellForRowAt indexPath: IndexPath) -> UITableViewCell {
     guard indexPath.row < viewModel.messages.count else { return NEBaseChatMessageCell() }
-    let model = viewModel.messages[indexPath.row]
+    var model = viewModel.messages[indexPath.row]
     var reuseId = "\(NEBaseChatMessageCell.self)"
     if model.replyedModel?.isReplay == true,
        model.isRevoked == false {
@@ -2567,7 +2572,7 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
   open func showTextViewController(_ model: MessageContentModel?) {
     guard let model = model as? MessageTextModel else { return }
 
-    let title = NECustomAttachment.titleOfRichText(model.message?.attachment)
+    let title = NECustomUtils.titleOfRichText(model.message?.attachment)
     let body = model.attributeStr
 
     if !(title?.isEmpty == false), !(body?.string.isEmpty == false) {
@@ -2791,7 +2796,7 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
         showTextViewController(model)
       }
     } else if customType == customMultiForwardType,
-              let data = NECustomAttachment.dataOfCustomMessage(model?.message?.attachment) {
+              let data = NECustomUtils.dataOfCustomMessage(model?.message?.attachment) {
       let url = data["url"] as? String
       let md5 = data["md5"] as? String
       guard let fileDirectory = NEPathUtils.getDirectoryForDocuments(dir: "\(imkitDir)file/") else { return }
@@ -2850,15 +2855,29 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
 extension ChatViewController: TopMessageViewDelegate {
   /// 点击置顶消息视图中的关闭按钮
   public func didClickCloseButton() {
+    // 校验网络
+    if NEChatDetectNetworkTool.shareInstance.manager?.isReachable == false {
+      showToast(commonLocalizable("network_error"))
+      return
+    }
+
     viewModel.untopMessage { [weak self] error in
       if let err = error {
         self?.showErrorToast(err)
+      } else {
+        self?.topMessageView.removeFromSuperview()
       }
     }
   }
 
   /// 点击置顶消息视图
   public func didTapTopMessageView() {
+    // 校验网络
+    if NEChatDetectNetworkTool.shareInstance.manager?.isReachable == false {
+      showToast(commonLocalizable("network_error"))
+      return
+    }
+
     var index = -1
     for (i, m) in viewModel.messages.enumerated() {
       if viewModel.topMessage?.messageClientId == m.message?.messageClientId {
@@ -2929,7 +2948,7 @@ extension ChatViewController: NEMutilSelectBottomViewDelegate {
       }
 
       // 解析消息中的depth
-      if let data = NECustomAttachment.dataOfCustomMessage(msg.attachment) {
+      if let data = NECustomUtils.dataOfCustomMessage(msg.attachment) {
         if let dep = data["depth"] as? Int {
           if dep >= customMultiForwardMaxDepth {
             invalidMessages.append(msg)
@@ -3164,6 +3183,7 @@ extension ChatViewController: ChatBaseCellDelegate {
       }
 
       if index >= 0 {
+        ChatDeduplicationHelper.instance.removeBlackTipSendedId(messageId: msg.messageClientId)
         viewModel.sendMessage(message: msg) { _, error in
           if let err = error {
             print("resend message error: \(err.localizedDescription)")
@@ -3188,7 +3208,7 @@ extension ChatViewController: ChatBaseCellDelegate {
           return
         }
       }
-      let data = NECustomAttachment.dataOfCustomMessage(model?.message?.attachment)
+      let data = NECustomUtils.dataOfCustomMessage(model?.message?.attachment)
 
       let time = message.createTime
       let date = Date()
@@ -3285,7 +3305,9 @@ extension ChatViewController: ChatBaseCellDelegate {
     ReadViewController(message: message, teamId: teamId)
   }
 
-  open func loadDataFinish() {}
+  open func loadDataFinish() {
+    hasFirstLoadData = true
+  }
 
   // MARK: - call kit noti
 

NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/MultiForwardViewController.swift

@@ -313,7 +313,7 @@ open class MultiForwardViewController: NEChatBaseViewController, UINavigationCon
       }
     } else if model?.type == .custom {
       if model?.customType == customMultiForwardType,
-         let data = NECustomAttachment.dataOfCustomMessage(model?.message?.attachment) {
+         let data = NECustomUtils.dataOfCustomMessage(model?.message?.attachment) {
         let url = data["url"] as? String
         let md5 = data["md5"] as? String
         guard let fileDirectory = NEPathUtils.getDirectoryForDocuments(dir: imkitDir) else { return }