# 6.3.1

Author: garenwang

CHANGELOG.md

@@ -1,9 +1,13 @@
-# 6.3.0
-优化弱网环境quic链接
+# 6.3.1    
 
+    
+# 6.3.0    
+
+修改弱网环境quic链接
+    
 # 6.2.9    
-支持AI智能识别
-优化部分已有接口
+
+新增AI智能识别
 
 # 6.2.8    
 支持冷存储

QCloudCOSXML.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
 
-s.version              = "6.3.0"
+s.version              = "6.3.1"
 
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -22,15 +22,15 @@ s.version              = "6.3.0"
   s.subspec 'Default' do |default|
   default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
 
-  default.dependency "QCloudCore",'6.3.0'
+  default.dependency "QCloudCore",'6.3.1'
     end
   s.subspec 'Slim' do |slim|
   slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  slim.dependency "QCloudCore/WithoutMTA",'6.3.0'
+  slim.dependency "QCloudCore/WithoutMTA",'6.3.1'
   end
   s.subspec 'Transfer' do |transfer|
   transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
-  transfer.dependency "QCloudCore/WithoutMTA",'6.3.0'
+  transfer.dependency "QCloudCore/WithoutMTA",'6.3.1'
 
   end
 

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

@@ -5,7 +5,7 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 603000
+#define QCloudCOSXMLModuleVersionNumber 603001
 
 //dependency
 

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"6.3.0";
+NSString * const QCloudCOSXMLModuleVersion = @"6.3.1";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

