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

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/plugin.iml" filepath="$PROJECT_DIR$/.idea/plugin.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/plugin.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.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/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Nov 16 08:16:14 CET 2022
+#Thu Jan 12 14:36:20 CET 2023
 gradle.version=6.7

package/android/.idea/gradle.xml

@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

package/android/.idea/jarRepositories.xml

@@ -31,5 +31,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://anylinesdk.blob.core.windows.net/maven/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>

package/android/.idea/misc.xml

@@ -1,7 +1,7 @@
 <?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">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

package/android/.idea/vcs.xml

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

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) {
@@ -111,28 +94,17 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
             }
         } catch (JSONException e) {
             e.printStackTrace();
+            returnError(e.getMessage());
         }
     }
 
     @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();
+            returnError(e.getMessage());
         }
     }
 
@@ -190,68 +162,44 @@ 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);
+            if (configObject != null) {
+                scan();
             } else {
                 returnError("No ViewPlugin in config. Please check your configuration.");
             }
+        } catch (LicenseException e) {
+            e.printStackTrace();
+            returnError("LICENSE ERROR: " + e.getMessage());
         } catch (JSONException e) {
             e.printStackTrace();
+            returnError("JSON ERROR: " + e.getMessage());
         }
     }
 
-    private void scan(Class<?> activityToStart, String scanMode, int requestCode) {
+    private void scan() throws LicenseException, JSONException {
 
-        Intent intent = new Intent(getCurrentActivity(), activityToStart);
+        Intent intent = new Intent(getCurrentActivity(), ScanActivity.class);
 
-        try {
-            configObject = new JSONObject(this.config);
+        configObject = new JSONObject(this.config);
 
-            // Hacky -> force cancelOnResult = true
-            options = configObject.getJSONObject("options");
-            options.put("cancelOnResult", true);
+        license = configObject.get("license").toString();
+        JSONObject optionsJSONObject = configObject.optJSONObject("options");
 
-            license = configObject.get("license").toString();
-            if (configObject.has("nativeBarcodeEnabled")) {
-                intent.putExtra(EXTRA_ENABLE_BARCODE_SCANNING, configObject.getBoolean("nativeBarcodeEnabled"));
-            }
-
-        } catch (JSONException e) {
-            returnError("JSON ERROR: " + e.getMessage());
+        if (optionsJSONObject != null) {
+            intent.putExtra(
+                    EXTRA_ENABLE_BARCODE_SCANNING,
+                    optionsJSONObject.optBoolean("nativeBarcodeEnabled", false)
+            );
         }
 
         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());
+        AnylineSdk.init(configObject.getString("license"), reactContext);
+        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;
     }