# 5.6.1

- midfa \增加自定义分片大小接口 \ -budfix

Author: karisli

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 5.6.1    
+- mta去除idfa
+- 增加自定义分片大小接口 
+- budfix
+    
 # 5.6.0    
 - 支持归档直传/-mta bugfix
 

QCloudCOSXML.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
-s.version              = "5.6.0"
+s.version              = "5.6.1"
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
   s.homepage         = "https://cloud.tencent.com/"
@@ -9,12 +9,12 @@ s.version              = "5.6.0"
   s.source           = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
   s.source_files = 'QCloudCOSXML/Classes/**/*'
-  s.dependency "QCloudCore",'5.6.0'
+  s.dependency "QCloudCore",'5.6.1'
   s.static_framework = true
 
   s.subspec 'Transfer' do |sbt|
     sbt.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
-    sbt.dependency "QCloudCore",'5.6.0'
+    sbt.dependency "QCloudCore",'5.6.1'
  #   sbt.static_framework=true
   end
 end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m

@@ -8,8 +8,9 @@
 #import "QCloudCOSXMLService+Quality.h"
 #import <objc/runtime.h>
 #import <QCloudCore/MTA.h>
+#import <QCloudCore/MTA+Account.h>
 #import <QCloudCore/MTAConfig.h>
-#import <QCloudCore/MTACrashReporter.h>
+
 #import <QCloudCore/QualityAssuranceDefine.h>
 #import <QCloudCore/QCloudCore.h>
 #import <QCloudCore/QCloudLogger.h>

QCloudCOSXML/Classes/Base/QualityDataUploader.h

@@ -6,7 +6,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <QCloudCore/MTA.h>
 
 @interface QualityDataUploader : NSObject
 

QCloudCOSXML/Classes/Base/QualityDataUploader.m

@@ -8,6 +8,9 @@
 #import "QualityDataUploader.h"
 #import <QCloudCore/QCloudLogger.h>
 #import "NSError+QCloudNetworking.h"
+#import <QCloudCore/MTA.h>
+#import <QCloudCore/MTA+Account.h>
+#import <QCloudCore/MTAConfig.h>
 static  NSString * kRequestSentKey = @"request_sent";
 static  NSString * kRequestFailKey = @"request_failed";
 static  NSString * kErrorCodeKey = @"error_code";

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

@@ -6,15 +6,15 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 506000
+#define QCloudCOSXMLModuleVersionNumber 506001
 
 //dependency
-#if QCloudCoreModuleVersionNumber != 506000
-    #error "库QCloudCOSXML依赖QCloudCore最小版本号为5.6.0，当前引入的QCloudCore版本号过低，请及时升级后使用" 
+#if QCloudCoreModuleVersionNumber != 506001 
+    #error "库QCloudCOSXML依赖QCloudCore最小版本号为5.6.1，当前引入的QCloudCore版本号过低，请及时升级后使用" 
 #endif
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleName;
 
-#endif
+#endif

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"5.6.0";
+NSString * const QCloudCOSXMLModuleVersion = @"5.6.1";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.h

@@ -24,6 +24,7 @@ typedef void (^RequestsMetricArrayBlock)(NSMutableArray *requstMetricArray);
  如果上传的对象大小大于1MB时，我们会在内部进行分片上传的处理，将文件切分成数个1MB大小的块，然后通过并行分快上传的方式进行上传。
  */
 @interface QCloudCOSXMLUploadObjectRequest<BodyType> : QCloudAbstractRequest
+@property (nonatomic,assign)NSUInteger sliceSize;
 /**
  上传文件（对象）的文件名，也是对象的key，请注意文件名中不可以含有问号即"?"字符
  */

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

@@ -51,10 +51,15 @@ @interface QCloudCOSXMLUploadObjectRequest ()<QCloudHttpRetryHandlerProtocol>
 {
     NSRecursiveLock* _recursiveLock;
     NSRecursiveLock* _progressLock;
+    NSUInteger uploadedSize;
+    //标记下标，从0开始
+    NSUInteger startPartNumber;
+    BOOL isChange;
 }
 @property (nonatomic, assign) int64_t totalBytesSent;
 @property (nonatomic, assign) NSUInteger dataContentLength;
 @property (nonatomic, strong) dispatch_source_t queueSource;
+//存储所有的分片
 @property (nonatomic, strong) NSMutableArray<QCloudMultipartInfo*>* uploadParts;
 @property (nonatomic, strong) NSString* uploadId;
 @property (nonatomic, strong) NSPointerArray* requestCacheArray;
@@ -91,6 +96,7 @@ - (instancetype) init
     _requstMetricArray = [NSMutableArray array];;
     _enableMD5Verification = YES;
     _retryHandler = [QCloudHTTPRetryHanlder defaultRetryHandler];
