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 {
fileCoordinator.coordinate(readingItemAt: url, options:[.forUploading], error: &error) {
fileUrl in
uploadFilesBlock?(fileUrl)
dismiss()
uploadFilesBlock?(fileUrl)
}
url.stopAccessingSecurityScopedResource()
if let error = error {
printLog("\(error.localizedDescription)")
}
} else {
print("授权失败")
YHHUD.flash(message: "文件授权失败")
dismiss()
}
}
......
......@@ -16,21 +16,14 @@ class YHImageViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
viewModel = YHWorkExperienceViewModel()
view.backgroundColor = .black
self.hidesBottomBarWhenPushed = true
if #available(iOS 11.0, *) {
} else {
self.automaticallyAdjustsScrollViewInsets = false
}
viewModel = YHWorkExperienceViewModel()
setView()
getData()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationController?.isNavigationBarHidden = false
}
func setView() {
......
......@@ -71,6 +71,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel())
return
}
DispatchQueue.global().async {
request.uploadingData = imageData
request.bucketName = self.model.bucket
let timestamp = Date().timeIntervalSince1970
......@@ -104,6 +106,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return
}).waitUntilFinished()
}
}
func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
let request = OSSPutObjectRequest()
......@@ -111,6 +114,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel())
return
}
DispatchQueue.global().async {
let fileExtension = URL(fileURLWithPath: file).pathExtension.lowercased()
request.uploadingData = fileData
request.bucketName = self.model.bucket
......@@ -145,8 +150,11 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return
}).waitUntilFinished()
}
}
func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
DispatchQueue.global().async {
let bucketName = self.getBucket(url)
let pathComponents = url.pathComponents
var objectKey = ""
......@@ -159,7 +167,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
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
let result = t
if (result.error != nil) {
......@@ -173,6 +181,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return
}).waitUntilFinished()
}
}
func getBucket(_ url: String) -> String {
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