Skip to content

Commit

Permalink
# 6.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
garenwang committed Feb 16, 2023
1 parent c64da5a commit 7c32a14
Show file tree
Hide file tree
Showing 16 changed files with 77 additions and 34 deletions.
51 changes: 31 additions & 20 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,48 @@
# 6.1.9
1.修改内容审核参数校验
# 6.2.0

# 6.1.8
1.新增 Bucket policy接口

# 6.1.9


# 6.1.8

# 6.1.7

# 6.1.7
1.修复断点下载进度bug

# 6.1.6

# 6.1.6
1.新增图片修复、人脸识别、人体识别、文字识别等十余个接口
# 6.1.5

# 6.1.5
1.新增急速识别相关参数
补充急速识别相关参数

# 6.1.4
1.新增分词相关接口
# 6.1.4

# 6.1.3
新增分词接口

# 6.1.3
1.新增语音识别相关接口


# 6.1.2
1.request新增payload参数。 2.修复已知bug

# 6.1.2
1.request新增payload参数。 2.修复已知bug"

# 6.1.1
1.修改头文件大小写问题
# 6.1.1

# 6.1.0
1.优化service注册校验逻辑。2.修复全部取消。
修改头文件大小写问题

# 6.1.0

# 6.0.9
1.优化service注册校验逻辑。2.修复全部取消。

# 6.0.9

1.新增内容审核接口

# 6.0.8

1.修改sdk与yymodel 方法命名冲突。2.修改一些SDK 内部一些警告
Expand Down
8 changes: 4 additions & 4 deletions QCloudCOSXML.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = "QCloudCOSXML"


s.version = "6.1.9"
s.version = "6.2.0"


s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
Expand All @@ -22,15 +22,15 @@ s.version = "6.1.9"
s.subspec 'Default' do |default|
default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'

default.dependency "QCloudCore",'6.1.9'
default.dependency "QCloudCore",'6.2.0'
end
s.subspec 'Slim' do |slim|
slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
slim.dependency "QCloudCore/WithoutMTA",'6.1.9'
slim.dependency "QCloudCore/WithoutMTA",'6.2.0'
end
s.subspec 'Transfer' do |transfer|
transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
transfer.dependency "QCloudCore/WithoutMTA",'6.1.9'
transfer.dependency "QCloudCore/WithoutMTA",'6.2.0'

end

Expand Down
2 changes: 1 addition & 1 deletion QCloudCOSXML/Classes/QCloudCOSXMLVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#ifndef QCloudCOSXMLModuleVersion_h
#define QCloudCOSXMLModuleVersion_h
#define QCloudCOSXMLModuleVersionNumber 601009
#define QCloudCOSXMLModuleVersionNumber 602000

