Merge pull request #363 from YangSen-qn/develop

fix uplog fail

Author: bachue

CHANGELOG.md

@@ -1,4 +1,9 @@
 #Changelog
+## 8.0.2(2020-09-14)
+## 修正
+- 修复日志上传失败问题
+- 优化日志上传逻辑
+
 ## 8.0.1(2020-09-08)
 ## 优化
 - 优化一些内存问题

Qiniu.podspec

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

QiniuSDK/Collect/QNReportConfig.m

@@ -26,7 +26,7 @@ - (instancetype)init {
     if (self) {
         _reportEnable = YES;
         _interval = 10;
-        _serverURL = @"https://uplog.qbox.me/log/4";
+        _serverURL = @"https://uplog.qbox.me/log/4?compressed=gzip";
         _recordDirectory = [NSString stringWithFormat:@"%@/report", [QNUtils sdkCacheDirectory]];
         _maxRecordFileSize = 2 * 1024 * 1024;
         _uploadThreshold = 4 * 1024;

QiniuSDK/Collect/QNUploadInfoReporter.m

@@ -126,9 +126,9 @@ - (void)innerReport:(NSString *)jsonString token:(NSString *)token {
             } 
         }
 
-        // 判断是否满足上传条件：文件大于上报临界值 && (首次上传 || 距上次上传时间大于_config.interval)
+        // 判断是否满足上传条件：文件大于上报临界值 || (首次上传 || 距上次上传时间大于_config.interval)
         NSTimeInterval currentTime = [[NSDate dateWithTimeIntervalSinceNow:0] timeIntervalSince1970];
-        if (file.size > _config.uploadThreshold && (_lastReportTime == 0 || currentTime - _lastReportTime > _config.interval * 60)) {
+        if (file.size > _config.uploadThreshold || (_lastReportTime == 0 || currentTime - _lastReportTime > _config.interval * 60)) {
 
             NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:_config.serverURL]];
             [request setValue:[NSString stringWithFormat:@"UpToken %@", token] forHTTPHeaderField:@"Authorization"];

QiniuSDK/Utils/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static NSString *const kQiniuVersion = @"8.0.1";
+static NSString *const kQiniuVersion = @"8.0.2";

README.md

@@ -13,7 +13,7 @@
 通过 CocoaPods
 
 ```ruby
-pod "Qiniu", "~> 8.0.1" 
+pod "Qiniu", "~> 8.0.2" 
 ```
 
 ## 运行环境