Skip to content

Commit

Permalink
Merge pull request #32 from lintianzhi/feature/resumable
Browse files Browse the repository at this point in the history
Feature/resumable
  • Loading branch information
xushiwei committed Feb 27, 2014
2 parents f82815e + 4b17877 commit 15ef979
Show file tree
Hide file tree
Showing 85 changed files with 8,822 additions and 16,006 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ pkg
# For vim:
*.swp
QiniuDemo/QiniuDemo.xcodeproj/xcuserdata
QiniuSDK.xcworkspace/xcuserdata
QiniuSDK.xcworkspace
QiniuSDK/QiniuSDK.xcodeproj/xcuserdata
171 changes: 163 additions & 8 deletions QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>32E78999-74F1-41B5-8E01-012904A3665A</string>
<key>IDESourceControlProjectName</key>
<string>QiniuDemo</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>A8AF101B-888C-45AB-AC64-9F1A07B02FB9</key>
<string>ssh://github.com/dazuiba/ios-sdk.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>QiniuDemo/QiniuDemo.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>A8AF101B-888C-45AB-AC64-9F1A07B02FB9</key>
<string>../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>ssh://github.com/dazuiba/ios-sdk.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>A8AF101B-888C-45AB-AC64-9F1A07B02FB9</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>A8AF101B-888C-45AB-AC64-9F1A07B02FB9</string>
<key>IDESourceControlWCCName</key>
<string>ios-sdk</string>
</dict>
</array>
</dict>
</plist>
Binary file not shown.
28 changes: 0 additions & 28 deletions QiniuDemo/QiniuDemo/QiniuPutPolicy.h

This file was deleted.

86 changes: 0 additions & 86 deletions QiniuDemo/QiniuDemo/QiniuPutPolicy.m

This file was deleted.

3 changes: 1 addition & 2 deletions QiniuDemo/QiniuDemo/QiniuViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
//

#import <UIKit/UIKit.h>
#import "../../QiniuSDK/QiniuUploadDelegate.h"
#import "../../QiniuSDK/QiniuSimpleUploader.h"
#import "QiniuSimpleUploader.h"

@interface QiniuViewController : UIViewController<QiniuUploadDelegate, UINavigationControllerDelegate, UIPopoverControllerDelegate, UIImagePickerControllerDelegate>
{
Expand Down
6 changes: 3 additions & 3 deletions QiniuDemo/QiniuDemo/QiniuViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ - (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view, typically from a nib.
QiniuAccessKey = @"<Please specify your access key>";
QiniuSecretKey = @"<Please specify your secret key>";
QiniuBucketName = @"<Please specify your bucket name>";
QiniuAccessKey = @"iyfeOR5ULAq4o_8LHslWEJZAf-CAEgpQExWxMvpQ";
QiniuSecretKey = @"--hLnvubaeE1OhsexDsyHSiDS9Eyl9sqgNH9iyj7";
QiniuBucketName = @"test";
}

- (void)didReceiveMemoryWarning
Expand Down
Loading

0 comments on commit 15ef979

Please sign in to comment.