Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md
#	Qiniu.podspec
#	QiniuSDK/Utils/QNPHAssetFile.m
#	QiniuSDK/Utils/QNVersion.h
#	README.md

Author: YangSen-qn

QiniuSDK/Utils/QNPHAssetFile.m

@@ -216,7 +216,7 @@ - (void)exportAssert {
             resource = assetRes;
         }
     }
-    NSString *fileName =  [NSString stringWithFormat:@"tempAsset-%lf.mov", [[NSDate date] timeIntervalSince1970]];
+    NSString *fileName = [NSString stringWithFormat:@"tempAsset-%f-%d.mov", [[NSDate date] timeIntervalSince1970], arc4random()%100000];
     PHAssetResourceRequestOptions *options = [PHAssetResourceRequestOptions new];
     //不支持icloud上传
     options.networkAccessAllowed = NO;

QiniuSDK/Utils/QNPHAssetResource.m

@@ -109,7 +109,8 @@ - (void)getInfo {
         _hasGotInfo = YES;
         NSConditionLock *assetReadLock = [[NSConditionLock alloc] initWithCondition:kAMASSETMETADATA_PENDINGREADS];
 
-        NSString *pathToWrite = [NSTemporaryDirectory() stringByAppendingString:self.phAssetResource.originalFilename];
+        NSString *fileName = [NSString stringWithFormat:@"tempAsset-%f-%d.mov", [[NSDate date] timeIntervalSince1970], arc4random()%100000];
+        NSString *pathToWrite = [NSTemporaryDirectory() stringByAppendingString:fileName];
         NSURL *localpath = [NSURL fileURLWithPath:pathToWrite];
         PHAssetResourceRequestOptions *options = [PHAssetResourceRequestOptions new];
         options.networkAccessAllowed = YES;
@@ -147,7 +148,8 @@ - (NSData *)fetchDataFromAsset:(PHAssetResource *)videoResource error:(NSError *
 
     NSConditionLock *assetReadLock = [[NSConditionLock alloc] initWithCondition:kAMASSETMETADATA_PENDINGREADS];
 
-    NSString *pathToWrite = [NSTemporaryDirectory() stringByAppendingString:videoResource.originalFilename];
+    NSString *fileName = [NSString stringWithFormat:@"tempAsset-%f-%d.mov", [[NSDate date] timeIntervalSince1970], arc4random()%100000];
+    NSString *pathToWrite = [NSTemporaryDirectory() stringByAppendingString:fileName];
     NSURL *localpath = [NSURL fileURLWithPath:pathToWrite];
     PHAssetResourceRequestOptions *options = [PHAssetResourceRequestOptions new];
     options.networkAccessAllowed = YES;