anyline-ocr-react-native-module 48.0.1 → 51.1.1

package/README.md

@@ -19,11 +19,11 @@ The plugin enables the connection to the SDK via React-Native.
 
 ## Getting Started
 
-Check out our getting-started section here: https://documentation-preview.anyline.com/react-native-plugin-component/latest/getting-started.html
+Check out our getting-started section here: https://documentation.anyline.com/react-native-plugin-component/latest/getting-started.html
 
 ## Documentation
 
-Check out our developer guide here: https://documentation-preview.anyline.com/react-native-plugin-component/latest/index.html
+Check out our developer guide here: https://documentation.anyline.com/react-native-plugin-component/latest/index.html
 
 ## License
 

package/android/.idea/PipelineViewerConfig.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PipelineViewerConfigProject">
+    <option name="enabled" value="false" />
+  </component>
+</project>

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="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

package/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -22,6 +22,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
+        namespace "com.anyline.reactnative"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
@@ -42,16 +43,10 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
-    packagingOptions {
-        pickFirst('lib/*/libgnustl_shared.so')
-        pickFirst('lib/*/libopencv_java3.so')
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
     buildFeatures {
         viewBinding true
         dataBinding true
@@ -59,9 +54,6 @@ android {
 }
 
 repositories {
-    flatDir {
-        dirs 'libs'
-    }
     maven {
         url 'https://anylinesdk.blob.core.windows.net/maven/'
     }
@@ -69,16 +61,8 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:48.0.0'
-    implementation "com.facebook.react:react-native:+"  // from node_modules
-    implementation("com.google.android.material:material:1.4.0-rc01")
+    implementation 'io.anyline:anylinesdk:51.1.0'
+    implementation "com.facebook.react:react-native:+"
+    implementation("com.google.android.material:material:1.9.0")
     implementation 'androidx.multidex:multidex:2.0.1'
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
 }

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.anyline.reactnative">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

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

@@ -18,7 +18,6 @@
       "cancelOnResult": false
     },
     "cutoutConfig": {
-      "style": "rect",
       "maxWidthPercent": "80%",
       "maxHeightPercent": "80%",
       "alignment": "center",

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

@@ -17,11 +17,14 @@ import com.facebook.react.bridge.ReactMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import io.anyline.plugin.ScanResult;
+import java.io.IOException;
+import java.util.HashMap;
+
 import io.anyline.products.AnylineUpdater;
 import io.anyline.trainer.AssetContext;
-import io.anyline.trainer.TrainerUtils;
 import io.anyline2.AnylineSdk;
+import io.anyline2.CacheConfig;
+import io.anyline2.CorrectedResultReporting;
 import io.anyline2.core.LicenseException;
 
 class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultReporter.OnResultListener {
@@ -110,8 +113,17 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
 
     @ReactMethod
     public void setupAnylineSDK(String license, final Promise promise) {
+        setupAnylineSDKWithCacheConfig(license, false, promise);
+    }
+
+    @ReactMethod
+    public void setupAnylineSDKWithCacheConfig(String license, boolean enableOfflineCache, final Promise promise) {
+        CacheConfig.Preset cacheConfig = CacheConfig.Preset.Default.INSTANCE;
+        if (enableOfflineCache) {
+            cacheConfig = CacheConfig.Preset.OfflineLicenseEventCachingEnabled.INSTANCE;
+        }
         try {
-            AnylineSdk.init(license, reactContext);
+            AnylineSdk.init(license, reactContext, "", cacheConfig);
             this.license = license;
             if (promise != null) {
                 promise.resolve(true);
@@ -126,8 +138,17 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
 
     @ReactMethod
     public void initSdk(String license) {
+        initSdk(license, false);
+    }
+
+    @ReactMethod
+    public void initSdk(String license, boolean enableOfflineCache) {
+        CacheConfig.Preset cacheConfig = CacheConfig.Preset.Default.INSTANCE;
+        if (enableOfflineCache) {
+            cacheConfig = CacheConfig.Preset.OfflineLicenseEventCachingEnabled.INSTANCE;
+        }
         try {
-            AnylineSdk.init(license, reactContext);
+            AnylineSdk.init(license, reactContext, "", cacheConfig);
         } catch (LicenseException e) {
             e.printStackTrace();
             returnError(e.getMessage());
@@ -151,19 +172,43 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
 
     @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);
-                    }
+        HashMap<String, String> hashMap = new HashMap<>();
+        hashMap.put("result", correctedResult);
+
+        try {
+            CorrectedResultReporting
+                    .Factory
+                    .getInstance()
+                    .reportCorrectedResult(
+                            blobKey,
+                            hashMap
+                    );
+            onResponseCallback.invoke("Success");
+        }
+        catch (IllegalArgumentException e) {
+            onResponseCallback.invoke("Error: " + e.getMessage());
+        }
+    }
+
+    @ReactMethod
+    public void exportCachedEvents(final Promise promise) {
+        try {
+            String exportedFile = AnylineSdk.exportCachedEvents();
+            if (exportedFile != null) {
+                if (promise != null) {
+                    promise.resolve(String.valueOf(exportedFile));
                 }
-        );
+            }
+            else {
+                if (promise != null) {
+                    promise.reject(E_ERROR, "Event cache is empty.");
+                }
+            }
+        } catch (IOException e) {
+            if (promise != null) {
+                promise.reject(E_ERROR, e.getMessage());
+            }
+        }
     }
 
     @ReactMethod
@@ -214,8 +259,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
                 //used to init or re-init the SDK
                 AnylineSdk.init(configObject.getString("license"), reactContext);
                 license = configObject.get("license").toString();
-            }
-            else {
+            } else {
                 throw new JSONException("No License in config. Please check your configuration.");
             }
         }

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

@@ -1,13 +1,11 @@
 <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" />
+        android:layout_height="match_parent" />
 
     <LinearLayout
         android:id="@+id/layout_change_orientation"
@@ -16,12 +14,13 @@
         android:layout_gravity="right|top"
         android:gravity="center"
         android:padding="40px">
+
         <ImageView
             android:id="@+id/imageview_change_orientation"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:scaleType="fitStart"
             android:background="@drawable/rotate_screen_background"
+            android:scaleType="fitStart"
             android:src="@drawable/rotate_screen_white" />
     </LinearLayout>
 
@@ -29,12 +28,13 @@
         android:id="@+id/layout_instruction"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         android:layout_gravity="bottom"
-        android:gravity="bottom"
         android:layout_marginVertical="30dp"
+        android:gravity="bottom"
+        android:orientation="vertical"
         android:paddingBottom="30dp"
-        android:orientation="vertical">
+        android:visibility="gone">
+
         <TextView
             android:id="@+id/textview_instruction"
             android:layout_width="match_parent"
@@ -50,41 +50,44 @@
         android:id="@+id/layout_bright_distance_feedback"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         android:layout_centerHorizontal="true"
         android:layout_gravity="top"
         android:gravity="top|center_horizontal"
+        android:orientation="vertical"
         android:paddingTop="20dp"
         android:paddingBottom="5dp"
-        android:orientation="vertical">
+        android:visibility="gone">
+
         <ImageView
             android:id="@+id/imageview_bright_distance_feedback"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="top|center_horizontal"
-            android:scaleType="centerInside"
+            android:layout_marginVertical="5dp"
             android:layout_weight="2"
-            android:layout_marginVertical="5dp"/>
+            android:gravity="top|center_horizontal"
+            android:scaleType="centerInside" />
+
         <TextView
             android:id="@+id/textview_bright_distance_feedback"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_weight="0"
             android:gravity="top|center_horizontal"
             android:text=""
             android:textColor="@color/white"
-            android:textSize="14sp"
-            android:layout_weight="0"/>
+            android:textSize="14sp" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="3"
-            android:orientation="vertical"/>
+            android:orientation="vertical" />
     </LinearLayout>
 
     <ImageView
         android:id="@+id/imageview_cutout_overlay"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:scaleType="fitStart" />
+        android:scaleType="fitStart"
+        android:visibility="gone" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

package/ios/ALNFCScanViewController.m

@@ -162,7 +162,7 @@ API_AVAILABLE(ios(13.0))
     ALCutoutConfig *cutoutConfig = scanViewPlugin.scanViewPluginConfig.cutoutConfig;
     ALScanFeedbackConfig *scanFeedbackConfig = scanViewPlugin.scanViewPluginConfig.scanFeedbackConfig;
     
-    ALPluginConfig *pluginConfig = scanViewPlugin.scanPlugin.scanPluginConfig.pluginConfig;
+    ALPluginConfig *pluginConfig = scanViewPlugin.scanPlugin.pluginConfig;
     ALMrzConfig *mrzConfig = pluginConfig.mrzConfig;
     
     // a bit lengthy but this is how you properly change the config (mrzFieldScanOptions and mrzMinFieldConfidences)
@@ -182,9 +182,9 @@ API_AVAILABLE(ios(13.0))
     mrzConfig.mrzMinFieldConfidences.dateOfExpiry = @(90);
     
     NSError *error;
-    ALScanViewPluginConfig *scanViewPluginConfig = [ALScanViewPluginConfig withScanPluginConfig:[ALScanPluginConfig withPluginConfig:pluginConfig]
-                                                                                   cutoutConfig:cutoutConfig
-                                                                             scanFeedbackConfig:scanFeedbackConfig];
+    ALScanViewPluginConfig *scanViewPluginConfig = [ALScanViewPluginConfig withPluginConfig:pluginConfig
+                                                                               cutoutConfig:cutoutConfig
+                                                                         scanFeedbackConfig:scanFeedbackConfig];
     ALScanViewPlugin *updatedScanViewPlugin = [[ALScanViewPlugin alloc] initWithConfig:scanViewPluginConfig error:&error];
     [self.scanView setScanViewPlugin:updatedScanViewPlugin error:&error];
     
@@ -245,7 +245,7 @@ API_AVAILABLE(ios(13.0))
     NSObject<ALScanViewPluginBase> *scanViewPluginBase = self.scanView.scanViewPlugin;
     if ([scanViewPluginBase isKindOfClass:ALScanViewPlugin.class]) {
         ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)scanViewPluginBase;
-        BOOL cancelOnResult = scanViewPlugin.scanPlugin.scanPluginConfig.cancelOnResult;
+        BOOL cancelOnResult = scanViewPlugin.scanPlugin.pluginConfig.cancelOnResult;
         if (cancelOnResult) {
             [self dismissViewControllerAnimated:YES completion:nil];
         }

package/ios/ALPluginScanViewController.m

@@ -76,6 +76,8 @@
         }
     }
 
+    NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
+
     self.scanView = [ALScanViewFactory withJSONDictionary:self.config
                                                  delegate:self
                                                     error:&error];
@@ -202,7 +204,7 @@
     NSObject<ALScanViewPluginBase> *scanViewPluginBase = self.scanView.scanViewPlugin;
     if ([scanViewPluginBase isKindOfClass:ALScanViewPlugin.class]) {
         ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)scanViewPluginBase;
-        BOOL cancelOnResult = scanViewPlugin.scanPlugin.scanPluginConfig.cancelOnResult;
+        BOOL cancelOnResult = scanViewPlugin.scanPlugin.pluginConfig.cancelOnResult;
         if (cancelOnResult) {
             __weak __block typeof(self) weakSelf = self;
             [self dismissViewControllerAnimated:YES completion:^{
@@ -290,7 +292,7 @@
     // applic. only to non-composites
     NSObject<ALScanViewPluginBase> *scanVwPluginBase = self.scanView.scanViewPlugin;
     if ([scanVwPluginBase isKindOfClass:ALScanViewPlugin.class]) {
-        return ((ALScanViewPlugin *)scanVwPluginBase).scanPlugin.scanPluginConfig.pluginConfig;
+        return ((ALScanViewPlugin *)scanVwPluginBase).scanPlugin.pluginConfig;
     }
     return nil;
 }
@@ -355,12 +357,10 @@
 
 // assume that pluginConfig carries the updated scanMode or whatever value that you wish to refresh.
 - (BOOL)updatePluginConfig:(ALPluginConfig *)pluginConfig error:(NSError * _Nullable * _Nullable)error {
-
-    ALScanPluginConfig *scanPluginConfig = [[ALScanPluginConfig alloc] initWithPluginConfig:pluginConfig];
     ALScanViewPluginConfig *origSVPConfig = ((ALScanViewPlugin *)self.scanView.scanViewPlugin).scanViewPluginConfig;
-    ALScanViewPluginConfig *scanViewPluginConfig = [ALScanViewPluginConfig withScanPluginConfig:scanPluginConfig
-                                                                                   cutoutConfig:origSVPConfig.cutoutConfig
-                                                                             scanFeedbackConfig:origSVPConfig.scanFeedbackConfig];
+    ALScanViewPluginConfig *scanViewPluginConfig = [ALScanViewPluginConfig withPluginConfig:pluginConfig
+                                                                               cutoutConfig:origSVPConfig.cutoutConfig
+                                                                         scanFeedbackConfig:origSVPConfig.scanFeedbackConfig];
     ALScanViewPlugin *newScanViewPlugin = [[ALScanViewPlugin alloc] initWithConfig:scanViewPluginConfig error:error];
     if (!newScanViewPlugin) {
         return NO;

package/ios/AnylineReact.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Anyline/anyline-ocr-react-native-module.git", :tag => "#{s.version}" }
 
   s.source_files  = "*.{h,m}"
-  s.dependency "Anyline", "~> 48"
+  s.dependency "Anyline", "~> 51"
   s.dependency "React"
 
 end

package/ios/AnylineSDKPlugin.m

@@ -56,6 +56,13 @@ RCT_EXPORT_METHOD(setup:(NSString *)config scanMode:(NSString *)scanMode onResul
 }
 
 RCT_EXPORT_METHOD(setupAnylineSDK:(NSString *)licenseKey
+        resolver:(RCTPromiseResolveBlock)resolve
+        rejecter:(RCTPromiseRejectBlock)reject) {
+    [self setupAnylineSDKWithCacheConfig:licenseKey enableOfflineCache:NO resolver:resolve rejecter:reject];
+}
+
+RCT_EXPORT_METHOD(setupAnylineSDKWithCacheConfig:(NSString *)licenseKey
+                  enableOfflineCache:(BOOL)enableOfflineCache
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
 
@@ -103,6 +110,23 @@ RCT_EXPORT_METHOD(licenseKeyExpiryDate:(RCTPromiseResolveBlock)resolve rejecter:
     resolve([AnylineSDK licenseExpirationDate]);
 }
 
+RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    _resolveBlock = resolve;
+    _rejectBlock = reject;
+    self.returnMethod = @"promise";
+
+    NSError *error;
+    NSString *exportPath = [AnylineSDK exportCachedEvents:&error];
+
+    if (!exportPath) {
+        NSString *errorString = @"Event cache is empty.";
+        [self returnError:errorString];
+    } else {
+        [self returnSuccess:exportPath];
+    }
+}
+
+
 - (void)initView:(NSString *)scanMode {
     NSData *data = [self.config dataUsingEncoding:NSUTF8StringEncoding];
     if (!data) {

package/package.json

@@ -1,6 +1,6 @@
 {
-  "_from": "anyline-ocr-react-native-module@^48.0.1",
-  "_id": "anyline-ocr-react-native-module@^48.0.1",
+  "_from": "anyline-ocr-react-native-module@^51.1.1",
+  "_id": "anyline-ocr-react-native-module@^51.1.1",
   "_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@^48.0.1",
+    "raw": "anyline-ocr-react-native-module@^51.1.1",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^48.0.1",
+    "rawSpec": "^51.1.1",
     "saveSpec": null,
-    "fetchSpec": "^48.0.1"
+    "fetchSpec": "^51.1.1"
   },
   "_requiredBy": [
     "/"
   ],
   "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-44.1.2.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^48.0.1",
+  "_spec": "anyline-ocr-react-native-module@^51.1.1",
   "_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": "48.0.1"
+  "version": "51.1.1"
 }