//dependency

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 = @"6.1.9";
NSString * const QCloudCOSXMLModuleVersion = @"6.2.0";
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
@interface QCloudQCloudCOSXMLLoad : NSObject
@end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ - (void)fakeStart {
self.totalBytesSent = 0;

if ([self.body isKindOfClass:[NSData class]]) {
NSData * body = self.body;
if(body.length == 0 && self.transferManager.cosService.configuration.disableUploadZeroData){
NSError *error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
message:@"QCloudCOSXMLUploadObjectRequest:InvalidArgument:您输入的body(Data)为空并且不允许上传空文件"];
[self onError:error];
[self cancel];
return;
}
[self startSimpleUpload];
} else if ([self.body isKindOfClass:[NSURL class]]) {
NSURL *url = (NSURL *)self.body;
Expand All @@ -265,6 +273,13 @@ - (void)fakeStart {
startPartNumber = 0;
[self startMultiUpload];
} else {
if(self.dataContentLength == 0 && self.transferManager.cosService.configuration.disableUploadZeroData){
NSError *error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
message:[NSString stringWithFormat:@"QCloudCOSXMLUploadObjectRequest:InvalidArgument:您输入的body(NSURL:%@)为空并且不允许上传空文件",self.body]];
[self onError:error];
[self cancel];
return;
}
[self startSimpleUpload];
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion QCloudCore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.name = "QCloudCore"


s.version = "6.1.9"
s.version = "6.2.0"



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ typedef void (^QCloudHTTPRequestConfigure)(QCloudRequestSerializer *_Nonnull req
@property (nonatomic, strong, readonly) QCloudResponseSerializer *_Nonnull responseSerializer;
@property (nonatomic, strong, readonly) NSURLRequest *_Nullable urlRequest;

/// sdk内部管理,业务测无需设置。
@property (nonatomic, assign, readonly) BOOL isRetry;

/**
该任务所处的服务
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ @interface QCloudHTTPRequest () {
@property (nonatomic, strong, readonly) NSMutableURLRequest *cachedURLRequest;
@property (nonatomic, strong, readonly) NSError *cachedURLRequestBuildError;
@property (nonatomic, strong) NSURLRequest *_Nullable urlRequest;

@end

@implementation QCloudHTTPRequest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
if (QCloudFileExist(httpRequset.downloadingURL.path)) {
httpRequset.localCacheDownloadOffset = QCloudFileSize(httpRequset.downloadingURL.path);
}
[httpRequset setValue:@(YES) forKey:@"isRetry"];
[weakSelf executeRestHTTPReqeust:httpRequset];
}
whenError:error]) {
Expand Down Expand Up @@ -478,6 +479,10 @@ - (void)executeRestHTTPReqeust:(QCloudHTTPRequest *)httpRequest {
NSData *data = (NSData *)body;
[mutableRequest setHTTPBody:data];
[mutableRequest setValue:[@([data length]) stringValue] forHTTPHeaderField:@"Content-Length"];
if(data.length == 0 && httpRequest.runOnService.configuration.disableUploadZeroData){
directError = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
message:[NSString stringWithFormat:@"InvalidArgument:您输入的body(Data)为空并且不允许上传空文件,是否为SDK内部重试:%@",httpRequest.isRetry ? @"" : @""]];
}
} else if ([body isKindOfClass:[NSURL class]]) {
NSURL *fileURL = (NSURL *)body;
if (![fileURL isFileURL]) {
Expand All @@ -487,6 +492,10 @@ - (void)executeRestHTTPReqeust:(QCloudHTTPRequest *)httpRequest {
NSUInteger fileSize = QCloudFileSize(fileURL.path);
[mutableRequest setValue:[@(fileSize) stringValue] forHTTPHeaderField:@"Content-Length"];
uploadFileURL = fileURL;
if(directError == nil && fileSize == 0 && httpRequest.runOnService.configuration.disableUploadZeroData){
directError = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
message:[NSString stringWithFormat:@"InvalidArgument:您输入的body(NSURL:%@)为空并且不允许上传空文件,是否为SDK内部重试:%@",fileURL, httpRequest.isRetry ? @"" : @""]];
}
} else if ([body isKindOfClass:[QCloudFileOffsetBody class]]) {
QCloudFileOffsetBody *fileBody = (QCloudFileOffsetBody *)body;
if (![fileBody.fileURL isFileURL]) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSTimeInterval timeoutInterval;

@property (nonatomic, assign) BOOL enableQuic;

/// 是否禁止上传空文件 NO 不禁止。YES 禁止
@property (nonatomic, assign) BOOL disableUploadZeroData;
@end

NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ - (instancetype)copyWithZone:(NSZone *)zone {
config.endpoint = [self.endpoint copy];
config.productVersion = self.productVersion;
config.isCloseShareLog = self.isCloseShareLog;
config.disableUploadZeroData = self.disableUploadZeroData;
config.timeoutInterval = self.timeoutInterval;
config.enableQuic = self.enableQuic;
config.disableSetupBeacon = self.disableSetupBeacon;
Expand Down
2 changes: 1 addition & 1 deletion QCloudCore/Classes/Base/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 601009
#define QCloudCoreModuleVersionNumber 602000

//dependency

Expand Down
2 changes: 1 addition & 1 deletion QCloudCore/Classes/Base/QCloudCoreVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudCoreVersion.h"
NSString * const QCloudCoreModuleVersion = @"6.1.9";
NSString * const QCloudCoreModuleVersion = @"6.2.0";
NSString * const QCloudCoreModuleName = @"QCloudCore";
@interface QCloudQCloudCoreLoad : NSObject
@end
Expand Down
6 changes: 3 additions & 3 deletions QCloudQuic.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.name = "QCloudQuic"


s.version = "6.1.9"
s.version = "6.2.0"


s.summary = "QCloudQuic 腾讯云iOS-SDK组件"
Expand Down Expand Up @@ -39,12 +39,12 @@ s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
s.subspec 'Default' do |default|
default.source_files = 'QCloudQuic/Classes/*', 'QCloudQuic/Classes/QCloudBase/**/*','QCloudQuic/Classes/QuicFramework//*.{h}'
default.vendored_frameworks = 'QCloudQuic/Classes/QuicFramework/Tquic.framework'
default.dependency "QCloudCOSXML",'6.1.9'
default.dependency "QCloudCOSXML",'6.2.0'
end
s.subspec 'Slim' do |slim|
slim.source_files = 'QCloudQuic/Classes/*', 'QCloudQuic/Classes/QCloudBase/**/*','QCloudQuic/Classes/QuicFramework//*.{h}'
slim.vendored_frameworks = 'QCloudQuic/Classes/QuicFramework/Tquic.framework'
slim.dependency "QCloudCOSXML/Slim",'6.1.9'
slim.dependency "QCloudCOSXML/Slim",'6.2.0'
end


Expand Down
2 changes: 1 addition & 1 deletion QCloudQuic/Classes/QCloudQuicVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#ifndef QCloudQuicModuleVersion_h
#define QCloudQuicModuleVersion_h
#define QCloudQuicModuleVersionNumber 601009
#define QCloudQuicModuleVersionNumber 602000

//dependency

Expand Down
2 changes: 1 addition & 1 deletion QCloudQuic/Classes/QCloudQuicVersion.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "QCloudQuicVersion.h"
NSString * const QCloudQuicModuleVersion = @"6.1.9";
NSString * const QCloudQuicModuleVersion = @"6.2.0";
NSString * const QCloudQuicModuleName = @"QCloudQuic";
@interface QCloudQCloudQuicLoad : NSObject
@end
Expand Down

0 comments on commit 7c32a14

Please sign in to comment.