Skip to content

Commit 4d1d9a7

Browse files
author
garenwang
committed
# 6.0.7
1 parent f61c750 commit 4d1d9a7

File tree

117 files changed

+599
-234
lines changed

Some content is hidden

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

117 files changed

+599
-234
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
# 6.0.7
2+
3+
14
# 6.0.6
2-
修复下载request已知问题
5+
36

47
# 6.0.5
5-
QCloudQuic 增加 Slim subspec
68

79

810
# 6.0.4
9-
修复签名
1011

1112

1213
# 6.0.3

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.0.6"
5+
s.version = "6.0.7"
66

77

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

25-
default.dependency "QCloudCore",'6.0.6'
25+
default.dependency "QCloudCore",'6.0.7'
2626
end
2727
s.subspec 'Slim' do |slim|
2828
slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
29-
slim.dependency "QCloudCore/WithoutMTA",'6.0.6'
29+
slim.dependency "QCloudCore/WithoutMTA",'6.0.7'
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.0.6'
33+
transfer.dependency "QCloudCore/WithoutMTA",'6.0.7'
3434

3535
end
3636

QCloudCOSXML/Classes/Base/QCloudAbstractRequest+Quality.m

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#import "QCloudAbstractRequest+Quality.h"
99
#import <objc/runtime.h>
1010
#import <QCloudCore/QualityDataUploader.h>
11-
11+
#import "QCloudCOSXMLVersion.h"
1212
@implementation QCloudAbstractRequest (Quality)
1313
+ (void)load {
1414
static dispatch_once_t onceToken;
@@ -30,12 +30,21 @@ + (void)exchangeImplementation {
3030

3131
- (void)__quality__notifyError:(NSError *)error {
3232
[self __quality__notifyError:error];
33-
[QualityDataUploader trackSDKRequestFailWithRequest:self error:error];
33+
[QualityDataUploader trackSDKRequestFailWithRequest:self error:error params:[self commonParams]];
3434
}
3535

3636
- (void)__quality__notifySuccess:(id)object {
3737
[self __quality__notifySuccess:object];
38-
[QualityDataUploader trackSDKRequestSuccessWithRequest:self];
38+
[QualityDataUploader trackSDKRequestSuccessWithRequest:self params:[self commonParams]];
39+
}
40+
41+
-(NSMutableDictionary *)commonParams{
42+
NSMutableDictionary * params = [NSMutableDictionary new];
43+
params[kQCloudRequestAppkeyKey] = kQCloudUploadAppReleaseKey;
44+
params[@"pName"] = @"cos";
45+
params[@"sdkVersion"] = QCloudCOSXMLModuleVersion;
46+
params[@"sdkVersionName"] = @(QCloudCOSXMLModuleVersionNumber);
47+
return params;
3948
}
4049

4150
@end

QCloudCOSXML/Classes/Base/QCloudCOSXMLEndPoint.m

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ - (NSString *)formattedBucket:(NSString *)bucket withAPPID:(NSString *)APPID {
4242
}
4343
} else {
4444
if (!APPID) {
45-
@throw [NSException exceptionWithName:kQCloudNetworkDomain
46-
reason:[NSString stringWithFormat:@"您没有配置AppID就使用了服务%@", self.class]
47-
userInfo:nil];
45+
if (DEBUG) {
46+
@throw [NSException exceptionWithName:kQCloudNetworkDomain
47+
reason:[NSString stringWithFormat:@"您没有配置AppID就使用了服务%@", self.class]
48+
userInfo:nil];
49+
}
4850
}
4951
}
5052

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Configuration.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#import "QCloudCOSXMLService+Configuration.h"
3333
#import <QCloudCore/QCloudCore.h>
34-
#import <QCloudCore/QCloudServiceConfiguration_Private.h>
34+
#import <QCloudCore/QCloudConfiguration_Private.h>
3535
#import "QCloudCOSXMLService+Private.h"
3636

3737
@implementation QCloudCOSXMLService (Configuration)

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ @implementation QCloudCOSXMLService
5050
+ (QCloudCOSXMLService *)defaultCOSXML {
5151
@synchronized(self) {
5252
if (!COSXMLService) {
53-
@throw [NSException exceptionWithName:QCloudErrorDomain reason:@"您没有配置默认的OCR服务配置,请配置之后再调用该方法" userInfo:nil];
53+
if (DEBUG) {
54+
@throw [NSException exceptionWithName:QCloudErrorDomain reason:@"您没有配置默认的OCR服务配置,请配置之后再调用该方法" userInfo:nil];
55+
}
5456
}
5557
return COSXMLService;
5658
}
@@ -59,11 +61,13 @@ + (QCloudCOSXMLService *)defaultCOSXML {
5961
+ (QCloudCOSXMLService *)registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration *)configuration {
6062
@synchronized(self) {
6163
if (COSXMLService) {
62-
@throw [NSException
63-
exceptionWithName:QCloudErrorDomain
64-
reason:[NSString stringWithFormat:
65-
@"默认的COSXMLService已存在,如有新的配置,请通过 registerCOSXMLWithConfiguration:withKey:重新注册"]
66-
userInfo:nil];
64+
if (DEBUG) {
65+
@throw [NSException
66+
exceptionWithName:QCloudErrorDomain
67+
reason:[NSString stringWithFormat:
68+
@"默认的COSXMLService已存在,如有新的配置,请通过 registerCOSXMLWithConfiguration:withKey:重新注册"]
69+
userInfo:nil];
70+
}
6771
}
6872
COSXMLService = [[QCloudCOSXMLService alloc] initWithConfiguration:configuration];
6973
if (!configuration.isCloseShareLog) {
@@ -78,9 +82,11 @@ + (QCloudCOSXMLService *)registerDefaultCOSXMLWithConfiguration:(QCloudServiceCo
7882
+ (QCloudCOSXMLService *)cosxmlServiceForKey:(NSString *)key {
7983
QCloudCOSXMLService *cosxmlService = [QCloudCOSXMLServiceCache() objectForKey:key];
8084
if (!cosxmlService) {
81-
@throw [NSException exceptionWithName:QCloudErrorDomain
82-
reason:[NSString stringWithFormat:@"您没有配置Key为%@的OCR服务配置,请配置之后再调用该方法", key]
83-
userInfo:nil];
85+
if (DEBUG) {
86+
@throw [NSException exceptionWithName:QCloudErrorDomain
87+
reason:[NSString stringWithFormat:@"您没有配置Key为%@的OCR服务配置,请配置之后再调用该方法", key]
88+
userInfo:nil];
89+
}
8490
}
8591
return cosxmlService;
8692
}
@@ -92,12 +98,14 @@ + (void)removeCOSXMLWithKey:(NSString *)key {
9298
+ (QCloudCOSXMLService *)registerCOSXMLWithConfiguration:(QCloudServiceConfiguration *)configuration withKey:(NSString *)key;
9399
{
94100
if ([self hasServiceForKey:key]) {
95-
@throw [NSException
96-
exceptionWithName:QCloudErrorDomain
97-
reason:[NSString
98-
stringWithFormat:
99-
@"key: %@ COSXMLService已存在,如有新的配置,请通过 registerCOSXMLWithConfiguration:withKey:重新注册", key]
100-
userInfo:nil];
101+
if (DEBUG) {
102+
@throw [NSException
103+
exceptionWithName:QCloudErrorDomain
104+
reason:[NSString
105+
stringWithFormat:
106+
@"key: %@ COSXMLService已存在,如有新的配置,请通过 registerCOSXMLWithConfiguration:withKey:重新注册", key]
107+
userInfo:nil];
108+
}
101109
}
102110
QCloudCOSXMLService *cosxmlService = [[QCloudCOSXMLService alloc] initWithConfiguration:configuration];
103111
[QCloudCOSXMLServiceCache() setObject:cosxmlService forKey:key];

QCloudCOSXML/Classes/CI/request/QCloudCICloudDataOperationsRequest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
#import <QCloudCore/QCloudSignatureFields.h>
4141
#import <QCloudCore/QCloudCore.h>
42-
#import <QCloudCore/QCloudServiceConfiguration_Private.h>
42+
#import <QCloudCore/QCloudConfiguration_Private.h>
4343
#import "QCloudPutObjectRequest+Custom.h"
4444
#import <QCloudCore/QCloudFileUtils.h>
4545
#import "QCloudPutObjectWatermarkResult.h"

QCloudCOSXML/Classes/CI/request/QCloudCIPicRecognitionRequest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#import "QCloudCIPicRecognitionRequest.h"
3434
#import <QCloudCore/QCloudSignatureFields.h>
3535
#import <QCloudCore/QCloudCore.h>
36-
#import <QCloudCore/QCloudServiceConfiguration_Private.h>
36+
#import <QCloudCore/QCloudConfiguration_Private.h>
3737
#import "QCloudCIPicRecognitionResults.h"
3838

3939

QCloudCOSXML/Classes/CI/request/QCloudCIPutObjectQRCodeRecognitionRequest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#import "QCloudCIPutObjectQRCodeRecognitionRequest.h"
3434
#import <QCloudCore/QCloudSignatureFields.h>
3535
#import <QCloudCore/QCloudCore.h>
36-
#import <QCloudCore/QCloudServiceConfiguration_Private.h>
36+
#import <QCloudCore/QCloudConfiguration_Private.h>
3737
#import "QCloudCIQRCodeRecognitionResults.h"
3838

3939

QCloudCOSXML/Classes/CI/request/QCloudGetDescribeMediaBucketsRequest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#import "QCloudGetDescribeMediaBucketsRequest.h"
3333
#import <QCloudCore/QCloudSignatureFields.h>
3434
#import <QCloudCore/QCloudCore.h>
35-
#import <QCloudCore/QCloudServiceConfiguration_Private.h>
35+
#import <QCloudCore/QCloudConfiguration_Private.h>
3636
#import "QCloudGetObjectRequest+Custom.h"
3737
#import "QCloudDescribeMediaInfo.h"
3838
NS_ASSUME_NONNULL_BEGIN

0 commit comments

Comments
 (0)