From 47da7a7c29590e1ff51e43a42ad8d64e8806c3a3 Mon Sep 17 00:00:00 2001 From: zher52 Date: Wed, 30 Dec 2020 14:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Diso13=E7=9B=B8=E6=9C=BA?= =?UTF-8?q?=E6=9C=AA=E5=85=A8=E5=B1=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ios/classes/CameraParameter.m | 2 +- src/ios/classes/CustomCamera.m | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ios/classes/CameraParameter.m b/src/ios/classes/CameraParameter.m index 5c5e933..118970d 100644 --- a/src/ios/classes/CameraParameter.m +++ b/src/ios/classes/CameraParameter.m @@ -46,7 +46,7 @@ fQuality = [[command argumentAtIndex:0] intValue]; - bOpacity = true; //[[command argumentAtIndex:7] boolValue]; + bOpacity = false; //[[command argumentAtIndex:7] boolValue]; nDefaultFlash = 2; //[[command argumentAtIndex:8] intValue]; bSwitchFlash = true; //[[command argumentAtIndex:9] boolValue]; nDefaultCamera = 0; //[[command argumentAtIndex:10] intValue]; diff --git a/src/ios/classes/CustomCamera.m b/src/ios/classes/CustomCamera.m index a2e9f1a..d2e77ce 100755 --- a/src/ios/classes/CustomCamera.m +++ b/src/ios/classes/CustomCamera.m @@ -495,7 +495,6 @@ static NSString* toBase64(NSData* data) { nDestType = 0; CameraParameter *param = [[CameraParameter alloc] initWithCommand:lastCommand]; - if (nSourceType == 0) { UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init]; imagePickerController.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; @@ -544,6 +543,9 @@ static NSString* toBase64(NSData* data) { } } }]; + if (@available(iOS 13.0, *)){ + cameraViewController.modalPresentationStyle = UIModalPresentationFullScreen; + } [self.viewController presentViewController:cameraViewController animated:YES completion:nil]; } }