提交0.1.18代码对齐

梁星国
1 parent c696910a
Showing 1 changed file with 105 additions and 105 deletions
CNLiveUploadManager/Classes/CNLiveUploadManager.m
@@ -240,9 +240,9 @@ static CNLiveUploadManager *_uploadManager;
     NSString *total = [NSString stringWithFormat:@"1"];
     NSString *current = [NSString stringWithFormat:@"1"];
     NSDictionary *dic = @{
-                          @"x:total":total,
-                          @"x:current":current
-                          }.copy;
+        @"x:total":total,
+        @"x:current":current
+    }.copy;
     QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
@@ -299,9 +299,9 @@ static CNLiveUploadManager *_uploadManager;
     NSString *total = [NSString stringWithFormat:@"1"];
     NSString *current = [NSString stringWithFormat:@"1"];
     NSDictionary *dic = @{
-                          @"x:total":total,
-                          @"x:current":current
-                          }.copy;
+        @"x:total":total,
+        @"x:current":current
+    }.copy;
     __block CGFloat currentPresent =0;//当前进度
     QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         currentPresent += percent;
@@ -352,9 +352,9 @@ static CNLiveUploadManager *_uploadManager;
     NSString *total = [NSString stringWithFormat:@"1"];
     NSString *current = [NSString stringWithFormat:@"1"];
     NSDictionary *dic = @{
-                          @"x:total":total,
-                          @"x:current":current
-                          }.copy;
+        @"x:total":total,
+        @"x:current":current
+    }.copy;
     QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
@@ -429,9 +429,9 @@ static CNLiveUploadManager *_uploadManager;
         NSString *total = [NSString stringWithFormat:@"%ld",(unsigned long)dataArr.count];
         NSString *current = [NSString stringWithFormat:@"%ld",index+1];
         NSDictionary *dic = @{
-                              @"x:total":total,
-                              @"x:current":current
-                              }.copy;
+            @"x:total":total,
+            @"x:current":current
+        }.copy;
         QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         } params:dic checkCrc:YES cancellationSignal:nil];
@@ -500,7 +500,7 @@ static CNLiveUploadManager *_uploadManager;
             }];
             !success ? : success(fileArray);
         }else{
-//            !success ? : success(fileArray);
+            //            !success ? : success(fileArray);
             NSError *error = [NSError errorWithDomain:@"上传出现错误" code:400 userInfo:@{NSLocalizedDescriptionKey:@"上传出现错误,请重新上传失败图片"}];
             !failure ? : failure(errorArray,error);
         }
@@ -797,7 +797,7 @@ static CNLiveUploadManager *_uploadManager;
         !failure ? : failure(nil,error);
         return;
     }
-
+    
     //回调数组
     NSMutableArray *fileArray  =  [NSMutableArray array];//成功数组 CNLiveUploadModel
     NSMutableArray *errorArray =  [NSMutableArray array];//失败数组 CNLiveUploadModel
@@ -877,7 +877,7 @@ static CNLiveUploadManager *_uploadManager;
             }];
             !success ? : success(fileArray);
         }else{
-//            !success ? : success(fileArray);
+            //            !success ? : success(fileArray);
             NSError *error = [NSError errorWithDomain:@"上传出现错误" code:400 userInfo:@{NSLocalizedDescriptionKey:@"上传出现错误,请重新上传失败图片"}];
             !failure ? : failure(errorArray,error);
         }
@@ -982,7 +982,7 @@ static CNLiveUploadManager *_uploadManager;
         !failure ? : failure(nil,error);
         return;
     }
-
+    
     PHVideoRequestOptions* options = [[PHVideoRequestOptions alloc] init];
     options.version = PHVideoRequestOptionsVersionOriginal;
     options.deliveryMode = PHVideoRequestOptionsDeliveryModeAutomatic;
@@ -1013,7 +1013,7 @@ static CNLiveUploadManager *_uploadManager;
             return;
         }];
     }];
- 
+    
 }
@@ -1651,14 +1651,14 @@ static CNLiveUploadManager *_uploadManager;
                 NSInteger code = error.code;
                 NSString * errorStr = error.localizedDescription;
-                  NSError *error;
-                  if (code == - 1001 || code == -1009) {
-                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
-                  }else {
-                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
-                  }
-                  !failure ? : failure(nil,error);
-                  return;
+                NSError *error;
+                if (code == - 1001 || code == -1009) {
+                    error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                }else {
+                    error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                }
+                !failure ? : failure(nil,error);
+                return;
             }
         }];
@@ -1689,14 +1689,14 @@ static CNLiveUploadManager *_uploadManager;
                 NSInteger code = error.code;
                 NSString * errorStr = error.localizedDescription;
-                  NSError *error;
-                  if (code == - 1001 || code == -1009) {
-                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
-                  }else {
-                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
-                  }
-                  !failure ? : failure(nil,error);
-                  return;
+                NSError *error;
+                if (code == - 1001 || code == -1009) {
+                    error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                }else {
+                    error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                }
+                !failure ? : failure(nil,error);
+                return;
             }
         }];
@@ -1726,16 +1726,16 @@ static CNLiveUploadManager *_uploadManager;
             } else {//请求token失败
-               NSInteger code = error.code;
-               NSString * errorStr = error.localizedDescription;
-                 NSError *error;
-                 if (code == - 1001 || code == -1009) {
-                     error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
-                 }else {
-                     error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
-                 }
-                 !failure ? : failure(nil,error);
-                 return;
+                NSInteger code = error.code;
+                NSString * errorStr = error.localizedDescription;
+                NSError *error;
+                if (code == - 1001 || code == -1009) {
+                    error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                }else {
+                    error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                }
+                !failure ? : failure(nil,error);
+                return;
             }
         }];
