Merge pull request #376 from qiniu/develop

发布v8.0.5

Author: Mei-Zhao

CHANGELOG.md

@@ -1,4 +1,8 @@
 #Changelog
+## 8.0.5(2020-11-18)
+## 优化
+- 优化无可用Host时的处理逻辑
+
 ## 8.0.4(2020-11-03)
 ## 优化
 - 优化Host冻结逻辑带来客户端上传超时问题，提高上传成功率

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.0.4'
+  s.version      = '8.0.5'
   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

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

QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		26F62ADDD5B6306E978C9A3F /* libPods-QiniuDemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14CB2139715DD7B6FD5B146E /* libPods-QiniuDemoTests.a */; };
 		2B848FF719DFA7ECB394CA9F /* libPods-QiniuDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9BC5A8D93F988C1240E05F /* libPods-QiniuDemo.a */; };
+		31304CA7256368E7001034D2 /* UploadResource_49M.zip in Resources */ = {isa = PBXBuildFile; fileRef = 31304CA6256368E7001034D2 /* UploadResource_49M.zip */; };
 		318191AB2531516F00D18536 /* UploadResource.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 318191AA2531516F00D18536 /* UploadResource.dmg */; };
 		93D230241C86D7F700434F6D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D230231C86D7F700434F6D /* main.m */; };
 		93D230271C86D7F700434F6D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D230261C86D7F700434F6D /* AppDelegate.m */; };
@@ -40,6 +41,7 @@
 /* Begin PBXFileReference section */
 		14CB2139715DD7B6FD5B146E /* libPods-QiniuDemoTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuDemoTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		24EE530BBB100BED89B08A3D /* Pods-QiniuDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuDemo/Pods-QiniuDemo.release.xcconfig"; sourceTree = "<group>"; };
+		31304CA6256368E7001034D2 /* UploadResource_49M.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = UploadResource_49M.zip; sourceTree = "<group>"; };
 		318191AA2531516F00D18536 /* UploadResource.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = UploadResource.dmg; sourceTree = "<group>"; };
 		318191AF25315F3500D18536 /* Configure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Configure.h; sourceTree = "<group>"; };
 		6B9BC5A8D93F988C1240E05F /* libPods-QiniuDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -94,6 +96,7 @@
 		318191A92531516F00D18536 /* DemoTestResource */ = {
 			isa = PBXGroup;
 			children = (
+				31304CA6256368E7001034D2 /* UploadResource_49M.zip */,
 				318191AF25315F3500D18536 /* Configure.h */,
 				318191AA2531516F00D18536 /* UploadResource.dmg */,
 			);
@@ -292,6 +295,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				93D230321C86D7F700434F6D /* LaunchScreen.storyboard in Resources */,
+				31304CA7256368E7001034D2 /* UploadResource_49M.zip in Resources */,
 				318191AB2531516F00D18536 /* UploadResource.dmg in Resources */,
 				93D2302F1C86D7F700434F6D /* Assets.xcassets in Resources */,
 				93D2302D1C86D7F700434F6D /* Main.storyboard in Resources */,

QiniuDemo/QiniuDemo/ViewController.m

@@ -47,7 +47,8 @@ - (IBAction)uploadAction:(UIButton *)sender {
     if (self.uploadState == UploadStatePrepare) {
 
 #ifdef YourToken
-        NSString *path = [[NSBundle mainBundle] pathForResource:@"UploadResource.dmg" ofType:nil];
+//        NSString *path = [[NSBundle mainBundle] pathForResource:@"UploadResource.dmg" ofType:nil];
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"UploadResource_49M.zip" ofType:nil];
         [self uploadImageToQNFilePath:path];
         [self changeUploadState:UploadStateUploading];
 #else

QiniuSDK.xcodeproj/project.pbxproj

@@ -48,6 +48,11 @@ extern const int kQNLocalIOError;
  */
 extern const int kQNMaliciousResponseError;
 
+/**
+ *    没有可用的Host 错误
+ */
+extern const int kQNNoUsableHostError;
+
 /**
  *    非预期的系统调用 错误
  */

QiniuSDK/Common/QNErrorCode.h

@@ -8,12 +8,17 @@
 
 #import "QNErrorCode.h"
 
+const int kQNUnexpectedSysCallError = -10;
+const int kQNNoUsableHostError = -9;
+const int kQNMaliciousResponseError = -8;
+const int kQNLocalIOError = -7;
 const int kQNZeroDataSize = -6;
 const int kQNInvalidToken = -5;
 const int kQNFileError = -4;
 const int kQNInvalidArgument = -3;
 const int kQNRequestCancelled = -2;
 const int kQNNetworkError = -1;
-const int kQNLocalIOError = -7;
-const int kQNMaliciousResponseError = -8;
-const int kQNUnexpectedSysCallError = -10;
+
+
+
+

QiniuSDK/Common/QNErrorCode.m

@@ -6,13 +6,11 @@
 //  Copyright © 2020 Qiniu. All rights reserved.
 //
 
-#import "QNZoneInfo.h"
-#import "QNResponseInfo.h"
-#import "QNUploadRequestMetrics.h"
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class QNUpToken, QNZonesInfo, QNUploadRegionRequestMetrics;
+@class QNResponseInfo, QNUpToken, QNZonesInfo, QNUploadRegionRequestMetrics;
 
 typedef void (^QNPrequeryReturn)(int code, QNResponseInfo * _Nullable httpResponseInfo, QNUploadRegionRequestMetrics * _Nullable metrics);
 

QiniuSDK/Common/QNZone.h

@@ -21,10 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)shared;
 
-/// 无效缓存，会根据inetAddress的host获取缓存列表，并移除inetAddress
-/// @param inetAddress address 信息
-- (void)invalidInetAdress:(id <QNIDnsNetworkAddress>)inetAddress;
-
 /// 根据host从缓存中读取DNS信息
 /// @param host 域名
 - (NSArray <id <QNIDnsNetworkAddress> > *)getInetAddressByHost:(NSString *)host;