已签署状态的签署逻辑

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -22,6 +22,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
     var id: Int = 0
     var oldUrl: String?
     var type: Int = 0
+    var isSign: Bool = false
 
     lazy var blackMaskView: UIView = {
         let view = UIView(frame:UIScreen.main.bounds)
@@ -98,6 +99,11 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
             }
             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() {
@@ -410,6 +416,20 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
                 cell.block = { [weak self] type in
                     guard let self = self else { return }
                     if type == .sign {
+                        if self.isSign {
+                            self.viewModel.requestSignatureLook("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)") {[weak self] success, error in
+                                guard let self = self else { return }
+                                if success {
+                                    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 ?? "")
+                                }
+                            }
+                        } 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 {
@@ -436,6 +456,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
                                 }
                             })
                         }
+                    }
                     
                     if type == .look {
                         self.viewModel.requestSignatureLook("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)") {[weak self] success, error in
@@ -640,10 +661,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
 extension YHMyDocumentsDetailViewController: SFSafariViewControllerDelegate {
     // MARK: 点击左上角的完成
     func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
-        viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in
-            guard let self = self else { return }
         controller.navigationController?.popViewController()
-        })
     }
 
     // MARK: 加载完成

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift

@@ -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] = ["id": id]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.callBack

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift

@@ -20,7 +20,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
     var id: Int = 0
     var oldUrl: String?
     var type: Int = 0
-    
+    var isSign: Bool = false
     lazy var previewFileTool:YHFilePreviewTool = {
        let tool = YHFilePreviewTool(targetVC: self)
        return tool
@@ -82,6 +82,11 @@ class YHMySignatureDetailViewController: YHBaseViewController {
             }
             self.tableView.reloadData()
         })
+        
+        viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in
+            guard let self = self else { return }
+            self.isSign = success
+        })
     }
     
     func updateDataSource() {
@@ -316,6 +321,20 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
             cell.block = { [weak self] type in
                 guard let self = self else { return }
                 if type == .sign {
+                    if self.isSign {
+                        self.viewModel.requestSignatureLook("\(self.id)") {[weak self] success, error in
+                            guard let self = self else { return }
+                            if success {
+                                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 ?? "")
+                            }
+                        }
+                    } else {
                         self.viewModel.requestSignaturePageURL("\(self.id)", callBackBlock: {[weak self] success, error in
                             guard let self = self else { return }
                             if error?.errorCode == 1008611 {
@@ -342,6 +361,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                             }
                         })
                     }
+                }
                 
                 if type == .look {
                     self.viewModel.requestSignatureLook("\(self.id)") {[weak self] success, error in
@@ -545,10 +565,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
 extension YHMySignatureDetailViewController: SFSafariViewControllerDelegate {
     // MARK: 点击左上角的完成
     func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
-        viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in
-            guard let self = self else { return }
         controller.navigationController?.popViewController()
-        })
     }
 
     // MARK: 加载完成

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift

@@ -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] = ["id": id]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.callBack