react-native-scanbot-barcode-scanner-sdk 3.2.1-rc1 → 3.2.1-rc2

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkModule.java

@@ -18,12 +18,15 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
+import org.json.JSONArray;
+import org.json.JSONException;
 
 import java.io.File;
 import java.io.IOException;
@@ -182,19 +185,22 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
 
                 detector.modifyConfig(new ScanbotBarcodeDetectorConfigBuilder(options));
 
-                final BarcodeScanningResult result = detector.detectFromBitmap(bitmap, 0);
                 WritableMap jsonResult;
-
-                final boolean shouldFilterBarcodes = options.hasKey("barcodeFilter");
-                if (shouldFilterBarcodes) {
-                    final BarcodeFilter barcodeFilter = JSONUtils.extractBarcodeFilter(options);
-                    if (barcodeFilter == null) {
-                        throw new IllegalArgumentException("Invalid Barcode Filter specified in JSON configuration: " + options.getString("barcodeFilter"));
-                    }
-                    final List<BarcodeItem> barcodeItems = JSONUtils.getBarcodeItemsFromResultWithFilter(result, barcodeFilter);
-                    jsonResult = jsonResultFromBarcodeScannerResult(barcodeItems);
+                final BarcodeScanningResult result = detector.detectFromBitmap(bitmap, 0);
+                if (result == null) {
+                    jsonResult = JSONUtils.jsonResultFromBarcodeItems(new ArrayList<>());
                 } else {
-                    jsonResult = jsonResultFromBarcodeScannerResult(result);
+                    final boolean shouldFilterBarcodes = options.hasKey("barcodeFilter");
+                    if (shouldFilterBarcodes) {
+                        final BarcodeFilter barcodeFilter = JSONUtils.extractBarcodeFilter(options);
+                        if (barcodeFilter == null) {
+                            throw new IllegalArgumentException("Invalid Barcode Filter specified in JSON configuration: " + options.getString("barcodeFilter"));
+                        }
+                        final List<BarcodeItem> barcodeItems = JSONUtils.getBarcodeItemsFromResultWithFilter(result, barcodeFilter);
+                        jsonResult = JSONUtils.jsonResultFromBarcodeItems(barcodeItems);
+                    } else {
+                        jsonResult = JSONUtils.jsonResultFromBarcodeResult(result);
+                    }
                 }
 
                 jsonResult.putString("imageFileUri", imageUri);
@@ -349,7 +355,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         final BarcodeScannerActivity.Result barcodeResult = BarcodeScannerActivity.extractResult(resultCode, intent);
 
         if (barcodeResult.getResultOk()) {
-            final WritableMap result = jsonResultFromBarcodeScannerResult(barcodeResult.getResult());
+            final WritableMap result = JSONUtils.jsonResultFromBarcodeResult(barcodeResult.getResult());
 
             String imagePath = intent.getStringExtra(BarcodeScannerActivity.SCANNED_BARCODE_IMAGE_PATH_EXTRA);
             if (imagePath == null) {
@@ -378,27 +384,6 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         }
     }
 
-    private static WritableMap jsonResultFromBarcodeScannerResult(List<BarcodeItem> barcodeItems) {
-        final WritableArray barcodes = Arguments.createArray();
-        for (BarcodeItem barcodeItem : barcodeItems) {
-            final WritableMap barcode = Arguments.createMap();
-            barcode.putString("type", barcodeItem.getBarcodeFormat().name());
-            barcode.putString("text", barcodeItem.getText());
-            barcode.putString("textWithExtension", barcodeItem.getTextWithExtension());
-            barcodes.pushMap(barcode);
-        }
-        final WritableMap result = Arguments.createMap();
-        result.putString("status", "OK");
-        result.putArray("barcodes", barcodes);
-        return result;
-    }
-
-    private static WritableMap jsonResultFromBarcodeScannerResult(BarcodeScanningResult barcodeResult) {
-        return jsonResultFromBarcodeScannerResult(
-            barcodeResult != null ? barcodeResult.getBarcodeItems() : new ArrayList<>()
-        );
-    }
-
     @NotNull
     @Contract(pure = true)
     private static String descriptionFromLicenseStatus(@NotNull io.scanbot.sap.Status status) {

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcodecameraview/RNScanbotBarcodeCameraComponent.java

@@ -207,22 +207,7 @@ public class RNScanbotBarcodeCameraComponent extends RNScanbotNativeComponent im
             return;
         }
 
-        final WritableArray barcodes = new WritableNativeArray();
-
-        for (BarcodeItem item: barcodeItems) {
-            final WritableMap barcode = new JSONUtils.WritableMapBuilder()
-                    .putString("text", item.getText())
-                    .putString("type", item.getBarcodeFormat().name())
-                    .putString("textWithExtension", item.getTextWithExtension())
-                    .build();
-            barcodes.pushMap(barcode);
-        }
-
-        final WritableMap result = new JSONUtils.WritableMapBuilder()
-                .putString("status", "OK")
-                .putArray("barcodes", barcodes)
-                .build();
-
+        final ReadableMap result = JSONUtils.jsonResultFromBarcodeItems(barcodeItems);
         final WritableMap data = new JSONUtils.WritableMapBuilder()
                 .putMap("result", result)
                 .build();

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/utils/JSONUtils.java

@@ -294,4 +294,39 @@ public final class JSONUtils {
         }
         return map.getBoolean(key);
     }
