Skip to content

Commit b0f2cee

Browse files
author
karisli
committed
# 6.0.2
1 parent 9e67fff commit b0f2cee

File tree

13 files changed

+50
-42
lines changed

13 files changed

+50
-42
lines changed

CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
# 6.0.2
2+
3+
14
# 6.0.1
25

36

47
# 6.0.0
5-
1.quic开放端口参数
6-
# 5.9.8
7-
1.增加删除tag接口
8+
9+
810
# 5.9.8
911

1012

Podfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PODS:
2-
- QCloudCore (6.0.0):
3-
- QCloudCore/Default (= 6.0.0)
4-
- QCloudCore/Default (6.0.0)
5-
- QCloudCOSXML (6.0.0):
6-
- QCloudCOSXML/Default (= 6.0.0)
7-
- QCloudCOSXML/Default (6.0.0):
8-
- QCloudCore (= 6.0.0)
2+
- QCloudCore (6.0.1):
3+
- QCloudCore/Default (= 6.0.1)
4+
- QCloudCore/Default (6.0.1)
5+
- QCloudCOSXML (6.0.1):
6+
- QCloudCOSXML/Default (= 6.0.1)
7+
- QCloudCOSXML/Default (6.0.1):
8+
- QCloudCore (= 6.0.1)
99

1010
DEPENDENCIES:
1111
- QCloudCore (from `.`)
@@ -18,9 +18,9 @@ EXTERNAL SOURCES:
1818
:path: "."
1919

2020
SPEC CHECKSUMS:
21-
QCloudCore: 860b1b99d15f2d18da44d48295a53f300af33261
22-
QCloudCOSXML: f8389d8119f8b8e83de17b8c83bc5f0356b02b92
21+
QCloudCore: 032304013ef6d8deddfa0b88345442024a225aa8
22+
QCloudCOSXML: 26f0f5d44a5ce88fa53f3443c04613be03710265
2323

2424
PODFILE CHECKSUM: 384b99448c6c2fa2f931b43a3eacbd13f1ec5751
2525

26-
COCOAPODS: 1.11.2
26+
COCOAPODS: 1.10.1

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

77

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

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

3535
end
3636

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

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

66
#ifndef QCloudCOSXMLModuleVersion_h
77
#define QCloudCOSXMLModuleVersion_h
8-
#define QCloudCOSXMLModuleVersionNumber 600001
8+
#define QCloudCOSXMLModuleVersionNumber 600002
99

