diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 13f5454..513f9d6 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 adac258..01ce057 100644 --- a/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift +++ b/SwiftProject/SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift @@ -399,9 +399,6 @@ class CCSpaceAlbumFilterPopView2: UIView { extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionViewDelegateFlowLayout { - - - // MARK: - UICollectionViewDataSource func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { return self.dataSource.count @@ -424,14 +421,11 @@ extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionVie let time:Double = Double(model.itemAsset!.duration) let timeStr:String = ZZHHelper.formatVideoTime(second:Int(time)) -// let timeStr:String = self.transToHourMinSec(second:Int(time)) - cell.frameCountLabel.isHidden = true cell.timeLabel.isHidden = false cell.timeLabel.text = timeStr } - return cell } @@ -494,10 +488,8 @@ extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionVie //MARK: - 获取图片data private func getImageData(for asset: PHAsset) -> Data? { - var imageData: Data? if asset.mediaType == .image { - let requestOptions = PHImageRequestOptions() requestOptions.isSynchronous = true//设置成同步回调 requestOptions.deliveryMode = .highQualityFormat @@ -505,13 +497,10 @@ extension CCSpaceAlbumFilterPopView2:UICollectionViewDataSource, UICollectionVie imageData = data } } - - print(".....:\(imageData)") return imageData } private func getVideoURL(from asset: PHAsset, completion: @escaping (URL,AVURLAsset) -> Void) { - if asset.mediaType == .video { let requestOptions = PHVideoRequestOptions() requestOptions.isNetworkAccessAllowed = true