Skip to content

Commit 309b5c6

Browse files
author
garenwang
committed
# 5.8.5
1:修复在上传在complete时点击了取消导致的crash 2:修复写日志时因磁盘不足导致的crash 3:pingtest 优化&字典转模型遍历数组时数组被修改crash
1 parent 5b2119d commit 309b5c6

17 files changed

+94
-64
lines changed

CHANGELOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
# 5.8.5
2+
1:修复在上传在complete时点击了取消导致的crash
3+
2:修复写日志时因磁盘不足导致的crash
4+
3:pingtest 优化&字典转模型遍历数组时数组被修改crash
5+
16
# 5.8.4
2-
- 修复日志量太小无落盘
3-
- 修复灯塔在bitcode开启之后编译失败的问题
4-
- 下载回调支持data
7+
- 日志量太小无落盘
58

69
# 5.8.3
710
接入灯塔SDK

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.8.4"
4+
s.version = "5.8.5"
55

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

@@ -19,15 +19,15 @@ s.version = "5.8.4"
1919
s.default_subspec = 'Default'
2020
s.subspec 'Default' do |default|
2121
default.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
22-
default.dependency "QCloudCore",'5.8.4'
22+
default.dependency "QCloudCore",'5.8.5'
2323
end
2424
s.subspec 'Slim' do |slim|
2525
slim.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
26-
slim.dependency "QCloudCore/WithoutMTA",'5.8.4'
26+
slim.dependency "QCloudCore/WithoutMTA",'5.8.5'
2727
end
2828
s.subspec 'Transfer' do |transfer|
2929
transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
30-
transfer.dependency "QCloudCore/WithoutMTA",'5.8.4'
30+
transfer.dependency "QCloudCore/WithoutMTA",'5.8.5'
3131
end
3232

3333
end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ + (QCloudCOSXMLService *)Quality_registerDefaultCOSXMLWithConfiguration:(QCloudS
3939
}
4040

4141
+ (void)initMTA {
42-
[QualityDataUploader startWithAppkey:kQAccount];
42+
[QualityDataUploader startWithAppkey:nil];
4343
}
4444
@end

QCloudCOSXML/Classes/Base/QCloudLogManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN
1313
- (instancetype)initWithLog:(NSArray *)logContent;
1414
@end
1515
#endif
16-
1716
/**
1817
QCloudCOSXML 日志管理类
1918
*/

QCloudCOSXML/Classes/Base/QualityDataUploader.m

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ + (void)trackSDKExceptionWithException:(NSException *)exception {
175175
}
176176

177177
+ (void)trackNormalEventWithKey:(NSString *)key props:(NSDictionary *)props {
178-
[self startReportWithEventKey:key paramters:props];
178+
[self startReportWithEventKey:key appkey:nil paramters:props];
179179
}
180180

181181
+ (void)internalUploadRequest:(QCloudAbstractRequest *)request event:(NSString *)eventKey withParamter:(NSMutableDictionary *)paramter {
@@ -191,15 +191,18 @@ + (void)internalUploadRequest:(QCloudAbstractRequest *)request event:(NSString *
191191

192192
+ (void)startReportSDKWithEventKey:(NSString *)eventKey paramters:(NSMutableDictionary *)paramter {
193193
paramter[kQCloudQualitySDKVersionKey] = QCloudCOSXMLModuleVersion;
194-
[self startReportWithEventKey:eventKey paramters:[paramter copy]];
194+
[self startReportWithEventKey:eventKey appkey:AppKey paramters:[paramter copy]];
195195
}
196196

197-
+ (void)startReportWithEventKey:(NSString *)eventKey paramters:(NSDictionary *)paramter {
197+
+ (void)startReportWithEventKey:(NSString *)eventKey appkey:(NSString *)appkey paramters:(NSDictionary *)paramter {
198198
Class cls = NSClassFromString(@"BeaconReport");
199199
if (cls) {
200200
Class eventCls = NSClassFromString(@"BeaconEvent");
201201
SuppressPerformSelectorLeakWarning(id eventObj = [eventCls performSelector:NSSelectorFromString(@"new")];
202-
[eventObj performSelector:NSSelectorFromString(@"setAppKey:") withObject:AppKey];
202+
if(appkey){
203+
[eventObj performSelector:NSSelectorFromString(@"setAppKey:") withObject:appkey];
204+
205+
}
203206
[eventObj performSelector:NSSelectorFromString(@"setCode:") withObject:eventKey];
204207
[eventObj performSelector:NSSelectorFromString(@"setParams:") withObject:paramter ? paramter : @{}];
205208
id beaconInstance = [cls performSelector:NSSelectorFromString(@"sharedInstance")];

QCloudCOSXML/Classes/Manager/QCloudCOSXMLService+Manager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ - (void)getPresignedURL:(QCloudGetPresignedURLRequest *)request {
245245
__block NSString *requestURLString = urlRequest.URL.absoluteString;
246246
[request.signatureProvider signatureWithFields:request.signatureFields
247247
request:request
248-
urlRequest:urlRequest
248+
urlRequest:(NSMutableURLRequest *)urlRequest
249249
compelete:^(QCloudSignature *signature, NSError *error) {
250250
NSString *authorizatioinString = signature.signature;
251251
if ([requestURLString hasSuffix:@"&"] || [requestURLString hasSuffix:@"?"]) {

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 508004
8+
#define QCloudCOSXMLModuleVersionNumber 508005
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.8.4";
2+
NSString * const QCloudCOSXMLModuleVersion = @"5.8.5";
33
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
44
@interface QCloudQCloudCOSXMLLoad : NSObject
55
@end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,12 +362,9 @@ - (void)startMultiUpload {
362362

363363
[self.requestCacheArray addPointer:(__bridge void *_Nullable)(uploadRequet)];
364364
[self.transferManager.cosService InitiateMultipartUpload:uploadRequet];
365-
366-
QCloudLogDebug(@"initPart self.transferManager :%@ self.transferManager.cosService :%@", self.transferManager, self.transferManager.cosService);
367365
}
368366

369367
- (NSArray<QCloudFileOffsetBody *> *)getFileLocalUploadParts {
370-
QCloudLogDebug(@"url.relativePath = %@", self.body);
371368
NSMutableArray *allParts = [NSMutableArray new];
372369
if (self.canceled) {
373370
return nil;
@@ -560,6 +557,10 @@ - (void)onError:(NSError *)error {
560557

561558
- (void)finishUpload:(NSString *)uploadId {
562559
NSURL *url = (NSURL *)self.body;
560+
if(self.canceled){
561+
NSLog(@"finishUpload canceled = %d",self.canceled?1:0);
562+
return;
563+
}
563564
NSInteger fileSize = QCloudFileSize(url.relativePath);
564565
if (fileSize != self.dataContentLength || !self.uploadBodyIsCompleted) {
565566
NSError *error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeImCompleteData

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.8.4"
12+
s.version = "5.8.5"
1313

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

0 commit comments

Comments
 (0)