Commit 01da70c0 authored by CZ1004's avatar CZ1004

修改压缩逻辑

parent c96c6e84
...@@ -196,7 +196,7 @@ class CompressQualityController : BaseViewController{ ...@@ -196,7 +196,7 @@ class CompressQualityController : BaseViewController{
currentQulity = 0.8 currentQulity = 0.8
} }
manager.compress(assets: self.model!, compressionQuality: currentQulity) {progress in manager.compress(assets: self.model!, compressionQuality: currentQulity) {progress in
compressingView.animationView.setProgress(CGFloat(progress), animated: true, duration: 0.1) compressingView.animationView.setProgress(CGFloat(progress), animated: false, duration: 0.1)
} completion: { compressedDataArray, errorArray in } completion: { compressedDataArray, errorArray in
for (index, data) in compressedDataArray.enumerated() { for (index, data) in compressedDataArray.enumerated() {
...@@ -209,7 +209,8 @@ class CompressQualityController : BaseViewController{ ...@@ -209,7 +209,8 @@ class CompressQualityController : BaseViewController{
} }
} }
DispatchQueue.main.asyncAfter(deadline:.now() + 2) {
DispatchQueue.main.async {
compressingView.removeFromSuperview() compressingView.removeFromSuperview()
let vc = CompressCompletedViewController() let vc = CompressCompletedViewController()
vc.model = self.model vc.model = self.model
...@@ -237,35 +238,6 @@ class CompressQualityController : BaseViewController{ ...@@ -237,35 +238,6 @@ class CompressQualityController : BaseViewController{
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
} }
// DispatchQueue.main.async {
// compressingView.removeFromSuperview()
// let vc = CompressCompletedViewController()
// vc.model = self.model
// vc.detailTipToplabel.text = "\(self.model!.count) items"
// vc.detailTipBottomlabel.text = "\(self.model!.count) items"
//
// var sum = 0.0
// var orgAllSize = 0.0
// var compressAllSize = 0.0
// for modelData in self.model! {
// orgAllSize = orgAllSize + modelData.orgSize
// compressAllSize = compressAllSize + modelData.compressSize
// sum = sum + modelData.orgSize - modelData.compressSize
// }
// if sum > 1000 {
// sum = sum / 1024
// vc.sizeToplabel.text = "\(sum)GB"
// }else{
// vc.sizeToplabel.text = "\(sum)MB"
// }
// let str = String(format:"%.2lf",(orgAllSize - compressAllSize) / orgAllSize)
// vc.sizeBottomlabel.text = "\(str)%"
//
//
// self.navigationController?.pushViewController(vc, animated: true)
// }
} }
} }
...@@ -133,10 +133,6 @@ class CompressViewModel{ ...@@ -133,10 +133,6 @@ class CompressViewModel{
options.deliveryMode = .highQualityFormat options.deliveryMode = .highQualityFormat
PHImageManager.default().requestImageDataAndOrientation(for: asset, options: options) { (imageData, _, _, error) in PHImageManager.default().requestImageDataAndOrientation(for: asset, options: options) { (imageData, _, _, error) in
if let error = error {
completion(nil, error as? Error)
return
}
guard let originalData = imageData else { guard let originalData = imageData else {
completion(nil, nil) completion(nil, nil)
......
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