Skip to content

Commit 0665a03

Browse files
author
karisli
committed
# 5.9.3
- XCode10编译修复
1 parent 4a9209d commit 0665a03

File tree

11 files changed

+25
-15
lines changed

11 files changed

+25
-15
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 5.9.3
2+
- XCode10编译修复
3+
14
# 5.9.2
25
-精简版包体积优化
36

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

77

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

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

3535
end
3636

QCloudCOSXML/Classes/Base/QCloudLogManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ - (void)onHandleDidFinishLaunching:(NSNotification *)notification {
135135
return;
136136
}
137137
// 如果剪贴板没有数据则不进行读取,减少ios14 剪贴板弹框次数
138-
if (@available(iOS 10.0, *)) {
138+
if ([UIDevice currentDevice].systemVersion.floatValue >= 10.0) {
139139
if (![[UIPasteboard generalPasteboard] hasStrings]) {
140140
return;
141141
}

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 = "5.9.2"
13+
s.version = "5.9.3"
1414

1515

1616

QCloudCore/Classes/Base/QCLOUDRestNet/SessionSupport/QCloudHTTPSessionManager.m

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
#import "QCloudThreadSafeMutableDictionary.h"
3030
#import "QCloudWeakProxy.h"
3131

32+
#ifndef __IPHONE_13_0
33+
#define __IPHONE_13_0 130000
34+
#endif
35+
3236
NSString *TaskDataKey(int64_t identifier) {
3337
return [NSString stringWithFormat:@"data-%lld", identifier];
3438
}
@@ -207,11 +211,14 @@ - (void)URLSession:(NSURLSession *)session
207211
directSetCost:[networkMetrics.domainLookupEndDate timeIntervalSinceDate:networkMetrics.domainLookupStartDate]
208212
forKey:kDnsLookupTookTime];
209213
}
210-
if (@available(ios 13.0, *)) {
214+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
215+
if ([UIDevice currentDevice].systemVersion.floatValue >= 13.0) {
211216
[taskData.httpRequest.benchMarkMan directSetValue:networkMetrics.localPort forKey:kLocalPort];
212217
[taskData.httpRequest.benchMarkMan directSetValue:networkMetrics.remoteAddress forKey:kRemoteAddress];
213218
[taskData.httpRequest.benchMarkMan directSetValue:networkMetrics.remotePort forKey:kRemotePort];
214219
}
220+
221+
#endif
215222
}
216223
}
217224
#endif

QCloudCore/Classes/Base/QCloudClientBase/Authentation/QCloudAuthentationV5Creator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
QCloudCredential* credential = [QCloudCredential new];
2121
credential.secretID = kSecretIDCSP;
2222
credential.secretKey = kSecretKeyCSP;
23-
credential.experationDate = [NSDate dateWithTimeIntervalSince1970:1504183628];
23+
credential.expirationDate = [NSDate dateWithTimeIntervalSince1970:1504183628];
2424
QCloudAuthentationV5Creator* creator = [[QCloudAuthentationV5Creator alloc] initWithCredential:credential];
2525
QCloudSignature* signature = [creator signatureForData:urlRequst];
2626

QCloudCore/Classes/Base/QCloudClientBase/Authentation/QCloudAuthentationV5Creator.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ - (QCloudSignature *)signatureForData:(NSMutableURLRequest *)urlrequest {
109109
}
110110
// 默认一个签名为10分钟有效,防止签名时间过长,导致泄露
111111
NSTimeInterval experationInterVal = nowInterval + 10 * 60;
112-
if (self.credential.experationDate) {
113-
experationInterVal = [self.credential.experationDate timeIntervalSince1970];
112+
if (self.credential.expirationDate) {
113+
experationInterVal = [self.credential.expirationDate timeIntervalSince1970];
114114
}
115115
NSString *signTime = [NSString stringWithFormat:@"%lld;%lld", (int64_t)nowInterval, (int64_t)experationInterVal];
116116
NSDictionary *headers = [[urlrequest allHTTPHeaderFields] filteHeaders];

QCloudCore/Classes/Base/QCloudClientBase/Authentation/QCloudCredentailFenceQueue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ typedef void (^QCloudCredentailFenceQueueContinue)(QCloudAuthentationCreator *cr
4646
credential.secretID = @"secretID";
4747
credential.secretKey = @"secretKey";
4848
//签名过期时间
49-
credential.experationDate = [NSDate dateWithTimeIntervalSince1970:1504183628];
49+
credential.expirationDate = [NSDate dateWithTimeIntervalSince1970:1504183628];
5050
credential.token = @"token";
5151
QCloudAuthentationV5Creator* creator = [[QCloudAuthentationV5Creator alloc] initWithCredential:credential];
5252
continueBlock(creator, nil);

QCloudCore/Classes/Base/QCloudClientBase/Authentation/QCloudCredential.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/**
4040
签名有效期截止的时间。没有设置的话,默认是起始时间加十分钟。
4141
*/
42-
@property (nonatomic, strong) NSDate *experationDate;
42+
@property (nonatomic, strong) NSDate *expirationDate;
4343

4444
/**
4545
改签名是否有效。

QCloudCore/Classes/Base/QCloudClientBase/Authentation/QCloudCredential.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ @implementation QCloudCredential
1414
Use the time after fix to compare,avoid time skew caused by Device
1515
*/
1616
- (BOOL)valid {
17-
if (!self.experationDate) {
17+
if (!self.expirationDate) {
1818
return YES;
1919
}
2020
NSDate *date = [NSDate date];
2121
if ([NSDate qcloud_getTimeDeviation]) {
2222
date = [NSDate qcloud_calibrateTime];
2323
}
24-
if ([date compare:self.experationDate] == NSOrderedDescending) {
24+
if ([date compare:self.expirationDate] == NSOrderedDescending) {
2525
return NO;
2626
}
2727
return YES;

0 commit comments

Comments
 (0)