github/cordova-plugin-mediaPicker
3
0
Fork 0
mirror of https://github.com/DmcSDK/cordova-plugin-mediaPicker synced 2026-06-09 00:00:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let the default selected album to be CameraRoll.

Browse Source 
Fixing index from NSInteger* to NSInteger.

https://github.com/DmcSDK/cordova-plugin-mediaPicker/issues/50
https://github.com/DmcSDK/cordova-plugin-mediaPicker/issues/36
This commit is contained in:
Roger Guo
2018-11-13 08:50:19 +08:00
parent 8172f8194f
commit 546f98dfd1
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ios/DMCMediaPicker/AlbumListView.h
+3 -3
View File
@@ -20,12 +20,12 @@
/** /**
select index select index
*/ */
@property (nonatomic ,assign)NSInteger* nowIndex; @property (nonatomic ,assign)NSInteger nowIndex;
/** /**
选择相册之后、传递相册数据源 选择相册之后、传递相册数据源
*/ */
@property (nonatomic ,copy)void(^didSelectAlbumBlock)(NSInteger *index); @property (nonatomic ,copy)void(^didSelectAlbumBlock)(NSInteger index);
-(void)setListDataSource:(NSMutableArray *)dataSource dataNameSource:(NSMutableArray *)names nowSelectAlbum:(NSInteger*)nowIndex ; -(void)setListDataSource:(NSMutableArray *)dataSource dataNameSource:(NSMutableArray *)names nowSelectAlbum:(NSInteger)nowIndex ;
@end @end
src/ios/DMCMediaPicker/AlbumListView.m
+6 -6
View File
@@ -42,18 +42,18 @@
#pragma mark - setter #pragma mark - setter
-(void)setListDataSource:(NSMutableArray *)dataSource dataNameSource:(NSMutableArray *)names nowSelectAlbum:(NSInteger*)nowIndex -(void)setListDataSource:(NSMutableArray *)dataSource dataNameSource:(NSMutableArray *)names nowSelectAlbum: (NSInteger)nowIndex
{ {
_dataSource=dataSource; _dataSource=dataSource;
_dataNameSource=names; _dataNameSource=names;
_nowIndex=nowIndex; _nowIndex=nowIndex;
[self.tableView reloadData]; [self.tableView reloadData];
int scrolltoIndex=0; NSInteger scrolltoIndex = 0;
//下面代码是让下拉选中了有个居中的感觉 //下面代码是让下拉选中了有个居中的感觉
if((int)_nowIndex>[_dataNameSource count]-4){ if(_nowIndex > [_dataNameSource count]-4){
scrolltoIndex= [_dataNameSource count]-1; scrolltoIndex = [_dataNameSource count]-1;
}else{ }else{
scrolltoIndex=((int)_nowIndex+3); scrolltoIndex=(_nowIndex+3);
} }
if([_dataNameSource count]>3){ if([_dataNameSource count]>3){
[self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForItem:scrolltoIndex inSection:0] atScrollPosition:UITableViewScrollPositionBottom animated:NO]; [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForItem:scrolltoIndex inSection:0] atScrollPosition:UITableViewScrollPositionBottom animated:NO];
@@ -150,4 +150,4 @@
} }
@end @end
src/ios/DMCMediaPicker/DmcPickerViewController.m
+15 -10
View File
@@ -18,7 +18,7 @@
AlbumListView *albumlistView; AlbumListView *albumlistView;
NSMutableArray *albumsTitlelist; NSMutableArray *albumsTitlelist;
NSMutableArray * dataSource; NSMutableArray * dataSource;
NSInteger* nowSelectAlbum; NSInteger nowSelectAlbum;
} }
@property (strong, nonatomic) PHImageManager *manager; @property (strong, nonatomic) PHImageManager *manager;
@@ -104,7 +104,7 @@
[albumlistView setListDataSource:dataSource dataNameSource:albumsTitlelist nowSelectAlbum:nowSelectAlbum]; [albumlistView setListDataSource:dataSource dataNameSource:albumsTitlelist nowSelectAlbum:nowSelectAlbum];
__weak DmcPickerViewController* weakSelf = self; __weak DmcPickerViewController* weakSelf = self;
//设置选择相册之后的block回调 //设置选择相册之后的block回调
[albumlistView setDidSelectAlbumBlock:^(NSInteger *index) { [albumlistView setDidSelectAlbumBlock:^(NSInteger index) {
[weakSelf show:index]; [weakSelf show:index];
@@ -203,7 +203,9 @@
}else if(self.selectMode==102){ }else if(self.selectMode==102){
options.predicate = [NSPredicate predicateWithFormat:@"mediaType == %ld", PHAssetMediaTypeVideo]; options.predicate = [NSPredicate predicateWithFormat:@"mediaType == %ld", PHAssetMediaTypeVideo];
} }
int defaultSelection = 0;
int i = 0;
for (PHFetchResult *fetchResult in allAlbums) { for (PHFetchResult *fetchResult in allAlbums) {
for (PHAssetCollection *collection in fetchResult) { for (PHAssetCollection *collection in fetchResult) {
// 有可能是PHCollectionList类的的对象，过滤掉 // 有可能是PHCollectionList类的的对象，过滤掉
@@ -212,23 +214,26 @@
if (collection.estimatedAssetCount <= 0) continue; if (collection.estimatedAssetCount <= 0) continue;
if (collection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumAllHidden) continue; //包含隐藏照片或视频的文件夹 if (collection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumAllHidden) continue; //包含隐藏照片或视频的文件夹
if (collection.assetCollectionSubtype == 1000000201) continue; //『最近删除』相册 if (collection.assetCollectionSubtype == 1000000201) continue; //『最近删除』相册
if (collection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumUserLibrary) {
defaultSelection = i;
}
PHFetchResult *group = [PHAsset fetchAssetsInAssetCollection:collection options:options]; PHFetchResult *group = [PHAsset fetchAssetsInAssetCollection:collection options:options];
if([group count]>0){ if([group count]>0){
[albumsTitlelist addObject:collection.localizedTitle]; [albumsTitlelist addObject:collection.localizedTitle];
[dataSource addObject:group]; [dataSource addObject:group];
i++;
} }
} }
} }
_manager = [PHImageManager defaultManager]; _manager = [PHImageManager defaultManager];
[self show:0]; [self show: defaultSelection];
} }
-(void)show:(NSInteger *)index{ -(void)show:(NSInteger) index {
if([dataSource count]>0){ if([dataSource count]>0){
fetchResult = dataSource[(int)index]; fetchResult = dataSource[index];
[self setTitleView:albumsTitlelist[(int)index]]; [self setTitleView:albumsTitlelist[index]];
[_collectionView reloadData]; [_collectionView reloadData];
[self hiddenAlbumlistView]; [self hiddenAlbumlistView];
[_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionTop animated:NO]; [_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionTop animated:NO];