Skip to content

Commit 5116b9d

Browse files
author
garenwang
committed
# 6.1.9
1 parent d6a8570 commit 5116b9d

19 files changed

+82
-182
lines changed

‎CHANGELOG.md‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,45 @@
1-
# 6.1.8
2-
1.新增 Bucket policy接口
1+
# 6.1.9
32

4-
# 6.1.7
3+
4+
# 6.1.8
5+
6+
7+
# 6.1.7
58
1.修复断点下载进度bug
9+
10+
# 6.1.6
611

7-
# 6.1.6
8-
1.新增图片修复、人脸识别、人体识别、文字识别等十余个接口
12+
13+
# 6.1.5
914

10-
# 6.1.5
11-
1.新增急速识别相关参数
15+
补充急速识别相关参数
1216

13-
# 6.1.4
14-
1.新增分词相关接口
17+
18+
# 6.1.4
1519

16-
# 6.1.3
20+
新增分词接口
21+
22+
# 6.1.3
1723
1.新增语音识别相关接口
24+
1825

19-
# 6.1.2
20-
1.request新增payload参数。 2.修复已知bug
26+
27+
# 6.1.2
28+
1.request新增payload参数。 2.修复已知bug"
2129

22-
# 6.1.1
23-
1.修改头文件大小写问题
30+
31+
# 6.1.1
2432

25-
# 6.1.0
26-
1.优化service注册校验逻辑。2.修复全部取消。
33+
修改头文件大小写问题
34+
35+
# 6.1.0
2736

28-
# 6.0.9
37+
1.优化service注册校验逻辑。2.修复全部取消。
38+
39+
# 6.0.9
2940

3041
1.新增内容审核接口
31-
42+
3243
# 6.0.8
3344

3445
1.修改sdk与yymodel 方法命名冲突。2.修改一些SDK 内部一些警告

‎QCloudCOSXML.podspec‎

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

44

5-
s.version = "6.1.8"
5+
s.version = "6.1.9"
66

77

88
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -22,15 +22,15 @@ s.version = "6.1.8"
2222
s.subspec 'Default' do |default|
2323
default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
2424

25-
default.dependency "QCloudCore",'6.1.8'
25+
default.dependency "QCloudCore",'6.1.9'
2626
end
2727
s.subspec 'Slim' do |slim|
2828
slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
29-
slim.dependency "QCloudCore/WithoutMTA",'6.1.8'
29+
slim.dependency "QCloudCore/WithoutMTA",'6.1.9'
3030
end
3131
s.subspec 'Transfer' do |transfer|
3232
transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
33-
transfer.dependency "QCloudCore/WithoutMTA",'6.1.8'
33+
transfer.dependency "QCloudCore/WithoutMTA",'6.1.9'
3434

3535
end
3636

‎QCloudCOSXML/Classes/CI/enum/QCloudRecognitionEnum.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ typedef NS_ENUM(NSUInteger, QCloudRecognitionEnum) {
1414
QCloudRecognitionTerrorist = 1 << 1,
1515
QCloudRecognitionPolitics = 1 << 2,
1616
QCloudRecognitionAds = 1 << 3,
17+
QCloudRecognitionIllegal = 1 << 4,
18+
QCloudRecognitionAbuse = 1 << 5,
1719
};
1820

1921
//拉取该状态的任务，以,分割，支持多状态：All、Submitted、Running、Success、Failed、Pause、Cancel。默认为 All。

‎QCloudCOSXML/Classes/CI/request/QCloudBatchimageRecognitionRequest.m‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
9191
}
9292
}
9393

94-
if (self.detectType == 0 ) {
95-
if (error != NULL) {
96-
*error = [NSError
97-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
98-
message:[NSString stringWithFormat:
99-
@"InvalidArgument:paramter[detectType] is invalid (nil), it must have some value. please check it"]];
100-
return NO;
101-
}
102-
}
103-
10494
NSURL *__serverURL = [self.runOnService.configuration.endpoint serverURLWithBucket:self.bucket
10595
appID:self.runOnService.configuration.appID
10696
regionName:self.regionName];
@@ -113,18 +103,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
113103