+
+    public static WritableMap jsonResultFromBarcodeResult(BarcodeScanningResult barcodeResult) {
+        return jsonResultFromBarcodeItems(
+                barcodeResult != null ? barcodeResult.getBarcodeItems() : new ArrayList<>()
+        );
+    }
+
+    public static WritableMap jsonResultFromBarcodeItems(List<BarcodeItem> barcodeItems) {
+        final WritableArray barcodes = Arguments.createArray();
+        for (BarcodeItem barcodeItem : barcodeItems) {
+            final WritableMap barcode = Arguments.createMap();
+            barcode.putString("type", barcodeItem.getBarcodeFormat().name());
+            barcode.putString("text", barcodeItem.getText());
+            barcode.putString("textWithExtension", barcodeItem.getTextWithExtension());
+            barcode.putArray("rawBytes", jsonFromRawBytes(barcodeItem.getRawBytes()));
+            barcodes.pushMap(barcode);
+        }
+        final WritableMap result = Arguments.createMap();
+        result.putString("status", "OK");
+        result.putArray("barcodes", barcodes);
+        return result;
+    }
+
+    public static ReadableArray jsonFromRawBytes(byte[] rawBytes) {
+        final WritableArray jsonArray = Arguments.createArray();
+        if (rawBytes.length == 0) {
+            return jsonArray;
+        }
+
+        for (byte b: rawBytes) {
+            jsonArray.pushInt(b);
+        }
+
+        return jsonArray;
+    }
 }

package/index.d.ts

