Skip to content

Commit 7c61f19

Browse files
author
karisli
committed
# 5.7.6
- fix上传crash
1 parent 6c7b2d6 commit 7c61f19

File tree

11 files changed

+20
-16
lines changed

11 files changed

+20
-16
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 5.7.6
2+
- fix上传crash
3+
14
# 5.7.5
25
- 5.7.5:增加crc检验
36
- 新增background优先级

QCloudCOSXML.podspec

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

4-
s.version = "5.7.5"
4+
s.version = "5.7.6"
55

66
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
77

@@ -17,15 +17,15 @@ s.version = "5.7.5"
1717
s.default_subspec = 'Default'
1818
s.subspec 'Default' do |default|
1919
default.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
20-
default.dependency "QCloudCore",'5.7.5'
20+
default.dependency "QCloudCore",'5.7.6'
2121
end
2222
s.subspec 'Slim' do |slim|
2323
slim.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
24-
slim.dependency "QCloudCore/WithoutMTA",'5.7.5'
24+
slim.dependency "QCloudCore/WithoutMTA",'5.7.6'
2525
end
2626
s.subspec 'Transfer' do |transfer|
2727
transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
28-
transfer.dependency "QCloudCore/WithoutMTA",'5.7.5'
28+
transfer.dependency "QCloudCore/WithoutMTA",'5.7.6'
2929
end
3030

3131
end

QCloudCOSXML/Classes/Manager/QCloudCOSXMLService+Manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by erichmzhang(张恒铭) on 07/12/2017.
66
//
77

8-
#import <QCloudCOSXML/QCloudCOSXML.h>
8+
#import "QCloudCOSXML.h"
99
#import "QCloudCOSStorageClassEnum.h"
1010
@class QCloudGetObjectACLRequest;
1111
@class QCloudPutObjectACLRequest;

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 507005
8+
#define QCloudCOSXMLModuleVersionNumber 507006
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 = @"5.7.5";
2+
NSString * const QCloudCOSXMLModuleVersion = @"5.7.6";
33
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
44
@interface QCloudQCloudCOSXMLLoad : NSObject
55
@end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ typedef void (^RequestsMetricArrayBlock)(NSMutableArray *_Nullable requstMetricA
4545
*/
4646
@interface QCloudCOSXMLUploadObjectRequest<BodyType> : QCloudAbstractRequest
4747
@property (nonatomic,assign)NSUInteger sliceSize;
48+
@property (nonatomic,assign)QCloudAbstractRequestPriority uploadPriority;
4849
/**
4950
上传文件(对象)的文件名,也是对象的key,请注意文件名中不可以含有问号即"?"字符
5051
*/

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ - (instancetype) init
9696
_enableMD5Verification = YES;
9797
_retryHandler = [QCloudHTTPRetryHanlder defaultRetryHandler];
9898
startPartNumber = -1;
99+
self.priority = QCloudAbstractRequestPriorityHigh;
99100
return self;
100101
}
101102
- (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dictionary {
@@ -213,7 +214,6 @@ -(void)getContinueInfo:(NSArray *)existParts{
213214
- (void) resumeUpload
214215
{
215216
QCloudListMultipartRequest* request = [QCloudListMultipartRequest new];
216-
request.priority = self.priority;
217217
request.timeoutInterval = self.timeoutInterval;
218218
request.enableQuic = self.enableQuic;
219219
request.object = self.object;
@@ -267,6 +267,7 @@ - (void) fakeStart {
267267
- (void) startSimpleUpload
268268
{
269269
QCloudPutObjectRequest* request = [QCloudPutObjectRequest new];
270+
request.priority = self.uploadPriority;
270271
request.enableQuic = self.enableQuic;
271272
request.regionName = self.regionName;
272273
__weak typeof(self) weakSelf = self;
@@ -304,7 +305,7 @@ - (void) startSimpleUpload
304305
};
305306
request.bucket = self.bucket;
306307
request.object = self.object;
307-
request.priority = self.priority;
308+
request.priority = self.uploadPriority;
308309
request.body = self.body;
309310
request.cacheControl = self.cacheControl;
310311
request.contentDisposition = self.contentDisposition;
@@ -342,7 +343,6 @@ - (void) startMultiUpload {
342343
uploadRequet.grantFullControl = self.grantFullControl;
343344
uploadRequet.customHeaders = [self.customHeaders mutableCopy];
344345
uploadRequet.retryPolicy.delegate = self;
345-
uploadRequet.priority = self.priority;
346346
__weak typeof(uploadRequet)weakRequest = uploadRequet;
347347
__weak typeof(self) weakSelf = self;
348348

@@ -457,7 +457,7 @@ - (void) uploadOffsetBodys:(NSArray<QCloudFileOffsetBody*>*)allParts
457457
request.timeoutInterval = self.timeoutInterval;
458458
request.regionName = self.regionName;
459459
request.object = self.object;
460-
request.priority = self.priority;
460+
request.priority = self.uploadPriority;
461461
request.partNumber = (int)body.index + 1;
462462
request.uploadId = self.uploadId;
463463
request.customHeaders = [self.customHeaders mutableCopy];
@@ -739,7 +739,6 @@ - (void) abort:(QCloudRequestFinishBlock _Nullable)finishBlock
739739
abortRequest.bucket = self.bucket;
740740
abortRequest.uploadId = self.uploadId;
741741
abortRequest.finishBlock = finishBlock;
742-
abortRequest.priority = self.priority;
743742
abortRequest.timeoutInterval = self.timeoutInterval;
744743
self.uploadId = nil;
745744
[self.transferManager.cosService AbortMultipfartUpload:abortRequest];

QCloudCore.podspec

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

12-
s.version = "5.7.5"
12+
s.version = "5.7.6"
1313

1414
s.summary = "QCloudCore--腾讯云iOS-SDK Foundation"
1515

QCloudCore/Classes/Base/QCLOUDRestNet/Operations/QCloudOperationQueue.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ - (void) dealloc {
5959
- (void) addOpreation:(QCloudRequestOperation *)operation
6060
{
6161
__block NSUInteger count = 0 ;
62+
6263
[_dataLock lock];
6364
if (operation.request.priority > QCloudAbstractRequestPriorityNormal) {
6465
[_highPerfomanceRequest addObject:operation];
@@ -103,7 +104,7 @@ - (void) tryStartAnyOperation
103104
QCloudRequestOperation* operation = _lowPerformanceRequest.firstObject;
104105
ExeOperation(operation);
105106
[_lowPerformanceRequest removeObject:operation];
106-
}else{
107+
}else if (_backgroundPerformanceRequest.count) {
107108
QCloudRequestOperation* operation = _backgroundPerformanceRequest.firstObject;
108109
ExeOperation(operation);
109110
[_backgroundPerformanceRequest removeObject:operation];

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 507005
8+
#define QCloudCoreModuleVersionNumber 507006
99

1010
//dependency
1111

0 commit comments

Comments
 (0)