Skip to content

Commit c776be8

Browse files
author
karisli
committed
# 5.6.4
pods提供瘦身版的s(去除MTA)
1 parent 3cbfc7e commit c776be8

File tree

194 files changed

+103
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+103
-57
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions

QCloudCOSXML.podspec

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "QCloudCOSXML"
33

4-
s.version = "5.6.3"
4+
s.version = "5.6.4"
55

66
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
77

@@ -10,17 +10,22 @@ s.version = "5.6.3"
1010
s.author = { "QCloud Terminal Team" => "QCloudTerminalTeam" }
1111
s.source = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
1212
s.ios.deployment_target = '8.0'
13-
s.source_files = 'QCloudCOSXML/Classes/**/*'
14-
15-
s.dependency "QCloudCore",'5.6.3'
13+
s.osx.deployment_target = "10.12"
1614

1715
s.static_framework = true
1816

19-
s.subspec 'Transfer' do |sbt|
20-
sbt.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
21-
22-
sbt.dependency "QCloudCore",'5.6.3'
23-
24-
# sbt.static_framework=true
17+
s.default_subspec = 'Default'
18+
s.subspec 'Default' do |default|
19+
default.source_files = 'Pod/Classes/**/*','Models/request.model','Pod/Classes/QCloudCOSXML/*'
20+
default.dependency "QCloudCore",'5.6.4'
21+
end
22+
s.subspec 'Slim' do |slim|
23+
slim.source_files = 'Pod/Classes/**/*','Models/request.model','Pod/Classes/QCloudCOSXML/*'
24+
slim.dependency "QCloudCore/WithoutMTA"
2525
end
26+
s.subspec 'Transfer' do |transfer|
27+
transfer.source_files = 'Pod/Classes/*','Pod/Classes/Transfer/**/*','Pod/Classes/Base/*'
28+
transfer.dependency "QCloudCore/WithoutMTA"
29+
end
30+
2631
end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
//
55
// Created by erichmzhang(张恒铭) on 2018/8/23.
66
//
7-
7+
#define kQAUploadStrategy @(2)
8+
#define kQAccount @"Iqcloud103800"
89
#import "QCloudCOSXMLService+Quality.h"
910
#import <objc/runtime.h>
1011

@@ -32,16 +33,24 @@ + (void) changeImplementation {
3233

3334
+ (QCloudCOSXMLService*) Quality_registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration*)configuration {
3435
id result = [self Quality_registerDefaultCOSXMLWithConfiguration:configuration];
36+
3537
[self initMTA];
3638
return result;
3739
}
3840

3941

4042
+ (void) initMTA {
41-
QCloudLogDebug(@"Quality assurence service start");
42-
TACMTAConfig* config = [TACMTAConfig getInstance];
43-
config.reportStrategy = kQAUploadStrategy;
44-
config.customerAppVersion = QCloudCOSXMLModuleVersion;
45-
[TACMTA startWithAppkey:kQAccount];
43+
44+
Class cls = NSClassFromString(@"TACMTAConfig");
45+
if (cls) {
46+
QCloudLogDebug(@"Quality assurence service start");
47+
Class config = [cls performSelector:NSSelectorFromString(@"getInstance")];
48+
[config performSelector:NSSelectorFromString(@"setReportStrategy:") withObject:kQAUploadStrategy];
49+
[config performSelector:NSSelectorFromString(@"setCustomerAppVersion:") withObject:QCloudCOSXMLModuleVersion];
50+
[cls performSelector:NSSelectorFromString(@"startWithAppkey") withObject:kQAccount];
51+
52+
}else{
53+
QCloudLogDebug(@"please pod MTA");
54+
}
4655
}
4756
@end

QCloudCOSXML/Classes/Base/QualityDataUploader.m

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
#import "QualityDataUploader.h"
99
#import <QCloudCore/QCloudLogger.h>
1010
#import <QCloudCore/NSError+QCloudNetworking.h>
11-
#import <QCloudCore/MTA.h>
12-
#import <QCloudCore/MTA+Account.h>
13-
#import <QCloudCore/MTAConfig.h>
11+
1412
static NSString * kRequestSentKey = @"request_sent";
1513
static NSString * kRequestFailKey = @"request_failed";
1614
static NSString * kErrorCodeKey = @"error_code";
@@ -63,10 +61,13 @@ +(BOOL)isNeedQuality:(Class)cls{
6361
return NO;
6462
}
6563

