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

package/ios/AnylineReact.podspec

@@ -7,8 +7,8 @@ Pod::Spec.new do |s|
   s.version      = package["version"]
   s.summary      = "anyline-ocr-react-native-module"
   s.authors      = {
-    'Jonas Laux' => 'jonas@anyline.com',
-    'Mike Chudziak' => 'mike.chudziak@callstack.io',
+    'Aldrich Co' => 'aldrich.co@anyline.com',
+    'Renato Neves' => 'renato.neves@anyline.com',
   }
 
   s.homepage     = "https://github.com/Anyline/anyline-ocr-react-native-module"
@@ -19,6 +19,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", "~> 42.0.0"
+  s.dependency "Anyline", "~> 43.0.0"
   s.dependency "React"
+
 end

package/ios/AnylineSDKPlugin.m

@@ -1,12 +1,12 @@
-#import "AnylineSDKPlugin.h"
 #import <Anyline/Anyline.h>
+#import "AnylineSDKPlugin.h"
 #import "ALJsonUIConfiguration.h"
 #import "ALPluginScanViewController.h"
 #import "ALPluginHelper.h"
 
 #import "ALNFCScanViewController.h"
 
-@interface AnylineSDKPlugin()<ALPluginScanViewControllerDelegate>
+@interface AnylineSDKPlugin()
 
 @property (nonatomic, strong) ALScanViewPluginConfig *conf;
 
@@ -15,7 +15,7 @@
 @property (nonatomic, assign) BOOL nativeBarcodeScanning;
 @property (nonatomic, strong) NSDictionary *jsonConfigDictionary;
 @property (nonatomic, strong) NSDictionary *ocrConfigDict;
-@property (nonatomic, strong) ALJsonUIConfiguration *jsonUIConf;
+@property (nonatomic, strong) ALJSONUIConfiguration *jsonUIConf;
 
 @property (nonatomic, strong) RCTResponseSenderBlock onResultCallback;
 @property (nonatomic, strong) RCTResponseSenderBlock onErrorCallback;
@@ -63,7 +63,7 @@ RCT_EXPORT_METHOD(setupPromise:(NSString *)config scanMode:(NSString *)scanMode
 }
 
 RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-   resolve(ALCoreController.versionNumber);
+   resolve(AnylineSDK.versionNumber);
 }
 
 
@@ -87,35 +87,24 @@ RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
     BOOL nativeBarcodeScanning = [[optionsDictionary objectForKey:@"nativeBarcodeEnabled"] boolValue];
     self.nativeBarcodeScanning = nativeBarcodeScanning ? nativeBarcodeScanning : NO;
 
