status-im/react-native-camera
2
0
Fork 0
mirror of https://github.com/status-im/react-native-camera.git synced 2025-02-24 17:58:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1571 from mirceanis/bugfix/reenable-camera-on-emulator

Browse Source 
reenable camera on android emulator
This commit is contained in:
João Guilherme Fidelis 2018-05-18 14:20:18 -03:00 committed by GitHub
commit a2aee1eb98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/src/main/java/org/reactnative/camera/CameraModule.java
View File

@ -190,18 +190,11 @@ public class CameraModule extends ReactContextBaseJavaModule {
public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) { public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
RNCameraView cameraView = (RNCameraView) nativeViewHierarchyManager.resolveView(viewTag); RNCameraView cameraView = (RNCameraView) nativeViewHierarchyManager.resolveView(viewTag);
try { try {
if (!Build.FINGERPRINT.contains("generic")) {
if (cameraView.isCameraOpened()) { if (cameraView.isCameraOpened()) {
cameraView.takePicture(options, promise, cacheDirectory); cameraView.takePicture(options, promise, cacheDirectory);
} else { } else {
promise.reject("E_CAMERA_UNAVAILABLE", "Camera is not running"); promise.reject("E_CAMERA_UNAVAILABLE", "Camera is not running");
} }
} else {
Bitmap image = RNCameraViewHelper.generateSimulatorPhoto(cameraView.getWidth(), cameraView.getHeight());
ByteArrayOutputStream stream = new ByteArrayOutputStream();
image.compress(Bitmap.CompressFormat.JPEG, 100, stream);
new ResolveTakenPictureAsyncTask(stream.toByteArray(), promise, options, cacheDirectory).execute();
}
} catch (Exception e) { } catch (Exception e) {
promise.reject("E_CAMERA_BAD_VIEWTAG", "takePictureAsync: Expected a Camera component"); promise.reject("E_CAMERA_BAD_VIEWTAG", "takePictureAsync: Expected a Camera component");
} }

2
android/src/main/java/org/reactnative/camera/RNCameraView.java
View File

@ -442,10 +442,8 @@ public class RNCameraView extends CameraView implements LifecycleEventListener,
if ((mIsPaused && !isCameraOpened()) || mIsNew) { if ((mIsPaused && !isCameraOpened()) || mIsNew) {
mIsPaused = false; mIsPaused = false;
mIsNew = false; mIsNew = false;
if (!Build.FINGERPRINT.contains("generic")) {
start(); start();
} }
}
} else { } else {
RNCameraViewHelper.emitMountErrorEvent(this, "Camera permissions not granted - component could not be rendered."); RNCameraViewHelper.emitMountErrorEvent(this, "Camera permissions not granted - component could not be rendered.");
} }