From 1a5a675fe79f9f9d507803f370d8493d25900ebe Mon Sep 17 00:00:00 2001 From: Zhu Lida Date: Tue, 22 Sep 2015 17:47:16 +0800 Subject: [PATCH 1/2] test --- .../JFImagePickerController/JFImageCollectionViewController.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/JFImagePickerController/JFImagePickerController/JFImageCollectionViewController.h b/JFImagePickerController/JFImagePickerController/JFImageCollectionViewController.h index fc5b0c2..8e2c301 100755 --- a/JFImagePickerController/JFImagePickerController/JFImageCollectionViewController.h +++ b/JFImagePickerController/JFImagePickerController/JFImageCollectionViewController.h @@ -10,6 +10,8 @@ @interface JFImageCollectionViewController : UIViewController +@property (nonatomic, assign) NSInteger maxCount; + - (UICollectionView *)collectionView; @end From 6e645580c8d421d860836102d9787a249d6cd66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E9=87=8C=E8=BE=BE?= Date: Tue, 22 Sep 2015 18:36:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?MOD=20:=20=E5=8F=AF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=9B=BE=E7=89=87=E6=95=B0=E9=87=8F=E4=B8=8A?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JFImagePickerController/JFAssetHelper.h | 1 + .../JFImagePickerController/JFAssetHelper.m | 7 +++++++ .../JFImagePickerController.h | 1 + .../JFImagePickerController.m | 13 ++++++++++--- .../JFImagePickerController/JFImagePickerViewCell.m | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/JFImagePickerController/JFImagePickerController/JFAssetHelper.h b/JFImagePickerController/JFImagePickerController/JFAssetHelper.h index 7a9c56b..3896299 100755 --- a/JFImagePickerController/JFImagePickerController/JFAssetHelper.h +++ b/JFImagePickerController/JFImagePickerController/JFAssetHelper.h @@ -32,6 +32,7 @@ @property (nonatomic, strong) NSMutableArray *defaultAssets; @property (nonatomic, strong) NSString *originStr; @property (nonatomic, strong) ALAsset *selectdAsset; +@property (nonatomic, assign) NSUInteger maxImagesCount; + (JFAssetHelper *)sharedAssetHelper; diff --git a/JFImagePickerController/JFImagePickerController/JFAssetHelper.m b/JFImagePickerController/JFImagePickerController/JFAssetHelper.m index 9aa42d9..36b345f 100755 --- a/JFImagePickerController/JFImagePickerController/JFAssetHelper.m +++ b/JFImagePickerController/JFImagePickerController/JFAssetHelper.m @@ -335,4 +335,11 @@ - (ALAssetsGroup *)getGroupAtIndex:(NSInteger)nIndex return _assetGroups[nIndex]; } +- (NSUInteger)maxImagesCount { + if (!_maxImagesCount) { + _maxImagesCount = 9; + } + return _maxImagesCount; +} + @end diff --git a/JFImagePickerController/JFImagePickerController/JFImagePickerController.h b/JFImagePickerController/JFImagePickerController/JFImagePickerController.h index 8b5a886..59f2dff 100755 --- a/JFImagePickerController/JFImagePickerController/JFImagePickerController.h +++ b/JFImagePickerController/JFImagePickerController/JFImagePickerController.h @@ -14,6 +14,7 @@ - (JFImagePickerController *)initWithPreviewIndex:(NSInteger)index; @property (nonatomic, weak) id pickerDelegate; +@property (nonatomic, assign) NSUInteger maxImagesCount; /** 当退出编辑模式时需调用clear，用来清理内存，已选择照片的缓存 diff --git a/JFImagePickerController/JFImagePickerController/JFImagePickerController.m b/JFImagePickerController/JFImagePickerController/JFImagePickerController.m index fdb1c41..90bd4dd 100755 --- a/JFImagePickerController/JFImagePickerController/JFImagePickerController.m +++ b/JFImagePickerController/JFImagePickerController/JFImagePickerController.m @@ -72,12 +72,13 @@ - (void)viewDidLoad UIBarButtonItem *rightFix = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; preview = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:self action:@selector(preview)]; UIBarButtonItem *fix = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; - selectNum = [[UIBarButtonItem alloc] initWithTitle:@"0/9" style:UIBarButtonItemStylePlain target:nil action:nil]; + selectNum = [[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:@"0/%ld", (unsigned long)ASSETHELPER.maxImagesCount] style:UIBarButtonItemStylePlain target:nil action:nil]; UIBarButtonItem *fix2 = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; UIBarButtonItem *done = [[UIBarButtonItem alloc] initWithTitle:@"完成" style:UIBarButtonItemStylePlain target:self action:@selector(choiceDone)]; [toolbar setItems:@[leftFix, preview, fix, selectNum, fix2, done, rightFix]]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeCount:) name:@"selectdPhotos" object:nil]; - selectNum.title = [NSString stringWithFormat:@"%ld/9", (unsigned long)ASSETHELPER.selectdPhotos.count]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeCount:) name:@"maxImagesCount" object:nil]; + selectNum.title = [NSString stringWithFormat:@"%ld/%ld", (unsigned long)ASSETHELPER.selectdPhotos.count, (unsigned long)ASSETHELPER.maxImagesCount]; } - (void)setLeftTitle:(NSString *)title{ @@ -89,7 +90,7 @@ - (UIToolbar *)customToolbar{ } - (void)changeCount:(NSNotification *)notifi{ - selectNum.title = [NSString stringWithFormat:@"%ld/9", (unsigned long)ASSETHELPER.selectdPhotos.count]; + selectNum.title = [NSString stringWithFormat:@"%ld/%ld", (unsigned long)ASSETHELPER.selectdPhotos.count, (unsigned long)ASSETHELPER.maxImagesCount]; if (![preview.title isEqualToString:@"取消"]) { if (ASSETHELPER.selectdPhotos.count>0) { preview.title = @"预览"; @@ -184,4 +185,10 @@ - (BOOL)shouldAutorotate{ return NO; } +- (void)setMaxImagesCount:(NSUInteger)maxImagesCount { + _maxImagesCount = maxImagesCount; + [ASSETHELPER setMaxImagesCount:maxImagesCount]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"maxImagesCount" object:nil]; +} + @end diff --git a/JFImagePickerController/JFImagePickerController/JFImagePickerViewCell.m b/JFImagePickerController/JFImagePickerController/JFImagePickerViewCell.m index f682d16..023737e 100755 --- a/JFImagePickerController/JFImagePickerController/JFImagePickerViewCell.m +++ b/JFImagePickerController/JFImagePickerController/JFImagePickerViewCell.m @@ -77,7 +77,7 @@ - (void)reloadNum:(NSNotification *)notifi{ - (void)tapCell:(UITapGestureRecognizer *)tap{ CGPoint location = [tap locationInView:self]; if (CGRectContainsPoint(CGRectMake(placeholder.frame.origin.x-5, placeholder.frame.origin.y-5, placeholder.frame.size.width+10, placeholder.frame.size.height+10), location)) { - if (self.numOfSelect==nil&&ASSETHELPER.selectdPhotos.count>=9) { + if (self.numOfSelect==nil&&ASSETHELPER.selectdPhotos.count>=ASSETHELPER.maxImagesCount) { return; } if (self.numOfSelect==nil) {