diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 513f9d6..d760806 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift b/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift index 01ce057..ef1d01b 100644 --- a/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift +++ b/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift @@ -337,6 +337,7 @@ class CCSpaceAlbumFilterPopView2: UIView { } func loadMoreData(offset:Int) { + let fetchResult_collection = PHAssetCollection.fetchAssetCollections(with: PHAssetCollectionType.smartAlbum, subtype: PHAssetCollectionSubtype.any, options: nil); //筛选空间相册 var spatialAC:PHAssetCollection? @@ -359,6 +360,10 @@ class CCSpaceAlbumFilterPopView2: UIView { fetchOptions.predicate = predicate } let fetchResult_asset = PHAsset.fetchAssets(in: sac, options: fetchOptions) + guard offset < fetchResult_asset.count else {//确保筛选有数据 + return + } + var count = 0 for i in offset ..< fetchResult_asset.count { let asset = fetchResult_asset.object(at: i)