# 6.1.0

Author: garenwang

CHANGELOG.md

@@ -1,22 +1,24 @@
-# 6.0.9   
+# 6.1.0    
 
-1.新增内容审核接口
+    
+# 6.0.9    
 
+1.新增内容审核接口
+    
 # 6.0.8    
 
 1.修改sdk与yymodel 方法命名冲突。2.修改一些SDK 内部一些警告
 
 # 6.0.7    
 
 优化QCloudCore
-
-# 6.0.6    
-
-修改sdkdonwlaodbug
-       
+    
 # 6.0.5    
 
 修改已知bug
+    
+# 6.0.5    
+
 QCloudQuic 增加 Slim subspec
 
 # 6.0.4    

QCloudCOSXML.podspec

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

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.h

@@ -82,14 +82,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param key 要获取的cosxml服务对应的key
 + (QCloudCOSXMLService *)cosxmlServiceForKey:(NSString *)key;
 #pragma hidden super selectors
-/**
- 检查是否存在key对应的service
-
- @param key key
- @return 存在与否
-
- */
-+ (BOOL)hasServiceForKey:(NSString *)key;
 
 /// 注册默认的cosxml服务
 /// @param configuration cosxml服务对应的配置信息，一旦配置之后无法修改
@@ -100,7 +92,14 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param key 该cosxml对应的key
 + (QCloudCOSXMLService *)registerCOSXMLWithConfiguration:(QCloudServiceConfiguration *)configuration withKey:(NSString *)key;
 
-+ (void)removeCOSXMLWithKey:(NSString *)key;
+/// 检查是否存在key对应的service
++ (BOOL)hasCosxmlServiceForKey:(NSString *)key;
++ (BOOL)hasServiceForKey:(NSString *)key __attribute__((deprecated("该方法过期，请用hasCosxmlServiceForKey:替换")));
+
+/// 删除可以对应的service
++ (void)removeCosxmlServiceWithKey:(NSString *)key;
++ (void)removeCOSXMLWithKey:(NSString *)key __attribute__((deprecated("该方法过期，请用removeCosxmlServiceWithKey:替换")));
+
 
 /**
 根据Bukcet, Object来生成可以直接访问的URL。如果您的Bucket是私有读的话，那么访问的时候需要带上签名，

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m

@@ -44,7 +44,6 @@
     return CloudcosxmlService;
 }
 @implementation QCloudCOSXMLService
-@synthesize sessionManager = _sessionManager;
 static QCloudCOSXMLService *COSXMLService = nil;
 
 + (QCloudCOSXMLService *)defaultCOSXML {
@@ -58,13 +57,6 @@ + (QCloudCOSXMLService *)defaultCOSXML {
 
 + (QCloudCOSXMLService *)registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration *)configuration {
     @synchronized(self) {
-        if (COSXMLService) {
-            @throw [NSException
-                    exceptionWithName:QCloudErrorDomain
-                    reason:[NSString stringWithFormat:
-                            @"默认的COSXMLService已存在，如有新的配置，请通过 registerCOSXMLWithConfiguration:withKey:重新注册"]
-                    userInfo:nil];
-        }
         COSXMLService = [[QCloudCOSXMLService alloc] initWithConfiguration:configuration];
         if (!configuration.isCloseShareLog) {
 #if TARGET_OS_IOS
@@ -85,20 +77,8 @@ + (QCloudCOSXMLService *)cosxmlServiceForKey:(NSString *)key {
     return cosxmlService;
 }
 
-+ (void)removeCOSXMLWithKey:(NSString *)key {
-    [QCloudCOSXMLServiceCache() removeObjectForKey:key];
-}
-
 + (QCloudCOSXMLService *)registerCOSXMLWithConfiguration:(QCloudServiceConfiguration *)configuration withKey:(NSString *)key;
 {
-    if ([self hasServiceForKey:key]) {
-        @throw [NSException
-                exceptionWithName:QCloudErrorDomain
-                reason:[NSString
-                        stringWithFormat:
-                            @"key: %@ COSXMLService已存在，如有新的配置，请通过 registerCOSXMLWithConfiguration:withKey:重新注册", key]
-                userInfo:nil];
-    }
     QCloudCOSXMLService *cosxmlService = [[QCloudCOSXMLService alloc] initWithConfiguration:configuration];
     [QCloudCOSXMLServiceCache() setObject:cosxmlService forKey:key];
     return cosxmlService;
@@ -133,12 +113,22 @@ - (NSString *)getURLWithBucket:(NSString *)bucket
     return [resultURL copy];
 }
 
-+ (BOOL)hasServiceForKey:(NSString *)key {
++ (BOOL)hasCosxmlServiceForKey:(NSString *)key {
     if (nil == [QCloudCOSXMLServiceCache() objectForKey:key]) {
         return NO;
     } else {
         return YES;
     }
 }
++ (BOOL)hasServiceForKey:(NSString *)key{
+    return [QCloudCOSXMLService hasCosxmlServiceForKey:key];
+}
+
++ (void)removeCosxmlServiceWithKey:(NSString *)key {
+    [QCloudCOSXMLServiceCache() removeObjectForKey:key];
+}
++ (void)removeCOSXMLWithKey:(NSString *)key{
+    [self removeCosxmlServiceWithKey:key];
+}
 
 @end

QCloudCOSXML/Classes/Transfer/QCloudCOSTransferMangerService.h

@@ -55,5 +55,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)CopyObject:(QCloudCOSXMLCopyObjectRequest *)copy;
 - (void)DownloadObject:(QCloudCOSXMLDownloadObjectRequest *)get;
 
+
+/// 是否注册了该key对应的服务
++ (BOOL)hasTransferMangerServiceForKey:(NSString *)key;
+
+/// 删除key对应的服务
++ (void)removeTransferMangerServiceWithKey:(NSString *)key;
 @end
 NS_ASSUME_NONNULL_END

QCloudCOSXML/Classes/Transfer/QCloudCOSTransferMangerService.m

@@ -124,11 +124,17 @@ - (void)DownloadObject:(QCloudCOSXMLDownloadObjectRequest *)request {
     [self.uploadFileQueue addOpreation:operation];
 }
 #pragma mark - UIApplicationDelegate interceptor
-/**
- This method needs to be called in the `- application:handleEventsForBackgroundURLSession:completionHandler:` application delegate.
- @param application       The singleton app object.
- @param identifier        The identifier of the URL session requiring attention.
- @param completionHandler The completion handler to call when you finish processing the events.
- */
+
++ (BOOL)hasTransferMangerServiceForKey:(NSString *)key {
+    if (nil == [QCloudCOSTransferMangerServiceCache() objectForKey:key]) {
+        return NO;
+    } else {
+        return YES;
+    }
+}
+
++ (void)removeTransferMangerServiceWithKey:(NSString *)key {
+    [QCloudCOSTransferMangerServiceCache() removeObjectForKey:key];
+}
 
 @end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

