Merge pull request #330 from XiaopingSun/update_7.3.4

Update 7.3.4

Author: bachue

QiniuSDK/Common/QNPHAssetFile.h

@@ -10,10 +10,8 @@
 
 #import "QNFileDelegate.h"
 
-API_AVAILABLE_BEGIN(ios(9.1))
-
 @class PHAsset;
-@interface QNPHAssetFile : NSObject <QNFileDelegate>
+API_AVAILABLE(ios(9.1)) @interface QNPHAssetFile : NSObject <QNFileDelegate>
 /**
  *    打开指定文件
  *
@@ -25,5 +23,3 @@ API_AVAILABLE_BEGIN(ios(9.1))
 - (instancetype)init:(PHAsset *)phAsset
                error:(NSError *__autoreleasing *)error;
 @end
-
-API_AVAILABLE_END

QiniuSDK/Common/QNPHAssetResource.h

@@ -10,11 +10,8 @@
 
 #import "QNFileDelegate.h"
 
-API_AVAILABLE_BEGIN(ios(9))
-
 @class PHAssetResource;
-
-@interface QNPHAssetResource : NSObject <QNFileDelegate>
+API_AVAILABLE(ios(9.0)) @interface QNPHAssetResource : NSObject <QNFileDelegate>
 
 /**
  *    打开指定文件
@@ -28,5 +25,3 @@ API_AVAILABLE_BEGIN(ios(9))
                error:(NSError *__autoreleasing *)error;
 
 @end
-
-API_AVAILABLE_END

QiniuSDK/Http/QNSessionManager.m

@@ -80,17 +80,12 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didFini
             _sessionStatistics = [[QNSessionStatistics alloc] init];
 
             // remote_ip & port
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+    #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
             if (@available(iOS 13.0, *)) {
                 _sessionStatistics.remoteIp = transactionMetrics.remoteAddress;
                 _sessionStatistics.port = [transactionMetrics.remotePort unsignedShortValue];
-            } else {
-                NSString *remoteIpAddressAndPort = [transactionMetrics valueForKey:@"__remoteAddressAndPort"];
-                NSRange indexRange = [remoteIpAddressAndPort rangeOfString:@":"];
-                _sessionStatistics.remoteIp = [remoteIpAddressAndPort substringToIndex:indexRange.location];
-                _sessionStatistics.port = [[remoteIpAddressAndPort substringFromIndex:indexRange.location + 1] intValue];
             }
-#endif
+    #endif
 
             // time
             _sessionStatistics.totalElapsedTime = metrics.taskInterval.duration * 1000;

QiniuSDK/Storage/QNUploadInfoReporter.h

@@ -20,7 +20,6 @@
 
 // request type item - 用于统计单个请求的打点信息
 @interface QNReportRequestItem : QNReportBaseItem
-- (id)init __attribute__((unavailable("Use buildWith: instead.")));
 + (instancetype)buildWithUpType:(NSString *)up_type
                    TargetBucket:(NSString *)target_bucket
                       targetKey:(NSString *)target_key
@@ -53,7 +52,6 @@
 
 // block type item - 用于统计分片上传整体质量信息
 @interface QNReportBlockItem : QNReportBaseItem
-- (id)init __attribute__((unavailable("Use buildWith: instead.")));
 + (instancetype)buildWithTargetRegionId:(NSString *)target_region_id
                         currentRegionId:(NSString *)current_region_id
                        totalElapsedTime:(int64_t)total_elapsed_time
@@ -68,7 +66,6 @@
 
 // quality type item - 用于统计上传结果
 @interface QNReportQualityItem : QNReportBaseItem
-- (id)init __attribute__((unavailable("Use buildWith: instead.")));
 + (instancetype)buildWithResult:(NSString *)result
                totalElapsedTime:(int64_t)total_elapsed_time
                   requestsCount:(int64_t)requests_count

QiniuSDKTests/QNTestConfig.h

@@ -6,4 +6,4 @@
 //  Copyright (c) 2014年 Qiniu. All rights reserved.
 //
 
-static NSString *const g_token = @"bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:96LezWHaS_dzbMt3V6YR5QCF-_Y=:eyJzY29wZSI6InNodWFuZ2h1bzEiLCJkZWFkbGluZSI6MTU5MDAyOTg0OX0K";
+static NSString *const g_token = @"bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:D0XrIxOVDM8ARHvGcI9-fZqg4Pc=:eyJzY29wZSI6InNodWFuZ2h1bzEiLCJkZWFkbGluZSI6MTU5MDA1NzM3NH0K";