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

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: "com.android.library"
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
@@ -13,7 +13,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -52,6 +52,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    buildFeatures {
+        viewBinding true
+        dataBinding true
+    }
 }
 
 repositories {
@@ -65,7 +69,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:42.2.0'
+    implementation 'io.anyline:anylinesdk:43.1.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/src/main/AndroidManifest.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.anyline.reactnative">
+    package="com.anyline.reactnative">
 
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-  <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
-  <application android:allowBackup="true">
-      <activity android:name="com.anyline.reactnative.Anyline4Activity" android:screenOrientation="portrait"/>
-      <activity android:name="com.anyline.reactnative.Document4Activity" android:screenOrientation="portrait"/>
-  </application>
+    <application android:allowBackup="true">
+        <activity
+            android:name=".ScanActivity"
+            android:screenOrientation="portrait" />
+    </application>
 </manifest>

package/android/src/main/assets/cow_tag_scanner.ale

@@ -0,0 +1,46 @@
+{
+  "cameraConfig": {
+    "captureResolution": "1080p"
+  },
+  "flashConfig": {
+    "mode": "auto",
+    "alignment": "bottom_right"
+  },
+  "viewPluginConfig": {
+    "pluginConfig": {
+      "id": "Barcode|Barcodes",
+      "barcodeConfig": {
+        "barcodeFormats": [
+          "ALL"
+        ],
+        "parseAAMVA": true
+      },
+      "cancelOnResult": false
+    },
+    "cutoutConfig": {
+      "style": "rect",
+      "maxWidthPercent": "80%",
+      "maxHeightPercent": "80%",
+      "alignment": "center",
+      "ratioFromSize": {
+        "width": 100,
+        "height": 80
+      },
+      "strokeWidth": 1,
+      "cornerRadius": 3,
+      "strokeColor": "FFFFFF",
+      "outerColor": "000000",
+      "outerAlpha": 0.3,
+      "feedbackStrokeColor": "0099FF"
+    },
+    "scanFeedbackConfig": {
+      "style": "rect",
+      "strokeColor": "0099FF",
+      "fillColor": "220099FF",
+      "animationDuration": 150,
+      "blinkAnimationOnResult": true,
+      "beepOnResult": true,
+      "vibrateOnResult": true
+    }
+  }
+}

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

@@ -22,8 +22,7 @@ public class AnylinePackage implements ReactPackage {
     }
 
     @Override
-    public List<NativeModule> createNativeModules(
-            ReactApplicationContext reactContext) {
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new AnylineSDKPlugin(reactContext));
         return modules;

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

@@ -4,12 +4,10 @@ package com.anyline.reactnative;
  * Created by jonesBoi on 02.12.16.
  */
 
-import android.app.Activity;
 import android.content.Intent;
 
 import com.anyline.reactnative.updateAsset.AnylineUpdateDelegateImpl;
 import com.anyline.reactnative.updateAsset.AssetContextJsonParser;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -19,13 +17,12 @@ import com.facebook.react.bridge.ReactMethod;
 import org.json.JSONException;
 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;
+import io.anyline2.AnylineSdk;
+import io.anyline2.core.LicenseException;
 
 class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultReporter.OnResultListener {
 
@@ -40,18 +37,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;
-    public static final int DIGITAL_METER = 3;
-    public static final int ANALOG_METER = 4;
-    public static final int AUTO_ANALOG_DIGITAL_METER = 5;
-    public static final int ANYLINE_OCR = 6;
-    public static final int BARCODE = 7;
-    public static final int ANYLINE_MRZ = 8;
-    public static final int ANYLINE_DOCUMENT = 9;
-    public static final int DIAL_METER = 10;
-    public static final int LICENSE_PLATE = 11;
-    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;
@@ -60,10 +45,8 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     private Callback onResultCallback;
     private Callback onErrorCallback;
     private Promise promise;
-    private ReactInstanceManager mReactInstanceManager;
     private String returnMethod;
     private String config;
-    private IAnylineUpdateDelegate anylineUpdateDelegate;
     private AssetContextJsonParser assetContextJsonParser;
 
     AnylineSDKPlugin(ReactApplicationContext context) {
@@ -117,22 +100,9 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     @ReactMethod
     public void initSdk(String license) {
         try {
-            AnylineSDK.init(license, reactContext);
+            AnylineSdk.init(license, reactContext);
         } catch (LicenseException e) {
-            finishWithError("error_license_init", "string");
-        }
-    }
-
-    protected void finishWithError(String identifier, String type) {
-        Activity activity = getCurrentActivity();
-
-        if (activity != null) {
-            String errorMessage = activity.getString(activity.getResources().getIdentifier(identifier, type, activity.getPackageName()));
-            Intent data = new Intent();
-            data.putExtra(AnylineSDKPlugin.EXTRA_ERROR_MESSAGE, errorMessage);
-            activity.setResult(AnylineSDKPlugin.RESULT_ERROR, data);
-            ResultReporter.onError(errorMessage);
-            activity.finish();
+            e.printStackTrace();
         }
     }
 
@@ -190,21 +160,9 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     private void scanAnyline4() {
         try {
             configObject = new JSONObject(this.config);
-            JSONObject options = configObject.getJSONObject("options");
-            if (options.has("viewPlugin")) {
-                JSONObject viewPlugin = options.getJSONObject("viewPlugin");
-                if (viewPlugin != null && viewPlugin.has("plugin")) {
-                    JSONObject plugin = viewPlugin.getJSONObject("plugin");
-                    if (plugin != null && plugin.has("documentPlugin")) {
-                        scan(Document4Activity.class, null, REQUEST_ANYLINE_4);
-                    } else {
-                        scan(Anyline4Activity.class, null, REQUEST_ANYLINE_4);
-                    }
-                } else {
-                    returnError("No Plugin in config. Please check your configuration.");
-                }
-            } else if (options.has("serialViewPluginComposite") || options.has("parallelViewPluginComposite")) {
-                scan(Anyline4Activity.class, null, REQUEST_ANYLINE_4);
+//            JSONObject options = configObject;
+            if (configObject != null) {
+                scan();
             } else {
                 returnError("No ViewPlugin in config. Please check your configuration.");
             }
@@ -213,20 +171,21 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
         }
     }
 
-    private void scan(Class<?> activityToStart, String scanMode, int requestCode) {
+    private void scan() {
 
-        Intent intent = new Intent(getCurrentActivity(), activityToStart);
+        Intent intent = new Intent(getCurrentActivity(), ScanActivity.class);
 
         try {
             configObject = new JSONObject(this.config);
 
-            // Hacky -> force cancelOnResult = true
-            options = configObject.getJSONObject("options");
-            options.put("cancelOnResult", true);
-
             license = configObject.get("license").toString();
-            if (configObject.has("nativeBarcodeEnabled")) {
-                intent.putExtra(EXTRA_ENABLE_BARCODE_SCANNING, configObject.getBoolean("nativeBarcodeEnabled"));
+            JSONObject optionsJSONObject = configObject.optJSONObject("options");
+
+            if (optionsJSONObject != null) {
+                intent.putExtra(
+                        EXTRA_ENABLE_BARCODE_SCANNING,
+                        optionsJSONObject.optBoolean("nativeBarcodeEnabled", false)
+                );
             }
 
         } catch (JSONException e) {
@@ -234,24 +193,19 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
         }
 
         intent.putExtra(EXTRA_LICENSE_KEY, license);
-        intent.putExtra(EXTRA_CONFIG_JSON, options.toString());
-
-        // Check if OCR
-        if (configObject.has("ocr")) {
-            try {
-                intent.putExtra(EXTRA_OCR_CONFIG_JSON, configObject.get("ocr").toString());
-            } catch (JSONException e) {
-                returnError(e.getMessage());
-            }
-        }
+        intent.putExtra(EXTRA_CONFIG_JSON, configObject.toString());
 
-        if (scanMode != null) {
-            intent.putExtra(EXTRA_SCAN_MODE, scanMode);
-        }
         ResultReporter.setListener(this);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-        reactContext.startActivityForResult(intent, requestCode, intent.getExtras());
+        try {
+            AnylineSdk.init(configObject.getString("license"), reactContext);
+        } catch (LicenseException e) {
+            e.printStackTrace();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        reactContext.startActivityForResult(intent, 1111, intent.getExtras());
     }
 
     @Override

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

@@ -4,14 +4,24 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 public class RotateButtonConfig {
+    private String alignment = "";
     private Offset offset = null;
 
-    public RotateButtonConfig(JSONObject jsonObject) throws JSONException {
+    public RotateButtonConfig(JSONObject jsonObject) {
+        alignment = jsonObject.optString("alignment", "");
         if (jsonObject.has("offset")) {
-            offset = new Offset(jsonObject.getJSONObject("offset"));
+            try {
+                offset = new Offset(jsonObject.getJSONObject("offset"));
+            }
+            catch (JSONException e) {
+
+            }
         }
     }
 
+    public String getAlignment() {
+        return alignment;
+    }
     public Offset getOffset() {
         return offset;
     }

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

@@ -0,0 +1,206 @@
+package com.anyline.reactnative;
+
+import static com.anyline.reactnative.AnylineSDKPlugin.EXTRA_CONFIG_JSON;
+import static com.anyline.reactnative.AnylineSDKPlugin.EXTRA_ERROR_MESSAGE;
+import static com.anyline.reactnative.AnylineSDKPlugin.RESULT_ERROR;
+
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
+import com.anyline.reactnative.databinding.ActivityScanBinding;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import io.anyline2.ScanResult;
+import io.anyline2.view.ScanView;
+import io.anyline2.viewplugin.ViewPluginBase;
+
+public class ScanActivity extends AppCompatActivity {
+
+    private static final String KEY_DEFAULT_ORIENTATION_APPLIED = "default_orientation_applied";
+
+    private ActivityScanBinding binding;
+    private ScanView scanView;
+
+    private float dpFactor = 0;
+    private boolean defaultOrientationApplied;
+    private int orientation;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityScanBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        dpFactor = getResources().getDisplayMetrics().density;
+
+        orientation = this.getResources().getConfiguration().orientation;
+
+        scanView = binding.scanView;
+
+        if (savedInstanceState != null) {
+            defaultOrientationApplied = savedInstanceState.getBoolean(KEY_DEFAULT_ORIENTATION_APPLIED);
+        }
+
+        if (getIntent().hasExtra(EXTRA_CONFIG_JSON)) {
+            // TODO check for throws clauses
+            try {
+                JSONObject configJSON = new JSONObject(getIntent().getStringExtra(EXTRA_CONFIG_JSON));
+
+                applyDefaultOrientation(configJSON);
+                setupChangeOrientationButton(configJSON);
+
+                scanView.init(configJSON);
+
+                ViewPluginBase viewPluginBase = scanView.getScanViewPlugin();
+
+                viewPluginBase.resultReceived = scanResult -> {
+                    setResult(AnylineSDKPlugin.RESULT_OK);
+                    JSONObject resultObject = getResultWithImagePath(scanResult);
+                    ResultReporter.onResult(resultObject.toString(), true);
+                    finish();
+                };
+
+                viewPluginBase.resultsReceived = scanResults -> {
+                    JSONArray resultJSONArray = new JSONArray();
+
+                    for (ScanResult scanResult : scanResults) {
+                        JSONObject resultObject = getResultWithImagePath(scanResult);
+                        resultJSONArray.put(resultObject);
+                    }
+                    setResult(AnylineSDKPlugin.RESULT_OK);
+                    ResultReporter.onResult(resultJSONArray.toString(), true);
+                    finish();
+                };
+            } catch (JSONException e) {
+                finishWithError("Error parsing view config: " + e.getMessage());
+            }
+        } else {
+            finishWithError("View config not found");
+        }
+    }
+
+    private void applyDefaultOrientation(JSONObject configJSON) {
+        if (defaultOrientationApplied) return;
+
+        JSONObject optionsJsonObject = configJSON.optJSONObject("options");
+
+        if (optionsJsonObject != null) {
+            String defaultOrientationJsonString = optionsJsonObject.optString("defaultOrientation", "");
+
+            if ("portrait".equals(defaultOrientationJsonString)) {
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            } else if ("landscape".equals(defaultOrientationJsonString)) {
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+            }
+        }
+        defaultOrientationApplied = true;
+    }
+
+    private void setupChangeOrientationButton(JSONObject configJSON) {
+        binding.layoutChangeOrientation.setVisibility(View.GONE);
+        JSONObject optionsJsonObject = configJSON.optJSONObject("options");
+
+        if (optionsJsonObject != null) {
+
+            JSONObject rotateButtonJson = optionsJsonObject.optJSONObject("rotateButton");
+            if (rotateButtonJson != null) {
+                RotateButtonConfig rotateButtonConfig = new RotateButtonConfig(rotateButtonJson);
+
+                CoordinatorLayout.LayoutParams buttonLayoutParams = new CoordinatorLayout.LayoutParams(
+                        CoordinatorLayout.LayoutParams.WRAP_CONTENT,
+                        CoordinatorLayout.LayoutParams.WRAP_CONTENT);
+
+                buttonLayoutParams.gravity = Gravity.TOP | Gravity.RIGHT;
+                String alignment = rotateButtonConfig.getAlignment();
+                if (alignment.length() > 0) {
+                    if (alignment.equals("top_left")) {
+                        buttonLayoutParams.gravity = Gravity.TOP | Gravity.LEFT;
+                    }
+                    if (alignment.equals("top_right")) {
+                        buttonLayoutParams.gravity = Gravity.TOP | Gravity.RIGHT;
+                    }
+                    if (alignment.equals("bottom_left")) {
+                        buttonLayoutParams.gravity = Gravity.BOTTOM | Gravity.LEFT;
+                    }
+                    if (alignment.equals("bottom_right")) {
+                        buttonLayoutParams.gravity = Gravity.BOTTOM | Gravity.RIGHT;
+                    }
+                }
+                if (rotateButtonConfig.hasOffset()) {
+                    buttonLayoutParams.setMargins(rotateButtonConfig.getOffset().getX(), rotateButtonConfig.getOffset().getY(), 0, 0);
+                }
+                binding.layoutChangeOrientation.setLayoutParams(buttonLayoutParams);
+                binding.layoutChangeOrientation.requestLayout();
+
+                binding.layoutChangeOrientation.setVisibility(View.VISIBLE);
+                binding.imageviewChangeOrientation.setOnClickListener(v -> {
+                    if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+                        orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+                        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                    } else {
+                        orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+                        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                    }
+                });
+            }
+        }
+    }
+
+    @NonNull
+    private JSONObject getResultWithImagePath(ScanResult scanResult) {
+        JSONObject resultObject = scanResult.getResult();
+
+        try {
+            String fullImagePath = scanResult.getImage().save();
+            String cutoutImagePath = scanResult.getCutoutImage().save();
+            resultObject.put("fullImagePath", fullImagePath);
+            resultObject.put("imagePath", cutoutImagePath);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return resultObject;
+    }
+
+    private void finishWithError(String errorMessage) {
+        Intent intent = new Intent();
+        intent.putExtra(EXTRA_ERROR_MESSAGE, errorMessage);
+        setResult(RESULT_ERROR, intent);
+        finish();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_DEFAULT_ORIENTATION_APPLIED, defaultOrientationApplied);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        scanView.start();
+    }
+
+    @Override
+    protected void onPause() {
+        scanView.stop();
+        scanView.getCameraView().releaseCameraInBackground();
+        super.onPause();
+    }
+
+    @Override
+    public void onBackPressed() {
+        ResultReporter.onCancel();
+        super.onBackPressed();
+    }
+}

package/android/src/main/res/drawable/rotate_screen_background.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid
+        android:color="#A5000000"/>
+    <stroke
+        android:color="@android:color/white"
+        android:width="1dp"/>
+    <corners
+        android:radius="30dp" />
+
+    <padding
+        android:left="4dp"
+        android:top="4dp"
+        android:right="4dp"
+        android:bottom="4dp" />
+
+</shape>

package/android/src/main/res/layout/activity_scan.xml

@@ -0,0 +1,27 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <io.anyline2.view.ScanView
+        android:id="@+id/scan_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:api_2_enabled="false" />
+
+    <LinearLayout
+        android:id="@+id/layout_change_orientation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|top"
+        android:gravity="center"
+        android:padding="40px">
+        <ImageView
+            android:id="@+id/imageview_change_orientation"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:scaleType="fitStart"
+            android:background="@drawable/rotate_screen_background"
+            android:src="@drawable/rotate_screen_white" />
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

package/android/src/main/res/values/anyline_sdk_plugin_strings.xml

@@ -1,34 +1,8 @@
 <resources>
-    <string name="error_unkown_scan_mode">Unkown scan mode: </string>
+    <string name="error_unknown_scan_mode">Unknown scan mode: </string>
     <string name="error_invalid_json_data">Config json is invalid.</string>
     <string name="error_invalid_segment_config">Semgent config not valid. Must have equal amount of titles and modes.</string>
     <string name="error_accessing_camera">Error while accessing camera.</string>
     <string name="error_licence_invalid">Error: Anyline license invalid.</string>
-    <string name="error_occured">An error occured.</string>
-
-    <string name="document_advanced_outline_detection">Advanced Outline Detection</string>
-    <string name="document_fast_outline_detection">Fast Outline Detection</string>
-    <string name="document_error_not_sharp">Document is not sharp. Please hold the camera steadily and ensure the document is in focus</string>
-    <string name="document_error_skew_too_high">Document is skewed. Place the camera directly above the document</string>
-    <string name="document_error_outline_not_found">Could not detect document outline</string>
-
-    <string name="document_error_glare_detected">Please remove the glare</string>
-    <string name="document_error_too_dark">The image is too dark. Please ensure there is enough light</string>
-    <string name="document_error_unknown">Unknown Failure</string>
-    <string name="document_picture_error">Error scanning full document:\n</string>
-    <string name="document_preview_success">Scanning full document. Please hold still</string>
-    <string name="document_picture_success">Document scanned successfully</string>
-    <string name="document_using_fast_mode">Switched to fast detection mode</string>
-    <string name="document_using_advanced_mode">Switched to advanced detection mode</string>
-    <string name="document_processing_picture_header">Processing</string>
-    <string name="document_processing_picture">Processing the Picture. Please wait</string>
-    <string name="document_error_shake">Shake detected</string>
-    <string name="document_error_closer">Come closer</string>
-    <string name="document_error_format">Unrecognised format</string>
-    <string name="document_image_saved_to">Image saved to</string>
-
-    <string name="document_processing">Processing</string>
-    <string name="document_processing_picture_please_wait">Processing the picture. Please wait.</string>
-
-
+    <string name="error_occurred">An error occurred.</string>
 </resources>