소스 검색

Update iOS RoomKit to 3.0.1

chengyuzhao 10 달 전
부모
커밋
89c2ceee19

+ 2 - 2
iOS/Example/Login/ProfileManager_Mock.swift

@@ -89,7 +89,7 @@ import TUIRoomKit
         let userInfo = V2TIMUserFullInfo()
         userInfo.nickName = name
         curUserModel?.name = name
-        V2TIMManager.sharedInstance()?.setSelfInfo(userInfo, succ: {
+        V2TIMManager.sharedInstance()?.setSelfInfo(info: userInfo, succ: {
             success()
             debugPrint("set profile success")
         }, fail: { (code, desc) in
@@ -150,7 +150,7 @@ import TUIRoomKit
         let userInfo = V2TIMUserFullInfo()
         userInfo.nickName = userModel.name
         userInfo.faceURL = userModel.avatar
-        V2TIMManager.sharedInstance()?.setSelfInfo(userInfo, succ: {
+        V2TIMManager.sharedInstance()?.setSelfInfo(info: userInfo, succ: {
             debugPrint("set profile success")
         }, fail: { (code, desc) in
             debugPrint("set profile failed.")

+ 1 - 1
iOS/TUIRoomKit/RoomExtension/Model/Manager/InviteToJoinRoomManager.swift

@@ -47,7 +47,7 @@ class InviteToJoinRoomManager {
         guard let dataString = dataDict.convertToString() else { return }
         let pushInfo = V2TIMOfflinePushInfo()
         invitedList.forEach { userId in
-            V2TIMManager.sharedInstance().invite(userId,
+            V2TIMManager.sharedInstance().invite(invitee: userId,
                                                  data: dataString,
                                                  onlineUserOnly: true,
                                                  offlinePushInfo: pushInfo,

+ 5 - 5
iOS/TUIRoomKit/RoomExtension/Model/Manager/RoomMessageManager.swift

@@ -64,7 +64,7 @@ class RoomMessageManager: NSObject {
                 let messageDic = messageModel.getDictFromMessageModel()
                 guard let jsonString = messageDic.convertToString() else { return }
                 let jsonData = jsonString.data(using: String.Encoding.utf8)
-                let message = V2TIMManager.sharedInstance().createCustomMessage(jsonData)
+                let message = V2TIMManager.sharedInstance().createCustomMessage(data: jsonData)
                 message?.supportMessageExtension = true
                 let param = [TUICore_TUIChatService_SendMessageMethod_MsgKey: message]
                 TUICore.callService(TUICore_TUIChatService, method: TUICore_TUIChatService_SendMessageMethod, param: param as [AnyHashable : Any])
@@ -78,7 +78,7 @@ class RoomMessageManager: NSObject {
             self.modifyMessage(message: message, dic: dic)
             return
         }
-        V2TIMManager.sharedInstance().findMessages([message.messageId]) { [weak self] messageArray in
+        V2TIMManager.sharedInstance().findMessages(messageIDList: [message.messageId]) { [weak self] messageArray in
             guard let self = self else { return }
             guard let array = messageArray else { return }
             for previousMessage in array where previousMessage.msgID == message.messageId {
@@ -92,14 +92,14 @@ class RoomMessageManager: NSObject {
     
     private func modifyMessage(message: RoomMessageModel, dic:[String: Any]) {
         guard let message = message.getMessage() else { return }
-        guard var customElemDic = TUITool.jsonData2Dictionary(message.customElem.data) as? [String: Any] else { return }
+        guard var customElemDic = TUITool.jsonData2Dictionary(message.customElem?.data) as? [String: Any] else { return }
         for (key, value) in dic {
             customElemDic[key] = value
         }
         guard let jsonString = customElemDic.convertToString() else { return }
         let jsonData = jsonString.data(using: String.Encoding.utf8)
-        message.customElem.data = jsonData
-        V2TIMManager.sharedInstance().modifyMessage(message) { code, desc, msg in
+        message.customElem?.data = jsonData
+        V2TIMManager.sharedInstance().modifyMessage(msg: message) { code, desc, msg in
             if code == 0 {
                 debugPrint("modifyMessage,success")
             } else {

+ 1 - 1
iOS/TUIRoomKit/RoomExtension/Model/Model/RoomMessageModel.swift

@@ -62,7 +62,7 @@ class RoomMessageModel {
     private func setMessageCustomElemData(dict: [String: Any], message: V2TIMMessage) {
         guard let jsonString = dict.convertToString() else { return }
         let jsonData = jsonString.data(using: String.Encoding.utf8)
-        message.customElem.data = jsonData
+        message.customElem?.data = jsonData
     }
     
     func getDictFromMessageModel() -> [String: Any] {

+ 1 - 1
iOS/TUIRoomKit/RoomExtension/Model/TUIRoomImAccessService.swift

@@ -33,7 +33,7 @@ class TUIRoomImAccessService: NSObject, TUIServiceProtocol  {
 }
 
 extension TUIRoomImAccessService: V2TIMSignalingListener {
-    func onReceiveNewInvitation(_ inviteID: String, inviter: String, groupID: String, inviteeList: [String], data: String?) {
+    func onReceiveNewInvitation(inviteID: String, inviter: String?, groupID: String?, inviteeList: [String], data: String?) {
         guard let data = data else { return }
         let dict = data.convertToDic()
         guard let businessID = dict?["businessID"] as? String else { return }

+ 2 - 2
iOS/TUIRoomKit/RoomExtension/View/ViewModel/RoomMessageBubbleCellData.swift

@@ -31,7 +31,7 @@ class RoomMessageBubbleCellData: TUIBubbleMessageCellData {
     override class func getDisplayString(_ message: V2TIMMessage) -> String {
         let businessID = parseBusinessID(message: message)
         if businessID == BussinessID_GroupRoomMessage {
-            let dict = TUITool.jsonData2Dictionary(message.customElem.data) as? [String: Any]
+            let dict = TUITool.jsonData2Dictionary(message.customElem?.data) as? [String: Any]
             let userName = dict?["ownerName"] as? String ?? ""
             return localizedReplace(.quickMeetingText, replace: userName)
         } else {
@@ -41,7 +41,7 @@ class RoomMessageBubbleCellData: TUIBubbleMessageCellData {
     
     private class func parseBusinessID(message: V2TIMMessage?) -> String {
         guard let message = message else { return "" }
-        let customData = message.customElem.data
+        let customData = message.customElem?.data
         let dict = TUITool.jsonData2Dictionary(customData)
         guard let businessID = dict?["businessID"] as? String else { return ""}
         return businessID

+ 2 - 2
iOS/TUIRoomKit/Source/Common/Components/FloatChat/Service/FloatChatService.swift

@@ -33,7 +33,7 @@ class FloatChatService: NSObject {
     func sendGroupMessage(_ message: String) -> AnyPublisher<String, Never> {
         return Future<String, Never> { [weak self] promise in
             guard let self = self else { return }
-            self.imManager?.sendGroupTextMessage(message, to: self.roomId, priority: .PRIORITY_NORMAL, succ: {
+            self.imManager?.sendGroupTextMessage(text: message, to: self.roomId, priority: .PRIORITY_NORMAL, succ: {
                 promise(.success((message)))
             }, fail: { code, message in
                 let errorMsg = TUITool.convertIMError(Int(code), msg: message)
@@ -46,7 +46,7 @@ class FloatChatService: NSObject {
 }
 
 extension FloatChatService: V2TIMAdvancedMsgListener {
-    func onRecvNewMessage(_ msg: V2TIMMessage!) {
+    func onRecvNewMessage(msg: V2TIMMessage!) {
         guard msg.groupID == roomId, let msg = msg else { return }
         let floatMessage = FloatChatMessage(msg: msg)
         store?.dispatch(action: FloatChatActions.onMessageReceived(payload: floatMessage))

+ 2 - 2
iOS/TUIRoomKit/Source/Common/Components/FloatChat/State/FloatChatState.swift

@@ -42,14 +42,14 @@ struct FloatChatMessage: Codable, Equatable {
         switch msg.elemType {
         case .ELEM_TYPE_TEXT:
             self.type = .text
-            self.content = msg.textElem.text
+            self.content = msg.textElem?.text ?? ""
         case .ELEM_TYPE_IMAGE:
             self.type = .image
         case .ELEM_TYPE_VIDEO:
             self.type = .video
         case .ELEM_TYPE_FILE:
             self.type = .file
-            self.fileName = msg.fileElem.filename
+            self.fileName = msg.fileElem?.filename ?? ""
         default: break
         }
     }

+ 1 - 1
iOS/TUIRoomKit/TUIRoomKit.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |spec|
   spec.name                  = 'TUIRoomKit'
-  spec.version               = '3.0.0'
+  spec.version               = '3.0.1'
   spec.platform              = :ios
   spec.ios.deployment_target = '13.0'
   spec.license               = { :type => 'MIT', :file => 'LICENSE' }