status-im
/
react-native-camera
mirror of https://github.com/status-im/react-native-camera.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add bounds to barcodeReadEvent

This commit is contained in:
Simon Ermler 2018-03-26 23:15:59 +02:00
parent c839f11f45
commit 6939734ba3
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/src/main/java/org/reactnative/camera/events/BarCodeReadEvent.java
View File

@ -4,10 +4,12 @@ import android.support.v4.util.Pools;
import org.reactnative.camera.CameraViewManager; import org.reactnative.camera.CameraViewManager;
import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap; import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event; import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.RCTEventEmitter; import com.facebook.react.uimanager.events.RCTEventEmitter;
import com.google.zxing.Result; import com.google.zxing.Result;
import com.google.zxing.ResultPoint;
import java.util.Date; import java.util.Date;
@ -62,7 +64,15 @@ public class BarCodeReadEvent extends Event<BarCodeReadEvent> {
event.putInt("target", getViewTag()); event.putInt("target", getViewTag());
event.putString("data", mBarCode.getText()); event.putString("data", mBarCode.getText());
event.putString("type", mBarCode.getBarcodeFormat().toString()); event.putString("type", mBarCode.getBarcodeFormat().toString());
WritableArray resultPoints = Arguments.createArray();
ResultPoint[] points = mBarCode.getResultPoints();
for (ResultPoint point: points) {
WritableMap newPoint = Arguments.createMap();
newPoint.putString("x", String.valueOf(point.getX()));
newPoint.putString("y", String.valueOf(point.getY()));
resultPoints.pushMap(newPoint);
}
event.putArray("bounds",resultPoints);
return event; return event;
} }
} }

14
ios/RN/RNCamera.m
View File

@ -702,10 +702,20 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
AVMetadataMachineReadableCodeObject *codeMetadata = (AVMetadataMachineReadableCodeObject *) metadata; AVMetadataMachineReadableCodeObject *codeMetadata = (AVMetadataMachineReadableCodeObject *) metadata;
for (id barcodeType in self.barCodeTypes) { for (id barcodeType in self.barCodeTypes) {
if ([metadata.type isEqualToString:barcodeType]) { if ([metadata.type isEqualToString:barcodeType]) {
AVMetadataMachineReadableCodeObject *transformed = (AVMetadataMachineReadableCodeObject *)[_previewLayer transformedMetadataObjectForMetadataObject:metadata];
NSDictionary *event = @{ NSDictionary *event = @{
@"type" : codeMetadata.type, @"type" : codeMetadata.type,
@"data" : codeMetadata.stringValue @"data" : codeMetadata.stringValue,
@"bounds": @{
@"origin": @{
@"x": [NSString stringWithFormat:@"%f", transformed.bounds.origin.x],
@"y": [NSString stringWithFormat:@"%f", transformed.bounds.origin.y]
},
@"size": @{
@"height": [NSString stringWithFormat:@"%f", transformed.bounds.size.height],
@"width": [NSString stringWithFormat:@"%f", transformed.bounds.size.width]
}
}
}; };
[self onCodeRead:event]; [self onCodeRead:event];

5
types/index.d.ts vendored
View File

@ -57,8 +57,9 @@ export interface RNCameraProps {
// -- BARCODE PROPS // -- BARCODE PROPS
barCodeTypes?: Array<keyof BarCodeType>; barCodeTypes?: Array<keyof BarCodeType>;
onBarCodeRead?(event: { onBarCodeRead?(event: {
data: string data: string,
type: keyof BarCodeType type: keyof BarCodeType,
bounds:[{x:string,y:string}]|{origin:{x:string,y:string},size:{height:string,width:string}}
}): void; }): void;
// -- FACE DETECTION PROPS // -- FACE DETECTION PROPS