+    startPartNumber = -1;
     return self;
 }
 - (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dictionary {
@@ -134,27 +140,77 @@ - (void) continueMultiUpload:(QCloudListPartsResult*)existParts
         [existMap setObject:part forKey:part.partNumber];
     }
     QCloudLogDebug(@"SERVER EXIST PARTS %@", [existParts qcloud_modelToJSONString]);
-    
+
     NSMutableArray* restParts = [NSMutableArray new];
     for (QCloudFileOffsetBody* offsetBody in allParts) {
         NSString* key = [@(offsetBody.index+1) stringValue];
         QCloudMultipartUploadPart* part = [existMap objectForKey:key];
+     
         if (!part) {
             [restParts addObject:offsetBody];
         } else {
+            if (part.size != offsetBody.sliceLength) {
+                isChange = YES;
+                break;
+            }
             QCloudMultipartInfo* info = [QCloudMultipartInfo new];
             info.eTag = part.eTag;
             info.partNumber = part.partNumber;
             [_uploadParts addObject:info];
         }
     }
-    if (restParts.count == 0) {
-        [self finishUpload:self.uploadId];
-    } else {
-        [self uploadOffsetBodys:restParts];
+
+    if (!isChange) {
+        if (restParts.count == 0) {
+             [self finishUpload:self.uploadId];
+        }else{
+            [self uploadOffsetBodys:restParts];
+        }
+    }else{
+        //重新分片
+        [self getContinueInfo:existParts.parts];
+        if (uploadedSize == self.dataContentLength) {
+            [self finishUpload:self.uploadId];
+        } else {
+        //开始分片
+            [self uploadOffsetBodys:[self getFileLocalUploadParts]];
+        }
+    }
+}
+
+-(void)getContinueInfo:(NSArray *)existParts{
+    _uploadParts = [NSMutableArray new];
+    int i=1;
+    QCloudMultipartUploadPart  *part = existParts[0];
+    QCloudMultipartInfo* info = [QCloudMultipartInfo new];
+    info.eTag = part.eTag;
+    info.partNumber = part.partNumber;
+    if ([info.partNumber integerValue]!=1){
+        return;
     }
+
+    for (i = 0; i<existParts.count; i++) {
+        QCloudMultipartUploadPart  *part1 = existParts[i];
+        QCloudMultipartInfo* info1 = [QCloudMultipartInfo new];
+        info1.eTag = part1.eTag;
+        info1.partNumber = part1.partNumber;
+        uploadedSize+=part1.size;
+        [_uploadParts addObject:info1];
+        if (i == existParts.count-1) {
+            break;
+        }
+        QCloudMultipartUploadPart  *part2 = existParts[i+1];
+        if (([part1.partNumber integerValue]+1)!= [part2.partNumber integerValue]) {
+            break;
+        }
+       
+    }
+    startPartNumber = _uploadParts.count;
+    
+    QCloudLogDebug(@"resume startPartNumber =   offset =  %ld %ld",startPartNumber,uploadedSize);
 }
 
+
 - (void) resumeUpload
 {
     QCloudListMultipartRequest* request = [QCloudListMultipartRequest new];
@@ -179,6 +235,8 @@ - (void) resumeUpload
 - (void) fakeStart {
     [self.benchMarkMan benginWithKey:kTaskTookTime];
     if (self.uploadId) {
+        startPartNumber = 0;
+        uploadedSize = 0;
         [self resumeUpload];
         return;
     }
@@ -190,6 +248,9 @@ - (void) fakeStart {
         NSURL* url = (NSURL*)self.body;
         self.dataContentLength = QCloudFileSize(url.path);
         if (self.dataContentLength > kQCloudCOSXMLUploadLengthLimit) {
+            //开始分片上传的时候，上传的起始位置是0
+            uploadedSize = 0;
+            startPartNumber = 0;
            [self startMultiUpload];
         } else {
             [self startSimpleUpload];
@@ -305,12 +366,14 @@ - (void) startMultiUpload {
 {
     NSMutableArray* allParts = [NSMutableArray new];
     NSURL* url = (NSURL*)self.body;
-    int64_t restContentLength = self.dataContentLength;
-    int64_t offset = 0;
-    for (int i = 0; ;i++ ) {
+    int64_t restContentLength = self.dataContentLength-uploadedSize;
+    //便宜的起始位置
+    int64_t offset = uploadedSize;
+    for (int i = startPartNumber; ;i++ ) {
         int64_t slice = 0;
-        if (restContentLength >= kQCloudCOSXMLUploadSliceLength) {
-            slice = kQCloudCOSXMLUploadSliceLength;
+        NSUInteger uploadSliceLength = self.sliceSize>10?self.sliceSize:kQCloudCOSXMLUploadSliceLength;
+        if (restContentLength >= uploadSliceLength) {
+            slice = uploadSliceLength;
         } else {
             slice = restContentLength;
         }

QCloudCore.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "QCloudCore"
-s.version              = "5.6.0"
+s.version              = "5.6.1"
   s.summary          = "QCloudCore--腾讯云iOS-SDK Foundation"
 
 # This description is used to generate tags and improve search results.