Commit 95de71f51d17e29d57bb07f44d82a76eb8d602ba
1 parent
5b54b59d
提交0.1.6
Showing
3 changed files
with
15 additions
and
15 deletions
CNLiveUploadManager.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 = 'CNLiveUploadManager' | 10 | s.name = 'CNLiveUploadManager' |
| 11 | - s.version = '0.1.5' | 11 | + s.version = '0.1.6' |
| 12 | s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取' | 12 | s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取' |
| 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. |
CNLiveUploadManager/Classes/CNLiveUploadManager.h
| @@ -34,6 +34,20 @@ | @@ -34,6 +34,20 @@ | ||
| 34 | #define kCNUploadSize50MB 50*1024*1024 //用于大于50MB的变为640*480分辨率 | 34 | #define kCNUploadSize50MB 50*1024*1024 //用于大于50MB的变为640*480分辨率 |
| 35 | #define kCNUploadSize100MB 100*1024*1024 //用于大于100MB的变为640*480分辨率 | 35 | #define kCNUploadSize100MB 100*1024*1024 //用于大于100MB的变为640*480分辨率 |
| 36 | 36 | ||
| 37 | +//////////////////////////////////////////////////////// | ||
| 38 | +//////////// 发送图片,视频限制 | ||
| 39 | +//////////////////////////////////////////////////////// | ||
| 40 | +#define kFriendsCircle_limit_photo 20*1024.0*1024.0 //朋友圈限制图片20M | ||
| 41 | +#define kFirendsCircle_limit_video 30*1024.0*1024.0 //朋友圈限制视频30M | ||
| 42 | +#define kTarentoComment_limit_photo 10*1024.0*1024.0 //达人评论10M | ||
| 43 | +#define kSweepCode_limit_phoho 10*1024.0*1024.0 //扫码10M限制 | ||
| 44 | +#define kChat_limit_photo 20*1024.0*1024.0 //聊天限制图片20M | ||
| 45 | +#define kChat_limit_video 20*1024.0*1024.0 //聊天限制视频20M | ||
| 46 | +#define kChatBackgroupImage_limit_photo 5*1024.0*1024.0 //聊天背景图限制5 M | ||
| 47 | +#define kChat_limit_video_length 5*60 //聊天限制视频5分钟 | ||
| 48 | +#define kFriendsCircle_limit_video_maxEdit 5*60 //朋友圈限制视频5分钟 | ||
| 49 | +#define kFriendsCircle_limit_video_max 10*60 //朋友圈限制最大视频编辑10分钟 | ||
| 50 | + | ||
| 37 | typedef NS_ENUM(NSUInteger, CNLiveUploadType) { | 51 | typedef NS_ENUM(NSUInteger, CNLiveUploadType) { |
| 38 | CNLiveUploadTypeQN,//七牛 | 52 | CNLiveUploadTypeQN,//七牛 |
| 39 | CNLiveUploadTypeKS,//金山 | 53 | CNLiveUploadTypeKS,//金山 |
CNLiveUploadManager/Classes/CNLiveUploadManager.m
| @@ -11,20 +11,6 @@ | @@ -11,20 +11,6 @@ | ||
| 11 | #define kiOS9_1Later ([UIDevice currentDevice].systemVersion.floatValue >= 9.1f) | 11 | #define kiOS9_1Later ([UIDevice currentDevice].systemVersion.floatValue >= 9.1f) |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | -//////////////////////////////////////////////////////// | ||
| 15 | -//////////// 发送图片,视频限制 | ||
| 16 | -//////////////////////////////////////////////////////// | ||
| 17 | -#define kFriendsCircle_limit_photo 20*1024.0*1024.0 //朋友圈限制图片20M | ||
| 18 | -#define kFirendsCircle_limit_video 30*1024.0*1024.0 //朋友圈限制视频30M | ||
| 19 | -#define kTarentoComment_limit_photo 10*1024.0*1024.0 //达人评论10M | ||
| 20 | -#define kSweepCode_limit_phoho 10*1024.0*1024.0 //扫码10M限制 | ||
| 21 | -#define kChat_limit_photo 20*1024.0*1024.0 //聊天限制图片20M | ||
| 22 | -#define kChat_limit_video 20*1024.0*1024.0 //聊天限制视频20M | ||
| 23 | -#define kChatBackgroupImage_limit_photo 5*1024.0*1024.0 //聊天背景图限制5 M | ||
| 24 | -#define kChat_limit_video_length 5*60 //聊天限制视频5分钟 | ||
| 25 | -#define kFriendsCircle_limit_video_maxEdit 5*60 //朋友圈限制视频5分钟 | ||
| 26 | -#define kFriendsCircle_limit_video_max 10*60 //朋友圈限制最大视频编辑10分钟 | ||
| 27 | - | ||
| 28 | 14 | ||
| 29 | 15 | ||
| 30 | #pragma mark - 七牛category | 16 | #pragma mark - 七牛category |