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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8031,7 +8031,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -8180,7 +8180,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -8391,7 +8391,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -8442,7 +8442,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift

@@ -580,22 +580,20 @@ extension YHResignDocumentDetailViewController {
                     self.emailInputView.textField.becomeFirstResponder()
                 } else if editType == .sendToWechat {
                     YHHUD.show(.progress(message: "加载中..."))
-                    self.viewModel.previewResginDocument(docId: model.docId) { [weak self] model, error in
+                    self.viewModel.getOriginalDoc(docId: model.docId) { [weak self] model, error in
                         YHHUD.hide()
                         guard let self = self else {
                             return
                         }
-                        // 全部是私域链接，转公域处理
+                        // 可能是私域链接也可能是公域，用统一方法处理
                         if let urlString = model?.url, urlString.count > 0 {
                             YHHUD.show(.progress(message: "加载中..."))
-                            self.viewModel.getPublicImageUrl(urlString) { [weak self] success, error in
+                            self.viewModel.getRealUsefulUrl(urlString) { [weak self] success in
                                 YHHUD.hide()
                                 guard let self = self else {
                                     return
                                 }
-                                if let success = success, let url = URL(string: success) {
-                                    //self.previewFile(url)
-                                    //YHShareManager.shared.sendLinkContent(self.name, "", UIImage(), link: success)
+                                if success.count > 0, let url = URL(string: success) {
                                     self.downloadRemoteFile(url: url) { [weak self] destination in
                                         guard let self = self else {
                                             return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignDocumentManagement(续签文书管理)/VM/YHResignDocumentViewModel.swift

@@ -136,6 +136,30 @@ class YHResignDocumentViewModel: YHBaseViewModel {
         }
     }
     
+    func getOriginalDoc(docId: Int, callback: @escaping (_ documentModel: YHResignDocumentPreviewModel?, _ error: YHErrorModel?) -> ()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignDocument.getOriginalDoc
+        let _ = YHNetRequest.getRequest(url: strUrl, params: ["docId": docId]) { json, code in
+            //1. json字符串 转 对象
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHResignDocumentPreviewModel.deserialize(from: dic) else {
+                    let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    callback(nil, err)
+                    return
+                }
+                callback(resultModel, nil)
+                
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callback(nil, err)
+            }
+            
+        } failBlock: { err in
+            callback(nil, err)
+        }
+    }
+    
     func getResginDocumentUrl(docId: Int, isEditable: Bool, callback: @escaping (_ documentModel: YHResignDocumentPreviewModel?, _ error: YHErrorModel?) -> ()) {
         let params: [String : Any] = ["id": docId, "type": isEditable ? 1 : 0]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignDocument.getResginDocumentUrl

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -613,6 +613,8 @@ class YHAllApiName {
         static let sendOriginalDoc = "super-app/renewal/send-original-doc"
         // 上传签署文件
         static let uploadSignedDoc = "super-app/renewal/upload-signed-doc"
+        // 续期文书-获取原始文件
+        static let getOriginalDoc = "super-app/renewal/get-original-doc"
     }
     
     // 续签预约