Merge branch 'master' of github.com:lwansbrough/react-native-camera

This commit is contained in:
Lochlan Wansbrough 2016-01-31 19:28:11 -08:00
commit 84809401a5
3 changed files with 5 additions and 6 deletions

View File

@ -159,6 +159,8 @@ public class RCTCameraModule extends ReactContextBaseJavaModule {
camera.takePicture(null, null, new Camera.PictureCallback() {
@Override
public void onPictureTaken(byte[] data, Camera camera) {
camera.stopPreview();
camera.startPreview();
switch (options.getInt("target")) {
case RCT_CAMERA_CAPTURE_TARGET_MEMORY:
String encoded = Base64.encodeToString(data, Base64.DEFAULT);

View File

@ -144,6 +144,3 @@ public class RCTCameraView extends ViewGroup {
this.postInvalidate(this.getLeft(), this.getTop(), this.getRight(), this.getBottom());
}
}

View File

@ -89,6 +89,9 @@ class RCTCameraViewFinder extends TextureView implements TextureView.SurfaceText
_isStarting = true;
try {
_camera = RCTCamera.getInstance().acquireCameraInstance(_cameraType);
Camera.Parameters parameters = _camera.getParameters();
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
_camera.setParameters(parameters);
_camera.setPreviewTexture(_surfaceTexture);
_camera.startPreview();
} catch (NullPointerException e) {
@ -120,6 +123,3 @@ class RCTCameraViewFinder extends TextureView implements TextureView.SurfaceText
}
}
}