@@ -3,7 +3,7 @@ import { BarcodeScannerConfiguration, BatchBarcodeScannerConfiguration, DetectBa
 import { BarcodeDocumentFormat, BarcodeFormat, EngineMode } from "./src/enum";
 import { BarcodeResult, BarcodeScannerResult, BatchBarcodeScannerResult } from "./src/result";
 import { ScanbotBarcodeCameraView } from "./src/components/barcode-camera-view/scanbot-barcode-camera-view";
-import { ScanbotBarcodeCameraViewConfiguration, ScanbotBarcodeCameraViewResult} from "./src/components/barcode-camera-view/scanbot-barcode-camera-view-types";
+import { ScanbotBarcodeCameraViewConfiguration} from "./src/components/barcode-camera-view/scanbot-barcode-camera-view-types";
 
 export {
     BarcodeScannerConfiguration,
@@ -15,7 +15,6 @@ export {
     BatchBarcodeScannerResult,
     ScanbotBarcodeCameraView,
     ScanbotBarcodeCameraViewConfiguration,
-    ScanbotBarcodeCameraViewResult,
     EngineMode
 }
 

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.m

@@ -178,20 +178,10 @@
         results = filterBarcodeResults(results, _cameraViewConfiguration.barcodeFilter);
     }
     
-    NSMutableArray* jsonBarcodes = [[NSMutableArray alloc] init];
-    
-    for (SBSDKBarcodeScannerResult* result in results) {
-        [jsonBarcodes addObject:@{
-            @"text": result.rawTextString,
-            @"type": result.type.name,
-            @"textWithExtension": result.rawTextStringWithExtension,
-        }];
-    }
-    
     NSDictionary* outResult = @{
         @"result": @{
             @"status": @"OK",
-            @"barcodes": jsonBarcodes
+            @"barcodes": jsonFromBarcodeResults(results)
         }
     };
     

package/ios/ScanbotBarcodeSdk.m

@@ -267,9 +267,13 @@ RCT_EXPORT_METHOD(detectBarcodesOnImage:(NSDictionary *)configuration
         }
         NSArray<SBSDKBarcodeScannerResult *> *barcodeResults = [barcodeScanner detectBarCodesOnImage:image];
         
-        SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilter(configuration);
-        if (barcodeFilter != nil) {
-            barcodeResults = filterBarcodeResults(barcodeResults, barcodeFilter);
+        if (barcodeResults) {
+            SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilter(configuration);
+            if (barcodeFilter != nil) {
+                barcodeResults = filterBarcodeResults(barcodeResults, barcodeFilter);
+            }
+        } else {
+            barcodeResults = [[NSArray alloc] init];
         }
         
         resolve(@{

package/ios/Utils/BarcodeMapping.h

@@ -44,6 +44,17 @@ static inline SBSDKBarcodeDocumentType* barcodeDocumentTypeFromString(NSString*
     return nil;
 }
 
+static inline NSArray<NSNumber*>* jsonFromRawBytes(NSData* rawBytes) {
+    NSMutableArray<NSNumber*>* byteArray = [[NSMutableArray alloc] init];
+    uint8_t* bytePtr = (uint8_t*)[rawBytes bytes];
+    NSInteger totalData = [rawBytes length] / sizeof(uint8_t);
+    for (int i=0 ; i<totalData; i++) {
+        uint8_t current = bytePtr[i];
+        [byteArray addObject:[[NSNumber alloc] initWithUnsignedChar:current]];
+    }
+    return byteArray;
+}
+
 static inline NSString* stringFromBarcodeType(SBSDKBarcodeType* type) {
     if ([type.name isEqualToString:@"QRCode"]) {
         return @"QR_CODE";
@@ -60,11 +71,11 @@ static inline NSString* stringFromBarcodeType(SBSDKBarcodeType* type) {
 }
 
 static inline NSDictionary<NSString*, NSObject*>* jsonFromBarcodeResult(SBSDKBarcodeScannerResult *result) {
-
     NSMutableDictionary* x = @{
         @"type": stringFromBarcodeType(result.type),
         @"text": result.rawTextString,
         @"textWithExtension": result.rawTextStringWithExtension,
+        @"rawBytes": jsonFromRawBytes(result.rawBytes)
     }.mutableCopy;
     return x.copy;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "3.2.1-rc1",
+  "version": "3.2.1-rc2",
   "description": "Scanbot Barcode Scanner SDK React Native Plugin for Android and iOS",
   "main": "index.js",
   "files": [

package/src/components/barcode-camera-view/scanbot-barcode-camera-view-types.tsx

@@ -1,4 +1,5 @@
 import { StyleProp, ViewStyle } from 'react-native';
+import { BarcodeResult } from 'react-native-scanbot-barcode-scanner-sdk';
 import {
   BarcodeDocumentFormat,
   BarcodeFilter,
@@ -9,7 +10,7 @@ import {
 import { FinderAspectRatio } from '../../model';
 
 export interface ScanbotBarcodeCameraViewProperties {
-  onBarcodeScannerResult?: (result: ScanbotBarcodeCameraViewResult) => void;
+  onBarcodeScannerResult?: (result: BarcodeResult) => void;
   requestComponentReload?: () => void;
   configuration?: ScanbotBarcodeCameraViewConfiguration;
   style: StyleProp<ViewStyle>;
@@ -21,11 +22,6 @@ export interface ScanbotBarcodeCameraViewBarcode {
   type: string;
 }
 
-export type ScanbotBarcodeCameraViewResult = {
-  status: 'OK' | 'CANCELED';
-  barcodes: ScanbotBarcodeCameraViewBarcode[];
-};
-
 export interface ScanbotBarcodeCameraViewConfiguration {
   /**
    * The finder view is a rectangular overlay view that clips the camera view,

package/src/result.ts

@@ -15,11 +15,16 @@ export interface BarcodeResultField {
      * The raw text encoded in the barcode that also includes the extension, if detected
      */
     textWithExtension: string;
+
+    /**
+    * The array of raw bytes contained in the barcode.
+    */
+    rawBytes: number[]; 
 }
 
 export interface BarcodeResult {
     status: Status;
-    barcodes?: BarcodeResultField[];
+    barcodes: BarcodeResultField[];
 }
 
 export type BarcodeScannerResult = BarcodeResult & {