Skip to content

Commit 2655144

Browse files
shine2008shine2008
authored
Merge pull request #339 from Dongshanxu/master
9.2.0 bugfix
2 parents 289250a + 2e7ed10 commit 2655144

31 files changed

Lines changed: 149 additions & 209 deletions

‎NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ChatViewController.swift‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ extension ChatViewController: ChatBaseCellDelegate {
146146

147147
func didTapAvatarView(_ cell: UITableViewCell, _ model: MessageContentModel?) {
148148
if let isOut = model?.message?.isOutgoingMsg, isOut {
149-
Router.shared.use(MeSetting, parameters: ["nav": navigationController as Any], closure: nil)
149+
Router.shared.use(MeSettingRouter, parameters: ["nav": navigationController as Any], closure: nil)
150150
return
151151
}
152152
if let uid = model?.message?.from {
@@ -638,7 +638,7 @@ extension ChatViewController {
638638
// MARK:ChatInputViewDelegate
639639
public func sendText(text: String?) {
640640
guard let content = text, content.count > 0 else {
641-
self.view.makeToast(localizable("text_is_nil"))
641+
self.showToast(localizable("text_is_nil"))
642642
return
643643
}
644644
if viewmodel.isReplying, let msg = self.viewmodel.operationModel?.message {
@@ -726,7 +726,7 @@ extension ChatViewController {
726726
}else if index == 3 {
727727
showBottomVideoAction(self, false)
728728
}else {
729-
self.view.makeToast(localizable("open_soon"))
729+
self.showToast(localizable("open_soon"))
730730
}
731731
}
732732

@@ -796,7 +796,7 @@ extension ChatViewController {
796796
}
797797

798798
guard let image = info[.originalImage] as? UIImage else {
799-
self.view.makeToast(localizable("image_is_nil"))
799+
self.showToast(localizable("image_is_nil"))
800800
return
801801
}
802802
viewmodel.sendImageMessage(image: image, {[weak self] error in
@@ -908,7 +908,9 @@ extension ChatViewController {
908908
NEAuthManager.requestAudioAuthorization { granted in
909909
if granted {
910910
}else {
911-
self.showToast(localizable("没有麦克风权限"))
911+
DispatchQueue.main.async {
912+
self.showToast(localizable("没有麦克风权限"))
913+
}
912914
}
913915
}
914916
}
@@ -975,7 +977,7 @@ extension ChatViewController {
975977
public func playAudio(_ filePath: String, didBeganWithError error: Error?) {
976978
print(#function + "\(error)")
977979
if let e = error {
978-
self.view.makeToast(e.localizedDescription)
980+
self.showToast(e.localizedDescription)
979981
// stop
980982
self.playingCell?.stopAnimation()
981983
}
@@ -984,7 +986,7 @@ extension ChatViewController {
984986
public func playAudio(_ filePath: String, didCompletedWithError error: Error?) {
985987
print(#function + "\(error)")
986988
if let e = error {
987-
self.view.makeToast(e.localizedDescription)
989+
self.showToast(e.localizedDescription)
988990
}
989991
// stop
990992
self.playingCell?.stopAnimation()
@@ -993,7 +995,7 @@ extension ChatViewController {
993995
public func stopPlayAudio(_ filePath: String, didCompletedWithError error: Error?) {
994996
print(#function + "\(error)")
995997
if let e = error {
996-
self.view.makeToast(e.localizedDescription)
998+
self.showToast(e.localizedDescription)
997999
}
9981000
self.playingCell?.stopAnimation()
9991001
}
@@ -1021,7 +1023,7 @@ extension ChatViewController {
10211023
print("[record] sdk Completed error:\(error)")
10221024
self.menuView.stopRecordAnimation()
10231025
guard let fp = filePath else {
1024-
self.view.makeToast(error?.localizedDescription)
1026+
self.showToast(error?.localizedDescription ?? "")
10251027
return
10261028
}
10271029
let dur = recordDuration(filePath: fp)
@@ -1030,13 +1032,13 @@ extension ChatViewController {
10301032
if dur > 1 {
10311033
self.viewmodel.sendAudioMessage(filePath: fp, { error in
10321034
if let e = error {
1033-
self.view.makeToast(e.localizedDescription)
1035+
self.showToast(e.localizedDescription)
10341036
}else {
10351037

10361038
}
10371039
})
10381040
}else {
1039-
self.view.makeToast(localizable("录音时间太短"))
1041+
self.showToast(localizable("录音时间太短"))
10401042
}
10411043
}
10421044

‎NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/ReadViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public class ReadViewController: NEBaseViewController, UIScrollViewDelegate, UIT
172172
NIMSDK.shared().chatManager.queryMessageReceiptDetail(message) { anError, receiptInfo in
173173
print("anError:\(anError) receiptInfo:\(receiptInfo)")
174174
if let error = anError {
175-
self.view.makeToast(error.localizedDescription)
175+
self.showToast(error.localizedDescription)
176176
return
177177
}
178178

‎NEKitChatUI/NEKitChatUI/Classes/Chat/Controller/UserSettingViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public class UserSettingViewController: NEBaseViewController, UserSettingViewMod
167167
return true
168168
}){
169169
weakSelf?.navigationController?.viewControllers = allControllers
170-
Router.shared.use(ChatPushGroupVC, parameters: ["nav": weakSelf?.navigationController as Any, "session" : session as Any], closure: nil)
170+
Router.shared.use(PushTeamChatVCRouter, parameters: ["nav": weakSelf?.navigationController as Any, "session" : session as Any], closure: nil)
171171
}
172172
}
173173
}else if let error = param["msg"] as? String {

‎NEKitChatUI/NEKitChatUI/Classes/Chat/Model/CustomerSampleAttachment.swift‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎NEKitChatUI/NEKitChatUI/Classes/Chat/ViewModel/ChatViewModel.swift‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -496,21 +496,26 @@ public class ChatViewModel: NSObject, ChatRepoMessageDelegate, NIMChatManagerDel
496496
}
497497

498498
// MARK: NIMChatManagerDelegate
499+
//收到消息
499500
public func onRecvMessages(_ messages: [NIMMessage]) {
500501
print("\(#function) 1messages:\(messages.count)")
501502

502503
for msg in messages {
503504
if msg.session?.sessionId == self.session.sessionId {
504-
self.newMsg = msg
505-
self.addTimeMessage(msg)
506-
self.messages.append(self.modelFromMessage(message: msg))
505+
506+
//自定义消息处理
507+
if msg.messageType == .custom {
508+
509+
}else {
510+
self.newMsg = msg
511+
self.addTimeMessage(msg)
512+
self.messages.append(self.modelFromMessage(message: msg))
513+
}
514+
507515
}
508516
}
509517
self.delegate?.onRecvMessages(messages)
510-
511-
// self.markRead(messages: messages, { error in
512-
// print("mark read \(error?.localizedDescription)")
513-
// })
518+
514519
}
515520

516521

@@ -520,25 +525,30 @@ public class ChatViewModel: NSObject, ChatRepoMessageDelegate, NIMChatManagerDel
520525
if message.session?.sessionId != self.session.sessionId {
521526
return
522527
}
523-
if self.newMsg == nil {
524-
self.newMsg = message
525-
}
526-
527-
var isResend = false
528-
for (i, msg) in self.messages.enumerated() {
529-
if message.messageId == msg.message?.messageId {
530-
self.messages[i].message = message
531-
isResend = true
532-
break
528+
//自定义消息发送之前的处理
529+
if message.messageType == .custom {
530+
531+
}else {
532+
if self.newMsg == nil {
533+
self.newMsg = message
533534
}
535+
536+
var isResend = false
537+
for (i, msg) in self.messages.enumerated() {
538+
if message.messageId == msg.message?.messageId {
539+
self.messages[i].message = message
540+
isResend = true
541+
break
542+
}
543+
}
544+
545+
if !isResend {
546+
self.addTimeMessage(message)
547+
self.messages.append(self.modelFromMessage(message: message))
548+
}
549+
550+
self.delegate?.willSend(message)
534551
}
535-
536-
if !isResend {
537-
self.addTimeMessage(message)
538-
self.messages.append(self.modelFromMessage(message: message))
539-
}
540-
541-
self.delegate?.willSend(message)
542552
}
543553

544554
public func send(_ message: NIMMessage, progress: Float) {

‎NEKitChatUI/NEKitChatUI/Classes/ChatRouter/ChatRouter.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public struct ChatRouter {
1111

1212

1313
// p2p
14-
Router.shared.register("pushChatVC") { param in
14+
Router.shared.register(PushP2pChatVCRouter) { param in
1515
print("param:\(param)")
1616
let nav = param["nav"] as? UINavigationController
1717
guard let session = param["session"] as? NIMSession else {
@@ -22,7 +22,7 @@ public struct ChatRouter {
2222
}
2323

2424
// group
25-
Router.shared.register(ChatPushGroupVC) { param in
25+
Router.shared.register(PushTeamChatVCRouter) { param in
2626
print("param:\(param)")
2727
let nav = param["nav"] as? UINavigationController
2828
guard let session = param["session"] as? NIMSession else {

‎NEKitCommonUI/NEKitCommonUI/Classes/ViewControllerExtension.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ extension UIViewController: UIImagePickerControllerDelegate {
244244
//在需要的地方present出来
245245
self.present(photoPicker, animated: true, completion: nil)
246246
}else {
247-
self.view.makeToast("未打开相册权限")
247+
self.showToast("未打开相册权限")
248248
}
249249
}
250250
}
@@ -259,7 +259,9 @@ extension UIViewController: UIImagePickerControllerDelegate {
259259
//在需要的地方present出来
260260
self.present(photoPicker, animated: true, completion: nil)
261261
}else {
262-
self.view.makeToast("未打开相册权限")
262+
// self.view.makeToast("未打开相册权限")
263+
self.showToast("未打开相册权限")
264+
263265
}
264266
}
265267
}

‎NEKitContactUI/NEKitContactUI/Classes/Common/ContactCellDataProtrol.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import Foundation
77
import UIKit
88

99
public protocol ContactCellDataProtrol {
10-
func setModel(_ model: ContactInfo, _ config: ContactsConfig)
10+
func setModel(_ model: ContactInfo)
1111
}

‎NEKitContactUI/NEKitContactUI/Classes/Common/ContactRouter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public struct ContactRouter {
2323
nav?.pushViewController(contactSelectVC, animated: true)
2424
}
2525

26-
Router.shared.register(ContactSearchUserRouter) { param in
26+
Router.shared.register(ContactAddFriendRouter) { param in
2727
let nav = param["nav"] as? UINavigationController
2828
let findFrined = FindFriendViewController()
2929
nav?.pushViewController(findFrined, animated: true)

‎NEKitContactUI/NEKitContactUI/Classes/Common/ContactsConfig.swift‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)