Skip to content

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

已签署状态的签署逻辑

parent 13fbea07
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 43 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ 24e45d78
...@@ -22,6 +22,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController { ...@@ -22,6 +22,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
var id: Int = 0 var id: Int = 0
var oldUrl: String? var oldUrl: String?
var type: Int = 0 var type: Int = 0
var isSign: Bool = false
lazy var blackMaskView: UIView = { lazy var blackMaskView: UIView = {
let view = UIView(frame:UIScreen.main.bounds) let view = UIView(frame:UIScreen.main.bounds)
...@@ -98,6 +99,11 @@ class YHMyDocumentsDetailViewController: YHBaseViewController { ...@@ -98,6 +99,11 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
} }
self.tableView.reloadData() self.tableView.reloadData()
}) })
viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.isSign = success
})
} }
func updateDataSource() { func updateDataSource() {
...@@ -410,21 +416,10 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -410,21 +416,10 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
cell.block = { [weak self] type in cell.block = { [weak self] type in
guard let self = self else { return } guard let self = self else { return }
if type == .sign { if type == .sign {
self.viewModel.requestSignaturePageURL("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in if self.isSign {
guard let self = self else { return } self.viewModel.requestSignatureLook("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)") {[weak self] success, error in
if error?.errorCode == 1008611 { guard let self = self else { return }
YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") { if success {
self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
guard let self = self else { return }
let url = URL(string: self.viewModel.personalUrl)!
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController)
})
}
} else {
if success ?? false {
let url = URL(string: self.viewModel.pageUrl)! let url = URL(string: self.viewModel.pageUrl)!
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
...@@ -434,7 +429,33 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -434,7 +429,33 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
} }
}) } else {
self.viewModel.requestSignaturePageURL("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
if error?.errorCode == 1008611 {
YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") {
self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
guard let self = self else { return }
let url = URL(string: self.viewModel.personalUrl)!
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController)
})
}
} else {
if success ?? false {
let url = URL(string: self.viewModel.pageUrl)!
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController)
} else {
YHHUD.flash(message: error?.errorMsg ?? "")
}
}
})
}
} }
if type == .look { if type == .look {
...@@ -640,10 +661,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -640,10 +661,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
extension YHMyDocumentsDetailViewController: SFSafariViewControllerDelegate { extension YHMyDocumentsDetailViewController: SFSafariViewControllerDelegate {
// MARK: 点击左上角的完成 // MARK: 点击左上角的完成
func safariViewControllerDidFinish(_ controller: SFSafariViewController) { func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in controller.navigationController?.popViewController()
guard let self = self else { return }
controller.navigationController?.popViewController()
})
} }
// MARK: 加载完成 // MARK: 加载完成
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift
View file @ 24e45d78
...@@ -218,7 +218,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel { ...@@ -218,7 +218,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
} }
} }
func requestSignCallBack(_ id: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) { func requestSignCallBack(_ id: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
// let params: [String : Any] = ["order_id": orderId] // let params: [String : Any] = ["order_id": orderId]
let params: [String : Any] = ["id": id] let params: [String : Any] = ["id": id]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.callBack let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.callBack
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ 24e45d78
...@@ -20,7 +20,7 @@ class YHMySignatureDetailViewController: YHBaseViewController { ...@@ -20,7 +20,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
var id: Int = 0 var id: Int = 0
var oldUrl: String? var oldUrl: String?
var type: Int = 0 var type: Int = 0
var isSign: Bool = false
lazy var previewFileTool:YHFilePreviewTool = { lazy var previewFileTool:YHFilePreviewTool = {
let tool = YHFilePreviewTool(targetVC: self) let tool = YHFilePreviewTool(targetVC: self)
return tool return tool
...@@ -82,6 +82,11 @@ class YHMySignatureDetailViewController: YHBaseViewController { ...@@ -82,6 +82,11 @@ class YHMySignatureDetailViewController: YHBaseViewController {
} }
self.tableView.reloadData() self.tableView.reloadData()
}) })
viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.isSign = success
})
} }
func updateDataSource() { func updateDataSource() {
...@@ -316,21 +321,10 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -316,21 +321,10 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
cell.block = { [weak self] type in cell.block = { [weak self] type in
guard let self = self else { return } guard let self = self else { return }
if type == .sign { if type == .sign {
self.viewModel.requestSignaturePageURL("\(self.id)", callBackBlock: {[weak self] success, error in if self.isSign {
guard let self = self else { return } self.viewModel.requestSignatureLook("\(self.id)") {[weak self] success, error in
if error?.errorCode == 1008611 { guard let self = self else { return }
YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") { if success {
self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
guard let self = self else { return }
let url = URL(string: self.viewModel.personalUrl)!
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController)
})
}
} else {
if success ?? false {
let url = URL(string: self.viewModel.pageUrl)! let url = URL(string: self.viewModel.pageUrl)!
let safariViewController = SFSafariViewController(url: url) let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
...@@ -340,7 +334,33 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -340,7 +334,33 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
YHHUD.flash(message: error?.errorMsg ?? "") YHHUD.flash(message: error?.errorMsg ?? "")
} }
} }
}) } else {
self.viewModel.requestSignaturePageURL("\(self.id)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
if error?.errorCode == 1008611 {
YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") {
self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
guard let self = self else { return }
let url = URL(string: self.viewModel.personalUrl)!
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController)
})
}
} else {
if success ?? false {
let url = URL(string: self.viewModel.pageUrl)!
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self
self.navigationController?.pushViewController(safariViewController)
} else {
YHHUD.flash(message: error?.errorMsg ?? "")
}
}
})
}
} }
if type == .look { if type == .look {
...@@ -545,10 +565,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -545,10 +565,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
extension YHMySignatureDetailViewController: SFSafariViewControllerDelegate { extension YHMySignatureDetailViewController: SFSafariViewControllerDelegate {
// MARK: 点击左上角的完成 // MARK: 点击左上角的完成
func safariViewControllerDidFinish(_ controller: SFSafariViewController) { func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in controller.navigationController?.popViewController()
guard let self = self else { return }
controller.navigationController?.popViewController()
})
} }
// MARK: 加载完成 // MARK: 加载完成
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift
View file @ 24e45d78
...@@ -88,7 +88,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel { ...@@ -88,7 +88,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
} }
} }
func requestSignCallBack(_ id: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) { func requestSignCallBack(_ id: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
// let params: [String : Any] = ["order_id": orderId] // let params: [String : Any] = ["order_id": orderId]
let params: [String : Any] = ["id": id] let params: [String : Any] = ["id": id]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.callBack let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.callBack
......
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