From f0e6cb2fda4c751cb10e07bf0eef8438dbdd5b13 Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Tue, 23 Jun 2020 10:35:15 +0800 Subject: [PATCH] update --- Example-Old/Example/TestToastVC.swift | 53 +++++++++++++++------------ Source/HUDUtils.swift | 2 +- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Example-Old/Example/TestToastVC.swift b/Example-Old/Example/TestToastVC.swift index 87d646f..5a05644 100644 --- a/Example-Old/Example/TestToastVC.swift +++ b/Example-Old/Example/TestToastVC.swift @@ -44,37 +44,42 @@ class TestToastVC: BaseListVC { }.startRotate() simulateSync() } else if row == 1 { - Toast.push("progress") { (t) in - t.update { (vm) in - vm.scene = .loading - vm.title = "正在同步" - vm.message = "请稍等片刻" - } - t.startRotate() - t.update(progress: 0) - let s = DispatchSemaphore(value: 1) - DispatchQueue.global().async { - for i in 0 ... 5 { - s.wait() - DispatchQueue.main.async { - Toast.find("progress", last: { (t) in - t.update(progress: CGFloat(i)/5) - print("\(CGFloat(i)/5)") - if i == 5 { - t.update { (vm) in - vm.scene = .success - vm.title = "同步成功" - vm.message = "xxx" + if let _ = Toast.find("progress").last { + + } else { + Toast.push("progress") { (t) in + t.update { (vm) in + vm.scene = .loading + vm.title = "正在同步" + vm.message = "请稍等片刻" + } + t.startRotate() + t.update(progress: 0) + let s = DispatchSemaphore(value: 1) + DispatchQueue.global().async { + for i in 0 ... 5 { + s.wait() + DispatchQueue.main.async { + Toast.find("progress", last: { (t) in + t.update(progress: CGFloat(i)/5) + print("\(CGFloat(i)/5)") + if i == 5 { + t.update { (vm) in + vm.scene = .success + vm.title = "同步成功" + vm.message = "xxx" + } } + }) + DispatchQueue.main.asyncAfter(deadline: .now()+1) { + s.signal() } - }) - DispatchQueue.main.asyncAfter(deadline: .now()+1) { - s.signal() } } } } } + } else if row == 2 { let t = Toast.push(scene: .success, title: "同步成功", message: "点击查看详情") t.didTapped { [weak self, weak t] in diff --git a/Source/HUDUtils.swift b/Source/HUDUtils.swift index eef8a2f..4754b81 100644 --- a/Source/HUDUtils.swift +++ b/Source/HUDUtils.swift @@ -15,6 +15,6 @@ extension String { extension ProHUD { static var safeAreaInsets: UIEdgeInsets { - return Inspire.shared.screen.updatedSafeAreaInsets + return Inspire.shared.screen.safeAreaInsets } }