Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -301,6 +301,7 @@
 		047AA3F62C50E773009C4554 /* YHShareCashOutModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F52C50E773009C4554 /* YHShareCashOutModel.swift */; };
 		047AA3F82C5CC7B0009C4554 /* YHShareStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */; };
 		047AA3FA2C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */; };
+		047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */; };
 		0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */; };
 		0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */; };
 		048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; };
@@ -937,6 +938,7 @@
 		047AA3F52C50E773009C4554 /* YHShareCashOutModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareCashOutModel.swift; sourceTree = "<group>"; };
 		047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareStepView.swift; sourceTree = "<group>"; };
 		047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInvitationWithGiftsSelectItemView.swift; sourceTree = "<group>"; };
+		047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignAppendStepView.swift; sourceTree = "<group>"; };
 		0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; };
 		0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateListVC.swift; sourceTree = "<group>"; };
 		048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; };
@@ -1922,6 +1924,7 @@
 				0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */,
 				044CF8D32BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift */,
 				0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */,
+				047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -4035,6 +4038,7 @@
 				045EEE962B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemsView.swift in Sources */,
 				A592FE912BA6CC010062FACA /* YHCertificateEntryHeadView.swift in Sources */,
 				0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */,
+				047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */,
 				044D0C1E2C22CFBF00C5CF5E /* YHEditWorkViewController.swift in Sources */,
 				A5ACE9302B4564F7002C94D2 /* Algorithm.swift in Sources */,
 				045EEED52B9F171A0022A143 /* YHEducationRequestViewModel.swift in Sources */,

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

@@ -558,6 +558,18 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
                                             present(safariViewController, animated: true, completion: nil)
                                         })
                                     }
+                                } else if error?.errorCode == 1008612 {
+                                    YHSignAppendStepView.show {[weak self] name, phone in
+                                        guard let self = self else { return }
+                                        self.viewModel.requestSignaturePersonalWithNameAndPhoneURL(name: name, phone: phone, callBackBlock: {[weak self] success, error in
+                                            guard let self = self else { return }
+                                            let url = URL(string: self.viewModel.personalUrl) ?? URL(fileURLWithPath: "")
+                                            let safariViewController = SFSafariViewController(url: url)
+                                            safariViewController.dismissButtonStyle = .close
+                                            safariViewController.delegate = self
+                                            safariViewController.modalPresentationStyle = .fullScreen
+                                        })
+                                    }
                                 } else {
                                     if success ?? false {
                                         let url = URL(string: self.viewModel.pageUrl) ?? URL(fileURLWithPath: "")

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

@@ -175,6 +175,30 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
         }
     }
     
+    func requestSignaturePersonalWithNameAndPhoneURL(name: String, phone: String,callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
+        let params: [String : Any] = ["user_name": name,
+                                      "mobile": phone]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.personalUrl
+        let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            if json.code == 200 {
+                let dic = json.data
+                guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
+                    callBackBlock(false,nil)
+                    return
+                }
+                self.personalUrl = result.url
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
+    
     func requestSignatureLook(_ id: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
         let params: [String : Any] = ["id": id]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.look

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

@@ -408,6 +408,18 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                                         present(safariViewController, animated: true, completion: nil)
                                     })
                                 }
+                            } else if error?.errorCode == 1008612 {
+                                YHSignAppendStepView.show {[weak self] name, phone in
+                                    guard let self = self else { return }
+                                    self.viewModel.requestSignaturePersonalWithNameAndPhoneURL(name: name, phone: phone, callBackBlock: {[weak self] success, error in
+                                        guard let self = self else { return }
+                                        let url = URL(string: self.viewModel.personalUrl) ?? URL(fileURLWithPath: "")
+                                        let safariViewController = SFSafariViewController(url: url)
+                                        safariViewController.dismissButtonStyle = .close
+                                        safariViewController.delegate = self
+                                        safariViewController.modalPresentationStyle = .fullScreen
+                                    })
+                                }
                             } else {
                                 if success ?? false {
                                     let url = URL(string: self.viewModel.pageUrl) ?? URL(fileURLWithPath: "")

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

@@ -88,6 +88,30 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
         }
     }
     
+    func requestSignaturePersonalWithNameAndPhoneURL(name: String, phone: String,callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
+        let params: [String : Any] = ["user_name": name,
+                                      "mobile": phone]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.personalUrl
+        let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            if json.code == 200 {
+                let dic = json.data
+                guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
+                    callBackBlock(false,nil)
+                    return
+                }
+                self.personalUrl = result.url
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
+    
     func requestSignCallBack(_ id: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
 //        let params: [String : Any] = ["order_id": orderId]
         let params: [String : Any] = ["id": id]

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的文书和签字/service_step_tips.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_step_tips@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_step_tips@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}