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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3114,7 +3114,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3317,7 +3317,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3362,7 +3362,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

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

@@ -17,7 +17,6 @@ class YHBaseViewModel {
         let size = image.imageSize()
         YHHUD.flash(message: "\(Float(size/1024/1024))M")
 #endif
-        YHOSSManager.share.getOSSID()
 //        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.uploadApi
 //        let boundary = UUID().uuidString
 //        let headers: HTTPHeaders = [
@@ -44,11 +43,13 @@ class YHBaseViewModel {
             }
             return
         }
-        YHOSSManager.share.putObject(image: image) {[weak self] success, error in
-            guard let _ = self else { return }
-            DispatchQueue.main.async {
-                // 在这里执行需要在主线程上完成的任务
-                callBackBlock(success, error)
+        YHOSSManager.share.updateToken {
+            YHOSSManager.share.putObject(image: image) {[weak self] success, error in
+                guard let _ = self else { return }
+                DispatchQueue.main.async {
+                    // 在这里执行需要在主线程上完成的任务
+                    callBackBlock(success, error)
+                }
             }
         }
     }
@@ -69,7 +70,6 @@ class YHBaseViewModel {
 //        } failBlock: { err in
 //            callBackBlock(nil,err)
 //        }
-        YHOSSManager.share.getOSSID()
         if YHNetworkStatusManager.shared.isNetWorkOK == false {
             DispatchQueue.main.async {
                 YHHUD.flash(message: "网络异常")
@@ -79,13 +79,15 @@ class YHBaseViewModel {
             }
             return
         }
-        YHOSSManager.share.getPublic(url: url, callBackBlock: { [weak self] success, error in
-            guard let _ = self else { return }
-            DispatchQueue.main.async {
-                // 在这里执行需要在主线程上完成的任务
-                callBackBlock(success, error)
-            }
-        })
+        YHOSSManager.share.updateToken {
+            YHOSSManager.share.getPublic(url: url, callBackBlock: { [weak self] success, error in
+                guard let _ = self else { return }
+                DispatchQueue.main.async {
+                    // 在这里执行需要在主线程上完成的任务
+                    callBackBlock(success, error)
+                }
+            })
+        }
     }
     
     //换取多张图片
@@ -126,7 +128,6 @@ class YHBaseViewModel {
 //        } failBlock: { err in
 //            callBackBlock(nil, err)
 //        }
-        YHOSSManager.share.getOSSID()
         if YHNetworkStatusManager.shared.isNetWorkOK == false {
             DispatchQueue.main.async {
                 YHHUD.flash(message: "网络异常")
@@ -136,12 +137,14 @@ class YHBaseViewModel {
             }
             return
         }
-        YHOSSManager.share.putFile(file: url, callBackBlock: {[weak self] success, error in
-            guard let _ = self else { return }
-            DispatchQueue.main.async {
-                // 在这里执行需要在主线程上完成的任务
-                callBackBlock(success, error)
-            }
-        })
+        YHOSSManager.share.updateToken {
+            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(首页)/V/YHAgreementAlertView.swift

@@ -104,7 +104,7 @@ class YHAgreementAlertView: UIView {
             button.backgroundColor =  UIColor(hex:0xffffff)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
             button.contentHorizontalAlignment = .center
-            button.setTitle("取消", for: .normal)
+            button.setTitle("拒绝", for: .normal)
             button.setTitleColor( UIColor.brandMainColor, for: .normal)
             button.layer.cornerRadius = kCornerRadius3
             button.layer.borderWidth = 1
@@ -127,7 +127,7 @@ class YHAgreementAlertView: UIView {
             button.backgroundColor =  UIColor.brandMainColor
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
             button.contentHorizontalAlignment = .center
-            button.setTitle("确认", for: .normal)
+            button.setTitle("同意", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
             button.layer.cornerRadius = kCornerRadius3
             button.addTarget(self, action: #selector(agree), for: .touchUpInside)

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

@@ -518,6 +518,7 @@ extension YHCertificateUploadSheetView: PHPickerViewControllerDelegate {
 extension YHCertificateUploadSheetView: UIDocumentPickerDelegate  {
     
     func selectFile() {
+        YHOSSManager.share.getOSSID()
         UIViewController.current?.present(documentPickerVC, animated: true, completion: nil)
     }
     

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

@@ -424,6 +424,7 @@ extension YHDocumentUploadView: PHPickerViewControllerDelegate {
 extension YHDocumentUploadView: UIDocumentPickerDelegate  {
     
     func selectFile() {
+        YHOSSManager.share.getOSSID()
         UIViewController.current?.present(documentPickerVC, animated: true, completion: nil)
     }
     

galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift

@@ -29,7 +29,22 @@ class YHOSSManager: NSObject, URLSessionDelegate {
     override init() {
     }
     
-    func getOSSID() {
+    func updateToken(completionHandler: (() -> Void)? = nil) {
+        if let dateFromString = ISO8601DateFormatter().date(from: YHOSSManager.share.model.Expiration) {
+            // 将日期转换为当前日期和时间
+            let currentDate = Date()
+            // 比较两个日期
+            if dateFromString > currentDate {
+                completionHandler?()
+            } else {
+                YHOSSManager.share.getOSSID(completionHandler: completionHandler)
+            }
+        } else {
+            YHOSSManager.share.getOSSID(completionHandler: completionHandler)
+        }
+    }
+    
+    func getOSSID(completionHandler: (() -> Void)? = nil) {
         let param: [String: Any] = ["path": "*"]
         let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.getID
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
@@ -42,14 +57,20 @@ class YHOSSManager: NSObject, URLSessionDelegate {
             self.model = resultModel
             self.mProvider = OSSStsTokenCredentialProvider(accessKeyId: self.model.accessKeyId, secretKeyId: self.model.accessKeySecret, securityToken: self.model.securityToken)
             self.mClient = OSSClient(endpoint: self.model.endpoint, credentialProvider: self.mProvider)
+            if let block = completionHandler {
+                block()
+            }
         } failBlock: { err in
         }
     }
     
     func putObject(image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
         let request = OSSPutObjectRequest()
-        let size = Int(5 * 1024 * 1024)
-        guard let imageData = image.compressOriginalImage(size) else { return }
+        let size = Int(2 * 1024 * 1024)
+        guard let imageData = image.compressOriginalImage(size) else {
+            callBackBlock(nil, YHErrorModel())
+            return
+        }
         request.uploadingData = imageData
         request.bucketName = self.model.bucket
         let timestamp = Date().timeIntervalSince1970
@@ -86,7 +107,10 @@ class YHOSSManager: NSObject, URLSessionDelegate {
     
     func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
         let request = OSSPutObjectRequest()
-        guard let fileData = try? Data(contentsOf: URL(string: file) ?? URL(fileURLWithPath: "")) else { return }
+        guard let fileData = try? Data(contentsOf: URL(string: file) ?? URL(fileURLWithPath: "")) else {
+            callBackBlock(nil, YHErrorModel())
+            return
+        }
         let fileExtension = URL(fileURLWithPath: file).pathExtension.lowercased()
         request.uploadingData = fileData
         request.bucketName = self.model.bucket