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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  OSS 封装及实现文件图片上传

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

@@ -18,22 +18,38 @@ class YHBaseViewModel {
         YHHUD.flash(message: "\(Float(size/1024/1024))M")
 #endif
         
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.uploadApi
-        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
+//        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.uploadApi
+//        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)
+//        }
+        if YHNetworkStatusManager.shared.isNetWorkOK == false {
+            DispatchQueue.main.async {
+                YHHUD.flash(message: "网络异常")
+                let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络异常")
+                callBackBlock(nil, errorModel)
+                return
+            }
+            return
+        }
+        YHOSSManager.share.putObject(image: image) {[weak self] success, error 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)
+            DispatchQueue.main.async {
+                // 在这里执行需要在主线程上完成的任务
+                callBackBlock(success, error)
             }
-        } failBlock: { err in
-            callBackBlock(nil, err)
         }
     }
     
@@ -75,23 +91,39 @@ class YHBaseViewModel {
     
     // 上传方法
     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)
+//        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)
+//        }
+        if YHNetworkStatusManager.shared.isNetWorkOK == false {
+            DispatchQueue.main.async {
+                YHHUD.flash(message: "网络异常")
+                let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络异常")
+                callBackBlock(nil, errorModel)
+                return
             }
-        } failBlock: { err in
-            callBackBlock(nil, err)
+            return
         }
+        YHOSSManager.share.putFile(file: url, callBackBlock: {[weak self] success, error in
+            guard let _ = self else { return }
+            DispatchQueue.main.async {
+                // 在这里执行需要在主线程上完成的任务
+                callBackBlock(success, error)
+            }
+        })
     }
 }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -44,6 +44,8 @@ class YHHomePageViewController: YHBaseViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         requestAppNewVersion()
+        //获取OSS密钥
+        YHOSSManager.share.getOSSID()
     }
     
     lazy var searchView: YHHomeSearchView = {
@@ -72,7 +74,6 @@ private extension YHHomePageViewController {
         homeHeaderView.homeBannerView.dataArr = [YHBannerModel.localDefaultItem()]
         loadFirstData()
         getHomeBannerData()
-        
     }
     
     func getHomeBannerData() {

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

@@ -190,6 +190,7 @@ class YHAllApiName {
         static let uploadApi = "oss/upload/storage"
         static let getPublicApi = "oss/storage/convertToPublicURL"
         static let getPublicUrlsApi = "oss/storage/batchConvertToPublicURL"
+        static let getID = "ossv2/sts/auth"
     }
     
     //我的签字

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

@@ -92,6 +92,8 @@ class YHNetRequest: NSObject {
         requestHeader.add(name:"app_version",value:version)
         
         requestHeader.add(name:"pass",value:"")
+        requestHeader.add(name:"businessCode",value:"4001001")
+
         let appkey = "958364f87222c200a72414f492bf0e26"
         let signOrgiString = "appid=" + "1" + "&" + "timestamp=" + dateStr + "&" + "appkey=" + appkey
         let sign = signOrgiString.md5()