Skip to content

Commit 0ddea37

Browse files
authored
Merge pull request #213 from longbai/us_zone
PHAssetResourceRequestOptions
2 parents b5734ed + 62fe0a1 commit 0ddea37

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#Changelog
22

3+
## 7.1.4 (2016-11-07)
4+
## 修改
5+
* PHAssetResourceRequestOptions 参数类型
6+
37
## 7.1.3 (2016-11-07)
48
## 增加
59
* 增加zoneNa0 北美

Qiniu.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Qiniu'
3-
s.version = '7.1.2'
3+
s.version = '7.1.4'
44
s.summary = 'Qiniu Resource Storage SDK for iOS and Mac'
55
s.homepage = 'https://github.com/qiniu/objc-sdk'
66
s.social_media_url = 'http://weibo.com/qiniutek'

QiniuSDK/Common/QNPHAssetFile.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,10 @@ - (NSString *)getInfo {
144144
if (resource.originalFilename) {
145145
fileName = resource.originalFilename;
146146
}
147-
PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
148-
options.version = PHImageRequestOptionsVersionCurrent;
147+
PHAssetResourceRequestOptions *options = [PHAssetResourceRequestOptions new];
149148
//不支持icloud上传
150149
options.networkAccessAllowed = NO;
151-
options.deliveryMode = PHVideoRequestOptionsDeliveryModeAutomatic;
150+
152151
NSString *PATH_VIDEO_FILE = [NSTemporaryDirectory() stringByAppendingPathComponent:fileName];
153152
[[NSFileManager defaultManager] removeItemAtPath:PATH_VIDEO_FILE error:nil];
154153
[[PHAssetResourceManager defaultManager] writeDataForAssetResource:resource toFile:[NSURL fileURLWithPath:PATH_VIDEO_FILE] options:options completionHandler:^(NSError *_Nullable error) {

QiniuSDK/Common/QNVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
/**
1212
* sdk 版本
1313
*/
14-
static const NSString *kQiniuVersion = @"7.1.3";
14+
static const NSString *kQiniuVersion = @"7.1.4";

0 commit comments

Comments
 (0)