fixed #234

tilltue · Nov 9, 2019 · d6cf40d · d6cf40d
1 parent 0cdcae6
commit d6cf40d
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 deletions.
diff --git a/TLPhotoPicker/Classes/TLAlbumPopView.swift b/TLPhotoPicker/Classes/TLAlbumPopView.swift
@@ -25,8 +25,10 @@ extension PopupViewProtocol where Self: UIView {
         return frame
     }
     func setupPopupFrame() {
-        if self.originalFrame != self.popupView.frame {
+        if self.originalFrame == CGRect.zero {
             self.originalFrame = self.popupView.frame
+        }else {
+            self.originalFrame.size.height = self.popupView.frame.height
         }
     }
     func show(_ show: Bool, duration: TimeInterval = 0.1) {

diff --git a/TLPhotoPicker/Classes/TLPhotoLibrary.swift b/TLPhotoPicker/Classes/TLPhotoLibrary.swift
@@ -21,6 +21,8 @@ class TLPhotoLibrary {
     lazy var imageManager: PHCachingImageManager = {
         return PHCachingImageManager()
     }()
+    internal var assetCollections: [PHFetchResult<PHAssetCollection>] = []
+    internal var albums: PHFetchResult<PHCollection>? = nil
 
     deinit {
         //        print("deinit TLPhotoLibrary")
@@ -164,6 +166,8 @@ extension TLPhotoLibrary {
     }
 
     func fetchCollection(configure: TLPhotosPickerConfigure) {
+        self.albums = nil
+        self.assetCollections = []
         let useCameraButton = configure.usedCameraButton
         let options = getOption(configure: configure)
         let fetchCollectionOption = configure.fetchCollectionOption
@@ -173,6 +177,7 @@ extension TLPhotoLibrary {
             let fetchCollection = PHAssetCollection.fetchAssetCollections(with: .album,
                                                                           subtype: subType,
                                                                           options: collectionOption)
+            self.assetCollections.append(fetchCollection)
             var collections = [PHAssetCollection]()
             fetchCollection.enumerateObjects { (collection, index, _) in 
                 if configure.allowedAlbumCloudShared == false && collection.assetCollectionSubtype == .albumCloudShared {
@@ -202,6 +207,7 @@ extension TLPhotoLibrary {
             let fetchCollection = PHAssetCollection.fetchAssetCollections(with: .smartAlbum,
                                                                           subtype: subType,
                                                                           options: collectionOption)
+            self.assetCollections.append(fetchCollection)
             if
                 let collection = fetchCollection.firstObject,
                 result.contains(where: { $0.localIdentifier == collection.localIdentifier }) == false
@@ -262,6 +268,7 @@ extension TLPhotoLibrary {
                 //Album
                 let collectionOption = fetchCollectionOption[.topLevelUserCollections]
                 let albumsResult = PHCollectionList.fetchTopLevelUserCollections(with: collectionOption)
+                self?.albums = albumsResult
                 albumsResult.enumerateObjects({ (collection, index, stop) -> Void in
                     guard let collection = collection as? PHAssetCollection else { return }
                     var assetsCollection = TLAssetsCollection(collection: collection)

diff --git a/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift b/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift
@@ -738,14 +738,57 @@ extension TLPhotosPickerViewController: PHLivePhotoViewDelegate {
 
 // MARK: - PHPhotoLibraryChangeObserver
 extension TLPhotosPickerViewController: PHPhotoLibraryChangeObserver {
+    private func getChanges(_ changeInstance: PHChange) -> PHFetchResultChangeDetails<PHAsset>? {
+        func isChangesCount<T>(changeDetails: PHFetchResultChangeDetails<T>?) -> Bool {
+            guard let changeDetails = changeDetails else {
+                return false
+            }
+            let before = changeDetails.fetchResultBeforeChanges.count
+            let after = changeDetails.fetchResultAfterChanges.count
+            return before != after
+        }
+
+        func isAlbumsChanges() -> Bool {
+            guard let albums = self.photoLibrary.albums else {
+                return false
+            }
+            let changeDetails = changeInstance.changeDetails(for: albums)
+            return isChangesCount(changeDetails: changeDetails)
+        }
+
+        func isCollectionsChanges() -> Bool {
+            for fetchResultCollection in self.photoLibrary.assetCollections {
+                let changeDetails = changeInstance.changeDetails(for: fetchResultCollection)
+                if isChangesCount(changeDetails: changeDetails) == true {
+                    return true
+                }
+            }
+            return false
+        }
+
+        if isAlbumsChanges() || isCollectionsChanges() {
+            DispatchQueue.main.async {
+                self.albumPopView.show(false, duration: self.configure.popup.duration)
+                self.photoLibrary.fetchCollection(configure: self.configure)
+            }
+            return nil
+        }else {
+            guard let changeFetchResult = self.focusedCollection?.fetchResult else { return nil }
+            guard let changes = changeInstance.changeDetails(for: changeFetchResult) else { return nil }
+            return changes
+        }
+    }
+
     public func photoLibraryDidChange(_ changeInstance: PHChange) {
         var addIndex = 0
         if getfocusedIndex() == 0 {
             addIndex = self.usedCameraButton ? 1 : 0
         }
         DispatchQueue.main.async {
-            guard let changeFetchResult = self.focusedCollection?.fetchResult else { return }
-            guard let changes = changeInstance.changeDetails(for: changeFetchResult) else { return }
+            guard let changes = self.getChanges(changeInstance) else {
+                return
+            }
+
             if changes.hasIncrementalChanges, self.configure.groupByFetch == nil {
                 var deletedSelectedAssets = false
                 var order = 0