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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -245,6 +245,7 @@
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
 		A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
 		A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
+		A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A520124E2BABCE05008655EA /* YHFileListContentView.swift */; };
 		A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */; };
 		A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5112B99715000EA5973 /* YHConstantArrayData.swift */; };
 		A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
@@ -334,7 +335,6 @@
 		A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */; };
 		A5D0012A2BABC84A001F003C /* YHFileListHeaerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */; };
 		A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001292BABC84A001F003C /* YHFileListBottomView.swift */; };
-		A5D0012E2BABC87D001F003C /* YHFileListContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D0012D2BABC87D001F003C /* YHFileListContentView.swift */; };
 		A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
 		A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
 		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
@@ -625,6 +625,7 @@
 		A51044172B493675006B60BB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		A51044192B495DD0006B60BB /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
 		A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
+		A520124E2BABCE05008655EA /* YHFileListContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListContentView.swift; sourceTree = "<group>"; };
 		A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeCustomCell.swift; sourceTree = "<group>"; };
 		A554A5112B99715000EA5973 /* YHConstantArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConstantArrayData.swift; sourceTree = "<group>"; };
 		A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
@@ -718,7 +719,6 @@
 		A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChoiceButtonHoldView.swift; sourceTree = "<group>"; };
 		A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListHeaerView.swift; sourceTree = "<group>"; };
 		A5D001292BABC84A001F003C /* YHFileListBottomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListBottomView.swift; sourceTree = "<group>"; };
-		A5D0012D2BABC87D001F003C /* YHFileListContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListContentView.swift; sourceTree = "<group>"; };
 		A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
 		A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
 		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
@@ -1983,7 +1983,7 @@
 		A5D001262BABC84A001F003C /* V */ = {
 			isa = PBXGroup;
 			children = (
-				A5D0012D2BABC87D001F003C /* YHFileListContentView.swift */,
+				A520124E2BABCE05008655EA /* YHFileListContentView.swift */,
 				A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */,
 				A5D001292BABC84A001F003C /* YHFileListBottomView.swift */,
 			);
@@ -2256,7 +2256,7 @@
 				045EEEA82B9F171A0022A143 /* YHWorkIntroductionViewController.swift in Sources */,
 				045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
 				04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
-				A5D0012E2BABC87D001F003C /* YHFileListContentView.swift in Sources */,
+				A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */,
 				045EEF042B9F171A0022A143 /* YHIdentityCardCell.swift in Sources */,
 				045EEEB42B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift in Sources */,
 				045EEF132B9F171A0022A143 /* YHCountryMessage.swift in Sources */,

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

@@ -72,4 +72,26 @@ class YHBaseViewModel {
             callBackBlock(nil,err)
         }
     }
+    
+    // 上传方法
+    func uploadFile(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.uploadApi
+        printLog("\(url)")
+        let boundary = UUID().uuidString
+        let headers: HTTPHeaders = [
+            "Content-type": "multipart/form-data; boundary=\(boundary)",
+            "businessCode": "4001001"
+        ]
+        let _ = YHNetRequest.uplaodFileRequest(url: strUrl, headers: headers, fileUrl: url) { [weak self] json, code in
+            guard let self = 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(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -56,7 +56,9 @@ class YHFileListViewController: YHBaseViewController {
 extension YHFileListViewController {
     func loadData() {
         if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
-            let param = ["order_id":orderID,"node":"1","state":"1"]
+            
+            let tttt = "11758" //for test hjl
+            let param = ["order_id":tttt,"node":"1","state":"1"]
             certificateReqVM.getCertificateFileListData(params: param) { success, error in
 //                if success == true {
 //                    self.headerView.dataModel = self.certificateReqVM.certificateEntryModel
@@ -91,7 +93,7 @@ extension YHFileListViewController {
         
         
         
-        
+        myScrollView.backgroundColor = UIColor(hex:0x0D37C7, alpha: 1.0)
         view.addSubview(myScrollView)
         myScrollView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHUploadContentVC.swift

@@ -102,6 +102,10 @@ class YHUploadContentVC: YHBaseViewController {
                 // 将文件数据上传到服务器
                 let size = String(format: "%.2fM", Double(fileData.count)/(1024.0 * 1024.0))
                 print("\(size)")
+                self.viewModel.uploadFile(fileUrl.absoluteString) {[weak self] success, error in
+                    guard let self = self else { return }
+
+                }
             }
         }
         sheetView.uploadImageBlock = {

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -8,11 +8,10 @@
 
 // MARK: - 管理项目开发中需要使用到的域名地址
 class YHBaseUrlManager {
-    
     static let shared = YHBaseUrlManager()
-    
     //测试环境
-    static let baseUrlTest : String = "http://test.api.diymanager.galaxy-immi.com/" //APP 使用域名
+    static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com/" //APP 使用域名
+    
     //正式环境
     static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com/"
     

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -9,7 +9,7 @@ import Foundation
 import Alamofire
 import CryptoSwift
 import UIKit
-
+import CoreServices
 //class YHNetErrorModel {
 //    var responseStatusCode: Int = 0
 //    var responseStatusCodeStr: String = ""
@@ -198,6 +198,52 @@ class YHNetRequest: NSObject {
         return uploadRequest
     }
     
+    func uploadFileRequest(_ headers: HTTPHeaders, _ url: String) -> Request? {
+        guard YHNetworkStatusManager.shared.isNetWorkOK == true else {
+            YHHUD.flash(message: "网络异常")
+            return httpRequest
+        }
+        
+        guard let fileData = try? Data(contentsOf: URL(string: url) ?? URL(fileURLWithPath: "")) else {
+            return httpRequest
+        }
+        
+        let fileExtension = URL(fileURLWithPath: url).pathExtension.lowercased()
+        let fileUTI = mimeType(for: url)
+#if DEBUG
+        printLog("\(fileExtension)-------\(fileUTI ?? "")")
+#endif
+        let multipartFormData = MultipartFormData()
+        
+        // 将图片添加到multipartFormData中
+        multipartFormData.append(fileData, withName: "file", fileName: "image.\(fileExtension)", mimeType: fileUTI)
+        
+        // 发送POST请求
+        let uploadRequest = AF.upload(multipartFormData: multipartFormData, to: self.url!, headers: headers)
+        
+        uploadRequest.responseString(completionHandler: { string in
+#if DEBUG
+            printLog("\n网络请求已返回 string=\(string)")
+#endif
+            self.completeHandle(string: string)
+        })
+        
+        return uploadRequest
+    }
+    
+    func mimeType(for path: String) -> String? {
+        let url = URL(fileURLWithPath: path)
+        let pathExtension = url.pathExtension
+     
+        if let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, pathExtension as CFString, nil)?.takeRetainedValue() {
+            if let mimeType = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)?.takeRetainedValue() {
+                return mimeType as String
+            }
+        }
+        return nil
+    }
+    
+    
     /// 请求response完成处理
     func completeHandle(string: AFDataResponse<String>) {
         let responseResult = string.result
@@ -267,4 +313,9 @@ extension YHNetRequest {
         printLog("\n发起请求的URL是===> url = \(url)")
         return YHNetRequest().url(url).success(successBlock).failed(failBlock).uploadRequest(headers, image)
     }
+    
+    class func uplaodFileRequest(url:String, headers:HTTPHeaders, fileUrl: String, successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
+        printLog("\n发起请求的URL是===> url = \(url)")
+        return YHNetRequest().url(url).success(successBlock).failed(failBlock).uploadFileRequest(headers, fileUrl)
+    }
 }