Commit b9531383af516d8186eaa3f0e4ba53caf180d35e

Authored by 梁星国
1 parent de8eb2a9

提交0.0.16_更改IM路径

CNLiveImagePickerController.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveImagePickerController' 10 s.name = 'CNLiveImagePickerController'
11 - s.version = '0.0.15' 11 + s.version = '0.0.16'
12 s.summary = '相册' 12 s.summary = '相册'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveImagePickerController/Classes/TZImageManager.m
@@ -886,12 +886,13 @@ static dispatch_once_t onceToken; @@ -886,12 +886,13 @@ static dispatch_once_t onceToken;
886 NSDateFormatter *formater = [[NSDateFormatter alloc] init]; 886 NSDateFormatter *formater = [[NSDateFormatter alloc] init];
887 [formater setDateFormat:@"yyyy-MM-dd-HH:mm:ss-SSS"]; 887 [formater setDateFormat:@"yyyy-MM-dd-HH:mm:ss-SSS"];
888 #pragma mark - 添加: 原有逻辑-根据会话id取得path(LXG) 888 #pragma mark - 添加: 原有逻辑-根据会话id取得path(LXG)
889 - NSString *filaName = [NSString stringWithFormat:@"output-%@_%d_fileType=videoType.mp4",[formater stringFromDate:[NSDate date]],arc4random()]; 889 +// NSString *filaName = [NSString stringWithFormat:@"output-%@_%d_fileType=videoType.mp4",[formater stringFromDate:[NSDate date]],arc4random()];
  890 + NSString *filaName = [NSString stringWithFormat:@"%3.f_%d_video_file.mp4", [[NSDate date] timeIntervalSince1970],arc4random() % 100000];
890 // NSString *outputPath = [NSHomeDirectory() stringByAppendingFormat:@"/tmp/output-%@.mp4", [formater stringFromDate:[NSDate date]]]; 891 // NSString *outputPath = [NSHomeDirectory() stringByAppendingFormat:@"/tmp/output-%@.mp4", [formater stringFromDate:[NSDate date]]];
891 NSString *outputPath = @""; 892 NSString *outputPath = @"";
892 if (self.conversationId) { 893 if (self.conversationId) {
893 894
894 - outputPath = [[CNLiveBusinessTools newChatFilePathByUserId:self.conversationId] stringByAppendingPathComponent:filaName];//聊天 895 + outputPath = [CNLiveBusinessTools chatImageAndVideoUploadIMCachePath:filaName];//聊天
895 896
896 } 897 }
897 else 898 else
CNLiveImagePickerController/Classes/TZPhotoPickerController.m
@@ -714,7 +714,8 @@ static CGFloat itemMargin = 5; @@ -714,7 +714,8 @@ static CGFloat itemMargin = 5;
714 if ([NSString isEmpty:tzImagePickerVc.conversationId]) { 714 if ([NSString isEmpty:tzImagePickerVc.conversationId]) {
715 outputPath = [CNLiveBusinessTools chatFilePathByUserId:CNUserShareModel.uid]; 715 outputPath = [CNLiveBusinessTools chatFilePathByUserId:CNUserShareModel.uid];
716 }else{ 716 }else{
717 - outputPath = [CNLiveBusinessTools newChatFilePathByUserId:tzImagePickerVc.conversationId]; 717 + NSString *fileName = [NSString stringWithFormat:@"%3.f_%d_video_file", [[NSDate date] timeIntervalSince1970],arc4random() % 100000];
  718 + outputPath = [CNLiveBusinessTools chatImageAndVideoUploadIMCachePath:fileName];
718 719
719 } 720 }
720 721