From 6ac80334f6cc3409e5b976d1360df6b10f1f469d Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Tue, 13 Aug 2019 11:32:27 +0800 Subject: [PATCH] update --- Example/Example/AppDelegate.swift | 21 +++++++ .../ProHUDBuy.imageset/Contents.json | 22 +++++++ .../ProHUDBuy.imageset/ProHUDBuy@2x.png | Bin 0 -> 3731 bytes .../ProHUDBuy.imageset/ProHUDBuy@3x.png | Bin 0 -> 5095 bytes .../ProHUDMessage.imageset/Contents.json | 22 +++++++ .../ProHUDMessage@2x.png | Bin 0 -> 2366 bytes .../ProHUDMessage@3x.png | Bin 0 -> 3248 bytes .../ProHUDTrash.imageset/Contents.json | 22 +++++++ .../ProHUDTrash.imageset/ProHUDTrash@2x.png | Bin 0 -> 2312 bytes .../ProHUDTrash.imageset/ProHUDTrash@3x.png | Bin 0 -> 3145 bytes Example/Example/TestAlertVC.swift | 37 +++++++++-- Example/Example/TestGuardVC.swift | 24 ++++--- Example/Example/TestToastVC.swift | 4 +- ProHUD/Alert/AlertConfig.swift | 57 +++-------------- ProHUD/Alert/AlertController.swift | 2 +- ProHUD/Alert/AlertModel.swift | 28 +-------- ProHUD/ProHUD.swift | 59 ++++++++++++++++++ ProHUD/Toast/ToastConfig.swift | 53 +--------------- ProHUD/Toast/ToastController.swift | 7 ++- ProHUD/Toast/ToastModel.swift | 27 +------- 20 files changed, 215 insertions(+), 170 deletions(-) create mode 100644 Example/Example/Assets.xcassets/ProHUDBuy.imageset/Contents.json create mode 100644 Example/Example/Assets.xcassets/ProHUDBuy.imageset/ProHUDBuy@2x.png create mode 100644 Example/Example/Assets.xcassets/ProHUDBuy.imageset/ProHUDBuy@3x.png create mode 100644 Example/Example/Assets.xcassets/ProHUDMessage.imageset/Contents.json create mode 100644 Example/Example/Assets.xcassets/ProHUDMessage.imageset/ProHUDMessage@2x.png create mode 100644 Example/Example/Assets.xcassets/ProHUDMessage.imageset/ProHUDMessage@3x.png create mode 100644 Example/Example/Assets.xcassets/ProHUDTrash.imageset/Contents.json create mode 100644 Example/Example/Assets.xcassets/ProHUDTrash.imageset/ProHUDTrash@2x.png create mode 100644 Example/Example/Assets.xcassets/ProHUDTrash.imageset/ProHUDTrash@3x.png diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift index 25ae9a1..e1991e1 100644 --- a/Example/Example/AppDelegate.swift +++ b/Example/Example/AppDelegate.swift @@ -73,3 +73,24 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } +extension ProHUD.Scene { + static var confirm: ProHUD.Scene { + var scene = ProHUD.Scene(identifier: "confirm") + scene.image = UIImage(named: "ProHUDMessage") + return scene + } + static var delete: ProHUD.Scene { + var scene = ProHUD.Scene(identifier: "delete") + scene.image = UIImage(named: "ProHUDTrash") + scene.title = "确认删除" + scene.message = "此操作不可撤销" + return scene + } + static var buy: ProHUD.Scene { + var scene = ProHUD.Scene(identifier: "buy") + scene.image = UIImage(named: "ProHUDBuy") + scene.title = "确认付款" + scene.message = "一旦购买拒不退款" + return scene + } +} diff --git a/Example/Example/Assets.xcassets/ProHUDBuy.imageset/Contents.json b/Example/Example/Assets.xcassets/ProHUDBuy.imageset/Contents.json new file mode 100644 index 0000000..50c90e6 --- /dev/null +++ b/Example/Example/Assets.xcassets/ProHUDBuy.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ProHUDBuy@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ProHUDBuy@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Example/Example/Assets.xcassets/ProHUDBuy.imageset/ProHUDBuy@2x.png b/Example/Example/Assets.xcassets/ProHUDBuy.imageset/ProHUDBuy@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2e97e5c2e4677e6e72d11f93f74d08878f93993b GIT binary patch literal 3731 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 literal 0 HcmV?d00001 diff --git a/Example/Example/Assets.xcassets/ProHUDMessage.imageset/ProHUDMessage@3x.png b/Example/Example/Assets.xcassets/ProHUDMessage.imageset/ProHUDMessage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a7322dd30124a609147ae6c2cb1cef84182ad568 GIT binary patch literal 3248 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 Yi;3W&SeEnH--iRRG`nH?#>6AxKb~7)jQ{`u literal 0 HcmV?d00001 diff --git a/Example/Example/Assets.xcassets/ProHUDTrash.imageset/ProHUDTrash@3x.png b/Example/Example/Assets.xcassets/ProHUDTrash.imageset/ProHUDTrash@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d3f1ccedd46e3b14766765c44516aa95d8a105a1 GIT binary patch literal 3145 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 literal 0 HcmV?d00001 diff --git a/Example/Example/TestAlertVC.swift b/Example/Example/TestAlertVC.swift index a5122ab..5fea8ff 100644 --- a/Example/Example/TestAlertVC.swift +++ b/Example/Example/TestAlertVC.swift @@ -18,7 +18,11 @@ class TestAlertVC: BaseListVC { } override var titles: [String] { - return ["场景：正在同步（超时）", "场景：同步成功（写法1）", "场景：同步成功（写法2）", "场景：同步失败和重试"] + return ["场景：正在同步（超时）", + "场景：同步成功（写法1）", + "场景：同步成功（写法2）", + "场景：同步失败和重试", + "极限场景：多个弹窗重叠"] } override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { @@ -28,12 +32,12 @@ class TestAlertVC: BaseListVC { func f() { Alert.push(scene: .loading, title: "正在同步", message: "请稍等片刻") { (a) in a.identifier = "loading" - a.animate(rotate: true) + a.rotate() a.didForceQuit { [weak self] in let t = Toast.push(scene: .loading, title: "正在同步", message: "请稍等片刻（点击展开为Alert）") { (vm) in vm.identifier = "loading" } - t.animate(rotate: true) + t.rotate() t.didTapped { [weak t] in t?.pop() f() @@ -47,7 +51,7 @@ class TestAlertVC: BaseListVC { } else if row == 1 { Alert.push() { (a) in a.identifier = "loading" - a.animate(rotate: true) + a.rotate() a.update { (vm) in vm.scene = .loading vm.title = "正在同步" @@ -67,7 +71,7 @@ class TestAlertVC: BaseListVC { let a = Alert.push() { (a) in a.identifier = "loading" } - a.animate(rotate: true) + a.rotate() a.update { (vm) in vm.scene = .loading vm.title = "正在同步" @@ -94,7 +98,7 @@ class TestAlertVC: BaseListVC { vm.message = "请稍等片刻" vm.remove(action: 0, 1) } - a.animate(rotate: true) + a.rotate() DispatchQueue.main.asyncAfter(deadline: .now()+2) { a.update { (vm) in vm.scene = .error @@ -109,6 +113,27 @@ class TestAlertVC: BaseListVC { }) } loading() + } else if row == 4 { + func f(_ i: Int) { + Alert.push() { (a) in + a.rotate() + a.update { (vm) in + vm.scene = .loading + vm.title = "正在同步" + String(i) + vm.message = "请稍等片刻" + } + } + } + f(1) + DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { + f(2) + } + DispatchQueue.main.asyncAfter(deadline: .now() + 1) { + f(3) + } + DispatchQueue.main.asyncAfter(deadline: .now() + 2) { + f(4) + } } } diff --git a/Example/Example/TestGuardVC.swift b/Example/Example/TestGuardVC.swift index d80a6fc..2156478 100644 --- a/Example/Example/TestGuardVC.swift +++ b/Example/Example/TestGuardVC.swift @@ -54,19 +54,27 @@ class TestGuardVC: BaseListVC { vm.add(subTitle: "价格") vm.add(message: "只需一次性付费$2999即可永久享用。") vm.add(action: .destructive, title: "购买") { [weak vc] in - Alert.push(scene: .confirm, title: "确认购买", message: "一旦购买拒不退款") { (vc) in + Alert.push(scene: .buy) { (vc) in vc.identifier = "confirm" vc.update { (vm) in vm.add(action: .destructive, title: "购买") { [weak vc] in vc?.update({ (vm) in - vm.scene = .success - vm.title = "购买成功" - vm.message = "感谢您的支持" - vm.remove(action: 1) - vm.update(action: 0, style: .default, title: "我知道了") { - vc?.pop() - } + vm.scene = .loading + vm.title = "正在付款" + vm.message = "请稍等片刻" + vm.remove(action: 0, 1) }) + vc?.rotate() + DispatchQueue.main.asyncAfter(deadline: .now()+1) { + vc?.update({ (vm) in + vm.scene = .success + vm.title = "购买成功" + vm.message = "感谢您的支持" + vm.add(action: .default, title: "我知道了") { + vc?.pop() + } + }) + } } vm.add(action: .cancel, title: "取消", handler: nil) } diff --git a/Example/Example/TestToastVC.swift b/Example/Example/TestToastVC.swift index d8abb9c..9b4cdb9 100644 --- a/Example/Example/TestToastVC.swift +++ b/Example/Example/TestToastVC.swift @@ -35,7 +35,7 @@ class TestToastVC: BaseListVC { if row == 0 { Toast.push(scene: .loading, title: "正在同步", message: "请稍等片刻") { (vm) in vm.identifier = "loading" - }.animate(rotate: true) + }.rotate() simulateSync() } else if row == 1 { let t = Toast.push(scene: .success, title: "同步成功", message: "点击查看详情") @@ -64,8 +64,8 @@ class TestToastVC: BaseListVC { } } else if row == 5 { Toast.push(scene: .default, title: "禁止手势移除", message: "这条消息无法通过向上滑动移出屏幕。5秒后自动消失，每次拖拽都会刷新倒计时。") { (vc) in + vc.isRemovable = false vc.update { (vm) in - vm.isRemovable = false vm.duration = 5 } } diff --git a/ProHUD/Alert/AlertConfig.swift b/ProHUD/Alert/AlertConfig.swift index 0e056a0..a10d9a9 100644 --- a/ProHUD/Alert/AlertConfig.swift +++ b/ProHUD/Alert/AlertConfig.swift @@ -28,11 +28,6 @@ public extension ProHUD.Configuration { // MARK: 图标样式 /// 图标尺寸 public var iconSize = CGSize(width: 48, height: 48) - /// 某个场景的默认图片 - /// - Parameter callback: 回调 - public func iconForScene(_ callback: @escaping (ProHUD.Alert.Scene) -> UIImage?) { - privIconForScene = callback - } // MARK: 文本样式 /// 标题字体 @@ -59,11 +54,6 @@ public extension ProHUD.Configuration { privReloadData = callback } - /// 默认持续时间（当viewmodel的duration为nil时，会从这里获取） - public func durationForScene(_ callback: @escaping (ProHUD.Alert.Scene) -> TimeInterval?) { - privDurationForScene = callback - } - /// 多少秒后显示强制退出的按钮（只有无按钮的弹窗才会出现） public var forceQuitTimer = TimeInterval(30) @@ -88,10 +78,6 @@ internal extension ProHUD.Configuration.Alert { return privReloadData } - var durationForScene: (ProHUD.Alert.Scene) -> TimeInterval? { - return privDurationForScene - } - } @@ -122,33 +108,10 @@ fileprivate var privLayoutContentView: (ProHUD.Alert) -> Void = { } }() -fileprivate var privIconForScene: (ProHUD.Alert.Scene) -> UIImage? = { - return { (scene) in - let imgStr: String - switch scene { - case .success: - imgStr = "ProHUDSuccess" - case .warning: - imgStr = "ProHUDWarning" - case .error: - imgStr = "ProHUDError" - case .loading: - imgStr = "ProHUDLoading" - case .confirm: - imgStr = "ProHUDMessage" - case .delete: - imgStr = "ProHUDTrash" - default: - imgStr = "ProHUDMessage" - } - return ProHUD.image(named: imgStr) - } -}() - fileprivate var privUpdateImage: (ProHUD.Alert) -> Void = { return { (vc) in let config = cfg.alert - let img = vc.vm.icon ?? privIconForScene(vc.vm.scene) + let img = vc.vm.icon ?? vc.vm.scene.image if let imgv = vc.imageView { imgv.image = img } else { @@ -172,6 +135,12 @@ fileprivate var privUpdateImage: (ProHUD.Alert) -> Void = { fileprivate var privUpdateTextStack: (ProHUD.Alert) -> Void = { return { (vc) in let config = cfg.alert + if vc.vm.title == nil { + vc.vm.title = vc.vm.scene.title + } + if vc.vm.message == nil { + vc.vm.message = vc.vm.scene.message + } if vc.vm.title?.count ?? 0 > 0 || vc.vm.message?.count ?? 0 > 0 { vc.contentStack.addArrangedSubview(vc.textStack) vc.textStack.snp.makeConstraints { (mk) in @@ -360,15 +329,3 @@ fileprivate var privReloadData: (ProHUD.Alert) -> Void = { } }() - - -fileprivate var privDurationForScene: (ProHUD.Alert.Scene) -> TimeInterval? = { - return { (scene) in - switch scene { - case .loading: - return nil - default: - return 2 - } - } -}() diff --git a/ProHUD/Alert/AlertController.swift b/ProHUD/Alert/AlertController.swift index 1eedafc..37f771b 100644 --- a/ProHUD/Alert/AlertController.swift +++ b/ProHUD/Alert/AlertController.swift @@ -178,7 +178,7 @@ public extension Alert { /// - Parameter title: 标题 /// - Parameter message: 正文 /// - Parameter actions: 更多操作 - @discardableResult class func push(scene: Alert.Scene = .default, title: String? = nil, message: String? = nil, _ actions: ((Alert) -> Void)? = nil) -> Alert { + @discardableResult class func push(scene: ProHUD.Scene = .default, title: String? = nil, message: String? = nil, _ actions: ((Alert) -> Void)? = nil) -> Alert { return Alert(scene: scene, title: title, message: message, actions: actions).push() } diff --git a/ProHUD/Alert/AlertModel.swift b/ProHUD/Alert/AlertModel.swift index ebdc493..172c52b 100644 --- a/ProHUD/Alert/AlertModel.swift +++ b/ProHUD/Alert/AlertModel.swift @@ -9,34 +9,10 @@ import UIKit public extension Alert { - enum Scene { - /// 默认场景 - case `default` - - /// 加载中场景 - case loading - - /// 确认场景 - case confirm - - /// 删除场景 - case delete - - /// 成功场景 - case success - - /// 警告场景 - case warning - - /// 错误场景 - case error - - } - class ViewModel { /// 使用场景 - public var scene = Scene.default + public var scene = ProHUD.Scene.default /// 标题 public var title: String? { @@ -81,7 +57,7 @@ public extension Alert { internal func updateDuration() { durationBlock?.cancel() - if let t = duration ?? cfg.alert.durationForScene(scene), t > 0 { + if let t = duration ?? scene.alertDuration, t > 0 { durationBlock = DispatchWorkItem(block: { [weak self] in self?.vc?.pop() }) diff --git a/ProHUD/ProHUD.swift b/ProHUD/ProHUD.swift index 0a0b605..af4c7d3 100644 --- a/ProHUD/ProHUD.swift +++ b/ProHUD/ProHUD.swift @@ -16,8 +16,67 @@ public class ProHUD { return cfg } + public struct Scene { + private var id = "unknown" + public var identifier: String { + return id + } + public var image: UIImage? + public var alertDuration: TimeInterval? + public var toastDuration: TimeInterval? = 3 + public var title: String? + public var message: String? + init() { + + } + } + } +// 默认场景 +public extension ProHUD.Scene { + init(identifier: String) { + self.init() + id = identifier + } + + static var `default`: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "default") + scene.image = ProHUD.image(named: "ProHUDMessage") + return scene + } + static var loading: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "loading") + scene.alertDuration = 0 + scene.toastDuration = 0 + scene.image = ProHUD.image(named: "ProHUDLoading") + return scene + } + static var success: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "success") + scene.alertDuration = 2 + scene.image = ProHUD.image(named: "ProHUDSuccess") + return scene + } + static var warning: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "warning") + scene.alertDuration = 2 + scene.toastDuration = 5 + scene.image = ProHUD.image(named: "ProHUDWarning") + return scene + } + static var error: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "error") + scene.alertDuration = 2 + scene.toastDuration = 5 + scene.image = ProHUD.image(named: "ProHUDError") + return scene + } + + +} + + // MARK: - Utilities internal extension ProHUD { diff --git a/ProHUD/Toast/ToastConfig.swift b/ProHUD/Toast/ToastConfig.swift index cc858da..da3eda0 100644 --- a/ProHUD/Toast/ToastConfig.swift +++ b/ProHUD/Toast/ToastConfig.swift @@ -23,11 +23,6 @@ public extension ProHUD.Configuration { // MARK: 图标样式 /// 图标尺寸 public var iconSize = CGSize(width: 48, height: 48) - /// 某个场景的默认图片 - /// - Parameter callback: 回调 - public func iconForScene(_ callback: @escaping (ProHUD.Toast.Scene) -> UIImage?) { - privIconForScene = callback - } // MARK: 文本样式 /// 标题字体 @@ -46,10 +41,6 @@ public extension ProHUD.Configuration { privReloadData = callback } - /// 默认持续时间（当viewmodel的duration为nil时，会从这里获取） - public mutating func durationForScene(_ callback: @escaping (ProHUD.Toast.Scene) -> TimeInterval?) { - privDurationForScene = callback - } } } @@ -62,9 +53,6 @@ internal extension ProHUD.Configuration.Toast { return privReloadData } - var durationForScene: (ProHUD.Toast.Scene) -> TimeInterval? { - return privDurationForScene - } } @@ -84,12 +72,12 @@ fileprivate var privReloadData: (ProHUD.Toast) -> Void = { vc.view.addSubview(vc.imageView) } // 设置数据 - vc.imageView.image = vc.vm.icon ?? privIconForScene(vc.vm.scene) + vc.imageView.image = vc.vm.icon ?? vc.vm.scene.image vc.imageView.layer.removeAllAnimations() vc.titleLabel.textColor = cfg.primaryLabelColor - vc.titleLabel.text = vc.vm.title + vc.titleLabel.text = vc.vm.title ?? vc.vm.scene.title vc.bodyLabel.textColor = cfg.secondaryLabelColor - vc.bodyLabel.text = vc.vm.message + vc.bodyLabel.text = vc.vm.message ?? vc.vm.scene.message // 更新布局 vc.imageView.snp.makeConstraints { (mk) in @@ -118,38 +106,3 @@ fileprivate var privReloadData: (ProHUD.Toast) -> Void = { } }() - - - -fileprivate var privIconForScene: (ProHUD.Toast.Scene) -> UIImage? = { - return { (scene) in - let imgStr: String - switch scene { - case .success: - imgStr = "ProHUDSuccess" - case .warning: - imgStr = "ProHUDWarning" - case .error: - imgStr = "ProHUDError" - case .loading: - imgStr = "ProHUDLoading" - default: - imgStr = "ProHUDMessage" - } - return ProHUD.image(named: imgStr) - } -}() - - -fileprivate var privDurationForScene: (ProHUD.Toast.Scene) -> TimeInterval? = { - return { (scene) in - switch scene { - case .loading: - return nil - case .error, .warning: - return 5 - default: - return 3 - } - } -}() diff --git a/ProHUD/Toast/ToastController.swift b/ProHUD/Toast/ToastController.swift index c283383..84d3f9c 100644 --- a/ProHUD/Toast/ToastController.swift +++ b/ProHUD/Toast/ToastController.swift @@ -53,6 +53,9 @@ public extension ProHUD { return vev }() + /// 是否可以通过手势移除（向上滑出屏幕） + public var isRemovable = true + /// 视图模型 public var vm = ViewModel() @@ -215,7 +218,7 @@ public extension Toast { /// - Parameter title: 标题 /// - Parameter message: 内容 /// - Parameter actions: 更多操作 - @discardableResult class func push(scene: Toast.Scene = .default, title: String? = nil, message: String? = nil, duration: TimeInterval? = nil, _ actions: ((Toast) -> Void)? = nil) -> Toast { + @discardableResult class func push(scene: ProHUD.Scene = .default, title: String? = nil, message: String? = nil, duration: TimeInterval? = nil, _ actions: ((Toast) -> Void)? = nil) -> Toast { return Toast(scene: scene, title: title, message: message, duration: duration, actions: actions).push() } @@ -297,7 +300,7 @@ fileprivate extension Toast { window?.transform = .init(translationX: 0, y: point.y) if sender.state == .recognized { let v = sender.velocity(in: sender.view) - if vm.isRemovable == true && (((window?.frame.origin.y ?? 0) < 0 && v.y < 0) || v.y < -1200) { + if isRemovable == true && (((window?.frame.origin.y ?? 0) < 0 && v.y < 0) || v.y < -1200) { // 移除 self.pop() } else { diff --git a/ProHUD/Toast/ToastModel.swift b/ProHUD/Toast/ToastModel.swift index e46bb33..85c9f59 100644 --- a/ProHUD/Toast/ToastModel.swift +++ b/ProHUD/Toast/ToastModel.swift @@ -9,28 +9,10 @@ import UIKit public extension Toast { - enum Scene { - /// 默认场景 - case `default` - - /// 加载中场景 - case loading - - /// 成功场景 - case success - - /// 警告场景 - case warning - - /// 错误场景 - case error - - } - class ViewModel { /// 使用场景 - public var scene = Scene.default + public var scene = ProHUD.Scene.default /// 标题 public var title: String? { @@ -62,10 +44,6 @@ public extension Toast { public weak var vc: Toast? - /// 是否可以通过手势移除（向上滑出屏幕） - public var isRemovable = true - - // MARK: 私有 /// 持续时间 @@ -76,7 +54,7 @@ public extension Toast { internal func updateDuration() { durationBlock?.cancel() - if let t = duration ?? cfg.toast.durationForScene(scene), t > 0 { + if let t = duration ?? scene.toastDuration, t > 0 { durationBlock = DispatchWorkItem(block: { [weak self] in self?.vc?.pop() }) @@ -87,5 +65,4 @@ public extension Toast { } } - }