From 3080f65b4fe130f362349c05d959168635565627 Mon Sep 17 00:00:00 2001 From: Christopher Dro Date: Tue, 26 Jan 2016 22:36:00 -0800 Subject: [PATCH 1/2] [Android] Add temp directory to targets --- .../RCTCamera/RCTCameraModule.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java b/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java index 28c1ae0..6866f66 100644 --- a/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java +++ b/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java @@ -33,6 +33,7 @@ public class RCTCameraModule extends ReactContextBaseJavaModule { public static final int RCT_CAMERA_CAPTURE_TARGET_MEMORY = 0; public static final int RCT_CAMERA_CAPTURE_TARGET_DISK = 1; public static final int RCT_CAMERA_CAPTURE_TARGET_CAMERA_ROLL = 2; + public static final int RCT_CAMERA_CAPTURE_TARGET_TEMP = 3; public static final int RCT_CAMERA_ORIENTATION_AUTO = 0; public static final int RCT_CAMERA_ORIENTATION_LANDSCAPE_LEFT = 1; public static final int RCT_CAMERA_ORIENTATION_LANDSCAPE_RIGHT = 2; @@ -109,6 +110,7 @@ public class RCTCameraModule extends ReactContextBaseJavaModule { put("memory", RCT_CAMERA_CAPTURE_TARGET_MEMORY); put("disk", RCT_CAMERA_CAPTURE_TARGET_DISK); put("cameraRoll", RCT_CAMERA_CAPTURE_TARGET_CAMERA_ROLL); + put("temp", RCT_CAMERA_CAPTURE_TARGET_TEMP); } }); } @@ -189,6 +191,25 @@ public class RCTCameraModule extends ReactContextBaseJavaModule { } callback.invoke(null, Uri.fromFile(pictureFile).toString()); break; + case RCT_CAMERA_CAPTURE_TARGET_TEMP: + File tempFile = getTempMediaFile(MEDIA_TYPE_IMAGE); + + if (tempFile == null) { + callback.invoke("Error creating media file.", null); + return; + } + + try { + FileOutputStream fos = new FileOutputStream(tempFile); + fos.write(data); + fos.close(); + } catch (FileNotFoundException e) { + callback.invoke("File not found: " + e.getMessage(), null); + } catch (IOException e) { + callback.invoke("Error accessing file: " + e.getMessage(), null); + } + callback.invoke(null, Uri.fromFile(tempFile).toString()); + break; } } }); @@ -226,4 +247,26 @@ public class RCTCameraModule extends ReactContextBaseJavaModule { } return mediaFile; } + + + private File getTempMediaFile(int type) { + try { + String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date()); + File outputDir = _reactContext.getCacheDir(); + File outputFile; + + if (type == MEDIA_TYPE_IMAGE) { + outputFile = File.createTempFile("IMG_" + timeStamp, "jpg", outputDir); + } else if (type == MEDIA_TYPE_VIDEO) { + outputFile = File.createTempFile("VID_" + timeStamp, "mp4", outputDir); + } else { + Log.e(TAG, "Unsupported media type:" + type); + return null; + } + return outputFile; + } catch (Exception e) { + Log.e(TAG, e.getMessage()); + return null; + } + } } From d0355fe2e67efc70ccfb24919d75937e488262e5 Mon Sep 17 00:00:00 2001 From: Christopher Dro Date: Tue, 26 Jan 2016 22:37:06 -0800 Subject: [PATCH 2/2] [Docs] Add capture target temp to readme --- README.md | 4 ++-- .../main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cb1fef4..28ecd99 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # react-native-camera [![npm version](https://badge.fury.io/js/react-native-camera.svg)](http://badge.fury.io/js/react-native-camera) [![Gitter](https://badges.gitter.im/lwansbrough/react-native-camera.svg)](https://gitter.im/lwansbrough/react-native-camera) -A camera module for React Native. +A camera module for React Native. ![](https://i.imgur.com/5j2JdUk.gif) ## Known Issues @@ -154,7 +154,7 @@ The type of capture that will be performed by the camera - either a still image #### `captureTarget` -Values: `Camera.constants.CaptureTarget.cameraRoll` (default), `Camera.constants.CaptureTarget.disk`, ~~`Camera.constants.CaptureTarget.memory`~~ (deprecated), +Values: `Camera.constants.CaptureTarget.cameraRoll` (default), `Camera.constants.CaptureTarget.disk`, `Camera.constants.CaptureTarget.temp`, ~~`Camera.constants.CaptureTarget.memory`~~ (deprecated), This property allows you to specify the target output of the captured image data. By default the image binary is sent back as a base 64 encoded string. The disk output has been shown to improve capture response time, so that is the recommended value. diff --git a/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java b/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java index 6866f66..06ab65f 100644 --- a/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java +++ b/android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java @@ -256,9 +256,9 @@ public class RCTCameraModule extends ReactContextBaseJavaModule { File outputFile; if (type == MEDIA_TYPE_IMAGE) { - outputFile = File.createTempFile("IMG_" + timeStamp, "jpg", outputDir); + outputFile = File.createTempFile("IMG_" + timeStamp, ".jpg", outputDir); } else if (type == MEDIA_TYPE_VIDEO) { - outputFile = File.createTempFile("VID_" + timeStamp, "mp4", outputDir); + outputFile = File.createTempFile("VID_" + timeStamp, ".mp4", outputDir); } else { Log.e(TAG, "Unsupported media type:" + type); return null;