diff --git a/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift b/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift index 409e772..78e043d 100644 --- a/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift +++ b/yinmeng-ios/Modules/Chat/Tool/YinCustomAttachmentCoding.swift @@ -12,7 +12,7 @@ class YinCustomAttachmentCoding: NSObject,NIMCustomAttachmentCoding { func decodeAttachment(_ content: String?) -> NIMCustomAttachment? { if let text = content as? NSString{ - if var data = text.mj_JSONObject() as? [String : Any],let first = data["first"] as? Int,let second = data["second"] as? Int,let dic = data["data"]{ + if let data = text.mj_JSONObject() as? [String : Any],let first = data["first"] as? Int,let second = data["second"] as? Int,let dic = data["data"]{ if let _dic = dic as? [String : Any]{ let model = ChatCustomMsgModel() diff --git a/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift b/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift index a2d71af..f61c9e0 100644 --- a/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift +++ b/yinmeng-ios/Modules/Room/VM/RoomVCViewModel.swift @@ -10,6 +10,7 @@ import RxSwift import RxCocoa import NIMSDK import MBProgressHUD + class RoomVCViewModel: NSObject { static let roomVM = RoomVCViewModel.init() var isMute = true diff --git a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift index cb489de..73f1f35 100644 --- a/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift +++ b/yinmeng-ios/Modules/Room/View/SendGift/View/SendGiftUserView.swift @@ -85,7 +85,7 @@ class SendGiftUserView: UIView { lazy var allUserBtn:UIButton = { let normalImage = UIImage.image(color: ThemeColor(hexStr: "#878B9C")) let selectedImage = UIImage.image(color: ThemeColor(hexStr: "#FFE710")) - let _allUserBtn = UIButton.getCustomBtn(text: "全选",font: UIFont.getScaleFont(ofSize: 13, weight: .medium),color: .white,selectedColor: ThemeColor(hexStr: "#28282"),bgImage: normalImage,selectedBgImage: selectedImage) + let _allUserBtn = UIButton.getCustomBtn(text: "全选",font: UIFont.getScaleFont(ofSize: 13, weight: .medium),color: .white,selectedColor: ThemeColor(hexStr: "#282828"),bgImage: normalImage,selectedBgImage: selectedImage) _allUserBtn.layer.cornerRadius = UIDevice.scaleWidth(width: 18)/2 _allUserBtn.layer.masksToBounds = true _allUserBtn.addTarget(self, action: #selector(clickAllChooseAction), for: .touchUpInside)