Merge branch 'master' of https://github.com/Anyline/anyline-ocr-react…

…-native-module
Anyline · Mar 14, 2020 · 80a30b7 · 80a30b7
2 parents 438455f + f0b4353
commit 80a30b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/example/RNExampleApp/config/DialMeterConfig.js b/example/RNExampleApp/config/DialMeterConfig.js
@@ -24,12 +24,12 @@ export default {
         },
         "viewPlugin": {
             "plugin": {
-                "id": "Meter_ID",
+                "id": "DIAL_METER",
                 "meterPlugin": {
                     "scanMode": "DIAL_METER"
                 }
             },
-            "cutout": {
+            "cutoutConfig": {
                 "style": "rect",
                 "maxWidthPercent": "90%",
                 "maxHeightPercent": "90%",
@@ -54,12 +54,13 @@ export default {
                 "cornerRadius": 4,
                 "strokeColor": "FFFFFF",
                 "outerColor": "000000",
-                "outerAlpha": 0.3
+                "outerAlpha": 0.3,
+	        "feedbackStrokeColor": "0099FF"
             },
             "scanFeedback": {
-                "style": "CONTOUR_RECT",
-                "strokeColor": "0099FF",
-                "fillColor": "220099FF",
+	        "style": "CONTOUR_RECT",
+        	"strokeColor": "0099FF",
+	        "fillColor": "220099FF",
                 "blinkOnResult": true,
                 "beepOnResult": true,
                 "vibrateOnResult": true

diff --git a/plugin/android/src/main/java/com/anyline/reactnative/Anyline4Activity.java b/plugin/android/src/main/java/com/anyline/reactnative/Anyline4Activity.java
@@ -242,6 +242,7 @@ public void onResult(ScanResult result) {
                                         jsonMeterResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, subResult,
                                                                                          jsonMeterResult);
                                         jsonResult.put(subResult.getPluginId(), jsonMeterResult);
+                                        AnylinePluginHelper.clearFinalBarcodeList();	// otherwise result from previous scan could be shown if new scan does not include barcode
 
                                     } catch (Exception e) {
                                         Log.e(TAG, "EXCEPTION", e);
@@ -427,6 +428,7 @@ public void onResult(MeterScanResult meterScanResult) {
                             }
 
                             setResult(scanViewPlugin, jsonResult);
+                            AnylinePluginHelper.clearFinalBarcodeList();	// otherwise result from previous scan could be shown if new scan does not include barcode
                         }
                     });
                 }

diff --git a/plugin/android/src/main/java/com/anyline/reactnative/AnylinePluginHelper.java b/plugin/android/src/main/java/com/anyline/reactnative/AnylinePluginHelper.java
@@ -120,6 +120,10 @@ public static boolean getNativeBarcodeMode() {
         return nativeBarcodeEnabled;
     }
 
+    public static void clearFinalBarcodeList() {
+        finalBarcodeList=null;
+    }
+
     public static JSONArray arrayOfDetectedBarcodes() {
 
         if (nativeBarcodeEnabled) {
@@ -261,7 +265,7 @@ public static void enableNativeBarcode(ScanView anylineScanView, final List<Barc
         anylineScanView.getCameraView().enableBarcodeDetection(new NativeBarcodeResultListener() {
             @Override
             public void onFailure(String e) {
-                finalBarcodeList=null;  // otherwise result from previous scan would be shown
+                //finalBarcodeList=null;  // otherwise result from previous scan would be shown
             }
 
             @Override