|
@@ -134,21 +134,21 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
}];
|
|
|
|
|
|
//真正的视频数据
|
|
|
- PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
|
|
|
- options.version = PHVideoRequestOptionsVersionOriginal;
|
|
|
- [[PHImageManager defaultManager] requestAVAssetForVideo:curModel.asset options:options resultHandler:^(AVAsset *asset, AVAudioMix *audioMix, NSDictionary *info) {
|
|
|
- if ([asset isKindOfClass:[AVURLAsset class]]) {
|
|
|
-
|
|
|
- AVURLAsset* urlAsset = (AVURLAsset*)asset;
|
|
|
- NSData *videoData = [NSData dataWithContentsOfURL:urlAsset.URL];
|
|
|
-
|
|
|
- if (videoData) {
|
|
|
- curModel.videoData = videoData;
|
|
|
- [cachesFileManager getFileNameWithContent:curModel.videoData fileName:curModel.filename type:uploadFileTypeVideo];
|
|
|
- curModel.videoData = nil;
|
|
|
- }
|
|
|
- }
|
|
|
- }];
|
|
|
+// PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
|
|
|
+// options.version = PHVideoRequestOptionsVersionOriginal;
|
|
|
+// [[PHImageManager defaultManager] requestAVAssetForVideo:curModel.asset options:options resultHandler:^(AVAsset *asset, AVAudioMix *audioMix, NSDictionary *info) {
|
|
|
+// if ([asset isKindOfClass:[AVURLAsset class]]) {
|
|
|
+//
|
|
|
+// AVURLAsset* urlAsset = (AVURLAsset*)asset;
|
|
|
+// NSData *videoData = [NSData dataWithContentsOfURL:urlAsset.URL];
|
|
|
+//
|
|
|
+// if (videoData) {
|
|
|
+// curModel.videoData = videoData;
|
|
|
+// [cachesFileManager getFileNameWithContent:curModel.videoData fileName:curModel.filename type:uploadFileTypeVideo];
|
|
|
+// curModel.videoData = nil;
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }];
|
|
|
|
|
|
}
|
|
|
else{
|
|
@@ -272,12 +272,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
|
|
|
}
|
|
|
else{
|
|
|
- NSString*pathStr = [cachesFileManager getFilePathWithName:_curUploadFileDataModel.filename type:uploadFileTypeVideo];
|
|
|
- NSData *curdata = [NSData dataWithContentsOfFile:pathStr];
|
|
|
+ //NSString*pathStr = [cachesFileManager getFilePathWithName:_curUploadFileDataModel.filename type:uploadFileTypeVideo];
|
|
|
+
|
|
|
+ if([cachesFileManager checkFileIsSaveState:_curUploadFileDataModel.filename withType:uploadFileTypeVideo]){
|
|
|
|
|
|
- if(curdata && curdata.length >0){
|
|
|
- curdata = nil;
|
|
|
-
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:uploadFileBeginNotification object:_curUploadFileDataModel];
|
|
|
return;
|
|
|
}
|
|
@@ -330,10 +328,13 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
if ([asset isKindOfClass:[AVURLAsset class]]) {
|
|
|
|
|
|
AVURLAsset* urlAsset = (AVURLAsset*)asset;
|
|
|
- NSData *videoData = [NSData dataWithContentsOfURL:urlAsset.URL];
|
|
|
+
|
|
|
+ BOOL isSuc = [cachesFileManager copyVideoItemAtPath:[urlAsset.URL path] fileName:_curUploadFileDataModel.filename error:nil];
|
|
|
+
|
|
|
+ //NSData *videoData = [NSData dataWithContentsOfURL:urlAsset.URL];
|
|
|
|
|
|
- if (videoData) {
|
|
|
- self->_curUploadFileDataModel.videoData = videoData;
|
|
|
+ if (isSuc) {
|
|
|
+ //self->_curUploadFileDataModel.videoData = videoData;
|
|
|
[weakSelf afterGetVideoDataFun];
|
|
|
}
|
|
|
else{
|
|
@@ -341,7 +342,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
|
|
|
}
|
|
|
}
|
|
|
}];
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|