Merge pull request #31 from lixm1988/main

适配sdk 4.13.0，禁用ChatMessage 默认构造函数

Author: zjc19891106

ChatroomUIKit.podspec

@@ -7,7 +7,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'ChatroomUIKit'
-  s.version          = '1.1.2'
+  s.version          = '1.1.3'
   s.summary          = 'ChatroomUIKit.'
 
 

Example/ChatroomUIKit/UIComponentsExampleViewController.swift

@@ -22,7 +22,7 @@ final class UIComponentsExampleViewController: UIViewController {
     }()
     //聊天区域
     lazy var barrageList: MessageList = {
-        MessageList(frame: CGRect(x: 0, y: ScreenHeight-BottomBarHeight-54-5, width: self.view.frame.width-50, height: 200))
+        MessageList(frame: CGRect(x: 0, y: ScreenHeight-BottomBarHeight-54-5-200, width: self.view.frame.width-50, height: 200))
     }()
     //底部工具栏
     lazy var bottomBar: BottomAreaToolBar = {

Sources/ChatroomUIKit/Classes/Service/Implement/ChatroomServiceImplement.swift

@@ -132,13 +132,13 @@ extension ChatroomServiceImplement: ChatroomService {
         }
     }
 
-    public func sendMessage(text: String, roomId: String, completion: @escaping (ChatMessage, ChatError?) -> Void) {
+    public func sendMessage(text: String, roomId: String, completion: @escaping (ChatMessage?, ChatError?) -> Void) {
         let user = ChatroomContext.shared?.currentUser
         if let user_json = user?.toJsonObject() {
             let message = ChatMessage(conversationID: roomId, body: ChatTextMessageBody(text: text), ext: ["chatroom_uikit_userInfo":user_json])
             message.chatType = .chatRoom
             ChatClient.shared().chatManager?.send(message, progress: nil,completion: { chatMessage, error in
-                completion(chatMessage ?? ChatMessage(),error)
+                completion(chatMessage,error)
             })
         }
     }

Sources/ChatroomUIKit/Classes/Service/Implement/UserServiceImplement.swift

@@ -93,14 +93,8 @@ extension UserServiceImplement:UserServiceProtocol {
         if ChatClient.shared().isLoggedIn {
             self.logout { _, _ in }
         }
-        if token.hasPrefix("00") {
-            ChatClient.shared().login(withUsername: userId.lowercased(), agoraToken: token) { user_id, error in
-                completion(error == nil,error)
-            }
-        } else {
-            ChatClient.shared().login(withUsername: userId, token: token) { user_id, error in
-                completion(error == nil,error)
-            }
+        ChatClient.shared().login(withUsername: userId, token: token) { user_id, error in
+            completion(error == nil,error)
         }
     }
 

Sources/ChatroomUIKit/Classes/Service/Protocol/ChatroomService.swift

@@ -84,7 +84,7 @@ import Foundation
     ///   - text: You'll send text.
     ///   - roomId: chatroom id
     ///   - completion: Send callback,what if success or error.
-    func sendMessage(text: String, roomId: String, completion: @escaping (ChatMessage,ChatError?) -> Void)
+    func sendMessage(text: String, roomId: String, completion: @escaping (ChatMessage?,ChatError?) -> Void)
 
     /// Send targeted text messages to some participants of the chat room
     /// - Parameters:

Sources/ChatroomUIKit/Classes/UI/Components/Chat/Cells/ChatMessageCell.swift

@@ -160,7 +160,7 @@ fileprivate let gift_tail_indent: CGFloat = 26
 @objc open class ChatEntity: NSObject {
 
     /// The message associated with the chat entity.
-    lazy public var message: ChatMessage = ChatMessage()
+    public var message: ChatMessage!
 
     /// The time at which the message was sent, formatted as "HH:mm".
     lazy open var showTime: String = {

Sources/ChatroomUIKit/Classes/UI/Components/Chat/Controllers/ReportOptionsController.swift

@@ -11,7 +11,7 @@ import UIKit
 
     public private(set) var items: [Bool] = []
 
-    public private(set) var reportMessage: ChatMessage = ChatMessage()
+    public private(set) var reportMessage: ChatMessage!
 
     public private(set) var selectIndex = 0
 

Sources/ChatroomUIKit/Classes/UI/Components/Room/Views/ChatroomView.swift

@@ -141,7 +141,7 @@ import UIKit
 
     @objc open func sendTextMessage(text: String) {
         self.service?.roomService?.sendMessage(text: text, roomId: ChatroomContext.shared?.roomId ?? "", completion: { [weak self] message, error in
-            if error == nil {
+            if error == nil,let message = message {
                 self?.chatList.showNewMessage(message: message, gift: nil)
             } else {
                 let errorInfo = "Send message failure!\n\(error?.errorDescription ?? "")"