提交0.0.20

梁星国
1 parent 3416b8a4
Showing 2 changed files with 82 additions and 72 deletions
CNLiveImagePickerController.podspec
CNLiveImagePickerController/Classes/CNEditVideoController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveImagePickerController'
-  s.version          = '0.0.19'
+  s.version          = '0.0.20'
   s.summary          = '相册'
 # This description is used to generate tags and improve search results.
@@ -125,34 +125,34 @@
     const CGFloat W = self.width;
     CGFloat minX = 0;
     CGFloat maxX = W;
-
+    
     switch (pan.view.tag) {
         case 0: {
             //left视图响应
             maxX = rct.origin.x + rct.size.width - kItemWidth;
-
+            
             point.x = MAX(minX, MIN(point.x, maxX));
             point.y = 0;
-
+            
             rct.size.width -= (point.x - rct.origin.x);
             rct.origin.x = point.x;
         }
             break;
-
+            
         case 1:
         {
             //right视图响应
             minX = rct.origin.x + kItemWidth/2;
             maxX = W - kItemWidth/2;
-
+            
             point.x = MAX(minX, MIN(point.x, maxX));
             point.y = 0;
-
+            
             rct.size.width = (point.x - rct.origin.x + kItemWidth/2);
         }
             break;
     }
-
+    
     switch (pan.state) {
         case UIGestureRecognizerStateBegan:
         case UIGestureRecognizerStateChanged:
@@ -160,7 +160,7 @@
                 [self.delegate editViewValidRectChanged];//滑动响应实现
             }
             break;
-
+            
         case UIGestureRecognizerStateEnded:
         case UIGestureRecognizerStateCancelled:
             self.layer.borderColor = [UIColor clearColor].CGColor;
@@ -168,12 +168,12 @@
                 [self.delegate editViewValidRectEndChanged];//滑动结束响应实现
             }
             break;
-
+            
         default:
             break;
     }
-
-
+    
+    
     self.validRect = rct;
 }
@@ -252,7 +252,7 @@
     [_queue cancelAllOperations];
     [self stopTimer];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-//    NSLog(@"---- %s", __FUNCTION__);
+    //    NSLog(@"---- %s", __FUNCTION__);
 }
 - (AVAssetImageGenerator *)generator
@@ -300,29 +300,29 @@
 - (void)viewDidLayoutSubviews
 {
     [super viewDidLayoutSubviews];
-
+    
     UIEdgeInsets inset = UIEdgeInsetsZero;
     if (@available(iOS 11, *)) {
         inset = self.view.safeAreaInsets;
     }
-
+    
     self.playerLayer.frame = CGRectMake(15, inset.top>0?inset.top:30, KScreenWidth-30, KScreenHeight-160-inset.bottom);
-
+    
     self.editView.frame = CGRectMake((KScreenWidth-kItemWidth*10)/2, KScreenHeight-100-inset.bottom, kItemWidth*10, kItemHeight);
     self.editView.validRect = self.editView.bounds;
     self.collectionView.frame = CGRectMake(inset.left, KScreenHeight-100-inset.bottom, KScreenWidth-inset.left-inset.right, kItemHeight);
-
+    
     CGFloat leftOffset = ((KScreenWidth-kItemWidth*10)/2-inset.left);
     CGFloat rightOffset = ((KScreenWidth-kItemWidth*10)/2-inset.right);
     [self.collectionView setContentInset:UIEdgeInsetsMake(0, leftOffset, 0, rightOffset)];
     [self.collectionView setContentOffset:CGPointMake(_offsetX-leftOffset, 0)];
-
+    
     CGFloat bottomViewH = 44;
     CGFloat bottomBtnH = 30;
     _bottomView.frame = CGRectMake(0, KScreenHeight-bottomViewH-inset.bottom, KScreenWidth, kItemHeight);
     _cancelBtn.frame = CGRectMake(10+inset.left, 7, 60, bottomBtnH);
     _doneBtn.frame = CGRectMake(KScreenWidth-70-inset.right, 7, 60, bottomBtnH);
-
+    
     [self.playerLayer setBackgroundColor:[UIColor clearColor].CGColor];
 }
@@ -380,9 +380,9 @@
     [self.view addSubview:self.editView];
     _indicatorLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 2, kItemHeight)];
-
+    
     _indicatorLine.backgroundColor = [RGBOF(0x0BBE06) colorWithAlphaComponent:.7];
-
+    
 }
 - (void)creatBottomView
