Merge pull request #37 from qiniu/develop

Release v6.2.0
qiniu · Mar 4, 2014 · 3399001 · 3399001
2 parents f215281 + ae2b461
commit 3399001
Show file tree

Hide file tree

Showing 104 changed files with 9,637 additions and 16,710 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,5 +60,5 @@ pkg
 # For vim:
 *.swp
 QiniuDemo/QiniuDemo.xcodeproj/xcuserdata
-QiniuSDK.xcworkspace/xcuserdata
+QiniuSDK.xcworkspace
 QiniuSDK/QiniuSDK.xcodeproj/xcuserdata
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## CHANGE LOG
 
+### v6.2.0
+
+2014-03-04 issue [#37](https://github.com/qiniu/ios-sdk/pull/37)
+
+- Replace ASIHttpRequest with AFNetwork2.0.3
+- 老的基于 ASIHttpRequest 的代码，建立了 ASIHttpRequest 分支，独立演化。
+
+
 ### v6.0.0
 
 2013-07-04 issue [#17](https://github.com/qiniu/ios-sdk/pull/17)

diff --git a/QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj b/QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj
diff --git a/QiniuDemo/QiniuDemo/Base.lproj/Main.storyboard b/QiniuDemo/QiniuDemo/Base.lproj/Main.storyboard
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13B3116" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
+    </dependencies>
+    <scenes>
+        <!--Qiniu Demo View Controller-->
+        <scene sceneID="ufC-wZ-h7g">
+            <objects>
+                <viewController id="vXZ-lx-hvc" customClass="QiniuDemoViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Ach-Wq-CiW"/>
+                        <viewControllerLayoutGuide type="bottom" id="3vz-5S-qwa"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d79-Nr-d7K">
+                                <rect key="frame" x="30" y="399" width="106" height="38"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="SimpleUpload">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="simpleUpload:" destination="vXZ-lx-hvc" eventType="touchDown" id="X34-D2-nQJ"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vfI-Dk-jNh">
+                                <rect key="frame" x="30" y="458" width="127" height="37"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="ResumableUpload">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="resumableUpload:" destination="vXZ-lx-hvc" eventType="touchDown" id="1Pr-OX-zWE"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lpg-Ce-rXO">
+                                <rect key="frame" x="208" y="341" width="78" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Download">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="download:" destination="vXZ-lx-hvc" eventType="touchDown" id="hLl-ak-tFx"/>
+                                </connections>
+                            </button>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KMS-LZ-EqT">
+                                <rect key="frame" x="30" y="33" width="256" height="257"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                            <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="oET-hQ-ctQ">
+                                <rect key="frame" x="30" y="298" width="246" height="2"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </progressView>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IW5-R1-pzu">
+                                <rect key="frame" x="30" y="489" width="41" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="STOP">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="stopResumableUpload:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="rGy-jz-gVa"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EcL-xi-nLq">
+                                <rect key="frame" x="93" y="489" width="64" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="RESUME">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="resumeUpload:" destination="vXZ-lx-hvc" eventType="touchDown" id="tyZ-TH-lF7"/>
+                                </connections>
+                            </button>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="g7L-9R-eMD">
+                                <rect key="frame" x="30" y="308" width="246" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <connections>
+                        <outlet property="downloadUrl" destination="g7L-9R-eMD" id="Fe3-3V-mQ2"/>
+                        <outlet property="msg" destination="KMS-LZ-EqT" id="9Bj-B2-mmh"/>
+                        <outlet property="progress" destination="kh9-bI-dsS" id="X4m-RB-gr9"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
diff --git a/QiniuDemo/QiniuDemo/[email protected] b/QiniuDemo/QiniuDemo/[email protected]
diff --git a/QiniuDemo/QiniuDemo/Default.png b/QiniuDemo/QiniuDemo/Default.png
diff --git a/QiniuDemo/QiniuDemo/[email protected] b/QiniuDemo/QiniuDemo/[email protected]
diff --git a/QiniuDemo/QiniuDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/QiniuDemo/QiniuDemo/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/QiniuDemo/QiniuDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/QiniuDemo/QiniuDemo/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/QiniuDemo/QiniuDemo/QiniuAppDelegate.h b/QiniuDemo/QiniuDemo/QiniuAppDelegate.h
diff --git a/QiniuDemo/QiniuDemo/QiniuDemo-Info.plist b/QiniuDemo/QiniuDemo/QiniuDemo-Info.plist
@@ -8,17 +8,6 @@
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>icon.png</string>
-				<string>[email protected]</string>
-			</array>
-		</dict>
-	</dict>
 	<key>CFBundleIdentifier</key>
 	<string>Qiniu.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -36,27 +25,16 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>MainStoryboard_iPhone</string>
-	<key>UIMainStoryboardFile~ipad</key>
-	<string>MainStoryboard_iPad</string>
+	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
-	<key>UIStatusBarStyle</key>
-	<string>UIStatusBarStyleBlackOpaque</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
 </dict>
 </plist>
diff --git a/QiniuDemo/QiniuDemo/QiniuDemo-Prefix.pch b/QiniuDemo/QiniuDemo/QiniuDemo-Prefix.pch
@@ -1,5 +1,7 @@
 //
-// Prefix header for all source files of the 'QiniuDemo' target in the 'QiniuDemo' project
+//  Prefix header
+//
+//  The contents of this file are implicitly included at the beginning of every source file.
 //
 
 #import <Availability.h>

diff --git a/QiniuDemo/QiniuDemo/QiniuDemoAppDelegate.h b/QiniuDemo/QiniuDemo/QiniuDemoAppDelegate.h
@@ -0,0 +1,15 @@
+//
+//  QiniuDemoAppDelegate.h
+//  QiniuDemo
+//
+//  Created by ltz on 14-2-28.
+//  Copyright (c) 2014年 Qiniu. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface QiniuDemoAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end
diff --git a/QiniuDemo/QiniuDemo/QiniuAppDelegate.m → QiniuDemo/QiniuDemo/QiniuDemoAppDelegate.m b/QiniuDemo/QiniuDemo/QiniuAppDelegate.m → QiniuDemo/QiniuDemo/QiniuDemoAppDelegate.m
@@ -1,19 +1,14 @@
 //
-//  QiniuAppDelegate.m
+//  QiniuDemoAppDelegate.m
 //  QiniuDemo
 //
-//  Created by Qiniu Developers 2013
+//  Created by ltz on 14-2-28.
+//  Copyright (c) 2014年 Qiniu. All rights reserved.
 //
 
-#import "QiniuAppDelegate.h"
+#import "QiniuDemoAppDelegate.h"
 
-@implementation QiniuAppDelegate
-
-- (void)dealloc
-{
-    [_window release];
-    [super dealloc];
-}
+@implementation QiniuDemoAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {

diff --git a/QiniuDemo/QiniuDemo/QiniuDemoViewController.h b/QiniuDemo/QiniuDemo/QiniuDemoViewController.h
@@ -0,0 +1,23 @@
+//
+//  QiniuDemoViewController.h
+//  QiniuDemo
+//
+//  Created by ltz on 14-2-28.
+//  Copyright (c) 2014年 Qiniu. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "QiniuSimpleUploader.h"
+#import "QiniuResumableUploader.h"
+
+@interface QiniuDemoViewController : UIViewController<QiniuUploadDelegate,UITextFieldDelegate>
+
+
+@property (retain, nonatomic)QiniuRioPutExtra *extra;
+@property (retain, nonatomic)QiniuResumableUploader *rUploader;
+@property (retain, nonatomic)QiniuSimpleUploader *sUploader;
+@property (copy, nonatomic)NSString *filePath;
+@property (copy, nonatomic)NSString *lastResumableKey;
+@property (copy, nonatomic)NSString *token;
+
+@end