anyline-ocr-react-native-module 42.0.0 → 42.2.0

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Feb 16 10:59:23 CET 2022
+#Wed Nov 16 08:16:14 CET 2022
 gradle.version=6.7

package/android/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>

package/android/.idea/gradle.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

package/android/.idea/jarRepositories.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://anylinesdk.blob.core.windows.net/testing/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://anylinesdk.blob.core.windows.net/maven/" />
+    </remote-repository>
+  </component>
+</project>

package/android/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

package/android/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

package/android/build.gradle

@@ -19,11 +19,11 @@ allprojects {
 
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
         ndk {
@@ -65,7 +65,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:42.0.0'
+    implementation 'io.anyline:anylinesdk:42.2.0'
     implementation "com.facebook.react:react-native:+"  // from node_modules
     implementation("com.google.android.material:material:1.4.0-rc01")
     implementation 'androidx.multidex:multidex:2.0.1'

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Nov 16 08:15:22 CET 2022
+sdk.dir=/Users/patrickfekete/Library/Android/sdk

package/android/src/main/java/com/anyline/reactnative/Anyline4Activity.java

@@ -51,9 +51,9 @@ import io.anyline.plugin.meter.MeterScanViewPlugin;
 import io.anyline.plugin.ocr.OcrScanResult;
 import io.anyline.plugin.ocr.OcrScanViewPlugin;
 import io.anyline.plugin.tire.TireScanResult;
-import io.anyline.plugin.tire.TireScanPlugin;
 import io.anyline.plugin.tire.TireScanViewPlugin;
 import io.anyline.view.AbstractBaseScanViewPlugin;
+import io.anyline.plugin.tire.TireSizeScanResult;
 import io.anyline.view.CutoutRect;
 import io.anyline.view.ParallelScanViewComposite;
 import io.anyline.view.ScanView;
@@ -62,7 +62,7 @@ import io.anyline.view.SerialScanViewComposite;
 
 public class Anyline4Activity extends AnylineBaseActivity {
     private static final String TAG = Anyline4Activity.class.getSimpleName();
-
+    private static final String KEY_DEFAULT_ORIENTATION_APPLIED = "default_orientation_applied";
     private ScanView anylineScanView;
     private AbstractBaseScanViewPlugin scanViewPlugin;
     private RadioGroup radioGroup;
@@ -71,7 +71,6 @@ public class Anyline4Activity extends AnylineBaseActivity {
     private Boolean isFirstCameraOpen; // only if camera is opened the first time get coordinates of the cutout to avoid flickering when switching between analog and digital
     private RelativeLayout parentLayout;
     private boolean defaultOrientationApplied;
-    private static final String KEY_DEFAULT_ORIENTATION_APPLIED = "default_orientation_applied";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -241,8 +240,8 @@ public class Anyline4Activity extends AnylineBaseActivity {
                                 } else if (subResult instanceof BarcodeScanResult) {
                                     try {
                                         jsonResult.put(
-                                            subResult.getPluginId(), 
-                                            extractBarcodeResult(jsonResult, subResult)
+                                                subResult.getPluginId(),
+                                                extractBarcodeResult(jsonResult, subResult)
                                         );
                                     } catch (Exception e) {
                                         Log.e(TAG, "EXCEPTION", e);
@@ -264,23 +263,19 @@ public class Anyline4Activity extends AnylineBaseActivity {
                         }
                     });
                 } else if (scanViewPlugin instanceof LicensePlateScanViewPlugin) {
-                    scanViewPlugin.addScanResultListener(new ScanResultListener<LicensePlateScanResult>() {
-                        @Override
-                        public void onResult(LicensePlateScanResult licensePlateResult) {
-                            JSONObject jsonResult = new JSONObject();
-                            try {
-                                jsonResult.put("country", licensePlateResult.getCountry());
-                                jsonResult.put("licensePlate", licensePlateResult.getResult());
-
-                                jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, licensePlateResult,
-                                        jsonResult);
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-
-                            setResult(scanViewPlugin, jsonResult);
+                    scanViewPlugin.addScanResultListener((ScanResultListener<LicensePlateScanResult>) licensePlateResult -> {
+                        JSONObject jsonResult = new JSONObject();
+                        try {
+                            jsonResult.put("country", licensePlateResult.getCountry());
+                            jsonResult.put("licensePlate", licensePlateResult.getResult());
+
+                            jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, licensePlateResult,
+                                    jsonResult);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
                         }
 
+                        setResult(scanViewPlugin, jsonResult);
                     });
                 } else if (scanViewPlugin instanceof IdScanViewPlugin) {
                     if (((IdScanPlugin) ((IdScanViewPlugin) scanViewPlugin).getScanPlugin()).getIdConfig() instanceof MrzConfig) {
@@ -290,90 +285,79 @@ public class Anyline4Activity extends AnylineBaseActivity {
                             cropAndTransformError = json.getString("cropAndTransformErrorMessage");
                         }
 
-                        scanViewPlugin.addScanResultListener(new ScanResultListener<ScanResult<ID>>() {
-                            @Override
-                            public void onResult(ScanResult<ID> idScanResult) {
-                                JSONObject jsonResult = ((MrzIdentification) idScanResult.getResult()).toJSONObject();
-                                try {
-                                    if (jsonResult.get("issuingCountryCode").equals("D")
-                                            && jsonResult.get("documentType").equals("ID")) {
-                                        if (jsonResult.get("issuingCountryCode").equals("D")) {
-                                            jsonResult.put("address", jsonResult.get("address"));
-                                        } else {
-                                            jsonResult.remove("address");
-                                        }
-
+                        scanViewPlugin.addScanResultListener((ScanResultListener<ScanResult<ID>>) idScanResult -> {
+                            JSONObject jsonResult = ((MrzIdentification) idScanResult.getResult()).toJSONObject();
+                            try {
+                                if (jsonResult.get("issuingCountryCode").equals("D")
+                                        && jsonResult.get("documentType").equals("ID")) {
+                                    if (jsonResult.get("issuingCountryCode").equals("D")) {
+                                        jsonResult.put("address", jsonResult.get("address"));
+                                    } else {
+                                        jsonResult.remove("address");
                                     }
-                                } catch (JSONException e) {
-                                    e.printStackTrace();
-                                }
-
-                                try {
-                                    jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, idScanResult,
-                                            jsonResult);
-                                } catch (Exception e) {
-                                    Log.e(TAG, "Exception is: ", e);
 
                                 }
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
 
-                                setResult(scanViewPlugin, jsonResult);
+                            try {
+                                jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, idScanResult,
+                                        jsonResult);
+                            } catch (Exception e) {
+                                Log.e(TAG, "Exception is: ", e);
 
                             }
 
+                            setResult(scanViewPlugin, jsonResult);
+
                         });
                     } else if (((IdScanPlugin) ((IdScanViewPlugin) scanViewPlugin).getScanPlugin()).getIdConfig() instanceof UniversalIdConfig) {
-                        scanViewPlugin.addScanResultListener(new ScanResultListener<ScanResult<ID>>() {
-                            @Override
-                            public void onResult(ScanResult<ID> idScanResult) {
-                                Identification identification = (Identification) idScanResult.getResult();
-                                HashMap<String, String> data = (HashMap<String, String>) identification.getResultData();
+                        scanViewPlugin.addScanResultListener((ScanResultListener<ScanResult<ID>>) idScanResult -> {
+                            Identification identification = (Identification) idScanResult.getResult();
+                            HashMap<String, String> data = (HashMap<String, String>) identification.getResultData();
 
-                                JSONObject jsonResult = new JSONObject(data);
+                            JSONObject jsonResult = new JSONObject(data);
 
-                                try {
-                                    jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, idScanResult,
-                                            jsonResult);
-                                } catch (Exception e) {
-                                    Log.e(TAG, "Exception is: ", e);
+                            try {
+                                jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, idScanResult,
+                                        jsonResult);
+                            } catch (Exception e) {
+                                Log.e(TAG, "Exception is: ", e);
 
-                                }
-                                setResult(scanViewPlugin, jsonResult);
                             }
+                            setResult(scanViewPlugin, jsonResult);
                         });
                     }
                 } else if (scanViewPlugin instanceof OcrScanViewPlugin) {
-                    scanViewPlugin.addScanResultListener(new ScanResultListener<OcrScanResult>() {
-                        @Override
-                        public void onResult(OcrScanResult ocrScanResult) {
-                            JSONObject jsonResult = new JSONObject();
-                            try {
-                                jsonResult.put("text", ocrScanResult.getResult().trim());
-                                jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, ocrScanResult,
-                                        jsonResult);
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-                            setResult(scanViewPlugin, jsonResult);
-
+                    scanViewPlugin.addScanResultListener((ScanResultListener<OcrScanResult>) ocrScanResult -> {
+                        JSONObject jsonResult = new JSONObject();
+                        try {
+                            jsonResult.put("text", ocrScanResult.getResult().trim());
+                            jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, ocrScanResult,
+                                    jsonResult);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
                         }
+                        setResult(scanViewPlugin, jsonResult);
 
                     });
 
                 } else if (scanViewPlugin instanceof TireScanViewPlugin) {
-                    scanViewPlugin.addScanResultListener(new ScanResultListener<TireScanResult>() {
-                        @Override
-                        public void onResult(TireScanResult tireScanResult) {
-                            JSONObject jsonResult = new JSONObject();
-                            try {
-                                jsonResult.put("text", tireScanResult.getResult().trim());
-                                jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, tireScanResult,
-                                        jsonResult);
-                            } catch (JSONException e) {
-                                e.printStackTrace();
+                    scanViewPlugin.addScanResultListener((ScanResultListener<TireScanResult>) tireScanResult -> {
+                        JSONObject jsonResult = new JSONObject();
+                        try {
+                            jsonResult.put("text", tireScanResult.getResult().trim());
+                            jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, tireScanResult,
+                                    jsonResult);
+                            if (tireScanResult instanceof TireSizeScanResult) {
+                                String tireScanDetailedResult = ((TireSizeScanResult) tireScanResult).getResult().toJson();
+                                jsonResult.put("tireScanDetailedResult", tireScanDetailedResult);
                             }
-                            setResult(scanViewPlugin, jsonResult);
-
+                        } catch (JSONException e) {
+                            e.printStackTrace();
                         }
+                        setResult(scanViewPlugin, jsonResult);
 
                     });
 
@@ -423,24 +407,21 @@ public class Anyline4Activity extends AnylineBaseActivity {
                     addSegmentRadioButtonUI(json);
 
                     anylineScanView.setCameraOpenListener(this);
-                    scanViewPlugin.addScanResultListener(new ScanResultListener<MeterScanResult>() {
-                        @Override
-                        public void onResult(MeterScanResult meterScanResult) {
-                            JSONObject jsonResult = new JSONObject();
-                            try {
-                                jsonResult = AnylinePluginHelper.setMeterScanMode(meterScanResult.getScanMode(),
-                                        jsonResult);
-                                jsonResult.put("reading", meterScanResult.getResult());
-
-                                jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, meterScanResult,
-                                        jsonResult);
-
-                            } catch (Exception e) {
-                                Log.e(TAG, "EXCEPTION", e);
-                            }
-
-                            setResult(scanViewPlugin, jsonResult);
+                    scanViewPlugin.addScanResultListener((ScanResultListener<MeterScanResult>) meterScanResult -> {
+                        JSONObject jsonResult = new JSONObject();
+                        try {
+                            jsonResult = AnylinePluginHelper.setMeterScanMode(meterScanResult.getScanMode(),
+                                    jsonResult);
+                            jsonResult.put("reading", meterScanResult.getResult());
+
+                            jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, meterScanResult,
+                                    jsonResult);
+
+                        } catch (Exception e) {
+                            Log.e(TAG, "EXCEPTION", e);
                         }
+
+                        setResult(scanViewPlugin, jsonResult);
                     });
                 }
 

package/android/src/main/java/com/anyline/reactnative/AnylinePluginHelper.java

@@ -144,6 +144,10 @@ public class AnylinePluginHelper {
             scanResult.getCutoutImage().save(imageFile, 90);
             jsonObject.put("imagePath", imageFile.getAbsolutePath());
 
+            if (scanResult.getBlobKey() != null) {
+                jsonObject.put("blobKey", scanResult.getBlobKey());
+            }
+
             File imageFileFull = TempFileUtil.createTempFileCheckCache(activity, UUID.randomUUID().toString(), ".jpg");
             scanResult.getFullImage().save(imageFileFull, 90);
             jsonObject.put("fullImagePath", imageFileFull.getAbsolutePath());
@@ -185,6 +189,10 @@ public class AnylinePluginHelper {
         return json;
     }
 
+    private static List<Barcode> getNativeBarcodeList() {
+        return finalBarcodeList;
+    }
+
     private static void setNativeBarcodeList(List<Barcode> barcodes) {
         final List<Barcode> barcodeList = new ArrayList<>();
         final List<String> barcodesDisplayedVal = new ArrayList<>();
@@ -208,10 +216,6 @@ public class AnylinePluginHelper {
 
     }
 
-    private static List<Barcode> getNativeBarcodeList() {
-        return finalBarcodeList;
-    }
-
     private static String findValidFormatForReference(int format) {
         if (format == Barcode.FORMAT_AZTEC) {
             return BarcodeFormat.AZTEC.toString();

package/android/src/main/java/com/anyline/reactnative/AnylineSDKPlugin.java

@@ -21,9 +21,11 @@ import org.json.JSONObject;
 
 import at.nineyards.anyline.core.LicenseException;
 import io.anyline.AnylineSDK;
+import io.anyline.plugin.ScanResult;
 import io.anyline.products.AnylineUpdater;
 import io.anyline.products.IAnylineUpdateDelegate;
 import io.anyline.trainer.AssetContext;
+import io.anyline.trainer.TrainerUtils;
 
 class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultReporter.OnResultListener {
 
@@ -38,9 +40,6 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     public static final int RESULT_CANCELED = 0;
     public static final int RESULT_OK = 1;
     public static final int RESULT_ERROR = 2;
-
-    private static final String E_ERROR = "E_ERROR";
-
     public static final int DIGITAL_METER = 3;
     public static final int ANALOG_METER = 4;
     public static final int AUTO_ANALOG_DIGITAL_METER = 5;
@@ -53,7 +52,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     public static final int SERIAL_NUMBER = 12;
     public static final int DOT_MATRIX_METER = 13;
     public static final int REQUEST_ANYLINE_4 = 14;
-
+    private static final String E_ERROR = "E_ERROR";
     private JSONObject configObject;
     private ReactApplicationContext reactContext;
     private String license;
@@ -152,6 +151,23 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
         routeScanMode(scanMode);
     }
 
+    @ReactMethod
+    public void reportCorrectedResult(String blobKey, String correctedResult, Callback onResponseCallback) {
+        ScanResult.reportCorrectedResult(
+                this.reactContext,
+                blobKey,
+                correctedResult,
+                "",
+                new TrainerUtils.ReportCorrectedResultHandler() {
+
+                    @Override
+                    public void onReportCorrectedResult(String s) {
+                        onResponseCallback.invoke(s);
+                    }
+                }
+        );
+    }
+
     @ReactMethod
     public void setupPromise(String config, String scanMode, final Promise promise) {
         this.promise = promise;

package/package.json

@@ -1,6 +1,6 @@
 {
-  "_from": "anyline-ocr-react-native-module@^42.0.0",
-  "_id": "anyline-ocr-react-native-module@^42.0.0",
+  "_from": "anyline-ocr-react-native-module@^42.2.0",
+  "_id": "anyline-ocr-react-native-module@^42.2.0",
   "_inBundle": false,
   "_integrity": "sha512-BGi9zNkSsoxXywDBIqzgBRvKUBniQOJHDKBrozZubKthZNRBAj8Ry5tW0Me0yLXt/fauME//hbC0wsenfPJZqw==",
   "_location": "/anyline-ocr-react-native-module",
@@ -8,19 +8,19 @@
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "anyline-ocr-react-native-module@^42.0.0",
+    "raw": "anyline-ocr-react-native-module@^42.2.0",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^42.0.0",
+    "rawSpec": "^42.2.0",
     "saveSpec": null,
-    "fetchSpec": "^42.0.0"
+    "fetchSpec": "^42.2.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-42.0.0.tgz",
+  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-42.2.0.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^42.0.0",
+  "_spec": "anyline-ocr-react-native-module@^42.2.0",
   "_where": "/Users/amiransari/Projects/anyline-ocr-react-native-module1/example/RNExampleApp",
   "bugs": {
     "url": "https://github.com/Anyline/anyline-ocr-react-native-module/issues"
@@ -47,5 +47,5 @@
     "type": "git",
     "url": "git+https://github.com/Anyline/anyline-ocr-react-native-module.git"
   },
-  "version": "42.0.0"
+  "version": "42.2.0"
 }