Commit f3b1687ecbcba829201fa0b0d21666560f57e4f1

Authored by yanglingyu
1 parent 2a5a2191

增加opt属性

CNLiveUploadManager.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveUploadManager' 10 s.name = 'CNLiveUploadManager'
11 - s.version = '0.1.23' 11 + s.version = '0.1.24'
12 s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取' 12 s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
@@ -50,6 +50,7 @@ Pod::Spec.new do |s| @@ -50,6 +50,7 @@ Pod::Spec.new do |s|
50 s.dependency 'CNLiveBaseKit' 50 s.dependency 'CNLiveBaseKit'
51 s.dependency 'CNLiveBusinessTools' 51 s.dependency 'CNLiveBusinessTools'
52 s.dependency 'CNLiveBaseTools' 52 s.dependency 'CNLiveBaseTools'
  53 + s.dependency 'CNLiveUserManagement'
53 54
54 55
55 56
CNLiveUploadManager/Classes/CNLiveUploadManager.h
@@ -74,7 +74,7 @@ typedef void (^progressHandlerBlock)(float progress);//进度 @@ -74,7 +74,7 @@ typedef void (^progressHandlerBlock)(float progress);//进度
74 74
75 @interface CNLiveUploadManager : NSObject 75 @interface CNLiveUploadManager : NSObject
76 76
77 - 77 +@property (nonatomic, strong)QNUploadOption *qnUploadOption;
78 /** 78 /**
79 释放单例 79 释放单例
80 */ 80 */
CNLiveUploadManager/Classes/CNLiveUploadManager.m
@@ -248,7 +248,7 @@ static CNLiveUploadManager *_uploadManager; @@ -248,7 +248,7 @@ static CNLiveUploadManager *_uploadManager;
248 248
249 !progress ? : progress(percent); 249 !progress ? : progress(percent);
250 } params:dic checkCrc:YES cancellationSignal:nil]; 250 } params:dic checkCrc:YES cancellationSignal:nil];
251 - 251 + self.qnUploadOption = opt;
252 [_qnUploadManager putData:data key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) { 252 [_qnUploadManager putData:data key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
253 253
254 dispatch_async(dispatch_get_main_queue(), ^{ 254 dispatch_async(dispatch_get_main_queue(), ^{
@@ -308,7 +308,7 @@ static CNLiveUploadManager *_uploadManager; @@ -308,7 +308,7 @@ static CNLiveUploadManager *_uploadManager;
308 NSLog(@"输出个数%f",currentPresent);//单个视频的进度 308 NSLog(@"输出个数%f",currentPresent);//单个视频的进度
309 !progress ? : progress(currentPresent); 309 !progress ? : progress(currentPresent);
310 } params:dic checkCrc:YES cancellationSignal:nil]; 310 } params:dic checkCrc:YES cancellationSignal:nil];
311 - 311 + self.qnUploadOption = opt;
312 [_qnUploadManager putPHAsset:phAsset key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) { 312 [_qnUploadManager putPHAsset:phAsset key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
313 dispatch_async(dispatch_get_main_queue(), ^{ 313 dispatch_async(dispatch_get_main_queue(), ^{
314 //返回结果 314 //返回结果
@@ -361,7 +361,7 @@ static CNLiveUploadManager *_uploadManager; @@ -361,7 +361,7 @@ static CNLiveUploadManager *_uploadManager;
361 NSLog(@"输出个数%f",percent);//单个视频的进度 361 NSLog(@"输出个数%f",percent);//单个视频的进度
362 !progress ? : progress(percent); 362 !progress ? : progress(percent);
363 } params:dic checkCrc:YES cancellationSignal:nil]; 363 } params:dic checkCrc:YES cancellationSignal:nil];
364 - 364 + self.qnUploadOption = opt;
365 [_qnUploadManager putFile:file key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) { 365 [_qnUploadManager putFile:file key:key token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
366 dispatch_async(dispatch_get_main_queue(), ^{ 366 dispatch_async(dispatch_get_main_queue(), ^{
367 //返回结果 367 //返回结果
@@ -435,7 +435,7 @@ static CNLiveUploadManager *_uploadManager; @@ -435,7 +435,7 @@ static CNLiveUploadManager *_uploadManager;
435 QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) { 435 QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
436 436
437 } params:dic checkCrc:YES cancellationSignal:nil]; 437 } params:dic checkCrc:YES cancellationSignal:nil];
438 - 438 + self.qnUploadOption = opt;
439 [strongManager putData:dataArr[index] key:keys[index] token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) { 439 [strongManager putData:dataArr[index] key:keys[index] token:token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
440 440
441 NSLog(@"***输出第%zi图片***",index); 441 NSLog(@"***输出第%zi图片***",index);