Merge pull request #339 from Dongshanxu/master

9.2.0 bugfix
netease-kit · Jun 30, 2022 · 2655144 · 2655144
2 parents 289250a + 2e7ed10
commit 2655144
Show file tree

Hide file tree

Showing 31 changed files with 149 additions and 209 deletions.
diff --git a/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ChatViewController.swift b/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ChatViewController.swift
@@ -146,7 +146,7 @@ extension ChatViewController: ChatBaseCellDelegate {
 
     func didTapAvatarView(_ cell: UITableViewCell, _ model: MessageContentModel?) {
         if let isOut = model?.message?.isOutgoingMsg, isOut {
-            Router.shared.use(MeSetting, parameters: ["nav": navigationController as Any], closure: nil)
+            Router.shared.use(MeSettingRouter, parameters: ["nav": navigationController as Any], closure: nil)
             return
         }
         if let uid = model?.message?.from {
@@ -638,7 +638,7 @@ extension ChatViewController {
 //    MARK:ChatInputViewDelegate
     public func sendText(text: String?) {
         guard let content = text, content.count > 0 else {
-            self.view.makeToast(localizable("text_is_nil"))
+            self.showToast(localizable("text_is_nil"))
             return
         }
         if viewmodel.isReplying, let msg = self.viewmodel.operationModel?.message {
@@ -726,7 +726,7 @@ extension ChatViewController {
         }else if index == 3 {
             showBottomVideoAction(self, false)
         }else {
-            self.view.makeToast(localizable("open_soon"))
+            self.showToast(localizable("open_soon"))
         }
     }
 
@@ -796,7 +796,7 @@ extension ChatViewController {
         }
 
         guard let image = info[.originalImage] as? UIImage else {
-            self.view.makeToast(localizable("image_is_nil"))
+            self.showToast(localizable("image_is_nil"))
             return
         }
         viewmodel.sendImageMessage(image: image, {[weak self] error in
@@ -908,7 +908,9 @@ extension ChatViewController {
             NEAuthManager.requestAudioAuthorization { granted in
                 if granted {
                 }else {
-                    self.showToast(localizable("没有麦克风权限"))
+                    DispatchQueue.main.async {
+                        self.showToast(localizable("没有麦克风权限"))
+                    }
                 }
             }
         }
@@ -975,7 +977,7 @@ extension ChatViewController {
     public func playAudio(_ filePath: String, didBeganWithError error: Error?) {
         print(#function + "\(error)")
         if let e = error {
-            self.view.makeToast(e.localizedDescription)
+            self.showToast(e.localizedDescription)
             // stop
             self.playingCell?.stopAnimation()
         }
@@ -984,7 +986,7 @@ extension ChatViewController {
     public func playAudio(_ filePath: String, didCompletedWithError error: Error?) {
         print(#function + "\(error)")
         if let e = error {
-            self.view.makeToast(e.localizedDescription)
+            self.showToast(e.localizedDescription)
         }
         // stop
         self.playingCell?.stopAnimation()
@@ -993,7 +995,7 @@ extension ChatViewController {
     public func stopPlayAudio(_ filePath: String, didCompletedWithError error: Error?) {
         print(#function + "\(error)")
         if let e = error {
-            self.view.makeToast(e.localizedDescription)
+            self.showToast(e.localizedDescription)
         }
         self.playingCell?.stopAnimation()
     }
@@ -1021,7 +1023,7 @@ extension ChatViewController {
         print("[record] sdk Completed error:\(error)")
         self.menuView.stopRecordAnimation()
         guard let fp = filePath else {
-            self.view.makeToast(error?.localizedDescription)
+            self.showToast(error?.localizedDescription ?? "")
             return
         }
         let dur = recordDuration(filePath: fp)
@@ -1030,13 +1032,13 @@ extension ChatViewController {
         if dur > 1 {
             self.viewmodel.sendAudioMessage(filePath: fp, { error in
                 if let e = error {
-                    self.view.makeToast(e.localizedDescription)
+                    self.showToast(e.localizedDescription)
                 }else {
 
                 }
             })
         }else {
-            self.view.makeToast(localizable("录音时间太短"))
+            self.showToast(localizable("录音时间太短"))
         }
     }
 

diff --git a/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ReadViewController.swift b/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ReadViewController.swift
@@ -172,7 +172,7 @@ public class ReadViewController: NEBaseViewController, UIScrollViewDelegate, UIT
         NIMSDK.shared().chatManager.queryMessageReceiptDetail(message) { anError, receiptInfo in
             print("anError:\(anError) receiptInfo:\(receiptInfo)")
             if let error = anError {
-                self.view.makeToast(error.localizedDescription)
+                self.showToast(error.localizedDescription)
                 return
             }
 

diff --git a/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/UserSettingViewController.swift b/NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/UserSettingViewController.swift
@@ -167,7 +167,7 @@ public class UserSettingViewController: NEBaseViewController, UserSettingViewMod
                         return true
                     }){
                         weakSelf?.navigationController?.viewControllers = allControllers
-                        Router.shared.use(ChatPushGroupVC, parameters: ["nav": weakSelf?.navigationController as Any, "session" : session as Any], closure: nil)
+                        Router.shared.use(PushTeamChatVCRouter, parameters: ["nav": weakSelf?.navigationController as Any, "session" : session as Any], closure: nil)
                     }
                 }
             }else if let error = param["msg"] as? String {

diff --git a/NEKitChatUI/NEKitChatUI/Classes/Chat/Model/CustomerSampleAttachment.swift b/NEKitChatUI/NEKitChatUI/Classes/Chat/Model/CustomerSampleAttachment.swift
diff --git a/NEKitChatUI/NEKitChatUI/Classes/Chat/ViewModel/ChatViewModel.swift b/NEKitChatUI/NEKitChatUI/Classes/Chat/ViewModel/ChatViewModel.swift
@@ -496,21 +496,26 @@ public class ChatViewModel: NSObject, ChatRepoMessageDelegate, NIMChatManagerDel
     }
 
     //    MARK: NIMChatManagerDelegate
+    //收到消息
     public func onRecvMessages(_ messages: [NIMMessage]) {
         print("\(#function) 1messages:\(messages.count)")
 
         for msg in messages {
             if msg.session?.sessionId == self.session.sessionId {
-                self.newMsg = msg
-                self.addTimeMessage(msg)
-                self.messages.append(self.modelFromMessage(message: msg))
+
+                //自定义消息处理
+                if msg.messageType == .custom {
+
+                }else {
+                    self.newMsg = msg
+                    self.addTimeMessage(msg)
+                    self.messages.append(self.modelFromMessage(message: msg))
+                }
+
             }
         }
         self.delegate?.onRecvMessages(messages)
-
-//        self.markRead(messages: messages, { error in
-//            print("mark read \(error?.localizedDescription)")
-//        })
+
     }
 
 
@@ -520,25 +525,30 @@ public class ChatViewModel: NSObject, ChatRepoMessageDelegate, NIMChatManagerDel
         if message.session?.sessionId != self.session.sessionId {
             return
         }
-        if self.newMsg == nil {
-            self.newMsg = message
-        }
-
-        var isResend = false
-        for (i, msg) in self.messages.enumerated() {
-            if message.messageId == msg.message?.messageId {
-                self.messages[i].message = message
-                isResend = true
-                break
+        //自定义消息发送之前的处理
+        if message.messageType == .custom {
+
+        }else {
+            if self.newMsg == nil {
+                self.newMsg = message
             }
+
+            var isResend = false
+            for (i, msg) in self.messages.enumerated() {
+                if message.messageId == msg.message?.messageId {
+                    self.messages[i].message = message
+                    isResend = true
+                    break
+                }
+            }
+
+            if !isResend {
+                self.addTimeMessage(message)
+                self.messages.append(self.modelFromMessage(message: message))
+            }
+
+            self.delegate?.willSend(message)
         }
-
-        if !isResend {
-            self.addTimeMessage(message)
-            self.messages.append(self.modelFromMessage(message: message))
-        }
-
-        self.delegate?.willSend(message)
     }
 
     public func send(_ message: NIMMessage, progress: Float) {

diff --git a/NEKitChatUI/NEKitChatUI/Classes/ChatRouter/ChatRouter.swift b/NEKitChatUI/NEKitChatUI/Classes/ChatRouter/ChatRouter.swift
@@ -11,7 +11,7 @@ public struct ChatRouter {
 
 
         // p2p
-        Router.shared.register("pushChatVC") { param in
+        Router.shared.register(PushP2pChatVCRouter) { param in
             print("param:\(param)")
             let nav = param["nav"] as? UINavigationController
             guard let session = param["session"] as? NIMSession else {
@@ -22,7 +22,7 @@ public struct ChatRouter {
         }
 
         // group
-        Router.shared.register(ChatPushGroupVC) { param in
+        Router.shared.register(PushTeamChatVCRouter) { param in
             print("param:\(param)")
             let nav = param["nav"] as? UINavigationController
             guard let session = param["session"] as? NIMSession else {

diff --git a/NEKitCommonUI/NEKitCommonUI/Classes/ViewControllerExtension.swift b/NEKitCommonUI/NEKitCommonUI/Classes/ViewControllerExtension.swift
@@ -244,7 +244,7 @@ extension UIViewController: UIImagePickerControllerDelegate {
                 //在需要的地方present出来
                 self.present(photoPicker, animated: true, completion: nil)
             }else {
-                self.view.makeToast("未打开相册权限")
+                self.showToast("未打开相册权限")
             }
         }
     }
@@ -259,7 +259,9 @@ extension UIViewController: UIImagePickerControllerDelegate {
                 //在需要的地方present出来
                 self.present(photoPicker, animated: true, completion: nil)
             }else {
-                self.view.makeToast("未打开相册权限")
+//                self.view.makeToast("未打开相册权限")
+                self.showToast("未打开相册权限")
+
             }
         }
     }

diff --git a/NEKitContactUI/NEKitContactUI/Classes/Common/ContactCellDataProtrol.swift b/NEKitContactUI/NEKitContactUI/Classes/Common/ContactCellDataProtrol.swift
@@ -7,5 +7,5 @@ import Foundation
 import UIKit
 
 public protocol ContactCellDataProtrol {
-    func setModel(_ model: ContactInfo, _ config: ContactsConfig)
+    func setModel(_ model: ContactInfo)
 }
diff --git a/NEKitContactUI/NEKitContactUI/Classes/Common/ContactRouter.swift b/NEKitContactUI/NEKitContactUI/Classes/Common/ContactRouter.swift
@@ -23,7 +23,7 @@ public struct ContactRouter {
             nav?.pushViewController(contactSelectVC, animated: true)
         }
 
-        Router.shared.register(ContactSearchUserRouter) { param in
+        Router.shared.register(ContactAddFriendRouter) { param in
             let nav = param["nav"] as? UINavigationController
             let findFrined = FindFriendViewController()
             nav?.pushViewController(findFrined, animated: true)

diff --git a/NEKitContactUI/NEKitContactUI/Classes/Common/ContactsConfig.swift b/NEKitContactUI/NEKitContactUI/Classes/Common/ContactsConfig.swift
diff --git a/NEKitContactUI/NEKitContactUI/Classes/Team/ViewController/TeamListViewController.swift b/NEKitContactUI/NEKitContactUI/Classes/Team/ViewController/TeamListViewController.swift
@@ -63,7 +63,7 @@ public class TeamListViewController: UIViewController, UITableViewDelegate, UITa
         }
         if let teamid = model.teamId {
             let session = NIMSession(teamid, type: .team)
-            Router.shared.use(ChatPushGroupVC, parameters: ["nav": navigationController as Any, "session" : session as Any], closure: nil)
+            Router.shared.use(PushTeamChatVCRouter, parameters: ["nav": navigationController as Any, "session" : session as Any], closure: nil)
         }
 
     }

diff --git a/...tContactUI/NEKitContactUI/Classes/UserInfo/ViewController/ContactUserViewController.swift b/...tContactUI/NEKitContactUI/Classes/UserInfo/ViewController/ContactUserViewController.swift
@@ -227,7 +227,7 @@ public class ContactUserViewController: ContactBaseViewController, UITableViewDe
             return
         }
         let session = NIMSession(accid, type: .P2P)
-        Router.shared.use("pushChatVC", parameters: ["nav": self.navigationController,"session": session]) { obj, routerState, str in
+        Router.shared.use(PushP2pChatVCRouter, parameters: ["nav": self.navigationController,"session": session]) { obj, routerState, str in
             print("obj:\(obj) routerState:\(routerState) str:\(str)")
         }
     }
@@ -238,7 +238,7 @@ public class ContactUserViewController: ContactBaseViewController, UITableViewDe
         if let userId = user?.userId {
             viewModel.deleteFriend(account: userId) { error in
                 if error != nil {
-                    self.view.makeToast(error?.localizedDescription)
+                    self.showToast(error?.localizedDescription ?? "")
                 }else {
                     self.navigationController?.popViewController(animated: true)
                 }

diff --git a/NEKitContactUI/NEKitContactUI/Classes/Views/Cell/ContactSelectedCell.swift b/NEKitContactUI/NEKitContactUI/Classes/Views/Cell/ContactSelectedCell.swift
@@ -35,8 +35,8 @@ class ContactSelectedCell: ContactTableViewCell {
         ])
     }
 
-    override func setModel(_ model: ContactInfo, _ config: ContactsConfig) {
-        super.setModel(model, config)
+    override func setModel(_ model: ContactInfo) {
+        super.setModel(model)
         if model.isSelected == false {
             sImage.isHighlighted = false
         }else {