Commit c2d94078 authored by Alex朱枝文's avatar Alex朱枝文

优化刷新银河管家消息布局更改逻辑,去除os日志

parent 12d21c7a
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
import UIKit import UIKit
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
import OSLog
class YHButlerServiceManager: NSObject { class YHButlerServiceManager: NSObject {
...@@ -38,6 +37,12 @@ class YHButlerServiceManager: NSObject { ...@@ -38,6 +37,12 @@ class YHButlerServiceManager: NSObject {
let qyOption = QYSDKOption(appKey: YhConstant.QiYuSDK.appKey) let qyOption = QYSDKOption(appKey: YhConstant.QiYuSDK.appKey)
qyOption.appName = YhConstant.QiYuSDK.appName qyOption.appName = YhConstant.QiYuSDK.appName
QYSDK.shared().register(with: qyOption) QYSDK.shared().register(with: qyOption)
/*
QYSDK.shared().registerPushMessageNotification { pushMessage in
os_log("#####registerPushMessageNotification %@ %ld %f", (pushMessage?.text ?? ""), (pushMessage?.type.rawValue ?? 0), (pushMessage?.time ?? 0))
printLog("$$$$registerPushMessageNotification \(pushMessage?.text ?? "") \(pushMessage?.type.rawValue ?? 0) \(pushMessage?.time ?? 0)")
}
*/
guard isUatAllowed() else { guard isUatAllowed() else {
return return
} }
...@@ -84,7 +89,7 @@ extension YHButlerServiceManager { ...@@ -84,7 +89,7 @@ extension YHButlerServiceManager {
/// 灰度打开 /// 灰度打开
func isUatAllowed() -> Bool { func isUatAllowed() -> Bool {
let allowed = YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules.QiYu_Service) == 1 let allowed = YHUatHelper.shared.getUatModuleStatusBy(module: .QiYu_Service) == 1
return allowed || true return allowed || true
} }
...@@ -195,7 +200,6 @@ extension YHButlerServiceManager { ...@@ -195,7 +200,6 @@ extension YHButlerServiceManager {
/// 获取所有会话的列表;非平台电商用户,只有一个会话项,平台电商用户,有多个会话项 /// 获取所有会话的列表;非平台电商用户,只有一个会话项,平台电商用户,有多个会话项
func getSessionList() -> [QYSessionInfo] { func getSessionList() -> [QYSessionInfo] {
let list = conversationManager?.getSessionList() ?? [] let list = conversationManager?.getSessionList() ?? []
os_log("#####getSessionList %@", (list.first?.description ?? ""))
printLog("$$$$getSessionList \(list.first?.lastMessageText ?? "") \(list.first?.lastMessageType.rawValue ?? 0) \(list.first?.lastMessageTimeStamp ?? 0)") printLog("$$$$getSessionList \(list.first?.lastMessageText ?? "") \(list.first?.lastMessageType.rawValue ?? 0) \(list.first?.lastMessageTimeStamp ?? 0)")
return list return list
} }
...@@ -203,7 +207,6 @@ extension YHButlerServiceManager { ...@@ -203,7 +207,6 @@ extension YHButlerServiceManager {
/// 所有的未读数 /// 所有的未读数
func allUnreadCount() -> Int { func allUnreadCount() -> Int {
let count = conversationManager?.allUnreadCount() ?? 0 let count = conversationManager?.allUnreadCount() ?? 0
os_log("#####allUnreadCount %ld", count)
printLog("$$$$allUnreadCount \(count)") printLog("$$$$allUnreadCount \(count)")
return count return count
} }
...@@ -214,7 +217,6 @@ extension YHButlerServiceManager { ...@@ -214,7 +217,6 @@ extension YHButlerServiceManager {
// 清空已读消息后刷新最新消息状态 // 清空已读消息后刷新最新消息状态
lastMessage = getLastMessage() lastMessage = getLastMessage()
printLog("$$$$clearUnreadCount") printLog("$$$$clearUnreadCount")
os_log("#####clearUnreadCount")
} }
} }
...@@ -225,7 +227,6 @@ extension YHButlerServiceManager: QYConversationManagerDelegate { ...@@ -225,7 +227,6 @@ extension YHButlerServiceManager: QYConversationManagerDelegate {
/// 会话列表变化;非平台电商用户,只有一个会话项,平台电商用户,有多个会话项 用这个方法可以拿到最新的完整的消息内容 /// 会话列表变化;非平台电商用户,只有一个会话项,平台电商用户,有多个会话项 用这个方法可以拿到最新的完整的消息内容
func onSessionListChanged(_ sessionList: [QYSessionInfo]!) { func onSessionListChanged(_ sessionList: [QYSessionInfo]!) {
printLog("$$$$onSessionListChanged \(sessionList.first?.lastMessageText ?? "") \(sessionList.first?.lastMessageType.rawValue ?? 0) \(sessionList.first?.lastMessageTimeStamp ?? 0) \(sessionList.first?.lastMessage?.messageId ?? "")") printLog("$$$$onSessionListChanged \(sessionList.first?.lastMessageText ?? "") \(sessionList.first?.lastMessageType.rawValue ?? 0) \(sessionList.first?.lastMessageTimeStamp ?? 0) \(sessionList.first?.lastMessage?.messageId ?? "")")
os_log("#####onSessionListChanged %@ %d", sessionList.first?.lastMessageText ?? "")
guard let message = sessionList.first else { guard let message = sessionList.first else {
return return
} }
...@@ -236,13 +237,11 @@ extension YHButlerServiceManager: QYConversationManagerDelegate { ...@@ -236,13 +237,11 @@ extension YHButlerServiceManager: QYConversationManagerDelegate {
/// 接收消息(进聊天页面会刷新, 目前不用这个方法打点记录) /// 接收消息(进聊天页面会刷新, 目前不用这个方法打点记录)
func onReceiveMessage(_ message: QYMessageInfo!) { func onReceiveMessage(_ message: QYMessageInfo!) {
printLog("$$$$onReceiveMessage \(message?.text ?? "") \(message?.type.rawValue ?? 0) \(message?.timeStamp ?? 0)") printLog("$$$$onReceiveMessage \(message?.text ?? "") \(message?.type.rawValue ?? 0) \(message?.timeStamp ?? 0)")
os_log("#####onReceiveMessage %@ %ld", (message?.text ?? ""))
} }
/// 会话未读数变化(进聊天页面会刷新) /// 会话未读数变化(进聊天页面会刷新)
func onUnreadCountChanged(_ count: Int) { func onUnreadCountChanged(_ count: Int) {
printLog("$$$$onUnreadCountChanged \(count)") printLog("$$$$onUnreadCountChanged \(count)")
os_log("#####onUnreadCountChanged %ld", count)
unreadCount = count unreadCount = count
NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil) NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
} }
......
...@@ -33,8 +33,14 @@ class YHOrderTipsView: UIView { ...@@ -33,8 +33,14 @@ class YHOrderTipsView: UIView {
fileprivate static let viewH2 : CGFloat = 162.0 fileprivate static let viewH2 : CGFloat = 162.0
fileprivate static let viewH3 : CGFloat = 226.0 fileprivate static let viewH3 : CGFloat = 226.0
private var orderTipsViewStyle: YHOrderTipsViewStyleType = .none private var orderTipsViewStyle: YHOrderTipsViewStyleType = .none {
private var didFirstLayoutItems = false didSet {
guard oldValue != orderTipsViewStyle else {
return
}
updateItemsStyle()
}
}
var tipViewH : CGFloat { var tipViewH : CGFloat {
return orderTipsViewStyle.getHeight() return orderTipsViewStyle.getHeight()
...@@ -66,15 +72,8 @@ class YHOrderTipsView: UIView { ...@@ -66,15 +72,8 @@ class YHOrderTipsView: UIView {
var customerServiceMessage: YHButlerServiceHomeInfoMessage? { var customerServiceMessage: YHButlerServiceHomeInfoMessage? {
didSet { didSet {
if let oldId = oldValue?.serviceMessage?.id, oldId.count > 0, oldId == customerServiceMessage?.serviceMessage?.id, oldValue?.showButler == customerServiceMessage?.showButler, oldValue?.serviceMessage?.isRead != customerServiceMessage?.serviceMessage?.isRead { updateItems()
if !didFirstLayoutItems { mgrItem.updateManagerTipsItemView(message: customerServiceMessage?.serviceMessage?.content ?? "一对一专属服务", didReadMessage: customerServiceMessage?.serviceMessage?.isRead ?? true)
updateItems()
}
mgrItem.updateMessageState(didReadMessage: customerServiceMessage?.serviceMessage?.isRead ?? true)
} else {
updateItems()
mgrItem.updateManagerTipsItemView(message: customerServiceMessage?.serviceMessage?.content ?? "一对一专属服务", didReadMessage: customerServiceMessage?.serviceMessage?.isRead ?? true)
}
} }
} }
...@@ -240,6 +239,9 @@ private extension YHOrderTipsView { ...@@ -240,6 +239,9 @@ private extension YHOrderTipsView {
orderTipsViewStyle = .none orderTipsViewStyle = .none
} }
}
private func updateItemsStyle() {
switch orderTipsViewStyle { switch orderTipsViewStyle {
case .none: case .none:
mgrItem.snp.remakeConstraints { make in mgrItem.snp.remakeConstraints { make in
...@@ -290,9 +292,6 @@ private extension YHOrderTipsView { ...@@ -290,9 +292,6 @@ private extension YHOrderTipsView {
make.height.equalTo(YHOrderTipsItemView.viewH) make.height.equalTo(YHOrderTipsItemView.viewH)
} }
} }
didFirstLayoutItems = true
// setNeedsLayout()
// layoutIfNeeded()
} }
@objc func tapButton(gestureRecognizer:UITapGestureRecognizer) { @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment