Skip to content

Commit

Permalink
# 5.6.4
Browse files Browse the repository at this point in the history
pods提供瘦身版的s(去除MTA)
  • Loading branch information
karisli committed Aug 1, 2019
1 parent 3cbfc7e commit c776be8
Show file tree
Hide file tree
Showing 194 changed files with 103 additions and 57 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 5.6.4
pods提供瘦身版的s(去除MTA)

# 5.6.3
-bugfix

Expand Down
25 changes: 15 additions & 10 deletions QCloudCOSXML.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "QCloudCOSXML"

s.version = "5.6.3"
s.version = "5.6.4"

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

Expand All @@ -10,17 +10,22 @@ s.version = "5.6.3"
s.author = { "QCloud Terminal Team" => "QCloudTerminalTeam" }
s.source = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.source_files = 'QCloudCOSXML/Classes/**/*'

s.dependency "QCloudCore",'5.6.3'
s.osx.deployment_target = "10.12"

s.static_framework = true

s.subspec 'Transfer' do |sbt|
sbt.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'

sbt.dependency "QCloudCore",'5.6.3'

# sbt.static_framework=true
s.default_subspec = 'Default'
s.subspec 'Default' do |default|
default.source_files = 'Pod/Classes/**/*','Models/request.model','Pod/Classes/QCloudCOSXML/*'
default.dependency "QCloudCore",'5.6.4'
end
s.subspec 'Slim' do |slim|
slim.source_files = 'Pod/Classes/**/*','Models/request.model','Pod/Classes/QCloudCOSXML/*'
slim.dependency "QCloudCore/WithoutMTA"
end
s.subspec 'Transfer' do |transfer|
transfer.source_files = 'Pod/Classes/*','Pod/Classes/Transfer/**/*','Pod/Classes/Base/*'
transfer.dependency "QCloudCore/WithoutMTA"
end

end
21 changes: 15 additions & 6 deletions QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
//
// Created by erichmzhang(张恒铭) on 2018/8/23.
//

#define kQAUploadStrategy @(2)
#define kQAccount @"Iqcloud103800"
#import "QCloudCOSXMLService+Quality.h"
#import <objc/runtime.h>

Expand Down Expand Up @@ -32,16 +33,24 @@ + (void) changeImplementation {

+ (QCloudCOSXMLService*) Quality_registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration*)configuration {
id result = [self Quality_registerDefaultCOSXMLWithConfiguration:configuration];

[self initMTA];
return result;
}


+ (void) initMTA {
QCloudLogDebug(@"Quality assurence service start");
TACMTAConfig* config = [TACMTAConfig getInstance];
config.reportStrategy = kQAUploadStrategy;
config.customerAppVersion = QCloudCOSXMLModuleVersion;
[TACMTA startWithAppkey:kQAccount];

Class cls = NSClassFromString(@"TACMTAConfig");
if (cls) {
QCloudLogDebug(@"Quality assurence service start");
Class config = [cls performSelector:NSSelectorFromString(@"getInstance")];
[config performSelector:NSSelectorFromString(@"setReportStrategy:") withObject:kQAUploadStrategy];
[config performSelector:NSSelectorFromString(@"setCustomerAppVersion:") withObject:QCloudCOSXMLModuleVersion];
[cls performSelector:NSSelectorFromString(@"startWithAppkey") withObject:kQAccount];

}else{
QCloudLogDebug(@"please pod MTA");
}
}
@end
15 changes: 8 additions & 7 deletions QCloudCOSXML/Classes/Base/QualityDataUploader.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
#import "QualityDataUploader.h"
#import <QCloudCore/QCloudLogger.h>
#import <QCloudCore/NSError+QCloudNetworking.h>
#import <QCloudCore/MTA.h>
#import <QCloudCore/MTA+Account.h>
#import <QCloudCore/MTAConfig.h>

static NSString * kRequestSentKey = @"request_sent";
static NSString * kRequestFailKey = @"request_failed";
static NSString * kErrorCodeKey = @"error_code";
Expand Down Expand Up @@ -63,10 +61,13 @@ +(BOOL)isNeedQuality:(Class)cls{
return NO;
}

