From 84b9931a8aa979d82c53376d9ff84f9e432dcc7c Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Wed, 24 Jun 2020 13:27:50 +0800 Subject: [PATCH] example --- Example-Old/Example/AppDelegate.swift | 28 ++ .../Feel1.imageset/Contents.json | 22 ++ .../Feel1.imageset/Feel1@2x.png | Bin 0 -> 4029 bytes .../Feel1.imageset/Feel1@3x.png | Bin 0 -> 5805 bytes Example-Old/Example/BaseListVC.swift | 2 +- Example-Old/Example/TestAlertVC.swift | 256 +++++++++++------- Example-Old/Example/TestGuardVC.swift | 51 +++- Example-Old/Example/TestToastVC.swift | 209 +++++++------- Example-Old/Example/ViewController.swift | 27 +- Source/ProHUD.swift | 2 + 10 files changed, 383 insertions(+), 214 deletions(-) create mode 100644 Example-Old/Example/Assets.xcassets/Feel1.imageset/Contents.json create mode 100644 Example-Old/Example/Assets.xcassets/Feel1.imageset/Feel1@2x.png create mode 100644 Example-Old/Example/Assets.xcassets/Feel1.imageset/Feel1@3x.png diff --git a/Example-Old/Example/AppDelegate.swift b/Example-Old/Example/AppDelegate.swift index 596d8f6..ad31f30 100644 --- a/Example-Old/Example/AppDelegate.swift +++ b/Example-Old/Example/AppDelegate.swift @@ -92,4 +92,32 @@ extension ProHUD.Scene { scene.message = "一旦购买拒不退款" return scene } + + /// 重写的loading场景 + static var loading: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "prohud.loading.rotate") + scene.image = UIImage(named: "prohud.rainbow.circle") + scene.title = "坐和放宽" + scene.message = "正在处理一些事情" + scene.alertDuration = 0 + scene.toastDuration = 0 + return scene + } + + static var sync: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "sync.rotate") + scene.image = UIImage(named: "prohud.rainbow.circle") + scene.title = "正在同步" + scene.alertDuration = 0 + scene.toastDuration = 0 + return scene + } + static var sync2: ProHUD.Scene { + var scene = ProHUD.Scene.init(identifier: "sync.rotate") + scene.image = UIImage(named: "prohud.rainbow.circle") + scene.alertDuration = 0 + scene.toastDuration = 0 + return scene + } + } diff --git a/Example-Old/Example/Assets.xcassets/Feel1.imageset/Contents.json b/Example-Old/Example/Assets.xcassets/Feel1.imageset/Contents.json new file mode 100644 index 0000000..b76d069 --- /dev/null +++ b/Example-Old/Example/Assets.xcassets/Feel1.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Feel1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Feel1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example-Old/Example/Assets.xcassets/Feel1.imageset/Feel1@2x.png b/Example-Old/Example/Assets.xcassets/Feel1.imageset/Feel1@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1861f6214c2107c23cae44716328f908ac401716 GIT binary patch literal 4029 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 literal 0 HcmV?d00001 diff --git a/Example-Old/Example/Assets.xcassets/Feel1.imageset/Feel1@3x.png b/Example-Old/Example/Assets.xcassets/Feel1.imageset/Feel1@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..85e05f47a0f53c5bb835bda283e734302d245def GIT binary patch literal 5805 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 literal 0 HcmV?d00001 diff --git a/Example-Old/Example/BaseListVC.swift b/Example-Old/Example/BaseListVC.swift index d37958b..eeb1337 100644 --- a/Example-Old/Example/BaseListVC.swift +++ b/Example-Old/Example/BaseListVC.swift @@ -80,7 +80,7 @@ extension BaseListVC: UITableViewDataSource, UITableViewDelegate { cell.textLabel?.numberOfLines = 0 cell.detailTextLabel?.textColor = .gray cell.detailTextLabel?.numberOfLines = 0 - + cell.accessoryType = .disclosureIndicator } cell.textLabel?.text = vm.sections[indexPath.section].rows[indexPath.row].title cell.detailTextLabel?.text = vm.sections[indexPath.section].rows[indexPath.row].subtitle diff --git a/Example-Old/Example/TestAlertVC.swift b/Example-Old/Example/TestAlertVC.swift index ebd407b..e9de230 100644 --- a/Example-Old/Example/TestAlertVC.swift +++ b/Example-Old/Example/TestAlertVC.swift @@ -12,13 +12,28 @@ import ProHUD // 模拟2秒后同步成功 func loadingSuccessAfter2Seconds() { DispatchQueue.main.asyncAfter(deadline: .now()+2) { - Alert.find("loading", last: { (a) in + Alert.find("loading") { (a) in a.update { (vm) in vm.scene = .success vm.title = "同步成功" vm.message = nil } - }) + } + } +} + +func updateProgress(callback: @escaping (CGFloat) -> Void) { + let s = DispatchSemaphore(value: 1) + DispatchQueue.global().async { + for i in 0 ... 100 { + s.wait() + DispatchQueue.main.async { + callback(CGFloat(i)/100) + DispatchQueue.main.asyncAfter(deadline: .now()+0.03) { + s.signal() + } + } + } } } @@ -46,69 +61,43 @@ class TestAlertVC: BaseListVC { sec.footer = "这些是自带的场景，可以重写已有场景，或者扩展新的场景。" } - vm.addSection(title: "常用场景示例") { (sec) in - // MARK: 场景：同步成功（写法1） - sec.addRow(title: "场景：同步成功（写法1）") { - Alert.push("loading") { (a) in - a.update { (vm) in - vm.scene = .loading - vm.title = "正在同步" - vm.message = "请稍等片刻" - } - a.startRotate() - } + vm.addSection(title: "常用示例") { (sec) in + // MARK: 同步成功（写法1） + sec.addRow(title: "正在同步（写法1）", subtitle: "创建的时候就布局好了。") { + Alert.push("loading", scene: .sync) loadingSuccessAfter2Seconds() } - // MARK: 场景：同步成功（写法2） - sec.addRow(title: "场景：同步成功（写法2）") { - let a = Alert.push("loading") { (a) in - a.startRotate() - } - a.update { (vm) in - vm.scene = .loading - vm.title = "正在同步" - vm.message = "请稍等片刻" - } + // MARK: 同步成功（写法2） + sec.addRow(title: "正在同步（写法2）", subtitle: "创建的时候没有布局完，发出去之后再更新布局。") { + Alert.push("loading", scene: .sync2) loadingSuccessAfter2Seconds() - } - // MARK: 场景：正在同步（更新进度） - sec.addRow(title: "场景：正在同步（更新进度）") { - Alert.push("progress") { (a) in - a.update { (vm) in - vm.scene = .loading + // 先发出去再更新（添加文字） + Alert.find("loading") { (vc) in + vc.update { (vm) in vm.title = "正在同步" - vm.message = "请稍等片刻" } - a.startRotate() + } + } + // MARK: 正在同步（更新进度） + sec.addRow(title: "正在同步（有进度显示）") { + Alert.push("progress", scene: .sync) { (a) in a.update(progress: 0) - let s = DispatchSemaphore(value: 1) - DispatchQueue.global().async { - for i in 0 ... 100 { - s.wait() - DispatchQueue.main.async { - Alert.find("progress", last: { (a) in - a.update(progress: CGFloat(i)/100) - print("\(CGFloat(i)/100)") - if i == 100 { - DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { - a.update { (vm) in - vm.scene = .success - vm.title = "同步成功" - vm.message = nil - } - } - } - }) - DispatchQueue.main.asyncAfter(deadline: .now()+0.03) { - s.signal() + updateProgress { (pct) in + a.update(progress: pct) + if pct >= 1 { + DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { + a.update { (vm) in + vm.scene = .success + vm.title = "同步成功" + vm.message = nil } } } } } } - // MARK: 场景：同步失败和重试 - sec.addRow(title: "场景：同步失败和重试（布局变化）") { + // MARK: 同步失败和重试 + sec.addRow(title: "同步失败和重试（布局变化）", subtitle: "添加、删除按钮使得窗口大小发生了变化。") { Alert.push("loading", scene: .loading) func loading() { Alert.find("loading") { (a) in @@ -134,29 +123,45 @@ class TestAlertVC: BaseListVC { } loading() } - sec.footer = "两种写法1和写法2动画效果略微不同" + // MARK: 自定义要旋转的图片 + sec.addRow(title: "自定义要旋转的图片", subtitle: "添加了自定义视图，在更新的时候记得要视情况移除。") { + Alert.push(scene: .privacy, title: "正在授权") { (vc) in + vc.identifier = "loading" + let imgv = UIImageView(image: UIImage(named: "prohud.rainbow.circle")) + vc.imageView.addSubview(imgv) + imgv.tag = 1 + imgv.snp.makeConstraints { (mk) in + mk.center.equalToSuperview() + mk.width.height.equalTo(18) + } + vc.startRotate(imgv.layer, speed: 4) + vc.vm.duration = 0 + } + DispatchQueue.main.asyncAfter(deadline: .now() + 4) { + Alert.find("loading") { (vc) in + vc.imageView.viewWithTag(1)?.removeFromSuperview() + vc.update { (vm) in + vm.scene = .success + vm.title = "授权成功" + vm.duration = 1 + } + } + } + } + + sec.footer = "写法1和写法2动画效果略微不同" } vm.addSection(title: "为了解决代码逻辑疏漏导致程序卡死、弹窗重叠等问题") { (sec) in // MARK: 极端场景：正在同步（超时未处理） sec.addRow(title: "极端场景：正在同步（超时未处理）", subtitle: "超时未处理的意外情况，弹窗可以手动关闭。（在config中配置所需时间）") { - func f() { - Alert.push(scene: .loading, title: "正在同步", message: "请稍等片刻") { (a) in - a.identifier = "loading" - a.startRotate() - a.didForceQuit { - let t = Toast.push(scene: .loading, title: "正在同步", message: "请稍等片刻（点击展开为Alert）") { (vm) in - vm.identifier = "loading" - } - t.startRotate() - t.didTapped { [weak t] in - t?.pop() - f() - } - } + Alert.push(scene: .loading, title: "坐和放宽", message: "我们正在帮你搞定一切") { (a) in + a.identifier = "loading" + a.startRotate() + a.didForceQuit { + Toast.push(scene: .default, title: "点击了强制关闭", message: "您可以处理超时事件") } } - f() } @@ -188,29 +193,91 @@ class TestAlertVC: BaseListVC { DispatchQueue.main.asyncAfter(deadline: .now()+4) { loading(6) } - } - // MARK: 极端场景：多个不同的弹窗重叠 - sec.addRow(title: "极端场景：多个不同的弹窗重叠", subtitle: "多个弹窗不得不重叠的时候，ProHUD的景深处理可以使其看起来舒服一些。") { - func f(_ i: Int) { - Alert.push() { (a) in - a.startRotate() + DispatchQueue.main.asyncAfter(deadline: .now()+4.5) { + Alert.push("loading", scene: .success) { (a) in a.update { (vm) in - vm.scene = .loading - vm.title = "正在同步" + String(i) - vm.message = "请稍等片刻" + vm.scene = .success + vm.title = "测试结束" } } } - f(1) - DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { - f(2) + } + // MARK: 极端场景：多个不同的弹窗重叠 + sec.addRow(title: "极端场景：多个不同的弹窗重叠", subtitle: "多个弹窗不得不重叠的时候，ProHUD的景深处理可以使其看起来舒服一些。") { + func a() { + Alert.push("a", scene: .default) { (a) in + a.update { (vm) in + vm.title = "Windows 10" + vm.message = "Windows 10不是為所有人設計,而是為每個人設計" + vm.icon = UIImage(named: "prohud.windmill") + vm.duration = 0 + } + DispatchQueue.main.asyncAfter(deadline: .now()+1) { + b() + } + } } - DispatchQueue.main.asyncAfter(deadline: .now() + 1) { - f(3) + func b() { + Alert.push("b", scene: .warning) { (a) in + a.update { (vm) in + vm.title = "Windows 10" + vm.message = "不要说我们没有警告过你" + vm.duration = 0 + } + } + DispatchQueue.main.asyncAfter(deadline: .now()+1) { + c() + } } - DispatchQueue.main.asyncAfter(deadline: .now() + 2) { - f(4) + func c() { + Alert.push("c", scene: .message) { (a) in + a.update { (vm) in + vm.title = "Windows 10" + vm.message = "我们都有不顺利的时候" + vm.duration = 0 + } + } + DispatchQueue.main.asyncAfter(deadline: .now()+1) { + d() + } } + func d() { + Alert.push("d", scene: .loading) { (a) in + a.update { (vm) in + vm.title = "Windows 10" + vm.message = "正在处理一些事情" + vm.duration = 0 + } + } + DispatchQueue.main.asyncAfter(deadline: .now()+3) { + e() + } + } + func e() { + Alert.push("e", scene: .failure) { (a) in + a.update { (vm) in + vm.title = "更新失败" + vm.message = "*回到以前的版本" + vm.add(action: .default, title: "好的") { + Alert.pop("e") + DispatchQueue.main.asyncAfter(deadline: .now()+0.3) { + Alert.pop("d") + } + DispatchQueue.main.asyncAfter(deadline: .now()+0.6) { + Alert.pop("c") + } + DispatchQueue.main.asyncAfter(deadline: .now()+0.9) { + Alert.pop("b") + } + DispatchQueue.main.asyncAfter(deadline: .now()+1.2) { + Alert.pop("a") + } + } + } + } + } + a() + } @@ -236,37 +303,26 @@ class TestAlertVC: BaseListVC { a.update { (vm) in vm.scene = .warning vm.title = "正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过" - vm.message = "正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过" + vm.message = "正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来 的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过" vm.add(action: .default, title: "我知道了", handler: nil) } } } // MARK: 只有标题 sec.addRow(title: "只有标题") { - Alert.push(scene: .default, title: "标题") + Alert.push(scene: .message, title: "这是标题") } // MARK: 只有消息 sec.addRow(title: "只有消息") { - Alert.push(scene: .default, message: "这是消息") + Alert.push(scene: .message, message: "这是消息") } // MARK: 只有消息 sec.addRow(title: "既没有标题也没有消息") { - Alert.push("a") + Alert.push() } } } - func simulateSync() { - DispatchQueue.main.asyncAfter(deadline: .now() + 15) { - Alert.find("loading", last: { (a) in - a.update { (vm) in - vm.scene = .success - vm.title = "同步成功" - vm.message = "啊哈哈哈哈哈哈哈哈" - } - }) - } - } } diff --git a/Example-Old/Example/TestGuardVC.swift b/Example-Old/Example/TestGuardVC.swift index 3045518..bd32608 100644 --- a/Example-Old/Example/TestGuardVC.swift +++ b/Example-Old/Example/TestGuardVC.swift @@ -15,7 +15,7 @@ class TestGuardVC: BaseListVC { override func viewDidLoad() { super.viewDidLoad() - vm.addSection(title: "") { (sec) in + vm.addSection(title: "简单使用") { (sec) in // MARK: 场景：删除菜单 sec.addRow(title: "场景：删除菜单") { Guard.push("del") { (vc) in @@ -81,8 +81,49 @@ class TestGuardVC: BaseListVC { } } + } + + vm.addSection(title: "添加自定义视图") { (sec) in + // MARK: 场景：选项切换 + sec.addRow(title: "场景：选项切换", subtitle: "很方便地添加自定义控件") { + Guard.push() { (vc) in + + if #available(iOS 13.0, *) { + let imgv = UIImageView(image: UIImage(systemName: "photo.fill.on.rectangle.fill")) + vc.textStack.addArrangedSubview(imgv) + imgv.contentMode = .scaleAspectFit + imgv.snp.makeConstraints { (mk) in + mk.height.equalTo(80) + } + } else { + // Fallback on earlier versions + } + + vc.vm.add(title: "背景蒙版") + vc.vm.add(subTitle: "选择一种模糊效果") + let seg = UISegmentedControl(items: ["extraLight", "light", "dark", "none"]) + seg.selectedSegmentIndex = 1 + vc.textStack.addArrangedSubview(seg) + seg.snp.makeConstraints { (mk) in + mk.height.equalTo(40) + } + vc.vm.add(subTitle: "设置蒙版透明度") + let slider = UISlider() + slider.minimumValue = 0 + slider.maximumValue = 100 + slider.value = 100 + vc.textStack.addArrangedSubview(slider) + slider.snp.makeConstraints { (mk) in + mk.height.equalTo(40) + } + vc.vm.add(action: .default, title: "OK") { [weak vc] in + vc?.pop() + } + } + } + // MARK: 场景：隐私协议页面 - sec.addRow(title: "场景：隐私协议页面") { + sec.addRow(title: "场景：隐私协议页面", subtitle: "也可以完全控制整个页面") { Guard.push("license") { (vc) in vc.isFullScreen = true vc.update { (vm) in @@ -103,7 +144,9 @@ class TestGuardVC: BaseListVC { } } } - + } + + vm.addSection(title: "对比效果") { (sec) in // MARK: 对比：原生的ActionSheet sec.addRow(title: "对比：原生的ActionSheet") { let ac = UIAlertController(title: "Title", message: "message", preferredStyle: .actionSheet) @@ -122,8 +165,6 @@ class TestGuardVC: BaseListVC { self.present(vc, animated: true, completion: nil) } } - - } diff --git a/Example-Old/Example/TestToastVC.swift b/Example-Old/Example/TestToastVC.swift index a8705ab..6ff4688 100644 --- a/Example-Old/Example/TestToastVC.swift +++ b/Example-Old/Example/TestToastVC.swift @@ -9,7 +9,20 @@ import UIKit import ProHUD -typealias Callback2 = (String) -> Void +// 模拟15秒后同步成功 +func loadingSuccessAfter15Seconds() { + DispatchQueue.main.asyncAfter(deadline: .now() + 15) { + Toast.find("loading") { (a) in + a.update { (vm) in + vm.scene = .success + vm.title = "同步成功" + vm.message = "啊哈哈哈哈哈哈哈哈" + } + } + } +} + + class TestToastVC: BaseListVC { override func viewDidLoad() { @@ -17,43 +30,31 @@ class TestToastVC: BaseListVC { // Do any additional setup after loading the view. - vm.addSection(title: "基本场景") { (sec) in - // MARK: 场景：正在同步 - sec.addRow(title: "场景：正在同步") { - Toast.push(scene: .loading, title: "正在同步", message: "请稍等片刻") { (vm) in - vm.identifier = "loading" - }.startRotate() - self.simulateSync() + vm.addSection(title: "简单的例子") { (sec) in + // MARK: 场景：正在加载（没有进度显示） + sec.addRow(title: "场景：正在加载（没有进度显示）") { + Toast.push(scene: .loading).startRotate() + loadingSuccessAfter15Seconds() } - // MARK: 场景：正在同步（更新进度） - sec.addRow(title: "场景：正在同步（更新进度）") { + // MARK: 场景：正在加载（有进度显示） + sec.addRow(title: "场景：正在加载（有进度显示）") { if Toast.find("progress").count == 0 { - Toast.push("progress") { (t) in + Toast.push("progress", scene: .loading) { (t) in t.update { (vm) in - vm.scene = .loading - vm.title = "正在同步" - vm.message = "请稍等片刻" + 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() + updateProgress { (pct) in + t.update(progress: pct) + if pct >= 1 { + DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { + t.update { (vm) in + vm.scene = .success + vm.icon = UIImage(named: "Feel1") + vm.title = "加载成功" + vm.message = "阿哈哈哈哈.jpg" } } } @@ -82,7 +83,40 @@ class TestToastVC: BaseListVC { } } // MARK: 场景：设备电量过低 - sec.addRow(title: "场景：设备电量过低") { + sec.addRow(title: "场景：设备电量过低", subtitle: "这条消息正文部分显示多行") { + Toast.push(scene: .warning, title: "设备电量过低", message: "请及时对设备进行充电，以免影响使用。\n为了您的续航，我们已经为您限制了设备的峰值性能。") { (vc) in + vc.vm.duration = 0 + } + } + } + + vm.addSection(title: "实用的例子") { (sec) in + // MARK: 避免重复发布同一条信息 + sec.addRow(title: "避免重复发布同一条信息 (id=aaa)", subtitle: "为一个实例指定 identifier 可以避免重复出现。") { + Toast.push("aaa") { (vc) in + vc.update { (vm) in + vm.scene = .warning + vm.message = "这则消息不会同时出现在多条横幅中。" + vm.duration = 0 + } + vc.pulse() + } + } + // MARK: 根据 identifier 查找并修改实例 + sec.addRow(title: "根据 identifier 查找并修改实例 (id=aaa)", subtitle: "在本例中，如果找不到就不进行处理。") { + // 本例和上例唯一的区别是 push -> find + Toast.find("aaa") { (t) in + t.update { (vm) in + vm.scene = .success + vm.title = "找到了哈哈" + vm.message = "根据 identifier 查找并修改实例" + vm.duration = 0 + } + t.pulse() + } + } + // MARK: 传入指定图标 + sec.addRow(title: "传入指定图标", subtitle: "虽然您对实例具有有完全的自由，但是更建议提前在场景中设置好对应的图片。") { Toast.push(scene: .default, title: "传入指定图标测试", message: "这是消息内容") { (vc) in vc.update { (vm) in if #available(iOS 13.0, *) { @@ -94,15 +128,8 @@ class TestToastVC: BaseListVC { } } } - } - - vm.addSection(title: "") { (sec) in - // MARK: 传入指定图标 - sec.addRow(title: "传入指定图标") { - Toast.push(scene: .warning, title: "设备电量过低", message: "请及时对设备进行充电，以免影响使用。") - } // MARK: 禁止手势移除 - sec.addRow(title: "禁止手势移除") { + sec.addRow(title: "禁止手势移除", subtitle: "常用于优先级低但是必须用户处理的事件。") { Toast.push(scene: .default, title: "禁止手势移除", message: "这条消息无法通过向上滑动移出屏幕。5秒后自动消失，每次拖拽都会刷新倒计时。") { (vc) in vc.isRemovable = false vc.update { (vm) in @@ -111,7 +138,7 @@ class TestToastVC: BaseListVC { } } // MARK: 组合使用示例 - sec.addRow(title: "组合使用示例") { + sec.addRow(title: "和弹窗组合使用示例", subtitle: "如果有一个横幅消息需要用户做出选择怎么办？可以点击的时候弹出一个弹窗来。") { Toast.push(scene: .message, title: "好友邀请", message: "你收到一条好友邀请，点击查看详情。", duration: 10) { (vc) in vc.identifier = "xxx" vc.didTapped { [weak vc] in @@ -130,34 +157,38 @@ class TestToastVC: BaseListVC { } } } - // MARK: 避免重复发布同一条信息 - sec.addRow(title: "避免重复发布同一条信息") { - if let t = Toast.find("aaa").last { - t.pulse() - t.update() { (vm) in - vm.title = "已经存在了" + + // MARK: 自定义要旋转的图片 + sec.addRow(title: "自定义要旋转的图片", subtitle: "添加了自定义视图，在更新的时候记得要视情况移除。") { + Toast.push(scene: .privacy, title: "正在授权", message: "请稍等片刻") { (t) in + t.identifier = "loading" + let imgv = UIImageView(image: UIImage(named: "prohud.rainbow.circle")) + t.imageView.addSubview(imgv) + imgv.tag = 1 + imgv.snp.makeConstraints { (mk) in + mk.center.equalToSuperview() + mk.width.height.equalTo(18) } - } else { - Toast.push(title: "这是一条id为aaa的横幅", message: "避免重复发布同一条信息") { (t) in - t.identifier = "aaa" - t.update { (vm) in - vm.scene = .warning - vm.duration = 0 + t.startRotate(imgv.layer, speed: 4) + t.vm.duration = 0 + } + DispatchQueue.main.asyncAfter(deadline: .now() + 5) { + Toast.find("loading") { (a) in + a.imageView.viewWithTag(1)?.removeFromSuperview() + a.update { (vm) in + vm.scene = .success + vm.title = "授权成功" + vm.message = "啊哈哈哈哈哈哈哈哈" } } } } - // MARK: 根据id查找并修改实例 - sec.addRow(title: "根据id查找并修改实例") { - Toast.push("aaa") { (t) in - t.update { (vm) in - vm.scene = .success - vm.title = "找到了哈哈" - vm.message = "根据id查找并修改实例" - } - t.pulse() - } - } + + } + + + vm.addSection(title: "极端场景") { (sec) in + // MARK: 测试较长的标题和内容 sec.addRow(title: "测试较长的标题和内容") { Toast.push() { (a) in @@ -169,7 +200,7 @@ class TestToastVC: BaseListVC { } } // MARK: 测试特别长的标题和内容 - sec.addRow(title: "测试特别长的标题和内容") { + sec.addRow(title: "测试特别长的标题和内容", subtitle: "可以在配置中设置 titleMaxLines/bodyMaxLines 来避免出现这种情况。") { Toast.push() { (a) in a.update { (vm) in vm.title = "正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过" @@ -178,55 +209,27 @@ class TestToastVC: BaseListVC { } } } - // MARK: 测试只有title - sec.addRow(title: "测试只有title") { + // MARK: 只有标题 + sec.addRow(title: "只有标题部分的效果", subtitle: "这种情况请控制文字不要太少，否则不美观。") { Toast.push() { (a) in a.update { (vm) in - vm.scene = .warning - vm.title = "正在同步看到了你撒地" - + vm.title = "坐和放宽，我们正在帮你搞定一切，这通常不会太久。" } } } - // MARK: 测试只有message - sec.addRow(title: "测试只有message") { + // MARK: 只有正文 + sec.addRow(title: "只有正文部分的效果", subtitle: "这种情况请控制文字不要太少，否则不美观。") { Toast.push() { (a) in a.update { (vm) in - vm.scene = .warning - vm.message = "正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过正在同步看到了你撒地方快乐撒的肌肤轮廓啊就是；来的跨省的人格人格离开那地方离开过" - + vm.message = "坐和放宽，我们正在帮你搞定一切，这通常不会太久。\n不幸的是，它花费的时间比通常要长。" } } } - // MARK: 自定义旋转的图片 - sec.addRow(title: "自定义旋转的图片") { - Toast.push(scene: .privacy, title: "正在授权", message: "请稍等片刻") { (t) in - t.identifier = "loading" - let imgv = UIImageView(image: UIImage(named: "prohud.rainbow.circle")) - t.imageView.addSubview(imgv) - imgv.snp.makeConstraints { (mk) in - mk.center.equalToSuperview() - mk.width.height.equalTo(18) - } - t.startRotate(imgv.layer, speed: 4) - } - self.simulateSync() - } + + } - } - - - func simulateSync() { - DispatchQueue.main.asyncAfter(deadline: .now() + 15) { - Toast.find("loading", last: { (a) in - a.update { (vm) in - vm.scene = .success - vm.title = "同步成功" - vm.message = "啊哈哈哈哈哈哈哈哈" - } - }) - } + } } diff --git a/Example-Old/Example/ViewController.swift b/Example-Old/Example/ViewController.swift index 3448d54..580b30c 100644 --- a/Example-Old/Example/ViewController.swift +++ b/Example-Old/Example/ViewController.swift @@ -7,7 +7,7 @@ // import UIKit -//import ProHUD +import ProHUD import SnapKit class ViewController: BaseListVC { @@ -17,22 +17,39 @@ class ViewController: BaseListVC { // Do any additional setup after loading the view. title = "\(Bundle.main.infoDictionary?["CFBundleName"] ?? "ProHUD")" - vm.addSection(title: "") { (sec) in - sec.addRow(title: "Toast") { + vm.addSection(title: "测试项目") { (sec) in + sec.addRow(title: "Toast", subtitle: "横幅控件，支持图片、标题和正文。\n不支持添加按钮，但可以接受一个点击事件。") { let vc = TestToastVC() vc.title = "Toast" self.navigationController?.pushViewController(vc, animated: true) } - sec.addRow(title: "Alert") { + sec.addRow(title: "Alert", subtitle: "弹窗控件，支持图片、标题、正文和按钮。\n按钮不设置事件回调时可以自动pop。") { let vc = TestAlertVC() vc.title = "Alert" self.navigationController?.pushViewController(vc, animated: true) } - sec.addRow(title: "Guard") { + sec.addRow(title: "Guard", subtitle: "操作表控件，原生支持标题、副标题、正文和按钮，也可以添加任意视图。") { let vc = TestGuardVC() vc.title = "Guard" self.navigationController?.pushViewController(vc, animated: true) } + + } + + + vm.addSection(title: "小提示") { (sec) in + sec.addRow(title: "所有控件都是ViewController", subtitle: "可以监听进入、离开移除事件。\n推入、推出统一为 push/pop 操作。\n所有控件都可以在配置中完全自定义布局及样式。\n通过 identifier 来获取实例，方便进行多实例管理") { + } + sec.addRow(title: "基于场景的应用", subtitle: "一个场景就是一套模板，原生提供了一些常用场景，您可以覆写，也可以新建场景。\n在场景中可以指定持续时间、标题、图标、正文等数据。") { + } + sec.addRow(title: "样式与逻辑分离", subtitle: "您可以在场景中指定一些规则，也可以在配置中完全自定义布局样式。\n在使用的时候呢，只需要确定数据即可。") { + } + sec.addRow(title: "Loading图片旋转", subtitle: "可以通过调用 .startRotate() 并可传入适当参数来旋转，也可以自定义场景\n如果场景的 identifier 包含 .rotate 则会自动旋转图片") { + } + sec.addRow(title: "按钮默认行为", subtitle: "为了灵活性，default 和 destructive 按钮默认不会对实例进行 pop 操作，但是如果它们没有实现回调事件，则会自动 pop。cancel 按钮永远会自动 pop。") { + } + sec.addRow(title: "持续时间", subtitle: "设置 duration 来指定持续时间，设置为 0 可以永久持续。\n原生提供的 loading 场景持续时间为永久。\n如果弹窗添加了按钮，则持续时间会自动变成永久，除非手动设置。") { + } } } diff --git a/Source/ProHUD.swift b/Source/ProHUD.swift index 5c3b35d..534e8d9 100644 --- a/Source/ProHUD.swift +++ b/Source/ProHUD.swift @@ -47,6 +47,8 @@ public extension ProHUD.Scene { static var message: ProHUD.Scene { var scene = ProHUD.Scene.init(identifier: "prohud.message") scene.image = ProHUD.image(named: "prohud.message") + scene.alertDuration = 2 + scene.toastDuration = 5 return scene } static var loading: ProHUD.Scene {