增加属性

yanglingyu
1 parent 7839ad72
Showing 3 changed files with 12 additions and 8 deletions
CNLiveUploadManager.podspec
CNLiveUploadManager/Classes/CNLiveUploadManager.h
CNLiveUploadManager/Classes/CNLiveUploadManager.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveUploadManager'
-  s.version          = '0.1.25'
+  s.version          = '0.1.26'
   s.summary          = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
 # This description is used to generate tags and improve search results.
@@ -75,6 +75,7 @@ typedef void (^progressHandlerBlock)(float progress);//进度
 @interface CNLiveUploadManager : NSObject
 @property (nonatomic, strong)QNUploadOption *qnUploadOption;
+@property (nonatomic, assign)BOOL calcelOption;
 /**
  释放单例
  */
@@ -243,12 +243,12 @@ static CNLiveUploadManager *_uploadManager;
         @"x:total":total,
         @"x:current":current
     }.copy;
-    
+    __weak typeof(self)weakSelf = self;
     QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         !progress ? : progress(percent);
     } params:dic checkCrc:YES cancellationSignal:^BOOL{
-        return YES;
+        return weakSelf.calcelOption;
     }];
     self.qnUploadOption = opt;
     [_qnUploadManager putData:data key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
@@ -305,12 +305,13 @@ static CNLiveUploadManager *_uploadManager;
         @"x:current":current
     }.copy;
     __block CGFloat currentPresent =0;//当前进度
+    __weak typeof(self)weakSelf = self;
     QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         currentPresent += percent;
         NSLog(@"输出个数%f",currentPresent);//单个视频的进度
         !progress ? : progress(currentPresent);
     } params:dic checkCrc:YES cancellationSignal:^BOOL{
-        return YES;
+        return weakSelf.calcelOption;
     }];
     self.qnUploadOption = opt;
     [_qnUploadManager putPHAsset:phAsset key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
@@ -359,13 +360,13 @@ static CNLiveUploadManager *_uploadManager;
         @"x:total":total,
         @"x:current":current
     }.copy;
-    
+    __weak typeof(self)weakSelf = self;
     QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         NSLog(@"输出个数%f",percent);//单个视频的进度
         !progress ? : progress(percent);
     } params:dic checkCrc:YES cancellationSignal:^BOOL{
-        return YES;
+        return weakSelf.calcelOption;
     }];
     self.qnUploadOption = opt;
     [_qnUploadManager putFile:file key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
@@ -426,7 +427,9 @@ static CNLiveUploadManager *_uploadManager;
     //创建group
     dispatch_group_t group = dispatch_group_create();
     //GCD遍历图片数组
+    
     __weak __typeof(_qnUploadManager)weakManager = _qnUploadManager;
+    __weak typeof(self)weakSelf = self;
     dispatch_apply(dataArr.count, globalQueue, ^(size_t index) {
         dispatch_group_enter(group);
         __strong __typeof(weakManager)strongManager = weakManager;
@@ -441,9 +444,9 @@ static CNLiveUploadManager *_uploadManager;
         QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         } params:dic checkCrc:YES cancellationSignal:^BOOL{
-            return YES;
+            return weakSelf.calcelOption;
         }];
-        self.qnUploadOption = opt;
+        weakSelf.qnUploadOption = opt;
         [strongManager putData:dataArr[index] key:keys[index] token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
             NSLog(@"***输出第%zi图片***",index);