@@ -486,7 +486,6 @@ - (void)uploadOffsetBodys:(NSArray<QCloudFileOffsetBody *> *)allParts {
             if (!weakSelf) {
                 return;
             }
-
             __strong typeof(weakSelf) strongSelf = weakSelf;
             __strong typeof(weakRequest) strongRequst = weakRequest;
             [strongSelf.requstMetricArray addObject:@ { [NSString stringWithFormat:@"%@", strongRequst] : strongRequst.benchMarkMan.tastMetrics }];
@@ -498,6 +497,10 @@ - (void)uploadOffsetBodys:(NSArray<QCloudFileOffsetBody *> *)allParts {
                 if (!self.canceled) {
                     [strongSelf cancel];
                 }
+            }else if(error && error.code == QCloudNetworkErrorCodeCanceled){
+                if (!self.canceled) {
+                    [strongSelf cancel];
+                }
             } else {
                 if (self.enableMD5Verification || self.enableVerification) {
                     if (outputObject.eTag.length == (kQCloudCOSXMLMD5Length + 2)) {

QCloudCore.podspec

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

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

@@ -16,4 +16,5 @@
 - (void)cancel:(QCloudRequestOperation *)operation;
 - (void)cancelByRequestID:(int64_t)requestID;
 - (void)cancelByRequestIDs:(NSArray<NSNumber *> *)requestIDs;
+- (void)cancelAllOperation;
 @end

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

@@ -164,6 +164,21 @@ - (void)removeRequestInQueue:(int64_t)requestID {
     }
 }
 
+-(void)cancelAllOperation{
+    @autoreleasepool {
+        void (^CancelOperation)(NSMutableArray *array) = ^(NSMutableArray *array) {
+            for (QCloudRequestOperation *request in [array copy]) {
+                [request.request cancel];
+            }
+        };
+        CancelOperation(_runningOperationArray);
+        CancelOperation(_highPerfomanceRequest);
+        CancelOperation(_lowPerformanceRequest);
+        CancelOperation(_normalPerformanceRequest);
+        CancelOperation(_backgroundPerformanceRequest);
+    }
+}
+
 - (void)cancelByRequestIDs:(NSArray<NSNumber *> *)requestIDs {
     [_dataLock lock];
     for (NSNumber *requestID in requestIDs) {