114104
self.requestData.serverURL = __serverURL.absoluteString;
115105
[self.requestData setValue:__serverURL.host forHTTPHeaderField:@"Host"];
116-
117-
118-
if ([self getDetectType].length == 0) {
119-
if (error != NULL) {
120-
*error = [NSError
121-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
122-
message:[NSString
123-
stringWithFormat:
124-
@"InvalidArgument:paramter[detect-type] is invalid (nil), it must have some value. please check it"]];
125-
return NO;
126-
}
127-
}
128106

129107
NSDictionary * params =@{
130108
@"Input":[self.input qcloud_modelToJSONObject],
@@ -170,7 +148,9 @@ - (NSString *)getDetectType {
170148
if (_detectType & QCloudRecognitionAds) {
171149
[detecyTypes addObject:@"Ads"];
172150
}
173-
151+
if(detecyTypes.count == 0){
152+
return @"";
153+
}
174154
return [detecyTypes componentsJoinedByString:@","];
175155
}
176156

‎QCloudCOSXML/Classes/CI/request/QCloudPostAudioRecognitionRequest.m‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,7 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
8787
return NO;
8888
}
8989
}
90-
91-
if (self.detectType == 0 ) {
92-
if (error != NULL) {
93-
*error = [NSError
94-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
95-
message:[NSString stringWithFormat:
96-
@"InvalidArgument:paramter[detectType] is invalid (nil), it must have some value. please check it"]];
97-
return NO;
98-
}
99-
}
100-
90+
10191
NSURL *__serverURL = [self.runOnService.configuration.endpoint serverURLWithBucket:self.bucket
10292
appID:self.runOnService.configuration.appID
10393
regionName:self.regionName];
@@ -111,18 +101,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
111101
self.requestData.serverURL = __serverURL.absoluteString;
112102
[self.requestData setValue:__serverURL.host forHTTPHeaderField:@"Host"];
113103

114-
115-
if ([self getDetectType].length == 0) {
116-
if (error != NULL) {
117-
*error = [NSError
118-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
119-
message:[NSString
120-
stringWithFormat:
121-
@"InvalidArgument:paramter[detect-type] is invalid (nil), it must have some value. please check it"]];
122-
return NO;
123-
}
124-
}
125-
126104
NSMutableDictionary * input = NSMutableDictionary.new;
127105
if (self.object) {
128106
[input setObject:self.object forKey:@"Object"];
@@ -178,6 +156,10 @@ - (NSString *)getDetectType {
178156
if (_detectType & QCloudRecognitionAds) {
179157
[detecyTypes addObject:@"Ads"];
180158
}
159+
160+
if(detecyTypes.count == 0){
161+
return @"";
162+
}
181163

182164
return [detecyTypes componentsJoinedByString:@","];
183165
}

‎QCloudCOSXML/Classes/CI/request/QCloudPostDocRecognitionRequest.m‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
8989
}
9090
}
9191

92-
if (self.detectType == 0 ) {
93-
if (error != NULL) {
94-
*error = [NSError
95-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
96-
message:[NSString stringWithFormat:
97-
@"InvalidArgument:paramter[detectType] is invalid (nil), it must have some value. please check it"]];
98-
return NO;
99-
}
100-
}
101-
10292
NSURL *__serverURL = [self.runOnService.configuration.endpoint serverURLWithBucket:self.bucket
10393
appID:self.runOnService.configuration.appID
10494
regionName:self.regionName];
@@ -112,19 +102,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
112102
self.requestData.serverURL = __serverURL.absoluteString;
113103
[self.requestData setValue:__serverURL.host forHTTPHeaderField:@"Host"];
114104

115-
116-
if ([self getDetectType].length == 0) {
117-
if (error != NULL) {
118-
*error = [NSError
119-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
120-
message:[NSString
121-
stringWithFormat:
122-
@"InvalidArgument:paramter[detect-type] is invalid (nil), it must have some value. please check it"]];
123-
return NO;
124-
}
125-
}
126-
127-
128105
NSMutableDictionary * input = NSMutableDictionary.new;
129106
if (self.object) {
130107
[input setObject:self.object forKey:@"Object"];
@@ -182,6 +159,10 @@ - (NSString *)getDetectType {
182159
if (_detectType & QCloudRecognitionAds) {
183160
[detecyTypes addObject:@"Ads"];
184161
}
162+
163+
if(detecyTypes.count == 0){
164+
return @"";
165+
}
185166

186167
return [detecyTypes componentsJoinedByString:@","];
187168
}

‎QCloudCOSXML/Classes/CI/request/QCloudPostTextRecognitionRequest.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
3737
/**
3838
功能描述：
3939
40-
本接口用于提交一个视频审核任务。视频审核功能为异步任务方式，您可以通过提交视频审核任务审核您的视频文件，然后通过查询视频审核任务接口查询审核结果。
40+
本接口用于提交一个文本审核任务。视频审核功能为异步任务方式，您可以通过提交文本审核任务审核您的视频文件，然后通过查询文本审核任务接口查询审核结果。
4141
4242
具体请查看：https://cloud.tencent.com/document/product/460/56285
4343

‎QCloudCOSXML/Classes/CI/request/QCloudPostTextRecognitionRequest.m‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
8888
}
8989
}
9090

91-
if (self.detectType == 0 ) {
92-
if (error != NULL) {
93-
*error = [NSError
94-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
95-
message:[NSString stringWithFormat:
96-
@"InvalidArgument:paramter[detectType] is invalid (nil), it must have some value. please check it"]];
97-
return NO;
98-
}
99-
}
100-
10191
NSURL *__serverURL = [self.runOnService.configuration.endpoint serverURLWithBucket:self.bucket
10292
appID:self.runOnService.configuration.appID
10393
regionName:self.regionName];
@@ -110,19 +100,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
110100

111101
self.requestData.serverURL = __serverURL.absoluteString;
112102
[self.requestData setValue:__serverURL.host forHTTPHeaderField:@"Host"];
113-
114-
115-
if ([self getDetectType].length == 0) {
116-
if (error != NULL) {
117-
*error = [NSError
118-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
119-
message:[NSString
120-
stringWithFormat:
121-
@"InvalidArgument:paramter[detect-type] is invalid (nil), it must have some value. please check it"]];
122-
return NO;
123-
}
124-
}
125-
126103

127104
NSMutableDictionary * input = NSMutableDictionary.new;
128105
if (self.object) {
@@ -186,6 +163,18 @@ - (NSString *)getDetectType {
186163
[detecyTypes addObject:@"Ads"];
187164
}
188165

166+
if (_detectType & QCloudRecognitionIllegal) {
167+
[detecyTypes addObject:@"Illegal"];
168+
}
169+
170+
if (_detectType & QCloudRecognitionAbuse) {
171+
[detecyTypes addObject:@"Abuse"];
172+
}
173+
174+
if(detecyTypes.count == 0){
175+
return @"";
176+
}
177+
189178
return [detecyTypes componentsJoinedByString:@","];
190179
}
191180
@end

‎QCloudCOSXML/Classes/CI/request/QCloudPostVideoRecognitionRequest.m‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
8888
}
8989
}
9090

91-
if (self.detectType == 0 ) {
92-
if (error != NULL) {
93-
*error = [NSError
94-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
95-
message:[NSString stringWithFormat:
96-
@"InvalidArgument:paramter[detectType] is invalid (nil), it must have some value. please check it"]];
97-
return NO;
98-
}
99-
}
100-
10191
if (self.mode == 0 ) {
10292
if (error != NULL) {
10393
*error = [NSError
@@ -141,19 +131,6 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
141131

142132
self.requestData.serverURL = __serverURL.absoluteString;
143133
[self.requestData setValue:__serverURL.host forHTTPHeaderField:@"Host"];
144-
145-
146-
if ([self getDetectType].length == 0) {
147-
if (error != NULL) {
148-
*error = [NSError
149-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
150-
message:[NSString
151-
stringWithFormat:
152-
@"InvalidArgument:paramter[detect-type] is invalid (nil), it must have some value. please check it"]];
153-
return NO;
154-
}
155-
}
156-
157134
NSDictionary * input = self.object ? @{@"Object":self.object} : @{@"Url":self.url?:@""};
158135
if (self.dataId) {
159136
NSMutableDictionary * minput = input.mutableCopy;
@@ -213,6 +190,10 @@ - (NSString *)getDetectType {
213190
if (_detectType & QCloudRecognitionAds) {
214191
[detecyTypes addObject:@"Ads"];
215192
}
193+
194+
if(detecyTypes.count == 0){
195+
return @"";
196+
}
216197

217198
return [detecyTypes componentsJoinedByString:@","];
218199
}

0 commit comments

Comments
 (0)