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

[android] add gps meta to android (#643)

Browse Source 
* writing metadata.location (lat and lon coords only) to the exif data... and returning the internal url for the new image (which can be used in conjunction with the RN CameraRoll)

* just a tidy up to remove some duplication and fix some logging (no functional changes)

* oops, fix typo

* docs

* added mediaUri to ios so its the same as android
This commit is contained in:
Nick Pomfret 2017-03-23 15:41:02 +00:00 committed by Zack Story
parent da68ee86a1
commit 98de15cf9a
3 changed files with 124 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -112,7 +112,9 @@ class BadInstagramCloneApp extends Component {
}
takePicture() {
this.camera.capture()
const options = {};
//options.location = ...
this.camera.capture({metadata: options})
.then((data) => console.log(data))
.catch(err => console.error(err));
}

146
android/src/main/java/com/lwansbrough/RCTCamera/RCTCameraModule.java
View File

@ -489,7 +489,7 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
return byteArray;
}
private byte[] saveImage(InputStream is, Bitmap image) {
private byte[] saveImage(Bitmap image) {
byte[] result = null;
try {
@ -502,26 +502,29 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
}
}
try {
is.close();
} catch (IOException e) {
e.printStackTrace();
}
return result;
}
private byte[] mirrorImage(byte[] data) {
ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
Bitmap photo = BitmapFactory.decodeStream(inputStream);
Bitmap photo = toBitmap(data);
Matrix m = new Matrix();
m.preScale(-1, 1);
Bitmap mirroredImage = Bitmap.createBitmap(photo, 0, 0, photo.getWidth(), photo.getHeight(), m, false);
return saveImage(inputStream, mirroredImage);
return saveImage(mirroredImage);
}
private static Bitmap toBitmap(byte[] data) {
try {
ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
Bitmap photo = BitmapFactory.decodeStream(inputStream);
inputStream.close();
return photo;
} catch (IOException e) {
throw new IllegalStateException("Will not happen", e);
}
}
private byte[] rotate(byte[] data, int exifOrientation) {
final Matrix bitmapMatrix = new Matrix();
@ -557,19 +560,17 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
break;
}
ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
Bitmap decodedBitmap = BitmapFactory.decodeStream(inputStream);
final Bitmap transformedBitmap = Bitmap.createBitmap(
Bitmap decodedBitmap = toBitmap(data);
Bitmap transformedBitmap = Bitmap.createBitmap(
decodedBitmap, 0, 0, decodedBitmap.getWidth(), decodedBitmap.getHeight(), bitmapMatrix, false
);
return saveImage(inputStream, transformedBitmap);
return saveImage(transformedBitmap);
}
private byte[] fixOrientation(byte[] data) {
final Metadata metadata;
try {
metadata = ImageMetadataReader.readMetadata(
final Metadata metadata = ImageMetadataReader.readMetadata(
new BufferedInputStream(new ByteArrayInputStream(data)), data.length
);
@ -582,7 +583,7 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
}
return data;
} catch (IOException | ImageProcessingException | MetadataException e) {
e.printStackTrace();
Log.e(TAG, "fail to fix orientation", e);
return data;
}
}
@ -593,7 +594,7 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
exif.setAttribute(ExifInterface.TAG_ORIENTATION, String.valueOf(ExifInterface.ORIENTATION_NORMAL));
exif.saveAttributes();
} catch (IOException e) {
Log.e(TAG, e.getMessage());
Log.e(TAG, "failed to save exif data", e);
}
}
@ -607,7 +608,7 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
try {
outputStream.close();
} catch (IOException e) {
e.printStackTrace();
Log.e(TAG, "problem compressing jpeg", e);
}
}
}
@ -674,10 +675,11 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
camera.stopPreview();
camera.startPreview();
WritableMap response = new WritableNativeMap();
switch (options.getInt("target")) {
case RCT_CAMERA_CAPTURE_TARGET_MEMORY:
String encoded = Base64.encodeToString(data, Base64.DEFAULT);
WritableMap response = new WritableNativeMap();
response.putString("data", encoded);
promise.resolve(response);
break;
@ -693,11 +695,12 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
promise.reject(error);
return;
}
writeLocationExifData(cameraRollFile, options);
rewriteOrientation(cameraRollFile.getAbsolutePath());
addToMediaStore(cameraRollFile.getAbsolutePath());
response.putString("path", Uri.fromFile(cameraRollFile).toString());
promise.resolve(response);
resolve(cameraRollFile, promise);
break;
}
case RCT_CAMERA_CAPTURE_TARGET_DISK: {
@ -713,9 +716,11 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
return;
}
writeLocationExifData(pictureFile, options);
rewriteOrientation(pictureFile.getAbsolutePath());
response.putString("path", Uri.fromFile(pictureFile).toString());
promise.resolve(response);
resolve(pictureFile, promise);
break;
}
case RCT_CAMERA_CAPTURE_TARGET_TEMP: {
@ -730,9 +735,11 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
promise.reject(error);
}
writeLocationExifData(tempFile, options);
rewriteOrientation(tempFile.getAbsolutePath());
response.putString("path", Uri.fromFile(tempFile).toString());
promise.resolve(response);
resolve(tempFile, promise);
break;
}
}
@ -751,6 +758,29 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
}
}
private void writeLocationExifData(File cameraRollFile, ReadableMap options) {
if(!options.hasKey("metadata"))
return;
ReadableMap metadata = options.getMap("metadata");
if (!metadata.hasKey("location"))
return;
ReadableMap location = metadata.getMap("location");
if(!location.hasKey("coords"))
return;
try {
ReadableMap coords = location.getMap("coords");
double latitude = coords.getDouble("latitude");
double longitude = coords.getDouble("longitude");
GPS.writeExifData(cameraRollFile, latitude, longitude);
} catch (IOException e) {
Log.e(TAG, "Couldn't write location data", e);
}
}
@ReactMethod
public void stopCapture(final Promise promise) {
if (mRecordingPromise != null) {
@ -881,4 +911,66 @@ public class RCTCameraModule extends ReactContextBaseJavaModule
public void onHostDestroy() {
// ... do nothing
}
private void resolve(final File imageFile, final Promise promise) {
final WritableMap response = new WritableNativeMap();
response.putString("path", Uri.fromFile(imageFile).toString());
// borrowed from react-native CameraRollManager, it finds and returns the 'internal'
// representation of the image uri that was just saved.
// e.g. content://media/external/images/media/123
MediaScannerConnection.scanFile(
_reactContext,
new String[]{imageFile.getAbsolutePath()},
null,
new MediaScannerConnection.OnScanCompletedListener() {
@Override
public void onScanCompleted(String path, Uri uri) {
if (uri != null) {
response.putString("mediaUri", uri.toString());
}
promise.resolve(response);
}
});
}
private static class GPS {
public static void writeExifData(File targetFile, double latitude, double longitude) throws IOException {
ExifInterface exif = new ExifInterface(targetFile.getAbsolutePath());
exif.setAttribute(ExifInterface.TAG_GPS_LATITUDE, toDegreeMinuteSecods(latitude));
exif.setAttribute(ExifInterface.TAG_GPS_LATITUDE_REF, latitudeRef(latitude));
exif.setAttribute(ExifInterface.TAG_GPS_LONGITUDE, toDegreeMinuteSecods(longitude));
exif.setAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF, longitudeRef(longitude));
exif.saveAttributes();
}
private static String latitudeRef(double latitude) {
return latitude < 0.0d ? "S" : "N";
}
private static String longitudeRef(double longitude) {
return longitude < 0.0d ? "W" : "E";
}
private static String toDegreeMinuteSecods(double latitude) {
latitude = Math.abs(latitude);
int degree = (int) latitude;
latitude *= 60;
latitude -= (degree * 60.0d);
int minute = (int) latitude;
latitude *= 60;
latitude -= (minute * 60.0d);
int second = (int) (latitude * 1000.0d);
StringBuffer sb = new StringBuffer();
sb.append(degree);
sb.append("/1,");
sb.append(minute);
sb.append("/1,");
sb.append(second);
sb.append("/1000,");
return sb.toString();
}
}
}

3
ios/RCTCameraManager.m
View File

@ -680,7 +680,8 @@ RCT_EXPORT_METHOD(hasFlash:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRej
else if (target == RCTCameraCaptureTargetCameraRoll) {
[[[ALAssetsLibrary alloc] init] writeImageDataToSavedPhotosAlbum:imageData metadata:metadata completionBlock:^(NSURL* url, NSError* error) {
if (error == nil) {
resolve(@{@"path":[url absoluteString]});
//path isn't really applicable here (this is an asset uri), but left it in for backward comparability
resolve(@{@"path":[url absoluteString], @"mediaUri":[url absoluteString]});
}
else {
reject(RCTErrorUnspecified, nil, RCTErrorWithMessage(error.description));