targeSize remove scale

loopeer · Sep 18, 2017 · d44ac69 · d44ac69
1 parent 09376cd
commit d44ac69
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/LPAlbum/Controllers/LPAlbum.swift b/LPAlbum/Controllers/LPAlbum.swift
@@ -18,13 +18,17 @@ import Photos
 
 public typealias SetConfigBlock = ((inout LPAlbum.Config) -> Void)
 public typealias CompleteSelectImagesBlock = (([UIImage]) -> Void)
+public typealias CompleteSelectAssetsBlock = (([PHAsset]) -> Void)
 public typealias ErrorBlock = ((UIViewController ,AlbumError) -> Void)
 public typealias TargetSizeBlock = ((CGSize) -> CGSize)
 
+
 public class LPAlbum: UIViewController {
 
     fileprivate let config: Config
     fileprivate var completeSelectImagesBlock: CompleteSelectImagesBlock?
+    fileprivate var completeSelectAssetsBlock: CompleteSelectAssetsBlock?
+
     fileprivate var errorBlock: ErrorBlock?
     fileprivate var targetSizeBlock: TargetSizeBlock?
 
@@ -162,12 +166,20 @@ extension LPAlbum {
             let option = PHImageRequestOptions()
             option.isSynchronous = true
             option.resizeMode = .exact
-            AlbumManager.getPhoto(asset: asset, targetSize: targetSize, option: option, resultHandler: {[weak self] (image, _) in
-                if image != nil { result.append(image!) }
-                if result.count == assets.count {
-                    self?.completeSelectImagesBlock?(result)
-                    self?.cancel() }
-            })
+            DispatchQueue.global().async {
+                AlbumManager.getPhoto(asset: asset,
+                                      targetSize: targetSize,
+                                      adaptScale: false,
+                                      option: option,
+                                      contentMode: .aspectFit,
+                                      resultHandler: {[weak self] (image, _) in
+                    if image != nil { result.append(image!) }
+                    if result.count == assets.count {
+                        DispatchQueue.main.async { self?.completeSelectImagesBlock?(result) }
+                    }
+                })
+            }
+            cancel()
         }
     }
 }
@@ -233,7 +245,7 @@ extension LPAlbum: UICollectionViewDelegate, UICollectionViewDataSource {
         guard UIImagePickerController.isSourceTypeAvailable(sourceType) else { fatalError("摄像头不可用") }
         let picker = UIImagePickerController()
         picker.sourceType = sourceType
-        picker.allowsEditing = true
+        picker.allowsEditing = false
         picker.delegate = self
         present(picker, animated: true, completion: nil)
     }

diff --git a/LPAlbum/Others/AlbumManager.swift b/LPAlbum/Others/AlbumManager.swift
@@ -27,17 +27,23 @@ public class AlbumManager {
 
     // 根据Asset获取photo
     @discardableResult
-    public class func getPhoto(asset: PHAsset, targetSize: CGSize, option: PHImageRequestOptions? = nil, resultHandler: @escaping ((UIImage?, [AnyHashable: Any]?) -> Void)) -> PHImageRequestID {
+    public class func getPhoto(asset: PHAsset,
+                               targetSize: CGSize,
+                               adaptScale: Bool = true,
+                               option: PHImageRequestOptions? = nil,
+                               contentMode: PHImageContentMode = .aspectFill,
+                               resultHandler: @escaping ((UIImage?, [AnyHashable: Any]?) -> Void))
+        -> PHImageRequestID {
 
         let defalutOption = PHImageRequestOptions()
         defalutOption.resizeMode = .fast
         defalutOption.deliveryMode = .opportunistic
 
-        let size = CGSize(width: targetSize.width * UIScreen.main.scale,
-                         height: targetSize.height * UIScreen.main.scale)
+        let adaptSize = CGSize(width: targetSize.width * UIScreen.main.scale,
+                               height: targetSize.height * UIScreen.main.scale)
         return AlbumManager.imageManager.requestImage(for: asset,
-                                                      targetSize: size,
-                                                      contentMode: .aspectFill,
+                                                      targetSize: adaptScale ? adaptSize : targetSize,
+                                                      contentMode: contentMode,
                                                       options: option ?? defalutOption,
                                                       resultHandler: resultHandler)
     }

diff --git a/LPAlbumDemo/PhotoCell.swift b/LPAlbumDemo/PhotoCell.swift
@@ -17,7 +17,7 @@ class PhotoCell: UICollectionViewCell {
 
         photoView.frame = bounds
         photoView.clipsToBounds = true
-        photoView.contentMode = .scaleAspectFill
+        photoView.contentMode = .scaleAspectFit
         contentView.addSubview(photoView)
     }
 

diff --git a/LPAlbumDemo/ViewController.swift b/LPAlbumDemo/ViewController.swift
@@ -39,12 +39,13 @@ class ViewController: UIViewController {
             $0.hasCamera = true
             $0.maxSelectCount = 9 - self.photos.count
         }.targeSize({ (size) -> CGSize in
-            return CGSize(width: 80, height: 80)
+            return CGSize(width: 240, height: 240)
         }).error {(vc, error) in
             vc.show(message: error.localizedDescription)
         }.complete { [weak self](images) in
             self?.photos.append(contentsOf: images)
             self?.collectionView.reloadData()
+            _ = images.map{ print($0.size) }
         }
     }
     func clean() {