Skip to content

Commit cfc6f11

Browse files
authored
Merge pull request #57 from zjc19891106/main
添加诈骗背景图提醒消息
2 parents 01e69e8 + d599bb8 commit cfc6f11

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

Example/EaseChatUIKit/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1818

1919
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
2020
// Override point for customization after application launch.
21-
let option = ChatOptions(appkey: "")
21+
let option = ChatOptions(appkey: "easemob#easeim")
2222
option.enableConsoleLog = true
2323
_ = ChatUIKitClient.shared.setup(option: option)
2424
let redPackage = ActionSheetItem(title: "Red".chat.localize, type: .normal,tag: "Red",image: UIImage(named: "photo", in: .chatBundle, with: nil))

Sources/EaseChatUIKit/Classes/UI/Components/Chat/Controllers/ChatThreadViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ import PhotosUI
6565
LoadingView(frame: self.view.bounds)
6666
}
6767

68-
public private(set) lazy var viewModel: ChatThreadViewModel = {
69-
ChatThreadViewModel(chatThread: self.profile)
68+
public private(set) lazy var viewModel: ChatThreadViewModel = {
69+
ComponentsRegister.shared.ThreadViewModel.init(chatThread: self.profile)
7070
}()
7171

7272
public private(set) var firstMessage: ChatMessage?

Sources/EaseChatUIKit/Classes/UI/Components/Chat/ViewModel/ChatThreadViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ import UIKit
127127
/// - type: ``MessageCellStyle``
128128
/// - extensionInfo: Extended information to be carried in the message.
129129
@objc(sendMessageWithText:type:extensionInfo:)
130-
public func sendMessage(text: String,type: MessageCellStyle,extensionInfo: Dictionary<String,Any> = [:]) {
130+
open func sendMessage(text: String,type: MessageCellStyle,extensionInfo: Dictionary<String,Any> = [:]) {
131131
if let message = self.constructMessage(text: text, type: type,extensionInfo: extensionInfo) {
132132
self.driver?.showMessage(message: message)
133133
self.chatService?.send(message: message) { [weak self] error, message in

Sources/EaseChatUIKit/Classes/UI/Components/Chat/ViewModel/MessageEntity.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,11 @@ public let urlPreviewImageHeight = CGFloat(137)
144144
}()
145145

146146
open func cellHeight() -> CGFloat {
147-
return 8+(Appearance.chat.contentStyle.contains(.withNickName) ? 28:2)+(Appearance.chat.contentStyle.contains(.withReply) ? self.replySize.height:2)+self.bubbleSize.height+(Appearance.chat.contentStyle.contains(.withDateAndTime) ? 22:6)+self.topicContentHeight()+self.reactionContentHeight()
147+
if message.body.type != .custom {
148+
return 8+(Appearance.chat.contentStyle.contains(.withNickName) ? 28:2)+(Appearance.chat.contentStyle.contains(.withReply) ? self.replySize.height:2)+self.bubbleSize.height+(Appearance.chat.contentStyle.contains(.withDateAndTime) ? 22:6)+self.topicContentHeight()+self.reactionContentHeight()
149+
} else {
150+
return self.bubbleSize.height
151+
}
148152
}
149153

150154
open func reactionMenuWidth() -> CGFloat {

Sources/EaseChatUIKit/Classes/UI/Components/Chat/ViewModel/MessageListViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ import UIKit
171171
/// - type: ``MessageCellStyle``
172172
/// - extensionInfo: Extended information to be carried in the message.
173173
@objc(sendMessageWithText:type:extensionInfo:)
174-
public func sendMessage(text: String,type: MessageCellStyle,extensionInfo: Dictionary<String,Any> = [:]) {
174+
open func sendMessage(text: String,type: MessageCellStyle,extensionInfo: Dictionary<String,Any> = [:]) {
175175
if let message = self.constructMessage(text: text, type: type,extensionInfo: extensionInfo) {
176176
self.driver?.showMessage(message: message)
177177
self.chatService?.send(message: message) { [weak self] error, message in

Sources/EaseChatUIKit/Classes/UI/Core/UIKit/Commons/ComponentsRegister.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ import UIKit
9797

9898
public var MessagesViewModel: MessageListViewModel.Type = MessageListViewModel.self
9999

100+
public var ThreadViewModel: ChatThreadViewModel.Type = ChatThreadViewModel.self
101+
100102
/// Message cell render entity.
101103
public var MessageRenderEntity: MessageEntity.Type = MessageEntity.self
102104

0 commit comments

Comments
 (0)