66-
+(TACMTAErrorCode)internalUploadEvent:(NSString *)eventKey withParamter:(NSDictionary *)paramter {
67-
TACMTAErrorCode result = [TACMTA trackCustomKeyValueEvent:eventKey props:paramter];
68-
QCloudLogDebug(@"%@ :%@",eventKey,paramter);
69-
return result;
64+
+(id)internalUploadEvent:(NSString *)eventKey withParamter:(NSDictionary *)paramter {
65+
Class cls = NSClassFromString(@"TACMTAErrorCode");
66+
if (cls) {
67+
Class result = [cls performSelector:NSSelectorFromString(@"trackCustomKeyValueEvent:props:") withObject:eventKey withObject:paramter];
68+
return result;
69+
}
70+
return nil;
7071
}
7172

7273
+ (void)trackRequestSentWithType:(Class)cls {

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
// QCloud Terminal Lab --- service for developers
33
//
44
#import <Foundation/Foundation.h>
5-
#import <QCloudCore/QCloudCoreVersion.h>
65

76
#ifndef QCloudCOSXMLModuleVersion_h
87
#define QCloudCOSXMLModuleVersion_h
9-
#define QCloudCOSXMLModuleVersionNumber 506003
8+
#define QCloudCOSXMLModuleVersionNumber 506004
109

1110
//dependency
12-
#if QCloudCoreModuleVersionNumber != 506003
13-
#error "库QCloudCOSXML依赖QCloudCore最小版本号为5.6.3,当前引入的QCloudCore版本号过低,请及时升级后使用"
14-
#endif
1511

1612
//
1713
FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "QCloudCOSXMLVersion.h"
2-
NSString * const QCloudCOSXMLModuleVersion = @"5.6.3";
2+
NSString * const QCloudCOSXMLModuleVersion = @"5.6.4";
33
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
44
@interface QCloudQCloudCOSXMLLoad : NSObject
55
@end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,6 @@ - (void) finishUpload:(NSString*)uploadId
562562
complete.customHeaders = [self.customHeaders mutableCopy];
563563
complete.retryPolicy.delegate = self;
564564
QCloudCompleteMultipartUploadInfo* info = [QCloudCompleteMultipartUploadInfo new];
565-
complete.priority = self.priority;
566565
[self.uploadParts sortUsingComparator:^NSComparisonResult(QCloudMultipartInfo* _Nonnull obj1,
567566
QCloudMultipartInfo* _Nonnull obj2) {
568567
int a = obj1.partNumber.intValue;
@@ -756,5 +755,4 @@ -(BOOL)shouldRetry:(NSURLSessionTask *)task error:(NSError *)error{
756755
}
757756
return YES;
758757
}
759-
760758
@end

QCloudCore.podspec

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Pod::Spec.new do |s|
1010
s.name = "QCloudCore"
1111

12-
s.version = "5.6.3"
12+
s.version = "5.6.4"
1313

1414
s.summary = "QCloudCore--腾讯云iOS-SDK Foundation"
1515

@@ -30,13 +30,17 @@ QCloudCore--腾讯云iOS-SDK Foundation。提供腾讯云iOS相关SDK的基础
3030
s.source = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
3131
# s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
3232
s.ios.deployment_target = '8.0'
33-
s.source_files = "QCloudCore/Classes/**/**/*"
33+
s.osx.deployment_target = "10.12"
3434
s.frameworks ='CoreMedia', "Accelerate", "SystemConfiguration"
3535
s.libraries = "z","c++"
36-
s.public_header_files = "QCloudCore/Classes/**/*.h"
3736
s.static_framework = true
38-
s.vendored_libraries='QCloudCore/Classes/QualityAssurance/libmtasdk.a'
39-
# s.public_header_files = 'Pod/Classes/**/*.h'
40-
# s.frameworks = 'UIKit', 'MapKit'
41-
# s.dependency 'AFNetworking', '~> 2.3'
37+
38+
s.default_subspec = 'Default'
39+
s.subspec 'Default' do |default|
40+
default.source_files = 'Pod/Classes/Base/**/*','Pod/Classes/QualityAssurance/*'
41+
default.vendored_libraries='Pod/Classes/QualityAssurance/libmtasdk.a'
42+
end
43+
s.subspec 'WithoutMTA' do |withoutMTA|
44+
withoutMTA.source_files = 'Pod/Classes/Base/**/*'
45+
end
4246
end

0 commit comments

Comments
 (0)