Merge pull request #321 from XiaopingSun/uplog_v4_developing

Uplog v4 developing

Author: bachue

.travis.yml

@@ -1,13 +1,12 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode11
 
 before_install:
-  - rvm install 2.3.1
-  - rvm use 2.3.1
+  - rvm install 2.6.4
+  - rvm use 2.6.4
   - brew update
   - gem install cocoapods --pre
   - pod --version
-  - pod repo remove master
   - rm -rf ~/.cocoapods
   - pod setup
   - pod install --verbose --no-repo-update
@@ -16,7 +15,7 @@ before_script:
   - export QINIU_TEST_ENV="travis"
 
 script:
-  - xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -configuration Release -destination 'platform=iOS Simulator,OS=11.0,name=iPhone SE' -enableCodeCoverage YES
+  - xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -configuration Release -destination 'platform=iOS Simulator,OS=12.4,name=iPhone Xs Max' -enableCodeCoverage YES
   - xcodebuild test -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_Mac -configuration Release -destination 'platform=macOS,arch=x86_64'
 
 after_success:

QiniuSDK.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,6 +28,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DF2CDE0919DAC05500CE01FB"
+               BuildableName = "QiniuSDK_MacTests.xctest"
+               BlueprintName = "QiniuSDK_MacTests"
+               ReferencedContainer = "container:QiniuSDK.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_Mac.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_MacTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_iOSTests.xcscheme

@@ -9,7 +9,7 @@
 #ifndef QNPipeline_h
 #define QNPipeline_h
 
-@class QNResponseInfo;
+@class QNHttpResponseInfo;
 
 @interface QNPipelineConfig : NSObject
 
@@ -31,8 +31,10 @@
 
 /**
  *    上传完成后的回调函数
+ *
+ *    @param info 上下文信息，包括状态码，错误值
  */
-typedef void (^QNPipelineCompletionHandler)(QNResponseInfo *info);
+typedef void (^QNPipelineCompletionHandler)(QNHttpResponseInfo *info);
 
 @interface QNPipeline : NSObject
 

QiniuSDK/BigData/QNPipeline.h

@@ -30,7 +30,7 @@ - (instancetype)initWithHost:(NSString*)host {
 
 @interface QNPipeline ()
 
-@property (nonatomic) id<QNHttpDelegate> httpManager;
+@property (nonatomic) QNSessionManager *httpManager;
 @property (nonatomic) QNPipelineConfig* config;
 
 + (NSDateFormatter*)dateFormatter;
@@ -132,12 +132,9 @@ - (void)pumpRepo:(NSString*)repo
          handler:(QNPipelineCompletionHandler)handler {
     NSDictionary* headers = @{ @"Authorization" : token,
                                @"Content-Type" : @"text/plain" };
-    [_httpManager post:[self url:repo] withData:[str dataUsingEncoding:NSUTF8StringEncoding] withParams:nil withHeaders:headers withTaskIdentifier:nil withCompleteBlock:^(QNResponseInfo* info, NSDictionary* resp) {
-        handler(info);
-    }
-        withProgressBlock:nil
-          withCancelBlock:nil
-               withAccess:nil];
+    [_httpManager post:[self url:repo] withData:[str dataUsingEncoding:NSUTF8StringEncoding] withParams:nil withHeaders:headers withIdentifier:nil withCompleteBlock:^(QNHttpResponseInfo *httpResponseInfo, NSDictionary *respBody) {
+        handler(httpResponseInfo);
+    } withProgressBlock:nil withCancelBlock:nil withAccess:nil];
 }
 
 + (NSDateFormatter*)dateFormatter {

QiniuSDK/BigData/QNPipeline.m

@@ -11,7 +11,6 @@
 #import "QNFileDelegate.h"
 
 API_AVAILABLE_BEGIN(ios(9.1))
-API_UNAVAILABLE_BEGIN(macos, tvos)
 
 @class PHAsset;
 @interface QNPHAssetFile : NSObject <QNFileDelegate>
@@ -28,4 +27,3 @@ API_UNAVAILABLE_BEGIN(macos, tvos)
 @end
 
 API_AVAILABLE_END
-API_UNAVAILABLE_END

QiniuSDK/Common/QNPHAssetFile.h

@@ -7,7 +7,6 @@
 //
 
 #import "QNPHAssetFile.h"
-#import <AVFoundation/AVFoundation.h>
 #import <Photos/Photos.h>
 #import "QNResponseInfo.h"