Skip to content

G
galaxy-iOS
Commit 79c1067e authored by David黄金龙's avatar David黄金龙
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 96 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateUploadSheetView.swift
View file @ 79c1067e
...@@ -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()
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHImageViewController.swift
View file @ 79c1067e
...@@ -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() {
......
galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift
View file @ 79c1067e
...@@ -71,38 +71,41 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -71,38 +71,41 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel()) callBackBlock(nil, YHErrorModel())
return return
} }
request.uploadingData = imageData DispatchQueue.global().async {
request.bucketName = self.model.bucket
let timestamp = Date().timeIntervalSince1970 request.uploadingData = imageData
let randomInt = Int.random(in: 1...100) // 随机生成1到10之间的整数 request.bucketName = self.model.bucket
let name = "\(UInt64(timestamp))" + "\(randomInt)" + ".jpg" let timestamp = Date().timeIntervalSince1970
let dateFormatter = DateFormatter() let randomInt = Int.random(in: 1...100) // 随机生成1到10之间的整数
dateFormatter.dateFormat = "yyyyMMdd" let name = "\(UInt64(timestamp))" + "\(randomInt)" + ".jpg"
let currentDateMMdd = dateFormatter.string(from: Date()) let dateFormatter = DateFormatter()
self.fileName.append(name) dateFormatter.dateFormat = "yyyyMMdd"
request.objectKey = "4001001" + "/" + currentDateMMdd + "/" + "\(name)" let currentDateMMdd = dateFormatter.string(from: Date())
request.contentDisposition = "inline" self.fileName.append(name)
request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in request.objectKey = "4001001" + "/" + currentDateMMdd + "/" + "\(name)"
printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)") request.contentDisposition = "inline"
} request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in
printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)")
let task = self.mClient.putObject(request)
task.continue({ (t) -> Any? in
let result = t
if (result.error != nil) {
callBackBlock(nil, YHErrorModel())
} else {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd"
let currentDateMMdd = dateFormatter.string(from: Date())
let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
self.fileName.removeFirst()
print("------------\(string)")
callBackBlock(string, YHErrorModel())
} }
return
}).waitUntilFinished() let task = self.mClient.putObject(request)
task.continue({ (t) -> Any? in
let result = t
if (result.error != nil) {
callBackBlock(nil, YHErrorModel())
} else {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd"
let currentDateMMdd = dateFormatter.string(from: Date())
let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
self.fileName.removeFirst()
print("------------\(string)")
callBackBlock(string, YHErrorModel())
}
return
}).waitUntilFinished()
}
} }
func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) { func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
...@@ -111,67 +114,73 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -111,67 +114,73 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel()) callBackBlock(nil, YHErrorModel())
return return
} }
let fileExtension = URL(fileURLWithPath: file).pathExtension.lowercased()
request.uploadingData = fileData
request.bucketName = self.model.bucket
let timestamp = Date().timeIntervalSince1970
let name = "\(UInt64(timestamp))" + ".\(fileExtension)"
self.fileName.append(name)
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd"
let currentDateMMdd = dateFormatter.string(from: Date())
request.objectKey = "4001001" + "/" + currentDateMMdd + "/" + "\(name)"
request.contentDisposition = "inline"
request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in
printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)")
}
let task = self.mClient.putObject(request)
task.continue({ (t) -> Any? in DispatchQueue.global().async {
let result = t let fileExtension = URL(fileURLWithPath: file).pathExtension.lowercased()
if (result.error != nil) { request.uploadingData = fileData
let error: NSError = (task.error)! as NSError request.bucketName = self.model.bucket
let result = error.description let timestamp = Date().timeIntervalSince1970
callBackBlock(nil, YHErrorModel()) let name = "\(UInt64(timestamp))" + ".\(fileExtension)"
} else { self.fileName.append(name)
let dateFormatter = DateFormatter() let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd" dateFormatter.dateFormat = "yyyyMMdd"
let currentDateMMdd = dateFormatter.string(from: Date()) let currentDateMMdd = dateFormatter.string(from: Date())
let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")" request.objectKey = "4001001" + "/" + currentDateMMdd + "/" + "\(name)"
self.fileName.removeFirst() request.contentDisposition = "inline"
callBackBlock(string, YHErrorModel()) request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in
printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)")
} }
return
}).waitUntilFinished() let task = self.mClient.putObject(request)
task.continue({ (t) -> Any? in
let result = t
if (result.error != nil) {
let error: NSError = (task.error)! as NSError
let result = error.description
callBackBlock(nil, YHErrorModel())
} else {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyyMMdd"
let currentDateMMdd = dateFormatter.string(from: Date())
let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
self.fileName.removeFirst()
callBackBlock(string, YHErrorModel())
}
return
}).waitUntilFinished()
}
} }
func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) { func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
let bucketName = self.getBucket(url) DispatchQueue.global().async {
let pathComponents = url.pathComponents
var objectKey = "" let bucketName = self.getBucket(url)
for i in 0..<pathComponents.count { let pathComponents = url.pathComponents
if i == 0 || i == 1 { var objectKey = ""
for i in 0..<pathComponents.count {
} else if i == pathComponents.count - 1 { if i == 0 || i == 1 {
objectKey = objectKey + pathComponents[i]
} else { } else if i == pathComponents.count - 1 {
objectKey = objectKey + pathComponents[i] + "/" objectKey = objectKey + pathComponents[i]
} else {
objectKey = objectKey + pathComponents[i] + "/"
}
} }
let task = self.mClient.presignConstrainURL(withBucketName: bucketName, withObjectKey: objectKey, withExpirationInterval: 60 * 5)
task.continue({ (t) -> Any? in
let result = t
if (result.error != nil) {
let error: NSError = (task.error)! as NSError
_ = error.description
callBackBlock(nil, YHErrorModel())
} else {
let string = result.result as! String
callBackBlock(string, YHErrorModel())
}
return
}).waitUntilFinished()
} }
let task = mClient.presignConstrainURL(withBucketName: bucketName, withObjectKey: objectKey, withExpirationInterval: 60 * 5)
task.continue({ (t) -> Any? in
let result = t
if (result.error != nil) {
let error: NSError = (task.error)! as NSError
_ = error.description
callBackBlock(nil, YHErrorModel())
} else {
let string = result.result as! String
callBackBlock(string, YHErrorModel())
}
return
}).waitUntilFinished()
} }
func getBucket(_ url: String) -> String { func getBucket(_ url: String) -> String {
......
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