iOS Team / CNLiveUploadManager · Commits

Commit 3497c053a4d708ea6a80e31cd547cd7c9b99e08f

Authored by 梁星国
1 parent 2f4c6b48

提交-主工程的代码更改 加入outPath 不在取 加入新参数

Inline Side-by-side
Showing 5 changed files with 20 additions and 31 deletions
CNLiveUploadManager.podspec
  View file @3497c05
... ... @@ -8,8 +8,8 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveUploadManager'
11   - s.version = '0.1.2'
12   - s.summary = '压缩上传'
  11 + s.version = '0.1.4'
  12 + s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
13 13  
14 14 # This description is used to generate tags and improve search results.
15 15 # * Think: What does it do? Why did you write it? What is the focus?
... ...
CNLiveUploadManager/Classes/CNLiveUploadManager.h
  View file @3497c05
... ... @@ -13,10 +13,17 @@
13 13 #import <AssetsLibrary/AssetsLibrary.h>
14 14 #import <PLShortVideoKit/PLShortVideoKit.h>
15 15 #import <Photos/Photos.h>
16   -#import "QNResolver.h"
17   -#import "QNDnsManager.h"
18   -#import "QNNetworkInfo.h"
19   -#import "UIImage+zipData.h"
  16 +#import <HappyDNS/HappyDNS.h>
  17 +#import <CNLiveCommonCategory/CNLiveCommonCategory.h>
  18 +#import <CNLiveBusinessTools/CNLiveBusinessTools.h>
  19 +#import <CNLiveUserManagement/CNUserInfoModel.h>
  20 +#import <CNLiveUserManagement/CNUserInfoManager.h>
  21 +#import <CNLiveBaseTools/CNLiveTimeTools.h>
  22 +#import "HttpService.h"
  23 +#import <AFNetworking/AFNetworking.h>
  24 +#import <YYKit/YYKit.h>
  25 +#import <CNLiveRequestBastKit/CNLiveNetworking.h>
  26 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
20 27  
21 28 @class CNLiveUploadModel;
22 29  
... ...
CNLiveUploadManager/Classes/CNLiveUploadManager.m
  View file @3497c05
... ... @@ -7,19 +7,6 @@
7 7 //
8 8  
9 9 #import "CNLiveUploadManager.h"
10   -#import "UIImage+zipData.h"
11   -#import "CNLiveNetworking.h"
12   -#import "CNLiveBusinessTools.h"
13   -#import "CNUserInfoManager.h"
14   -#import "CNUserInfoModel.h"
15   -#import "CNLiveTimeTools.h"
16   -#import "CNEnvironmentHeader.h"
17   -#import "CNLiveNetworking.h"
18   -#import "HttpService.h"
19   -#import <AFNetworking/AFNetworking.h>
20   -#import <YYKit/YYKit.h>
21   -
22   -
23 10  
24 11 #define kiOS9_1Later ([UIDevice currentDevice].systemVersion.floatValue >= 9.1f)
25 12  
... ...
Example/CNLiveUploadManager.xcodeproj/project.pbxproj
  View file @3497c05
... ... @@ -247,6 +247,9 @@
247 247 LastUpgradeCheck = 0720;
248 248 ORGANIZATIONNAME = jyyjkt;
249 249 TargetAttributes = {
  250 + 6003F589195388D20070C39A = {
  251 + DevelopmentTeam = 94X49GG3ZW;
  252 + };
250 253 6003F5AD195388D20070C39A = {
251 254 TestTargetID = 6003F589195388D20070C39A;
252 255 };
... ... @@ -351,6 +354,7 @@
351 354 "${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
352 355 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
353 356 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
  357 + "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
354 358 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
355 359 "${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
356 360 "${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
... ... @@ -368,6 +372,7 @@
368 372 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
369 373 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
370 374 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
  375 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
371 376 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
372 377 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
373 378 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
... ... @@ -520,6 +525,7 @@
520 525 baseConfigurationReference = 6F7C2FB50E752D98A9ADE584 /* Pods-CNLiveUploadManager_Example.debug.xcconfig */;
521 526 buildSettings = {
522 527 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  528 + DEVELOPMENT_TEAM = 94X49GG3ZW;
523 529 GCC_PRECOMPILE_PREFIX_HEADER = YES;
524 530 GCC_PREFIX_HEADER = "CNLiveUploadManager/CNLiveUploadManager-Prefix.pch";
525 531 INFOPLIST_FILE = "CNLiveUploadManager/CNLiveUploadManager-Info.plist";
... ... @@ -535,6 +541,7 @@
535 541 baseConfigurationReference = A7093B51D38A51D92C2439BC /* Pods-CNLiveUploadManager_Example.release.xcconfig */;
536 542 buildSettings = {
537 543 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  544 + DEVELOPMENT_TEAM = 94X49GG3ZW;
538 545 GCC_PRECOMPILE_PREFIX_HEADER = YES;
539 546 GCC_PREFIX_HEADER = "CNLiveUploadManager/CNLiveUploadManager-Prefix.pch";
540 547 INFOPLIST_FILE = "CNLiveUploadManager/CNLiveUploadManager-Info.plist";
... ...
Example/Podfile
  View file @3497c05
... ... @@ -7,20 +7,8 @@ platform :ios, &#39;9.0&#39;
7 7  
8 8 target 'CNLiveUploadManager_Example' do
9 9 pod 'CNLiveUploadManager', :path => '../'
10   -
11   - pod 'CNLiveTripartiteManagement/Qiniu'
12   - pod 'CNLiveRequestBastKit'
13   - pod 'CNLiveTripartiteManagement/MJExtension'
14   - pod 'CNLiveTripartiteManagement/YYKit'
15   - pod 'CNLiveTripartiteManagement/PLShortVideoKit'
16   - #基础basekit
17   - pod 'CNLiveCommonCategory'
18   - pod 'CNLiveBaseKit'
19   - pod 'CNLiveBusinessTools'
20   - pod 'CNLiveBaseTools'
21 10  
22 11  
23   -
24 12 pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
25 13 end
26 14  
... ...