Skip to content

G
galaxy-iOS
Commit f023e900 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

调整SF控制器的跳转方式

parent 8535fad8
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 12 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ f023e900
...@@ -440,7 +440,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -440,7 +440,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
let tmpVC = SFSafariViewController(url: url) let tmpVC = SFSafariViewController(url: url)
tmpVC.dismissButtonStyle = .close tmpVC.dismissButtonStyle = .close
tmpVC.delegate = self tmpVC.delegate = self
self.navigationController?.pushViewController(tmpVC) tmpVC.modalPresentationStyle = .fullScreen
present(tmpVC, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -463,7 +464,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -463,7 +464,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
let tmpVC = SFSafariViewController(url: url) let tmpVC = SFSafariViewController(url: url)
tmpVC.dismissButtonStyle = .close tmpVC.dismissButtonStyle = .close
tmpVC.delegate = self tmpVC.delegate = self
self.navigationController?.pushViewController(tmpVC) tmpVC.modalPresentationStyle = .fullScreen
present(tmpVC, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -498,7 +500,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -498,7 +500,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -514,7 +517,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -514,7 +517,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
}) })
} }
} else { } else {
...@@ -523,7 +527,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -523,7 +527,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -542,7 +547,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -542,7 +547,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -755,7 +761,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -755,7 +761,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
extension YHMyDocumentsDetailViewController: SFSafariViewControllerDelegate { extension YHMyDocumentsDetailViewController: SFSafariViewControllerDelegate {
// MARK: 点击左上角的完成 // MARK: 点击左上角的完成
func safariViewControllerDidFinish(_ controller: SFSafariViewController) { func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
controller.navigationController?.popViewController() controller.dismiss(animated: true)
viewModel.requestSignBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)") {[weak self] success, error in viewModel.requestSignBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)") {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ f023e900
...@@ -389,7 +389,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -389,7 +389,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -407,7 +408,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -407,7 +408,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
}) })
} }
} else { } else {
...@@ -416,7 +418,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -416,7 +418,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -435,7 +438,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -435,7 +438,8 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController) safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
...@@ -648,7 +652,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -648,7 +652,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
extension YHMySignatureDetailViewController: SFSafariViewControllerDelegate { extension YHMySignatureDetailViewController: SFSafariViewControllerDelegate {
// MARK: 点击左上角的完成 // MARK: 点击左上角的完成
func safariViewControllerDidFinish(_ controller: SFSafariViewController) { func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
controller.navigationController?.popViewController() controller.dismiss(animated: true)
viewModel.requestSignBack("\(id)") {[weak self] success, error in viewModel.requestSignBack("\(id)") {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment