Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#Changelog

## 7.1.4 (2016-11-07)
## 修改
* PHAssetResourceRequestOptions 参数类型

## 7.1.3 (2016-11-07)
## 增加
* 增加zoneNa0 北美
Expand Down
2 changes: 1 addition & 1 deletion Qiniu.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Qiniu'
s.version = '7.1.2'
s.version = '7.1.4'
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'
Expand Down
5 changes: 2 additions & 3 deletions QiniuSDK/Common/QNPHAssetFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,10 @@ - (NSString *)getInfo {
if (resource.originalFilename) {
fileName = resource.originalFilename;
}
PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
options.version = PHImageRequestOptionsVersionCurrent;
PHAssetResourceRequestOptions *options = [PHAssetResourceRequestOptions new];
//不支持icloud上传
options.networkAccessAllowed = NO;
options.deliveryMode = PHVideoRequestOptionsDeliveryModeAutomatic;

NSString *PATH_VIDEO_FILE = [NSTemporaryDirectory() stringByAppendingPathComponent:fileName];
[[NSFileManager defaultManager] removeItemAtPath:PATH_VIDEO_FILE error:nil];
[[PHAssetResourceManager defaultManager] writeDataForAssetResource:resource toFile:[NSURL fileURLWithPath:PATH_VIDEO_FILE] options:options completionHandler:^(NSError *_Nullable error) {
Expand Down
2 changes: 1 addition & 1 deletion QiniuSDK/Common/QNVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
/**
* sdk 版本
*/
static const NSString *kQiniuVersion = @"7.1.3";
static const NSString *kQiniuVersion = @"7.1.4";