@@ -465,7 +465,7 @@ - (void)uploadOffsetBodys:(NSArray<QCloudFileOffsetBody *> *)allParts {
     dispatch_resume(_queueSource);
     for (int i = 0; i < allParts.count; i++) {
         __block QCloudFileOffsetBody *body = allParts[i];
-
+        
         //如果自身被取消，终止c创建新的uploadPartRequest
         if (self.canceled) {
             QCloudLogDebug(@"请求被取消，终止创建新的uploadPartRequest");
@@ -488,19 +488,22 @@ - (void)uploadOffsetBodys:(NSArray<QCloudFileOffsetBody *> *)allParts {
         __weak typeof(request) weakRequest = request;
         __block int64_t partBytesSent = 0;
         int64_t partSize = body.sliceLength;
+        BOOL isRetry = request.isRetry;
         [request setSendProcessBlock:^(int64_t bytesSent, int64_t totalBytesSent, int64_t totalBytesExpectedToSend) {
-            int64_t restSize = totalBytesExpectedToSend - partSize;
-            if (restSize - partBytesSent <= 0) {
-                [weakSelf appendUploadBytesSent:bytesSent];
-            } else {
-                partBytesSent += bytesSent;
+            if(!request.enableQuic || !isRetry){
+                int64_t restSize = totalBytesExpectedToSend - partSize;
                 if (restSize - partBytesSent <= 0) {
-                    [weakSelf appendUploadBytesSent:partBytesSent - restSize];
+                    [weakSelf appendUploadBytesSent:bytesSent];
+                } else {
+                    partBytesSent += bytesSent;
+                    if (restSize - partBytesSent <= 0) {
+                        [weakSelf appendUploadBytesSent:partBytesSent - restSize];
+                    }
                 }
             }
         }];
         [request setFinishBlock:^(QCloudUploadPartResult *outputObject, NSError *error) {
-            QCloudLogInfo(@"收到一个part  %d的响应 %@", (i + 1), outputObject.eTag);
+            QCloudLogInfo(@"收到一个part  %d的响应 %@；是否重试：", (i + 1), outputObject.eTag, isRetry);
             if (!weakSelf) {
                 return;
             }

QCloudCore.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
 
-s.version              = "6.3.0"
+s.version              = "6.3.1"
 
 
 

QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/Serializer/QCloudResponseSerializer.m

@@ -15,7 +15,7 @@
 typedef id (^QCloudResponseSerializerBlock)(NSHTTPURLResponse *response, id inputData, NSError *__autoreleasing *error);
 
 QCloudResponseSerializerBlock QCloudResponseXMLSerializerBlock = ^(NSHTTPURLResponse *response, id inputData, NSError *__autoreleasing *error) {
-    QCloudLogDebug(@"response  %@", response);
+        
     if (![inputData isKindOfClass:[NSData class]]) {
         if (NULL != error) {
             *error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeResponseDataTypeInvalid
@@ -49,6 +49,7 @@
                                                                                                                  encoding:NSUTF8StringEncoding]]];
         return (id)nil;
     }
+    NSLog(@"output =  %@", output);
     return (id)output;
 };
 

QCloudCore/Classes/Base/QCLOUDRestNet/Retry/QCloudHTTPRetryHanlder.h

@@ -15,16 +15,36 @@ typedef void (^QCloudHTTPRetryFunction)(void);
 
 @end
 
+// 配置全局重试策略。
+// 开启： openConfig = YES; 并设置 maxCount & sleepStep。
+// 关闭： openConfig = NO;
+@interface QCloudHTTPRetryConfig : NSObject
+
+@property (nonatomic, assign) NSInteger maxCount;
+
+@property (nonatomic, assign) NSTimeInterval sleepStep;
+
+// 默认未开启，使用 QCloudHTTPRetryHanlder 中的 maxCount&sleepStep。
+@property (nonatomic, assign) BOOL openConfig;
+
++ (QCloudHTTPRetryConfig *)globalRetryConfig;
+
+@end
+
 @interface QCloudHTTPRetryHanlder : NSObject {
 @protected
     NSSet *_errorCode;
 }
 + (QCloudHTTPRetryHanlder *)defaultRetryHandler;
-@property (nonatomic, assign) NSInteger maxCount;
+
 @property (nonatomic, weak) id<QCloudHttpRetryHandlerProtocol> delegate;
+
+// 默认使用 QCloudHTTPRetryConfig.maxCount; 默认值 3
+@property (nonatomic, assign) NSInteger maxCount;
 /**
    sleeptime = sleepStep * 1^2 ，
  */
+// 默认使用 QCloudHTTPRetryConfig.sleepStep; 默认值 1
 @property (nonatomic, assign) NSTimeInterval sleepStep;
 - (instancetype)initWithMaxCount:(NSInteger)maxCount sleepTime:(NSTimeInterval)sleepStep;
 

QCloudCore/Classes/Base/QCLOUDRestNet/Retry/QCloudHTTPRetryHanlder.m

@@ -10,6 +10,28 @@
 #import "QCloudNetEnv.h"
 #import "QCloudLogger.h"
 #import "NSError+QCloudNetworking.h"
+
+@implementation QCloudHTTPRetryConfig
+
++ (QCloudHTTPRetryConfig *)globalRetryConfig{
+    static QCloudHTTPRetryConfig * config = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        config = [[QCloudHTTPRetryConfig alloc]init];
+    });
+    return config;
+}
+
+- (instancetype)init{
+    if(self = [super init]){
+        _maxCount = 0;
+        _sleepStep = 0;
+    }
+    return self;
+}
+
+@end
+
 @interface QCloudHTTPRetryHanlder ()
 @end
 
@@ -27,8 +49,8 @@ - (instancetype)initWithMaxCount:(NSInteger)maxCount sleepTime:(NSTimeInterval)s
     if (!self) {
         return self;
     }
-    _maxCount = maxCount;
     _sleepStep = sleepStep;
+    _maxCount = maxCount;
     [self reset];
     return self;
 }
@@ -60,12 +82,26 @@ - (BOOL)canRetryWhenError:(NSError *)error {
         }
     }
 
-    if (_currentTryCount >= _maxCount) {
+    if (_currentTryCount >= self.maxCount) {
         QCloudLogDebug(@"超过了最大重试次数，不再重试");
         return NO;
     }
 
     return [NSError isNetworkErrorAndRecoverable:error] || ([error.domain isEqualToString:kQCloudNetworkDomain] && error.code >= 500);
 }
 
+- (NSInteger)maxCount{
+    if(QCloudHTTPRetryConfig.globalRetryConfig.openConfig){
+        return QCloudHTTPRetryConfig.globalRetryConfig.maxCount;
+    }
+    return _maxCount;
+}
+
+- (NSTimeInterval)sleepStep{
+    if(QCloudHTTPRetryConfig.globalRetryConfig.openConfig){
+        return QCloudHTTPRetryConfig.globalRetryConfig.sleepStep;
+    }
+    return _sleepStep;
+}
+
 @end

QCloudCore/Classes/Base/QCloudCoreVersion.h

@@ -5,7 +5,7 @@
 
 #ifndef QCloudCoreModuleVersion_h
 #define QCloudCoreModuleVersion_h
-#define QCloudCoreModuleVersionNumber 603000
+#define QCloudCoreModuleVersionNumber 603001
 
 //dependency