+(TACMTAErrorCode)internalUploadEvent:(NSString *)eventKey withParamter:(NSDictionary *)paramter {
TACMTAErrorCode result = [TACMTA trackCustomKeyValueEvent:eventKey props:paramter];
QCloudLogDebug(@"%@ :%@",eventKey,paramter);
return result;
+(id)internalUploadEvent:(NSString *)eventKey withParamter:(NSDictionary *)paramter {
Class cls = NSClassFromString(@"TACMTAErrorCode");
if (cls) {
Class result = [cls performSelector:NSSelectorFromString(@"trackCustomKeyValueEvent:props:") withObject:eventKey withObject:paramter];
return result;
}
return nil;
}

+ (void)trackRequestSentWithType:(Class)cls {
Expand Down
6 changes: 1 addition & 5 deletions QCloudCOSXML/Classes/QCloudCOSXMLVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
// QCloud Terminal Lab --- service for developers
//
#import <Foundation/Foundation.h>
#import <QCloudCore/QCloudCoreVersion.h>

#ifndef QCloudCOSXMLModuleVersion_h
#define QCloudCOSXMLModuleVersion_h
#define QCloudCOSXMLModuleVersionNumber 506003
#define QCloudCOSXMLModuleVersionNumber 506004

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

//
FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
Expand Down
2 changes: 1 addition & 1 deletion QCloudCOSXML/Classes/QCloudCOSXMLVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudCOSXMLVersion.h"
NSString * const QCloudCOSXMLModuleVersion = @"5.6.3";
NSString * const QCloudCOSXMLModuleVersion = @"5.6.4";
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
@interface QCloudQCloudCOSXMLLoad : NSObject
@end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ - (void) finishUpload:(NSString*)uploadId
complete.customHeaders = [self.customHeaders mutableCopy];
complete.retryPolicy.delegate = self;
QCloudCompleteMultipartUploadInfo* info = [QCloudCompleteMultipartUploadInfo new];
complete.priority = self.priority;
[self.uploadParts sortUsingComparator:^NSComparisonResult(QCloudMultipartInfo* _Nonnull obj1,
QCloudMultipartInfo* _Nonnull obj2) {
int a = obj1.partNumber.intValue;
Expand Down Expand Up @@ -756,5 +755,4 @@ -(BOOL)shouldRetry:(NSURLSessionTask *)task error:(NSError *)error{
}
return YES;
}

@end
18 changes: 11 additions & 7 deletions QCloudCore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = "QCloudCore"

s.version = "5.6.3"
s.version = "5.6.4"

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

Expand All @@ -30,13 +30,17 @@ QCloudCore--腾讯云iOS-SDK Foundation。提供腾讯云iOS相关SDK的基础
s.source = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
# s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
s.ios.deployment_target = '8.0'
s.source_files = "QCloudCore/Classes/**/**/*"
s.osx.deployment_target = "10.12"
s.frameworks ='CoreMedia', "Accelerate", "SystemConfiguration"
s.libraries = "z","c++"
s.public_header_files = "QCloudCore/Classes/**/*.h"
s.static_framework = true
s.vendored_libraries='QCloudCore/Classes/QualityAssurance/libmtasdk.a'
# s.public_header_files = 'Pod/Classes/**/*.h'
# s.frameworks = 'UIKit', 'MapKit'
# s.dependency 'AFNetworking', '~> 2.3'

s.default_subspec = 'Default'
s.subspec 'Default' do |default|
default.source_files = 'Pod/Classes/Base/**/*','Pod/Classes/QualityAssurance/*'
default.vendored_libraries='Pod/Classes/QualityAssurance/libmtasdk.a'
end
s.subspec 'WithoutMTA' do |withoutMTA|
withoutMTA.source_files = 'Pod/Classes/Base/**/*'
end
end
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Created by Dong Zhao on 2017/3/29.
//
//

#ifndef QCloudCore_h
#define QCloudCore_h

Expand Down Expand Up @@ -41,9 +42,6 @@
#import "QCloudThreadSafeMutableDictionary.h"
#import "QCloudError.h"
#import "UIDevice+QCloudFCUUID.h"
#import "MTA.h"
#import "MTAConfig.h"
#import "MTACrashReporter.h"
#import "QualityAssuranceDefine.h"


#endif /* QCloudCore_h */
16 changes: 16 additions & 0 deletions QCloudCore/Classes/Base/QCloudCoreVersion.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// QCloud Terminal Lab --- service for developers
//
#import <Foundation/Foundation.h>

#ifndef QCloudCoreModuleVersion_h
#define QCloudCoreModuleVersion_h
#define QCloudCoreModuleVersionNumber 506003

//dependency

//
FOUNDATION_EXTERN NSString * const QCloudCoreModuleVersion;
FOUNDATION_EXTERN NSString * const QCloudCoreModuleName;

#endif
29 changes: 29 additions & 0 deletions QCloudCore/Classes/Base/QCloudCoreVersion.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#import "QCloudCoreVersion.h"
NSString * const QCloudCoreModuleVersion = @"5.6.3";
NSString * const QCloudCoreModuleName = @"QCloudCore";
@interface QCloudQCloudCoreLoad : NSObject
@end

@implementation QCloudQCloudCoreLoad
+ (void) load
{
Class cla = NSClassFromString(@"QCloudSDKModuleManager");
if (cla) {
NSMutableDictionary* module = [@{
@"name" : QCloudCoreModuleName,
@"version" : QCloudCoreModuleVersion
} mutableCopy];

NSString* buglyID = @"";
if (buglyID.length > 0) {
module[@"crashID"] = buglyID;
}

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wundeclared-selector"
id share = [cla performSelector:@selector(shareInstance)];
[share performSelector:@selector(registerModuleByJSON:) withObject:module];
#pragma clang diagnostic pop
}
}
@end
2 changes: 1 addition & 1 deletion QCloudCore/Classes/QCloudCoreVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#ifndef QCloudCoreModuleVersion_h
#define QCloudCoreModuleVersion_h
#define QCloudCoreModuleVersionNumber 506003
#define QCloudCoreModuleVersionNumber 506004

//dependency

Expand Down
2 changes: 1 addition & 1 deletion QCloudCore/Classes/QCloudCoreVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudCoreVersion.h"
NSString * const QCloudCoreModuleVersion = @"5.6.3";
NSString * const QCloudCoreModuleVersion = @"5.6.4";
NSString * const QCloudCoreModuleName = @"QCloudCore";
@interface QCloudQCloudCoreLoad : NSObject
@end
Expand Down
13 changes: 0 additions & 13 deletions QCloudCore/Classes/QualityAssurance/QualityAssuranceDefine.h

This file was deleted.

0 comments on commit c776be8

Please sign in to comment.