Commit 5b54b59da42c4fe8840fb57120e1bd62c198a6b3

Authored by 梁星国
1 parent 3497c053

提交0.1.5

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.4' 11 + s.version = '0.1.5'
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.
@@ -37,8 +37,10 @@ Pod::Spec.new do |s| @@ -37,8 +37,10 @@ Pod::Spec.new do |s|
37 # } 37 # }
38 38
39 # s.public_header_files = 'Pod/Classes/**/*.h' 39 # s.public_header_files = 'Pod/Classes/**/*.h'
  40 +
  41 + s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => 'CNLiveTripartiteManagement/PLShortVideoKit' }
  42 +
40 s.frameworks = 'UIKit' 43 s.frameworks = 'UIKit'
41 - s.dependency 'CNLiveTripartiteManagement/Qiniu'  
42 s.dependency 'CNLiveRequestBastKit' 44 s.dependency 'CNLiveRequestBastKit'
43 s.dependency 'CNLiveTripartiteManagement/MJExtension' 45 s.dependency 'CNLiveTripartiteManagement/MJExtension'
44 s.dependency 'CNLiveTripartiteManagement/YYKit' 46 s.dependency 'CNLiveTripartiteManagement/YYKit'
Example/CNLiveUploadManager.xcodeproj/project.pbxproj
@@ -526,6 +526,25 @@ @@ -526,6 +526,25 @@
526 buildSettings = { 526 buildSettings = {
527 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 527 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
528 DEVELOPMENT_TEAM = 94X49GG3ZW; 528 DEVELOPMENT_TEAM = 94X49GG3ZW;
  529 + FRAMEWORK_SEARCH_PATHS = (
  530 + "$(inherited)",
  531 + "\"${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking\"",
  532 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBaseKit\"",
  533 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBaseTools\"",
  534 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBusinessTools\"",
  535 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveCommonCategory\"",
  536 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveEnvironment\"",
  537 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveRequestBastKit\"",
  538 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUploadManager\"",
  539 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserManagement\"",
  540 + "\"${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS\"",
  541 + "\"${PODS_CONFIGURATION_BUILD_DIR}/MJExtension\"",
  542 + "\"${PODS_CONFIGURATION_BUILD_DIR}/Qiniu\"",
  543 + "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
  544 + "\"${PODS_CONFIGURATION_BUILD_DIR}/YYKit\"",
  545 + "\"${PODS_ROOT}/PLShortVideoKit/Pod/Library/Profession\"",
  546 + "\"${PODS_ROOT}/YYKit/Vendor\"",
  547 + );
529 GCC_PRECOMPILE_PREFIX_HEADER = YES; 548 GCC_PRECOMPILE_PREFIX_HEADER = YES;
530 GCC_PREFIX_HEADER = "CNLiveUploadManager/CNLiveUploadManager-Prefix.pch"; 549 GCC_PREFIX_HEADER = "CNLiveUploadManager/CNLiveUploadManager-Prefix.pch";
531 INFOPLIST_FILE = "CNLiveUploadManager/CNLiveUploadManager-Info.plist"; 550 INFOPLIST_FILE = "CNLiveUploadManager/CNLiveUploadManager-Info.plist";
@@ -542,6 +561,25 @@ @@ -542,6 +561,25 @@
542 buildSettings = { 561 buildSettings = {
543 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 562 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
544 DEVELOPMENT_TEAM = 94X49GG3ZW; 563 DEVELOPMENT_TEAM = 94X49GG3ZW;
  564 + FRAMEWORK_SEARCH_PATHS = (
  565 + "$(inherited)",
  566 + "\"${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking\"",
  567 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBaseKit\"",
  568 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBaseTools\"",
  569 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBusinessTools\"",
  570 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveCommonCategory\"",
  571 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveEnvironment\"",
  572 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveRequestBastKit\"",
  573 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUploadManager\"",
  574 + "\"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserManagement\"",
  575 + "\"${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS\"",
  576 + "\"${PODS_CONFIGURATION_BUILD_DIR}/MJExtension\"",
  577 + "\"${PODS_CONFIGURATION_BUILD_DIR}/Qiniu\"",
  578 + "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
  579 + "\"${PODS_CONFIGURATION_BUILD_DIR}/YYKit\"",
  580 + "\"${PODS_ROOT}/PLShortVideoKit/Pod/Library/Profession\"",
  581 + "\"${PODS_ROOT}/YYKit/Vendor\"",
  582 + );
545 GCC_PRECOMPILE_PREFIX_HEADER = YES; 583 GCC_PRECOMPILE_PREFIX_HEADER = YES;
546 GCC_PREFIX_HEADER = "CNLiveUploadManager/CNLiveUploadManager-Prefix.pch"; 584 GCC_PREFIX_HEADER = "CNLiveUploadManager/CNLiveUploadManager-Prefix.pch";
547 INFOPLIST_FILE = "CNLiveUploadManager/CNLiveUploadManager-Info.plist"; 585 INFOPLIST_FILE = "CNLiveUploadManager/CNLiveUploadManager-Info.plist";
Example/CNLiveUploadManager/CNLiveViewController.m
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 // 7 //
8 8
9 #import "CNLiveViewController.h" 9 #import "CNLiveViewController.h"
  10 +#import <CNLiveUploadManager/CNLiveUploadManager.h>
10 11
11 @interface CNLiveViewController () 12 @interface CNLiveViewController ()
12 13
@@ -18,6 +19,17 @@ @@ -18,6 +19,17 @@
18 { 19 {
19 [super viewDidLoad]; 20 [super viewDidLoad];
20 // Do any additional setup after loading the view, typically from a nib. 21 // Do any additional setup after loading the view, typically from a nib.
  22 +
  23 +
  24 + [CNLiveUploadManager uploadType:CNLiveUploadTypeQN token:@"" data:nil progress:^(float progress) {
  25 +
  26 + } success:^(CNLiveUploadModel *uploadModel) {
  27 +
  28 + } failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
  29 +
  30 + }];
  31 +
  32 +
21 } 33 }
22 34
23 - (void)didReceiveMemoryWarning 35 - (void)didReceiveMemoryWarning