公用方法 提取到基类

galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift

@@ -7,6 +7,46 @@
 //
 
 import UIKit
+import Alamofire
+
 class YHBaseViewModel {
+    // 上传方法
+    func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
+        let boundary = UUID().uuidString
+        let headers: HTTPHeaders = [
+            "Content-type": "multipart/form-data; boundary=\(boundary)",
+            "businessCode": "4001001"
+        ]
+        let _ = YHNetRequest.uplaodRequest(url: strUrl, headers: headers, image: image) { [weak self] json, code in
+            guard let _ = self else { return }
+            if json.code == 200 {
+                callBackBlock(json.data as? String, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(nil, error)
+            }
+        } failBlock: { err in
+            callBackBlock(nil, err)
+        }
+
+    }
+    
+    func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
+        let param: [String: Any] = ["fileUrl": url]
+        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let _ = self else { return }
+            if json.code == 200 {
+                callBackBlock(json.data as? String, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(nil, error)
+            }
+        } failBlock: { err in
+            callBackBlock(nil,err)
+        }
+    }
 
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift

@@ -9,7 +9,7 @@
 import UIKit
 import Alamofire
 
-class YHFamilyMemberViewModel {
+class YHFamilyMemberViewModel : YHBaseViewModel{
 
     var mainModel: YHFamilyMember = YHFamilyMember()
     
@@ -135,45 +135,6 @@ class YHFamilyMemberViewModel {
         }
     }
     
-    // 上传方法
-    func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
-        let boundary = UUID().uuidString
-        let headers: HTTPHeaders = [
-            "Content-type": "multipart/form-data; boundary=\(boundary)",
-            "businessCode": "4001001"
-        ]
-        let _ = YHNetRequest.uplaodRequest(url: strUrl, headers: headers, image: image) { [weak self] json, code in
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil, err)
-        }
-
-    }
-    
-    func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
-        let param: [String: Any] = ["fileUrl": url]
-        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
-            //1. json字符串 转 对象
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil,err)
-        }
-    }
-    
     func requestCnIDCardMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.cnIdCard
         let params: [String : Any] = ["url": url]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -390,46 +390,6 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         }
     }
     
-    // 上传方法
-    func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
-        let boundary = UUID().uuidString
-        let headers: HTTPHeaders = [
-            "Content-type": "multipart/form-data; boundary=\(boundary)",
-            "businessCode": "4001001"
-        ]
-        let _ = YHNetRequest.uplaodRequest(url: strUrl, headers: headers, image: image) { [weak self] json, code in
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil, err)
-        }
-
-    }
-    
-    func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
-        let param: [String: Any] = ["fileUrl": url]
-
-        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
-            //1. json字符串 转 对象
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil,err)
-        }
-    }
-    
     func requestCnIDCardMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.cnIdCard
         let params: [String : Any] = ["url": url]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift

@@ -276,45 +276,6 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         }
     }
     
-    // 上传方法
-    func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
-        let boundary = UUID().uuidString
-        let headers: HTTPHeaders = [
-            "Content-type": "multipart/form-data; boundary=\(boundary)",
-            "businessCode": "4001001"
-        ]
-        let _ = YHNetRequest.uplaodRequest(url: strUrl, headers: headers, image: image) { [weak self] json, code in
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil, err)
-        }
-
-    }
-    
-    func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
-        let param: [String: Any] = ["fileUrl": url]
-        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
-            //1. json字符串 转 对象
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil,err)
-        }
-    }
-    
     func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
 //        let params: [String : Any] = ["url": url]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/ViewModel/YHWorkIntroductionViewModel.swift

@@ -54,48 +54,8 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
         }
     }
     
-    // 上传方法
-    func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
-        let boundary = UUID().uuidString
-        let headers: HTTPHeaders = [
-            "Content-type": "multipart/form-data; boundary=\(boundary)",
-            "businessCode": "4001001"
-        ]
-        let _ = YHNetRequest.uplaodRequest(url: strUrl, headers: headers, image: image) { [weak self] json, code in
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil, err)
-        }
-
-    }
-    
-    func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
-        let param: [String: Any] = ["fileUrl": url]
-        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
-            //1. json字符串 转 对象
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil,err)
-        }
-    }
-    
     func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
-//        let params: [String : Any] = ["url": url]
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }