iOS Team / CNLiveImagePickerController · Commits

Commit 1b87d80a3af12d2468363e9f394bb9e91bdb0f94

Authored by 梁星国
1 parent a3d8fc5d

提交

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
CNLiveImagePickerController/Classes/CNImagePickerManager.m
  View file @1b87d80
... ... @@ -27,8 +27,8 @@
27 27 switch (enterType) {
28 28  
29 29 case CNImagePickerEnterTypeFriendsCircle:
30   - imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit;//编辑长度
31   - imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max;//编辑视频最大长度
  30 + imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit_upload;//编辑长度
  31 + imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max_upload;//编辑视频最大长度
32 32 // 3. 设置是否可以混选选择视频/图片/原图
33 33 imagePickerVc.allowPickingMultipleVideo = NO;
34 34 break;
... ... @@ -44,8 +44,8 @@
44 44 case CNImagePickerEnterTypeWitness:
45 45 imagePickerVc.allowPickingImage = NO;// 显示图片
46 46 imagePickerVc.allowPickingMultipleVideo = NO;
47   - imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit;//编辑长度
48   - imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max;//编辑视频最大长度
  47 + imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit_upload;//编辑长度
  48 + imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max_upload;//编辑视频最大长度
49 49 break;
50 50 case CNImagePickedEnterTypeField:
51 51 imagePickerVc.allowPickingImage = YES;// 显示图片
... ...
Example/CNLiveImagePickerController/CNLiveViewController.m
  View file @1b87d80
... ... @@ -102,7 +102,7 @@
102 102 // options.networkAccessAllowed = YES;
103 103 [imageManager requestImageDataForAsset:assets[i] options:options resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) {
104 104 img.imageData = imageData;
105   - if (imageData.length > kChat_limit_photo) {
  105 + if (imageData.length > kChat_limit_photo_upload) {
106 106 dispatch_async(dispatch_get_main_queue(), ^{
107 107  
108 108 NSLog(@"图片过大");
... ... @@ -128,7 +128,7 @@
128 128 zipData = [UIImage zipNSDataWithImage:img];//非原图压缩1028
129 129 }
130 130  
131   - if (zipData.length > kChat_limit_photo) {//压缩后大于20M
  131 + if (zipData.length > kChat_limit_photo_upload) {//压缩后大于20M
132 132 dispatch_async(dispatch_get_main_queue(), ^{
133 133 if (isSelectOriginalPhoto) {
134 134 NSLog(@"发送的原图过大");
... ...