home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-13 14:56:03 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix pick photos logic after pick & delete

Browse Source
This commit is contained in:
nixzhu
2015-10-21 16:25:31 +08:00
committed by nixzhu
parent 44371bd7ac
commit ca92da906a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/ViewControllers/NewFeed/NewFeedViewController.swift
+5 -6
View File
@@ -21,7 +21,7 @@ class NewFeedViewController: UIViewController {
@IBOutlet weak var messageTextView: UITextView!
@IBOutlet weak var mediaCollectionView: UICollectionView!
var imageAssetSet: Set<PHAsset>?
var imageAssets: [PHAsset] = []
var mediaImages = [UIImage]() {
didSet {
@@ -95,13 +95,11 @@ class NewFeedViewController: UIViewController {
let vc = segue.destinationViewController as! PickPhotosViewController
if let imageAssetSet = imageAssetSet {
vc.pickedImageSet = imageAssetSet
}
vc.pickedImageSet = Set(imageAssets)
vc.completion = { [weak self] images, imageAssetSet in
vc.completion = { [weak self] images, imageAssets in
self?.mediaImages = images
self?.imageAssetSet = imageAssetSet
self?.imageAssets = imageAssets
}
}
}
@@ -256,6 +254,7 @@ extension NewFeedViewController: UICollectionViewDataSource, UICollectionViewDel
case 1:
mediaImages.removeAtIndex(indexPath.item)
imageAssets.removeAtIndex(indexPath.item)
collectionView.deleteItemsAtIndexPaths([indexPath])
default:
Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift
+5 -3
View File
@@ -17,7 +17,7 @@ class PickPhotosViewController: UICollectionViewController, PHPhotoLibraryChange
var imageCacheController: ImageCacheController!
var pickedImageSet = Set<PHAsset>()
var completion: ((images: [UIImage], imageAssetSet: Set<PHAsset>) -> Void)?
var completion: ((images: [UIImage], imageAssets: [PHAsset]) -> Void)?
let photoCellID = "PhotoCell"
@@ -64,7 +64,9 @@ class PickPhotosViewController: UICollectionViewController, PHPhotoLibraryChange
let options = PHImageRequestOptions()
options.synchronous = true
for imageAsset in pickedImageSet {
let pickedImageAssets = Array(pickedImageSet)
for imageAsset in pickedImageAssets {
let maxSize: CGFloat = 512
@@ -97,7 +99,7 @@ class PickPhotosViewController: UICollectionViewController, PHPhotoLibraryChange
}
}
completion?(images: images, imageAssetSet: pickedImageSet)
completion?(images: images, imageAssets: pickedImageAssets)
navigationController?.popViewControllerAnimated(true)
}