Merge pull request #401 from YangSen-qn/master

handle sometimes PHAssert  upload fail

Author: xwen-winnie

CHANGELOG.md

@@ -1,4 +1,8 @@
 #Changelog
+## 8.3.2(2021-09-3)
+## 优化
+- 处理 PHAssert 偶现上传失败问题
+
 ## 8.3.1(2021-08-12)
 ## 优化
 - 对 DNS 域名预解析缓存增加缓存有效期，默认 10 分钟，支持手动修改有效期时长，kQNGlobalConfiguration.dnsCacheMaxTTL 单位为 s

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.3.1'
+  s.version      = '8.3.2'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'

QiniuDemo/Podfile

@@ -1,7 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 target "QiniuDemo" do
-  platform :ios, "7.0"
+  platform :ios, "10.0"
 
 #  pod 'Qiniu', '~> 8.1.1'
   pod 'Qiniu',:path => '../'

QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj

@@ -553,6 +553,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.QiniuDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_SWIFT_SYMBOLS = YES;
 				SUPPORTS_MACCATALYST = YES;
 			};
 			name = Debug;
@@ -569,6 +570,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.QiniuDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_SWIFT_SYMBOLS = YES;
 				SUPPORTS_MACCATALYST = YES;
 			};
 			name = Release;

QiniuDemo/QiniuDemo/ViewController.m

@@ -124,27 +124,27 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath {
 //    }
 //                option:uploadOption];
 
-    long long fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil] fileSize];
-    NSInputStream *stream = [NSInputStream inputStreamWithFileAtPath:filePath];
-    [upManager putInputStream:stream sourceId:filePath.lastPathComponent size:fileSize fileName:filePath.lastPathComponent key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
-        NSLog(@"info ===== %@", info);
-        NSLog(@"resp ===== %@", resp);
-
-        [weakSelf changeUploadState:UploadStatePrepare];
-        [weakSelf alertMessage:info.message];
-    } option:uploadOption];
-    
-//    NSURL *url = [NSURL fileURLWithPath:filePath];
-//    PHFetchResult *fetchResult = [PHAsset fetchAssetsWithALAssetURLs:@[url] options:nil];
-//    PHAsset *asset = [self getPHAssert];
-//    [upManager putPHAsset:asset key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
+//    long long fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil] fileSize];
+//    NSInputStream *stream = [NSInputStream inputStreamWithFileAtPath:filePath];
+//    [upManager putInputStream:stream sourceId:filePath.lastPathComponent size:fileSize fileName:filePath.lastPathComponent key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
 //        NSLog(@"info ===== %@", info);
 //        NSLog(@"resp ===== %@", resp);
 //
 //        [weakSelf changeUploadState:UploadStatePrepare];
 //        [weakSelf alertMessage:info.message];
-//    }
-//                option:uploadOption];
+//    } option:uploadOption];
+    
+    NSURL *url = [NSURL fileURLWithPath:filePath];
+    PHFetchResult *fetchResult = [PHAsset fetchAssetsWithALAssetURLs:@[url] options:nil];
+    PHAsset *asset = [self getPHAssert];
+    [upManager putPHAsset:asset key:key token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
+        NSLog(@"info ===== %@", info);
+        NSLog(@"resp ===== %@", resp);
+
+        [weakSelf changeUploadState:UploadStatePrepare];
+        [weakSelf alertMessage:info.message];
+    }
+                option:uploadOption];
 }
 
 - (PHAsset *)getPHAssert {

QiniuSDK/Storage/QNUploadInfo.h

@@ -64,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param dataSize 读取数据大小
 /// @param dataOffset 数据偏移量
 /// @param error 读取时的错误信息
-- (NSData *)readData:(NSInteger)dataSize dataOffset:(long)dataOffset error:(NSError **)error;
+- (NSData *)readData:(NSInteger)dataSize dataOffset:(long long)dataOffset error:(NSError **)error;
 
 /// 关闭流
 - (void)close;

QiniuSDK/Storage/QNUploadInfo.m

@@ -12,7 +12,7 @@
 @interface QNUploadInfo()
 
 @property(nonatomic,  copy)NSString *sourceId;
-@property(nonatomic, assign)long sourceSize;
+@property(nonatomic, assign)long long sourceSize;
 @property(nonatomic,  copy)NSString *fileName;
 
 @property(nonatomic, strong)id <QNUploadSource> source;
@@ -58,7 +58,7 @@ - (NSString *)getSourceId {
     return [self.source getId];
 }
 
-- (long)getSourceSize {
+- (long long)getSourceSize {
     return [self.source getSize];
 }
 
@@ -91,7 +91,7 @@ - (void)clearUploadState {
 - (void)checkInfoStateAndUpdate {
 }
 
-- (NSData *)readData:(NSInteger)dataSize dataOffset:(long)dataOffset error:(NSError **)error {
+- (NSData *)readData:(NSInteger)dataSize dataOffset:(long long)dataOffset error:(NSError **)error {
     if (!self.source) {
         *error = [NSError errorWithDomain:NSStreamSOCKSErrorDomain code:kQNLocalIOError userInfo:@{NSLocalizedDescriptionKey : @"file is not exist"}];
         return nil;

QiniuSDK/Storage/QNUploadInfoV1.m

@@ -174,10 +174,10 @@ - (QNUploadBlock *)nextUploadBlock:(NSError **)error {
         }
 
         // 从资源中读取新的 block 进行上传
-        long blockOffset = 0;
+        long long blockOffset = 0;
         if (self.blockList.count > 0) {
             QNUploadBlock *lastBlock = self.blockList[self.blockList.count - 1];
-            blockOffset = lastBlock.offset + lastBlock.size;
+            blockOffset = lastBlock.offset + (long long)(lastBlock.size);
         }
 
         block = [[QNUploadBlock alloc] initWithOffset:blockOffset blockSize:kBlockSize dataSize:self.dataSize index:self.blockList.count];

QiniuSDK/Storage/QNUploadSource.h

@@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * @return 资源大小
  */
-- (long)getSize;
+- (long long)getSize;
 
 /**
  * 读取数据

QiniuSDK/Storage/QNUploadSourceFile.m

@@ -38,7 +38,7 @@ - (nonnull NSString *)getFileName {
     return [[self.file path] lastPathComponent];
 }
 
-- (long)getSize {
+- (long long)getSize {
     return [self.file size];
 }