Commit 72a561d8ace2f3c4b7789240e8bb1290b250f50c
1 parent
cbc392e1
修复bug
Showing
2 changed files
with
10 additions
and
0 deletions
CNLiveCMineModule/Classes/CNCMine/View/CNMineEvaAlertView.m
| @@ -154,6 +154,7 @@ | @@ -154,6 +154,7 @@ | ||
| 154 | make.height.mas_equalTo(DS_adapt_length(43)); | 154 | make.height.mas_equalTo(DS_adapt_length(43)); |
| 155 | }]; | 155 | }]; |
| 156 | QMUIModalPresentationViewController *modalViewController = [[QMUIModalPresentationViewController alloc] init]; | 156 | QMUIModalPresentationViewController *modalViewController = [[QMUIModalPresentationViewController alloc] init]; |
| 157 | + modalViewController.onlyRespondsToKeyboardEventFromDescendantViews = NO; | ||
| 157 | modalViewController.contentView = alertView; | 158 | modalViewController.contentView = alertView; |
| 158 | modalViewController.modal = YES; | 159 | modalViewController.modal = YES; |
| 159 | [modalViewController showWithAnimated:YES completion:nil]; | 160 | [modalViewController showWithAnimated:YES completion:nil]; |
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMinePersonIconController.m
| @@ -217,6 +217,15 @@ | @@ -217,6 +217,15 @@ | ||
| 217 | 217 | ||
| 218 | [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) { | 218 | [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) { |
| 219 | UIImage *image = photos.firstObject; | 219 | UIImage *image = photos.firstObject; |
| 220 | + NSData *photoData = UIImageJPEGRepresentation(image,1); | ||
| 221 | + float length = [photoData length]/1000/1000; | ||
| 222 | + if (length>50 ) { | ||
| 223 | + [QMUITips showWithText:@"照片容量不能大于50M,请重选" inView:self.view]; | ||
| 224 | + return; | ||
| 225 | + }else if (image.size.width/image.size.height >10 || image.size.height/image.size.width >10){ | ||
| 226 | + [QMUITips showWithText:@"暂不支持长图" inView:self.view]; | ||
| 227 | + return; | ||
| 228 | + } | ||
| 220 | weakSelf.prepareImage = image; | 229 | weakSelf.prepareImage = image; |
| 221 | RSKImageCropViewController *imageCropVC = [[RSKImageCropViewController alloc] initWithImage:image cropMode:RSKImageCropModeCustom];//传入图片与裁剪框的类型 RSKImageCropModeCustom RSKImageCropModeSquare | 230 | RSKImageCropViewController *imageCropVC = [[RSKImageCropViewController alloc] initWithImage:image cropMode:RSKImageCropModeCustom];//传入图片与裁剪框的类型 RSKImageCropModeCustom RSKImageCropModeSquare |
| 222 | imageCropVC.delegate = weakSelf; | 231 | imageCropVC.delegate = weakSelf; |