Commit 79c1067e authored by David黄金龙's avatar David黄金龙

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优化
  //  优化上传大文件 UI显示异常问题
  修改预览显示异常
parents 2142257f dd27986c
...@@ -538,15 +538,16 @@ extension YHCertificateUploadSheetView: UIDocumentPickerDelegate { ...@@ -538,15 +538,16 @@ extension YHCertificateUploadSheetView: UIDocumentPickerDelegate {
fileCoordinator.coordinate(readingItemAt: url, options:[.forUploading], error: &error) { fileCoordinator.coordinate(readingItemAt: url, options:[.forUploading], error: &error) {
fileUrl in fileUrl in
uploadFilesBlock?(fileUrl)
dismiss() dismiss()
uploadFilesBlock?(fileUrl)
} }
url.stopAccessingSecurityScopedResource() url.stopAccessingSecurityScopedResource()
if let error = error { if let error = error {
printLog("\(error.localizedDescription)")
} }
} else { } else {
print("授权失败") YHHUD.flash(message: "文件授权失败")
dismiss() dismiss()
} }
} }
......
...@@ -16,21 +16,14 @@ class YHImageViewController: YHBaseViewController { ...@@ -16,21 +16,14 @@ class YHImageViewController: YHBaseViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
viewModel = YHWorkExperienceViewModel()
view.backgroundColor = .black view.backgroundColor = .black
viewModel = YHWorkExperienceViewModel()
self.hidesBottomBarWhenPushed = true
if #available(iOS 11.0, *) {
} else {
self.automaticallyAdjustsScrollViewInsets = false
}
setView() setView()
getData() getData()
} }
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
navigationController?.isNavigationBarHidden = false
} }
func setView() { func setView() {
......
...@@ -71,6 +71,8 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -71,6 +71,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel()) callBackBlock(nil, YHErrorModel())
return return
} }
DispatchQueue.global().async {
request.uploadingData = imageData request.uploadingData = imageData
request.bucketName = self.model.bucket request.bucketName = self.model.bucket
let timestamp = Date().timeIntervalSince1970 let timestamp = Date().timeIntervalSince1970
...@@ -104,6 +106,7 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -104,6 +106,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return return
}).waitUntilFinished() }).waitUntilFinished()
} }
}
func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) { func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
let request = OSSPutObjectRequest() let request = OSSPutObjectRequest()
...@@ -111,6 +114,8 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -111,6 +114,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel()) callBackBlock(nil, YHErrorModel())
return return
} }
DispatchQueue.global().async {
let fileExtension = URL(fileURLWithPath: file).pathExtension.lowercased() let fileExtension = URL(fileURLWithPath: file).pathExtension.lowercased()
request.uploadingData = fileData request.uploadingData = fileData
request.bucketName = self.model.bucket request.bucketName = self.model.bucket
...@@ -145,8 +150,11 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -145,8 +150,11 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return return
}).waitUntilFinished() }).waitUntilFinished()
} }
}
func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) { func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
DispatchQueue.global().async {
let bucketName = self.getBucket(url) let bucketName = self.getBucket(url)
let pathComponents = url.pathComponents let pathComponents = url.pathComponents
var objectKey = "" var objectKey = ""
...@@ -159,7 +167,7 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -159,7 +167,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
objectKey = objectKey + pathComponents[i] + "/" objectKey = objectKey + pathComponents[i] + "/"
} }
} }
let task = mClient.presignConstrainURL(withBucketName: bucketName, withObjectKey: objectKey, withExpirationInterval: 60 * 5) let task = self.mClient.presignConstrainURL(withBucketName: bucketName, withObjectKey: objectKey, withExpirationInterval: 60 * 5)
task.continue({ (t) -> Any? in task.continue({ (t) -> Any? in
let result = t let result = t
if (result.error != nil) { if (result.error != nil) {
...@@ -173,6 +181,7 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -173,6 +181,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return return
}).waitUntilFinished() }).waitUntilFinished()
} }
}
func getBucket(_ url: String) -> String { func getBucket(_ url: String) -> String {
if url.contains("test-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com") { if url.contains("test-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment