0.0.7

梁星国
1 parent 7c9dd834
Showing 23 changed files with 45 additions and 32 deletions
CNLiveImagePickerController.podspec
CNLiveImagePickerController/Classes/CNEditVideoController.m
CNLiveImagePickerController/Classes/CNImagePickerController.m
CNLiveImagePickerController/Classes/TZAssetCell.m
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/mjz_bq@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/mjz_go@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/mjz_q@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/mjz_sq@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/mjz_zk@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/ph_back@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/photo_back@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/photo_cell_normal@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/photo_enter@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/photo_original_nor@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/ph_unselect@2x.png → CNLiveImagePickerController/Classes/TZImagePickerController.bundle/photo_original_normal@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/ph_select@2x.png → CNLiveImagePickerController/Classes/TZImagePickerController.bundle/photo_original_select@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/placeImg@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/publish_zw@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/video_edit_left@2x.png
CNLiveImagePickerController/Classes/TZImagePickerController.bundle/video_edit_right@2x.png
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveImagePickerController'
-  s.version          = '0.0.6'
+  s.version          = '0.0.7'
   s.summary          = '相册'
  
 # This description is used to generate tags and improve search results.
@@ -101,14 +101,14 @@
     self.layer.borderWidth = 2;
     self.layer.borderColor = [UIColor clearColor].CGColor;
  
-    _leftView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"video_edit_left"]];
+    _leftView = [[UIImageView alloc] initWithImage:[UIImage imageNamedFromMyBundle:@"video_edit_left"]];
     _leftView.userInteractionEnabled = YES;
     _leftView.tag = 0;
     UIPanGestureRecognizer *lg = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panAction:)];
     [_leftView addGestureRecognizer:lg];
     [self addSubview:_leftView];
  
-    _rightView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"video_edit_right"]];
+    _rightView = [[UIImageView alloc] initWithImage:[UIImage imageNamedFromMyBundle:@"video_edit_right"]];
     _rightView.userInteractionEnabled = YES;
     _rightView.tag = 1;
     UIPanGestureRecognizer *rg = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panAction:)];
@@ -50,9 +50,9 @@
     self.iconThemeColor = RGBOF(0x00BBE06);// 主体颜色
     self.showPhotoCannotSelectLayer = YES;//达到上限是否有浮层
     self.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8];//设置达到上限的浮层
-    self.photoDefImage = [UIImage imageNamed:@"photo_cell_normal"];
+    self.photoDefImage = [UIImage imageNamedFromMyBundle:@"photo_cell_normal"];
     self.photoSelImage = [UIImage qmui_imageWithColor:RGBOF(0x0BBE06) size:CGSizeMake(22, 22) cornerRadius:11];
-    self.photoOriginDefImage = [UIImage imageNamed:@"photo_original_nor"];
+    self.photoOriginDefImage = [UIImage imageNamedFromMyBundle:@"photo_original_nor"];
  
     // 3. Set allow picking video & photo & originalPhoto or not
     // 3. 设置是否可以选择视频/图片/原图/gif(未开放)
@@ -88,7 +88,7 @@
     // 自定义导航栏上的返回按钮
     /*
      [imagePickerVc setNavLeftBarButtonSettingBlock:^(UIButton *leftButton){
-     [leftButton setImage:[UIImage imageNamed:@"back"] forState:UIControlStateNormal];
+     [leftButton setImage:[UIImage imageNamedFromMyBundle:@"back"] forState:UIControlStateNormal];
      [leftButton setImageEdgeInsets:UIEdgeInsetsMake(0, -10, 0, 20)];
      }];
      imagePickerVc.delegate = self;
@@ -102,7 +102,7 @@
     self.naviTitleColor = RGBOF(0x282828);//相册title
     self.naviTitleFont = [UIFont fontWithName:@"PingFangSC-Medium" size:18];//title文字大小
     [self setNavLeftBarButtonSettingBlock:^(UIButton *leftButton) {//设置返回按钮图标
-        [leftButton setImage:[UIImage imageNamed:@"photo_back"] forState:UIControlStateNormal];//返回按钮图片
+        [leftButton setImage:[UIImage imageNamedFromMyBundle:@"photo_back"] forState:UIControlStateNormal];//返回按钮图片
         [leftButton setTitle:@"返回" forState:UIControlStateNormal];//设置文字大小
         [leftButton setTitleColor:RGBOF(0x282828) forState:UIControlStateNormal];//设置文字颜色
         leftButton.titleLabel.font = [UIFont systemFontOfSize:15];//设置文字大小
@@ -130,9 +130,9 @@
         [previewButton setTitleColor:RGBOF(0x000000) forState:UIControlStateNormal];//默认
  
         //原图按钮
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateNormal];//默认
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_select"] forState:UIControlStateSelected];//选中
+        [originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
+        [originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_normal"] forState:UIControlStateNormal];//默认
+        [originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_select"] forState:UIControlStateSelected];//选中
         originalPhotoButton.titleLabel.font = [UIFont systemFontOfSize:16];
         [originalPhotoButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];
         [originalPhotoButton setTitleColor:RGBOF(0x000000) forState:UIControlStateNormal];
@@ -169,16 +169,16 @@
     [self setPhotoPreviewPageUIConfigBlock:^(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel) {
  
         //返回按钮
-        [backButton setImage:[UIImage imageNamed:@"photo_original_back"] forState:UIControlStateNormal];
+        [backButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_back"] forState:UIControlStateNormal];
         //选择按钮
-        [selectButton setImage:[UIImage imageNamed:@"photo_original_nor"] forState:UIControlStateNormal];
+        [selectButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_nor"] forState:UIControlStateNormal];
         [selectButton setImage:[UIImage qmui_imageWithColor:RGBOF(0x0BBE06) size:CGSizeMake(28, 28) cornerRadius:14] forState:UIControlStateSelected];
         [selectButton setTitle:@"" forState:UIControlStateDisabled];
  
         //原图按钮
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_normal"] forState:UIControlStateNormal];//默认
-        [originalPhotoButton setImage:[UIImage imageNamed:@"photo_original_select"] forState:UIControlStateSelected];//选中
+        [originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_normal"] forState:UIControlStateDisabled];//禁用
+        [originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_normal"] forState:UIControlStateNormal];//默认
+        [originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_select"] forState:UIControlStateSelected];//选中
         originalPhotoButton.titleLabel.font = [UIFont systemFontOfSize:16];
         [originalPhotoButton setTitleColor:RGBOF(0xB3B3B3) forState:UIControlStateDisabled];
         [originalPhotoButton setTitleColor:RGBAOF(0xFFFFFF, 0.7) forState:UIControlStateNormal];
@@ -244,8 +244,7 @@
     }];
     //相簿
     [self setAlbumCellDidSetModelBlock:^(TZAlbumCell *cell, UIImageView *posterImageView, UILabel *titleLabel) {
-        [posterImageView setBackgroundColor:[UIColor blueColor]];
-        [posterImageView setBackgroundColor:[UIColor blueColor]];
+        [posterImageView setBackgroundColor:[UIColor whiteColor]];
  
     }];
  
@@ -266,7 +265,7 @@
     }];
     //图片预览
     [self setPhotoPreviewPageDidLayoutSubviewsBlock:^(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel) {
-
+        [backButton setImage:[UIImage imageNamedFromMyBundle:@"navi_back"] forState:UIControlStateNormal];
         CGRect frame = toolBar.frame;
         doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
  
@@ -169,7 +169,7 @@
     model.needOscillatoryAnimation = NO;
  
     if (!model.isExport) {
-        self.imageView.image = [UIImage imageNamed:@"placeImg.png"];
+        self.imageView.image = [UIImage imageNamedFromMyBundle:@"placeImg.png"];
     }
  
  
@@ -441,13 +441,14 @@
 @interface TZAlbumCell ()
 @property (weak, nonatomic) UIImageView *posterImageView;
 @property (weak, nonatomic) UILabel *titleLabel;
+@property (weak, nonatomic) UIImageView *enterImageView;
 @end
  
 @implementation TZAlbumCell
  
 - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-    self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+    self.accessoryType = UITableViewCellAccessoryNone;
     return self;
 }
  
@@ -470,7 +471,7 @@
     }
  
     if (!model.isExport) {
-        self.posterImageView.image = [UIImage imageNamed:@"placeImg.png"];
+        self.posterImageView.image = [UIImage imageNamedFromMyBundle:@"placeImg.png"];
     }
  
     if (self.albumCellDidSetModelBlock) {
@@ -482,6 +483,7 @@
 - (void)layoutSubviews {
     if (iOS7Later) [super layoutSubviews];
     _selectedCountButton.frame = CGRectMake(self.tz_width - 24 - 30, 23, 24, 24);
+    self.enterImageView.frame = CGRectMake(self.tz_width - 20, 30, 6, 12);
     NSInteger titleHeight = ceil(self.titleLabel.font.lineHeight);
     self.titleLabel.frame = CGRectMake(80, (self.tz_height - titleHeight) / 2, self.tz_width - 80 - 50, titleHeight);
     self.posterImageView.frame = CGRectMake(0, 0, 70, 70);
@@ -520,6 +522,16 @@
     return _titleLabel;
 }
  
+- (UIImageView *)enterImageView {
+    if (_enterImageView == nil) {
+        UIImageView *enterImageView = [[UIImageView alloc] init];
+        enterImageView.image = [UIImage imageNamedFromMyBundle:@"photo_enter"];
+        [self.contentView addSubview:enterImageView];
+        _enterImageView = enterImageView;
+    }
+    return _enterImageView;
+}
+
 - (UIButton *)selectedCountButton {
     if (_selectedCountButton == nil) {
         UIButton *selectedCountButton = [[UIButton alloc] init];
@@ -54,7 +54,7 @@
     self.navigationBar.barStyle = UIBarStyleBlack;
     self.navigationBar.translucent = YES;
     [TZImageManager manager].shouldFixOrientation = NO;
-
+    
     // Default appearance, you can reset these after this method
     // 默认的外观，你可以在这个方法后重置
     self.oKButtonTitleColorNormal   = [UIColor colorWithRed:(83/255.0) green:(179/255.0) blue:(17/255.0) alpha:1.0];
@@ -385,7 +385,7 @@
     if ([[TZImageManager manager] authorizationStatusAuthorized]) {
         [_tipLabel removeFromSuperview];
         [_settingBtn removeFromSuperview];
-
+        
         [self pushPhotoPickerVc];
  
         TZAlbumPickerController *albumPickerVc = (TZAlbumPickerController *)self.visibleViewController;
@@ -694,7 +694,7 @@
  
     _HUDContainer.frame = CGRectMake((self.view.tz_width - 120) / 2, (self.view.tz_height - 90) / 2, 120, 90);
     _HUDIndicatorView.frame = CGRectMake(45, 15, 30, 30);
-    _HUDLabel.frame = CGRectMake(0,40, 120, 50);    
+    _HUDLabel.frame = CGRectMake(0,40, 120, 50);
 }
  
 #pragma mark - Public
@@ -769,16 +769,17 @@
     if (![[TZImageManager manager] authorizationStatusAuthorized]) {
         return;
     }
-
+    
     if (self.isFirstAppear) {
         TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
         [imagePickerVc showProgressHUD];
     }
     __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
-        TZImagePickerController *imagePickerVc = (TZImagePickerController *)weakSelf.navigationController;
-        [[TZImageManager manager] getAllAlbums:imagePickerVc.allowPickingVideo allowPickingImage:imagePickerVc.allowPickingImage needFetchAssets:!weakSelf.isFirstAppear completion:^(NSArray<TZAlbumModel *> *models) {
-            dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+            TZImagePickerController *imagePickerVc = (TZImagePickerController *)weakSelf.navigationController;
+            [[TZImageManager manager] getAllAlbums:imagePickerVc.allowPickingVideo allowPickingImage:imagePickerVc.allowPickingImage needFetchAssets:!weakSelf.isFirstAppear completion:^(NSArray<TZAlbumModel *> *models) {
+                
                 if (models == nil) {
                     [imagePickerVc hideProgressHUD];
                     return;
@@ -805,8 +806,9 @@
                 } else {
                     [self->_tableView reloadData];
                 }
-            });
-        }];
+                
+            }];
+        });
     });
 }
  
@@ -849,7 +851,7 @@
     cell.albumCellDidSetModelBlock = imagePickerVc.albumCellDidSetModelBlock;
     cell.selectedCountButton.backgroundColor = imagePickerVc.iconThemeColor;
     cell.model = _albumArr[indexPath.row];
-    cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+    cell.accessoryType = UITableViewCellAccessoryNone;
     return cell;
 }
  
@@ -920,7 +922,7 @@
             CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) ||
             CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) ||
             CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)));
-
+    
 }
  
 + (CGFloat)tz_statusBarHeight {