Merge pull request #98 from qiniu/develop

Release 6.3.2

Author: longbai

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+### v6.3.2
+
+- [#94] 上传进度指示调整
+
 ### v6.3.1
 
 - [#81] uploadfiledatawithoutkey

Qiniu.podspec

@@ -0,0 +1,42 @@
+Pod::Spec.new do |s|
+  s.name         = 'Qiniu'
+  s.version      = '6.3.2'
+  s.summary      = 'Qiniu Resource Storage SDK for iOS'
+  s.homepage     = 'https://github.com/qiniu/ios-sdk'
+  s.social_media_url = 'http://weibo.com/qiniutek'
+  s.author       = 'Qiniu => [email protected]'
+  s.documentation_url = 'http://developer.qiniu.com/docs/v6/sdk/ios-sdk.html'
+  s.source       = {:git => 'https://github.com/qiniu/ios-sdk.git', :tag => 'v6.3.2'}
+
+  s.platform = :ios, '6.0'
+  s.ios.deployment_target = '6.0'
+
+  s.source_files = 'QiniuSDK/**/*.{h,m}'
+  s.requires_arc = true
+
+  s.license = { :type => 'MIT', :text => <<-LICENSE
+The MIT License (MIT)
+
+Copyright (c) 2012-2014 qiniu.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+                 LICENSE
+               }
+
+end

QiniuSDK/QiniuConfig.h

@@ -9,7 +9,7 @@
 
 #define kQiniuUndefinedKey @"?"
 
-#define kQiniuVersion @"6.3.1"
+#define kQiniuVersion @"6.3.2"
 
 #define kQiniuUpHostsLast 1
 NSString *kQiniuUpHosts[kQiniuUpHostsLast+1];

QiniuSDK/QiniuResumableClient.m

@@ -207,6 +207,9 @@ - (void)mkfile:(NSString *)key
 
     QNCompleteBlock success = ^(AFHTTPRequestOperation *operation, id responseObject)
     {
+        if (progressBlock != nil) {
+            progressBlock(1);
+        }
         complete(operation, nil);
     };
     QNCompleteBlock failure = ^(AFHTTPRequestOperation *operation, NSError *error)
@@ -287,6 +290,10 @@ - (float) chunkUploadedAndPercent
     percent = (float)self.uploadedChunkNumber / self.chunkCount;
     [chunkNumlock unlock];
 
+    if (percent > 0.95) {
+        percent = 0.95;
+    }
+
     return percent;
 }
 

QiniuSDK/QiniuResumableUploader.m

@@ -180,7 +180,7 @@ - (void) uploadFile:(NSString *)filePath
                                             fileSize:fileSize
                                                extra:extra
                                               uphost:kQiniuUpHosts[mkfileRetryIndex]
-                                            progress:nil
+                                            progress:weakProgressBlock
                                             complete:weakCompleteBlock];
 
                                 return;
@@ -197,7 +197,7 @@ - (void) uploadFile:(NSString *)filePath
                                 fileSize:fileSize
                                    extra:extra
                                   uphost:kQiniuUpHosts[0]
-                                progress:nil
+                                progress:weakProgressBlock
                                 complete:weakCompleteBlock];
                     return;
                 }