@@ -398,11 +398,11 @@
     [_cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
     [_cancelBtn addTarget:self action:@selector(cancelBtn_click) forControlEvents:UIControlEventTouchUpInside];
     [_bottomView addSubview:_cancelBtn];
-
+    
     _doneBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     [_doneBtn setTitle:@"完成" forState:UIControlStateNormal];
     [_doneBtn setBackgroundColor:[UIColor clearColor]];
-
+    
     [_doneBtn setTitleColor:RGBOF(0x0BBE06) forState:UIControlStateNormal];
     _doneBtn.titleLabel.font = [UIFont systemFontOfSize:15];
     _doneBtn.layer.masksToBounds = YES;
@@ -468,9 +468,9 @@
         AVAsset *videoAsset = [AVURLAsset assetWithURL:videoURL];
         _avAsset = videoAsset ;
         [self.collectionView reloadData];
-
+        
     }
-  
+    
 }
 #pragma mark - action
@@ -504,7 +504,7 @@
 {
     [self stopTimer];
-   
+    
     TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController;
     [_tzImagePickerVc showProgressHUD];
@@ -548,7 +548,7 @@
                 self->_cancelBtn.enabled = YES;
             });
         }
-       
+        
     }];
 }
 #pragma mark - 截取视频
@@ -609,7 +609,7 @@
             if (error) {
                 NSLog(@"保存视频出错:%@",error.localizedDescription);
                 if (completion) {
-                     completion(NO,nil);
+                    completion(NO,nil);
                 }
             } else {
                 [assetLibrary assetForURL:assetURL resultBlock:^(ALAsset *asset) {
@@ -631,7 +631,7 @@
         }];
     }
-  
+    
 }
 - (PHAsset *)getAssetFromlocalIdentifier:(NSString *)localIdentifier{
@@ -961,44 +961,54 @@ static const char _CNOperationCellKey;
         return;
     }
-     NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
-        NSInteger row = indexPath.row;
-        NSInteger i = row  * _interval;
-        
-        CMTime time = CMTimeMake((i+0.35) * _avAsset.duration.timescale, _avAsset.duration.timescale);
-        
-        NSError *error = nil;
-        CGImageRef cgImg = [self.generator copyCGImageAtTime:time actualTime:NULL error:&error];
-        if (!error && cgImg) {
-            UIImage *image = [UIImage imageWithCGImage:cgImg];
-            CGImageRelease(cgImg);
-            if (image) {
-                [_imageCache setValue:image forKey:@(row).stringValue];
-            }
-
-            dispatch_async(dispatch_get_main_queue(), ^{
-
-                NSIndexPath *nowIndexPath = [collectionView indexPathForCell:cell];
-                if (row == nowIndexPath.row) {
-                    if (image) {
-                        [(CNEditVideoCell *)cell imageView].image = image;
-                    }
+    @try {
+        NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
+            NSInteger row = indexPath.row;
+            NSInteger i = row  * self->_interval;
+            
+            CMTime time = CMTimeMake((i+0.35) * self->_avAsset.duration.timescale, self->_avAsset.duration.timescale);
+            
+            
+            NSError *error = nil;
+            CGImageRef cgImg = [self.generator copyCGImageAtTime:time actualTime:NULL error:&error];
+            if (!error && cgImg) {
+                UIImage *image = [UIImage imageWithCGImage:cgImg];
+                CGImageRelease(cgImg);
+                if (image) {
+                    [self->_imageCache setValue:image forKey:@(row).stringValue];
+                }
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
-                } else {
-                    UIImage *cacheImage = _imageCache[@(nowIndexPath.row).stringValue];
-                    if (cacheImage) {
-                        [(CNEditVideoCell *)cell imageView].image = cacheImage;
+                    NSIndexPath *nowIndexPath = [collectionView indexPathForCell:cell];
+                    if (row == nowIndexPath.row) {
+                        if (image) {
+                            [(CNEditVideoCell *)cell imageView].image = image;
+                        }
+                        
+                    } else {
+                        UIImage *cacheImage = self->_imageCache[@(nowIndexPath.row).stringValue];
+                        if (cacheImage) {
+                            [(CNEditVideoCell *)cell imageView].image = cacheImage;
+                        }
                     }
-                }
-            });
-            [_opCache removeObjectForKey:@(row).stringValue];
-        }
-        objc_removeAssociatedObjects(cell);
-    }];
-    [_queue addOperation:op];
-    [_opCache setValue:op forKey:@(indexPath.row).stringValue];
+                });
+                [self->_opCache removeObjectForKey:@(row).stringValue];
+            }
+            objc_removeAssociatedObjects(cell);
+        }];
+        [_queue addOperation:op];
+        [_opCache setValue:op forKey:@(indexPath.row).stringValue];
+        
+        objc_setAssociatedObject(cell, &_CNOperationCellKey, op, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        
+    } @catch (NSException *exception) {
+        NSLog(@"获取视频预加载图片出问题");
+    } @finally {
+        
+    }
+    
-    objc_setAssociatedObject(cell, &_CNOperationCellKey, op, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 - (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
@@ -1017,13 +1027,13 @@ static const char _CNOperationCellKey;
 }
 /*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
+ #pragma mark - Navigation
+ 
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+ }
+ */
 @end