@@ -1765,14 +1765,14 @@ static CNLiveUploadManager *_uploadManager;
                 NSInteger code = error.code;
                 NSString * errorStr = error.localizedDescription;
-                  NSError *error;
-                  if (code == - 1001 || code == -1009) {
-                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
-                  }else {
-                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
-                  }
-                  !failure ? : failure(nil,error);
-                  return;
+                NSError *error;
+                if (code == - 1001 || code == -1009) {
+                    error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                }else {
+                    error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                }
+                !failure ? : failure(nil,error);
+                return;
             }
         }];
@@ -1802,14 +1802,14 @@ static CNLiveUploadManager *_uploadManager;
             } else {//请求token失败
                 NSInteger code = error.code;
                 NSString * errorStr = error.localizedDescription;
-                  NSError *error;
-                  if (code == - 1001 || code == -1009) {
-                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
-                  }else {
-                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
-                  }
-                  !failure ? : failure(nil,error);
-                  return;
+                NSError *error;
+                if (code == - 1001 || code == -1009) {
+                    error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                }else {
+                    error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                }
+                !failure ? : failure(nil,error);
+                return;
             }
         }];
@@ -1837,14 +1837,14 @@ static CNLiveUploadManager *_uploadManager;
             } else {//请求token失败
                 NSInteger code = error.code;
                 NSString * errorStr = error.localizedDescription;
-                  NSError *error;
-                  if (code == - 1001 || code == -1009) {
-                      error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
-                  }else {
-                      error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
-                  }
-                  !failure ? : failure(nil,error);
-                  return;
+                NSError *error;
+                if (code == - 1001 || code == -1009) {
+                    error = [NSError errorWithDomain:@"网络连接错误,请检查您的网络" code:code userInfo:@{NSLocalizedDescriptionKey:@"网络连接错误,请检查您的网络"}];
+                }else {
+                    error = [NSError errorWithDomain:errorStr code:code userInfo:@{NSLocalizedDescriptionKey:errorStr}];
+                }
+                !failure ? : failure(nil,error);
+                return;
             }
         }];
@@ -2246,43 +2246,43 @@ static CNLiveUploadManager *_uploadManager;
     shortVideoTranscoder.videoFrameRate = 0; //帧率
     [PLShortVideoRecorder checkAuthentication:^(PLSAuthenticationResult result) {
-           
-           if (PLSAuthenticationResultAuthorized == result || PLSAuthenticationResultNotDetermined == result) {//授权
-               //成功
-                 [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
-                     NSLog(@"输出转码后视频路径%@",url.path);
-                     NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
-                     dispatch_async(dispatch_get_main_queue(), ^{
-                         !success ? : success(url);
-                     });
-                     
-                 }];
-                 
-                 //失败
-                 [shortVideoTranscoder setFailureBlock:^(NSError *error){
-                     NSLog(@"输出错误%@",error);
-                     dispatch_async(dispatch_get_main_queue(), ^{
-                         !failure ? : failure();
-                     });
-                     
-                 }];
-                 
-                 [shortVideoTranscoder setProcessingBlock:^(float progress){
-                     // 更新压缩进度的 UI
-                     
-                     NSLog(@"transCoding progress: %f", progress);
-                     !progressCount ? : progressCount(progress);
-                 }];
-                 
-                 [shortVideoTranscoder startTranscoding];
-           }else {
-               dispatch_async(dispatch_get_main_queue(), ^{
-                   !failure ? : failure();
-               });
-           }
+        
+        if (PLSAuthenticationResultAuthorized == result || PLSAuthenticationResultNotDetermined == result) {//授权
+            //成功
+            [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
+                NSLog(@"输出转码后视频路径%@",url.path);
+                NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    !success ? : success(url);
+                });
+                
+            }];
+            
+            //失败
+            [shortVideoTranscoder setFailureBlock:^(NSError *error){
+                NSLog(@"输出错误%@",error);
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    !failure ? : failure();
+                });
+                
+            }];
+            
+            [shortVideoTranscoder setProcessingBlock:^(float progress){
+                // 更新压缩进度的 UI
+                
+                NSLog(@"transCoding progress: %f", progress);
+                !progressCount ? : progressCount(progress);
+            }];
+            
+            [shortVideoTranscoder startTranscoding];
+        }else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                !failure ? : failure();
+            });
+        }
     }];
-  
+    
 }
@@ -2321,7 +2321,7 @@ static CNLiveUploadManager *_uploadManager;
     NSInteger rand = random();
     NSString *filaName = [NSString stringWithFormat:@"/output-%@_fileType=videoType_%zi.mp4",[formater stringFromDate:[NSDate date]],rand];
     editOutputPath = [[CNLiveUploadManager createVideoFolderOutputPath:outputPath] stringByAppendingString:filaName];
-   
+    
     NSLog(@"输出转码前视频路径%@",editOutputPath);
     shortVideoTranscoder.outputURL = [NSURL fileURLWithPath:editOutputPath];
     shortVideoTranscoder.outputFileType = PLSFileTypeMPEG4;
@@ -2337,7 +2337,7 @@ static CNLiveUploadManager *_uploadManager;
     [PLShortVideoRecorder checkAuthentication:^(PLSAuthenticationResult result) {
         if (PLSAuthenticationResultAuthorized == result || PLSAuthenticationResultNotDetermined == result) {//授权
-
+            
             //成功
             [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
                 NSLog(@"输出转码后视频路径%@",url.path);
@@ -2496,7 +2496,7 @@ static CNLiveUploadManager *_uploadManager;
             }
         }
-
+        
     }
 }