-    self.jsonUIConf = [[ALJsonUIConfiguration alloc] initWithDictionary:optionsDictionary];
-    self.conf = [[ALScanViewPluginConfig alloc] initWithDictionary:optionsDictionary];
-    self.conf.cancelOnResult = true;
+    self.jsonUIConf = [[ALJSONUIConfiguration alloc] initWithDictionary:optionsDictionary];
+    self.conf = [[ALScanViewPluginConfig alloc] initWithJSONDictionary:optionsDictionary error:&error];
     self.ocrConfigDict = [dictionary objectForKey:@"ocr"];
 
     dispatch_async(dispatch_get_main_queue(), ^{
         [[UIApplication sharedApplication] keyWindow].rootViewController.modalPresentationStyle = UIModalPresentationFullScreen;
         
         if ([[scanMode uppercaseString] isEqualToString:[@"scan" uppercaseString]]) {
-            NSString *customCmdFile = [[dictionary objectForKey:@"options"] valueForKeyPath:@"viewPlugin.plugin.nfcPlugin"];
-            if (customCmdFile) {
+            BOOL isNFC = [optionsDictionary objectForKey:@"enableNFCWithMRZ"];
+            if (isNFC) {
                if (@available(iOS 13.0, *)) {
                    if ([ALNFCDetector readingAvailable]) {
                        ALNFCScanViewController *nfcScanViewController = [[ALNFCScanViewController alloc] initWithLicensekey:self.appKey
-                                                                                                              configuration:[dictionary objectForKey:@"options"]
-                                                                                                       uiConfig:self.jsonUIConf
-                                                                                                                   delegate:self];
-                       if([self.jsonConfigDictionary valueForKey:@"quality"]){
-                           nfcScanViewController.quality = [[self.jsonConfigDictionary valueForKey:@"quality"] integerValue];
-                       }
-                       
-                       if([self.jsonConfigDictionary valueForKey:@"cropAndTransformErrorMessage"]){
-                           NSString *str = [self.jsonConfigDictionary objectForKey:@"cropAndTransformErrorMessage"];
-                           nfcScanViewController.cropAndTransformErrorMessage = str;
-                       }
-                       
-                       if ([optionsDictionary valueForKey:@"nativeBarcodeEnabled"]) {
-                           nfcScanViewController.nativeBarcodeEnabled = [[self.jsonConfigDictionary objectForKey:@"nativeBarcodeEnabled"] boolValue];
-                       }
+                                                                                                              configuration:dictionary
+                                                                                                                   uiConfig:self.jsonUIConf
+                                                                                                                   finished:^(id  _Nullable callbackObj, NSString * _Nullable errorString) {
+                           [self returnCallback:callbackObj andErrorString:errorString];
+                       }];
                        
                        if(nfcScanViewController != nil){
                            [nfcScanViewController setModalPresentationStyle: UIModalPresentationFullScreen];
@@ -130,22 +119,10 @@ RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
             } else {
                 ALPluginScanViewController *pluginScanViewController =
                 [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
-                                                         configuration:[dictionary objectForKey:@"options"]
-                                                  uiConfiguration:self.jsonUIConf
-                                                              delegate:self];
-                
-                if([self.jsonConfigDictionary valueForKey:@"quality"]){
-                    pluginScanViewController.quality = [[self.jsonConfigDictionary valueForKey:@"quality"] integerValue];
-                }
-                
-                if([self.jsonConfigDictionary valueForKey:@"cropAndTransformErrorMessage"]){
-                    NSString *str = [self.jsonConfigDictionary objectForKey:@"cropAndTransformErrorMessage"];
-                    pluginScanViewController.cropAndTransformErrorMessage = str;
-                }
-                
-                if ([optionsDictionary valueForKey:@"nativeBarcodeEnabled"]) {
-                    pluginScanViewController.nativeBarcodeEnabled = [[self.jsonConfigDictionary objectForKey:@"nativeBarcodeEnabled"] boolValue];
-                }
+                                                         configuration:dictionary
+                                                       uiConfiguration:self.jsonUIConf finished:^(id  _Nullable callbackObj, NSString * _Nullable errorString) {
+                    [self returnCallback:callbackObj andErrorString:errorString];
+                }];
                 
                 if(pluginScanViewController != nil){
                     [pluginScanViewController setModalPresentationStyle: UIModalPresentationFullScreen];
@@ -155,22 +132,10 @@ RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
         } else {
             ALPluginScanViewController *pluginScanViewController =
             [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
-                                                     configuration:[dictionary objectForKey:@"options"]
-                                              uiConfiguration:self.jsonUIConf
-                                                          delegate:self];
-            
-            if([self.jsonConfigDictionary valueForKey:@"quality"]){
-                pluginScanViewController.quality = [[self.jsonConfigDictionary valueForKey:@"quality"] integerValue];
-            }
-            
-            if([self.jsonConfigDictionary valueForKey:@"cropAndTransformErrorMessage"]){
-                NSString *str = [self.jsonConfigDictionary objectForKey:@"cropAndTransformErrorMessage"];
-                pluginScanViewController.cropAndTransformErrorMessage = str;
-            }
-            
-            if ([optionsDictionary valueForKey:@"nativeBarcodeEnabled"]) {
-                pluginScanViewController.nativeBarcodeEnabled = [[self.jsonConfigDictionary objectForKey:@"nativeBarcodeEnabled"] boolValue];
-            }
+                                                     configuration:dictionary
+                                                   uiConfiguration:self.jsonUIConf finished:^(id  _Nullable callbackObj, NSString * _Nullable errorString) {
+                [self returnCallback:callbackObj andErrorString:errorString];
+            }];
             
             if(pluginScanViewController != nil){
                 [pluginScanViewController setModalPresentationStyle: UIModalPresentationFullScreen];
@@ -207,32 +172,6 @@ RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
     [self returnError:error.debugDescription];
 }
 
-- (ALScanMode)energyScanModeFromString:(NSString *)scanMode{
-
-    if ([[scanMode uppercaseString] isEqualToString:@"ANALOG_METER"]) {
-        return ALAnalogMeter;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"DIGITAL_METER"]){
-        return ALDigitalMeter;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"AUTO_ANALOG_DIGITAL_METER"]){
-        return ALAutoAnalogDigitalMeter;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"DIAL_METER"]){
-        return ALDialMeter;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"SERIAL_NUMBER"]){
-        return ALSerialNumber;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"HEAT_METER_4"]){
-        return ALHeatMeter4;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"HEAT_METER_5"]){
-        return ALHeatMeter5;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"HEAT_METER_6"]){
-        return ALHeatMeter6;
-    } else if ([[scanMode uppercaseString] isEqualToString:@"DOT_MATRIX_METER"]){
-            return ALDotMatrixMeter;
-    } else {
-        return ALAutoAnalogDigitalMeter;
-    }
-
-}
-
 - (BOOL)scanModeIndex:(NSString *)scanMode{
 
     NSArray *possibleScanModes = @[@"DOCUMENT", @"MRZ", @"BARCODE", @"LICENSE_PLATE", @"LICENSE_PLATE_US", @"ANYLINE_OCR", @"TIRE", @"ANALOG_METER", @"DIGITAL_METER", @"AUTO_ANALOG_DIGITAL_METER",
@@ -242,6 +181,24 @@ RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
 
 }
 
+//(id  _Nullable callbackObj, NSString * _Nullable errorString)
+- (void)returnCallback:(id _Nullable)callbackObj andErrorString:(NSString * _Nullable)errorString {
+    NSString *resultStr;
+    NSError *error;
+    if (errorString) {
+        [self returnError:errorString];
+    } else if ([NSJSONSerialization isValidJSONObject:callbackObj]) {
+        resultStr = [(NSDictionary *)callbackObj toJSONStringPretty:YES error:&error];
+        if (error) {
+            [self returnError:error.debugDescription];
+        }
+        [self returnSuccess:resultStr];
+    } else {
+        resultStr = @"callback object should be of JSON type";
+        [self returnError:resultStr];
+    }
+}
+
 - (void)returnSuccess:(NSString *)result{
     if([self.returnMethod isEqualToString:@"callback"]) {
         self.onResultCallback(@[result]);

package/package.json

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

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

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

package/android/.idea/compiler.xml

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

package/android/.idea/gradle.xml

@@ -1,18 +0,0 @@
-<?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

@@ -1,35 +0,0 @@
-<?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

@@ -1,10 +0,0 @@
-<?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

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

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +0,0 @@
-arguments=
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk-15.jdk/Contents/Home
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true

package/android/local.properties

@@ -1,8 +0,0 @@
-## 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