1010
//dependency
1111

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 = @"6.0.1";
2+
NSString * const QCloudCOSXMLModuleVersion = @"6.0.2";
33
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
44
@interface QCloudQCloudCOSXMLLoad : NSObject
55
@end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLDownloadObjectRequest.m

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,34 +65,40 @@ - (void)fakeStart {
6565

6666
}
6767
BOOL exist = [[NSFileManager defaultManager] fileExistsAtPath:self.resumableTaskFile];
68+
NSMutableDictionary *lowercaseStringDic = [NSMutableDictionary dictionary];
69+
[(NSDictionary*)outputObject enumerateKeysAndObjectsUsingBlock:^(NSString *key, id _Nonnull obj, BOOL * _Nonnull stop) {
70+
[lowercaseStringDic setValue:obj forKey:key.lowercaseString];
71+
}];
6872
if (!exist) {
6973
[[NSFileManager defaultManager] createFileAtPath:self.resumableTaskFile contents:[NSData data] attributes:nil];
70-
NSDictionary *dic = @{@"lastModified":outputObject[@"Last-Modified"],
71-
@"contentLength":outputObject[@"Content-Length"],
72-
@"etag":outputObject[@"Etag"],
73-
@"crc64ecma":outputObject[@"x-cos-hash-crc64ecma"],
74-
};
74+
NSMutableDictionary *dic = [NSMutableDictionary dictionary];
75+
[dic setValue:lowercaseStringDic[@"Last-Modified"] forKey:@"lastModified"];
76+
[dic setValue:lowercaseStringDic[@"Content-Length"] forKey:@"contentLength"];
77+
[dic setValue:lowercaseStringDic[@"Etag"] forKey:@"etag"];
78+
[dic setValue:lowercaseStringDic[@"x-cos-hash-crc64ecma"] forKey:@"crc64ecma"];
7579
NSError *parseError;
76-
NSData *info =[NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError];
80+
NSData *info =[NSJSONSerialization dataWithJSONObject:[dic copy] options:NSJSONWritingPrettyPrinted error:&parseError];
7781
NSError *writeDataError;
7882
[info writeToFile:self.resumableTaskFile options:0 error:&writeDataError];
7983
}else{
8084
NSData *data = [[NSData alloc] initWithContentsOfFile:self.resumableTaskFile];
8185
NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
86+
8287
//如果文件发生改变
83-
if(![dic[@"contentLength"] isEqualToString:outputObject[@"Content-Length"]] ||
84-
![dic[@"lastModified"] isEqualToString:outputObject[@"Last-Modified"]] ||
85-
![dic[@"etag"] isEqualToString:outputObject[@"Etag"]] ||
86-
![dic[@"crc64ecma"] isEqualToString:outputObject[@"x-cos-hash-crc64ecma"]]){
88+
if(![dic[@"contentLength"] isEqualToString:lowercaseStringDic[@"Content-Length"]] ||
89+
![dic[@"lastModified"] isEqualToString:lowercaseStringDic[@"Last-Modified"]] ||
90+
![dic[@"etag"] isEqualToString:lowercaseStringDic[@"Etag"]] ||
91+
![dic[@"crc64ecma"] isEqualToString:lowercaseStringDic[@"x-cos-hash-crc64ecma"]]){
8792
QCloudRemoveFileByPath(self.resumableTaskFile);
8893
[[NSFileManager defaultManager] createFileAtPath:self.resumableTaskFile contents:[NSData data] attributes:nil];
89-
NSDictionary *dic = @{@"lastModified":outputObject[@"Last-Modified"],
90-
@"contentLength":outputObject[@"Content-Length"],
91-
@"etag":outputObject[@"Etag"],
92-
@"crc64ecma":outputObject[@"x-cos-hash-crc64ecma"],
93-
};
94+
NSMutableDictionary *dic = [NSMutableDictionary dictionary];
95+
[dic setValue:lowercaseStringDic[@"Last-Modified"] forKey:@"lastModified"];
96+
[dic setValue:lowercaseStringDic[@"Content-Length"] forKey:@"contentLength"];
97+
[dic setValue:lowercaseStringDic[@"Etag"] forKey:@"etag"];
98+
[dic setValue:lowercaseStringDic[@"x-cos-hash-crc64ecma"] forKey:@"crc64ecma"];
99+
94100
NSError *parseError;
95-
NSData *info =[NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError];
101+
NSData *info =[NSJSONSerialization dataWithJSONObject:[dic copy] options:NSJSONWritingPrettyPrinted error:&parseError];
96102
NSError *writeDataError;
97103
[info writeToFile:self.resumableTaskFile options:0 error:&writeDataError];
98104
}else{

QCloudCore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.name = "QCloudCore"
1111

1212

13-
s.version = "6.0.1"
13+
s.version = "6.0.2"
1414

1515

1616

QCloudCore/Classes/Base/QCloudCoreVersion.h

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

66
#ifndef QCloudCoreModuleVersion_h
77
#define QCloudCoreModuleVersion_h
8-
#define QCloudCoreModuleVersionNumber 600001
8+
#define QCloudCoreModuleVersionNumber 600002
99

1010
//dependency
1111

QCloudCore/Classes/Base/QCloudCoreVersion.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "QCloudCoreVersion.h"
2-
NSString * const QCloudCoreModuleVersion = @"6.0.1";
2+
NSString * const QCloudCoreModuleVersion = @"6.0.2";
33
NSString * const QCloudCoreModuleName = @"QCloudCore";
44
@interface QCloudQCloudCoreLoad : NSObject
55
@end

QCloudQuic.podspec

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

1212

13-
s.version = "6.0.1"
13+
s.version = "6.0.2"
1414

1515

1616
s.summary = "QCloudQuic 腾讯云iOS-SDK组件"
@@ -36,7 +36,7 @@ s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
3636
s.source_files = 'QCloudQuic/Classes/QCloudBase/**/*','QCloudQuic/Classes/QuicFramework//*.{h}'
3737
s.vendored_frameworks = 'QCloudQuic/Classes/QuicFramework/Tquic.framework'
3838
s.static_framework = true
39-
s.dependency "QCloudCOSXML",'6.0.1'
39+
s.dependency "QCloudCOSXML",'6.0.2'
4040

4141

4242
end

0 commit comments

Comments
 (0)