From 539ad0462367e5670a6157be45ca4c4dd5563fda Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Tue, 23 Jun 2020 20:16:05 +0800 Subject: [PATCH] =?UTF-8?q?id=20=E5=8C=85=E5=90=AB=20.rotate=20=E7=9A=84?= =?UTF-8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E6=97=8B=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/Alert/AlertConfig.swift | 5 ++++ Source/Guard/GuardController.swift | 6 ++-- Source/HUDUtils.swift | 10 +++++++ Source/ProHUD.swift | 45 ++++++++++++++++++++---------- 4 files changed, 48 insertions(+), 18 deletions(-) diff --git a/Source/Alert/AlertConfig.swift b/Source/Alert/AlertConfig.swift index 9d04aff..f7f254f 100644 --- a/Source/Alert/AlertConfig.swift +++ b/Source/Alert/AlertConfig.swift @@ -313,6 +313,11 @@ fileprivate var privReloadData: (ProHUD.Alert) -> Void = { // 设置持续时间 vc.vm.updateDuration() + // id 包含 .rotate 的会自动旋转 + if vc.vm.scene.identifier.contains(".rotate") { + vc.startRotate() + } + // 「隐藏」按钮出现的时间 vc.vm.hideTimerBlock?.cancel() if vc.buttonEvents.count == 0 { diff --git a/Source/Guard/GuardController.swift b/Source/Guard/GuardController.swift index d050a7e..c9de5f3 100644 --- a/Source/Guard/GuardController.swift +++ b/Source/Guard/GuardController.swift @@ -185,14 +185,14 @@ public extension Guard { /// - identifier: 唯一标识 /// - toast: 实例对象 /// - Returns: 回调 - @discardableResult class func push(_ identifier: String, to viewController: UIViewController? = nil, _ instance: @escaping (Guard) -> Void) -> Guard { + @discardableResult class func push(_ identifier: String, to viewController: UIViewController? = nil, _ instance: ( (Guard) -> Void)? = nil) -> Guard { if let g = find(identifier).last { - instance(g) + instance?(g) return g } else { return Guard() { (gg) in gg.identifier = identifier - instance(gg) + instance?(gg) }.push(to: viewController) } } diff --git a/Source/HUDUtils.swift b/Source/HUDUtils.swift index 4754b81..005edbf 100644 --- a/Source/HUDUtils.swift +++ b/Source/HUDUtils.swift @@ -18,3 +18,13 @@ extension ProHUD { return Inspire.shared.screen.safeAreaInsets } } + + +func == (left: ProHUD.Scene, right: ProHUD.Scene) -> Bool { + return left.identifier == right.identifier +} + + +func != (left: ProHUD.Scene, right: ProHUD.Scene) -> Bool { + return left.identifier != right.identifier +} diff --git a/Source/ProHUD.swift b/Source/ProHUD.swift index ce983c8..5c3b35d 100644 --- a/Source/ProHUD.swift +++ b/Source/ProHUD.swift @@ -40,61 +40,76 @@ public extension ProHUD.Scene { id = identifier } static var `default`: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "default") + var scene = ProHUD.Scene.init(identifier: "prohud.default") scene.image = ProHUD.image(named: "prohud.note") return scene } static var message: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "message") + var scene = ProHUD.Scene.init(identifier: "prohud.message") scene.image = ProHUD.image(named: "prohud.message") return scene } static var loading: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "loading") + var scene = ProHUD.Scene.init(identifier: "prohud.loading.rotate") + scene.image = ProHUD.image(named: "prohud.rainbow.circle") + scene.title = "Loading" scene.alertDuration = 0 scene.toastDuration = 0 - scene.image = ProHUD.image(named: "prohud.rainbow.circle") return scene } static var success: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "success") - scene.alertDuration = 2 + var scene = ProHUD.Scene.init(identifier: "prohud.success") scene.image = ProHUD.image(named: "prohud.checkmark") + scene.title = "Success" + scene.alertDuration = 2 return scene } static var warning: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "warning") + var scene = ProHUD.Scene.init(identifier: "prohud.warning") + scene.image = ProHUD.image(named: "prohud.exclamationmark") + scene.title = "Warning" + scene.message = "Something happened." scene.alertDuration = 2 scene.toastDuration = 5 - scene.image = ProHUD.image(named: "prohud.exclamationmark") return scene } static var error: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "error") + var scene = ProHUD.Scene.init(identifier: "prohud.error") + scene.image = ProHUD.image(named: "prohud.xmark") + scene.title = "Error" + scene.message = "Please try again later." scene.alertDuration = 2 scene.toastDuration = 5 + return scene + } + static var failure: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "prohud.failure") scene.image = ProHUD.image(named: "prohud.xmark") + scene.title = "Failure" + scene.message = "Please try again later." + scene.alertDuration = 2 + scene.toastDuration = 5 return scene } static var confirm: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "confirm") + var scene = ProHUD.Scene.init(identifier: "prohud.confirm") + scene.image = ProHUD.image(named: "prohud.questionmark") scene.alertDuration = 2 scene.toastDuration = 5 - scene.image = ProHUD.image(named: "prohud.questionmark") return scene } static var privacy: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "privacy") + var scene = ProHUD.Scene.init(identifier: "prohud.privacy") + scene.image = ProHUD.image(named: "prohud.privacy") scene.alertDuration = 2 scene.toastDuration = 5 - scene.image = ProHUD.image(named: "prohud.privacy") return scene } static var delete: ProHUD.Scene { - var scene = ProHUD.Scene.init(identifier: "delete") + var scene = ProHUD.Scene.init(identifier: "prohud.delete") + scene.image = ProHUD.image(named: "prohud.trash") scene.alertDuration = 2 scene.toastDuration = 5 - scene.image = ProHUD.image(named: "prohud.trash") return scene }