anyline-ocr-react-native-module 53.2.0 → 53.3.0

package/android/build.gradle

@@ -61,7 +61,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:53.2.0'
+    implementation 'io.anyline:anylinesdk:53.3.0'
     implementation "com.facebook.react:react-native:+"
     implementation("com.google.android.material:material:1.9.0")
     implementation 'androidx.multidex:multidex:2.0.1'

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

@@ -35,6 +35,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     public static final String REACT_CLASS = "AnylineSDKPlugin";
     public static final String EXTRA_LICENSE_KEY = "EXTRA_LICENSE_KEY";
     public static final String EXTRA_CONFIG_JSON = "EXTRA_CONFIG_JSON";
+    public static final String EXTRA_SCANVIEW_INITIALIZATION_PARAMETERS = "EXTRA_SCANVIEW_INITIALIZATION_PARAMETERS";
     public static final String EXTRA_SCAN_MODE = "EXTRA_SCAN_MODE";
     public static final String EXTRA_ERROR_MESSAGE = "EXTRA_ERROR_MESSAGE";
     public static final String EXTRA_OCR_CONFIG_JSON = "EXTRA_OCR_CONFIG_JSON";
@@ -53,6 +54,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     private Promise promise;
     private String returnMethod;
     private String config;
+    private String scanViewInitializationParameters;
     private AssetContextJsonParser assetContextJsonParser;
 
     private static WrapperConfig wrapperConfig;
@@ -175,10 +177,16 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
 
     @ReactMethod
     public void setup(String config, String scanMode, Callback onResultReact, Callback onErrorReact) {
+        setupWithInitializationParameters(null, config, scanMode, onResultReact, onErrorReact);
+    }
+
+    @ReactMethod
+    public void setupWithInitializationParameters(String initializationParameters, String config, String scanMode, Callback onResultReact, Callback onErrorReact) {
         onResultCallback = onResultReact;
         onErrorCallback = onErrorReact;
         this.returnMethod = "callback";
         this.config = config;
+        this.scanViewInitializationParameters = initializationParameters;
 
         routeScanMode(scanMode);
     }
@@ -226,9 +234,14 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
 
     @ReactMethod
     public void setupPromise(String config, String scanMode, final Promise promise) {
+        setupPromiseWithInitializationParameters(null, config, scanMode, promise);
+    }
+    @ReactMethod
+    public void setupPromiseWithInitializationParameters(String initializationParameters, String config, String scanMode, final Promise promise) {
         this.promise = promise;
         this.returnMethod = "promise";
         this.config = config;
+        this.scanViewInitializationParameters = initializationParameters;
 
         routeScanMode(scanMode);
     }
@@ -281,13 +294,14 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
 
         if (optionsJSONObject != null) {
             intent.putExtra(
-                    EXTRA_ENABLE_BARCODE_SCANNING,
-                    optionsJSONObject.optBoolean("nativeBarcodeEnabled", false)
+                EXTRA_ENABLE_BARCODE_SCANNING,
+                optionsJSONObject.optBoolean("nativeBarcodeEnabled", false)
             );
         }
 
         intent.putExtra(EXTRA_LICENSE_KEY, license);
         intent.putExtra(EXTRA_CONFIG_JSON, configObject.toString());
+        intent.putExtra(EXTRA_SCANVIEW_INITIALIZATION_PARAMETERS, scanViewInitializationParameters);
 
         ResultReporter.setListener(this);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

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

@@ -1,8 +1,10 @@
 package com.anyline.reactnative;
 
 import static com.anyline.reactnative.AnylineSDKPlugin.EXTRA_CONFIG_JSON;
+import static com.anyline.reactnative.AnylineSDKPlugin.EXTRA_SCANVIEW_INITIALIZATION_PARAMETERS;
 import static com.anyline.reactnative.AnylineSDKPlugin.EXTRA_ERROR_MESSAGE;
 import static com.anyline.reactnative.AnylineSDKPlugin.RESULT_ERROR;
+import static io.anyline2.sdk.extension.ScanViewInitializationParametersExtensionKt.getScanViewInitializationParametersFromJsonObject;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -29,6 +31,7 @@ import org.json.JSONObject;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import io.anyline.plugin.config.ScanViewInitializationParameters;
 import io.anyline2.ScanResult;
 import io.anyline2.view.ScanView;
 import io.anyline2.viewplugin.ScanViewPlugin;
@@ -98,7 +101,17 @@ public class ScanActivity extends AppCompatActivity {
                 setupChangeOrientationButton(configJSON);
                 setupCustomUIFeedback(configJSON);
 
-                scanView.init(configJSON);
+                String initializationParametersString = getIntent().getStringExtra(EXTRA_SCANVIEW_INITIALIZATION_PARAMETERS);
+                if (initializationParametersString != null) {
+                    ScanViewInitializationParameters scanViewInitializationParameters =
+                            getScanViewInitializationParametersFromJsonObject(
+                                    this,
+                                    new JSONObject(initializationParametersString));
+                    scanView.init(configJSON, scanViewInitializationParameters);
+                }
+                else {
+                    scanView.init(configJSON);
+                }
 
                 ViewPluginBase viewPluginBase = scanView.getScanViewPlugin();
 

package/ios/ALNFCScanViewController.h

@@ -8,6 +8,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithLicensekey:(NSString *)licensekey
                      configuration:(NSDictionary *)anylineConfig
                           uiConfig:(ALJSONUIConfiguration *)uiConfig
+           initializationParamsStr:(NSString *)initializationParamsStr
                           finished:(ALPluginCallback)callback;
 @end
 

package/ios/ALNFCScanViewController.m

@@ -47,6 +47,7 @@ API_AVAILABLE(ios(13.0))
 // JPEG compression quality 0-100
 @property (nonatomic, assign) NSUInteger quality;
 
+@property (nonatomic, nullable) NSString *initializationParamsStr;
 
 @end
 
@@ -56,13 +57,14 @@ API_AVAILABLE(ios(13.0))
 - (instancetype)initWithLicensekey:(NSString *)licensekey
                      configuration:(NSDictionary *)anylineConfig
                           uiConfig:(ALJSONUIConfiguration *)uiConfig
+           initializationParamsStr:(NSString *)initializationParamsStr
                           finished:(ALPluginCallback)callback {
     if (self = [super init]) {
         _licenseKey = licensekey;
         _callback = callback;
         _config = anylineConfig;
         _uiConfig = uiConfig;
-        
+        _initializationParamsStr = initializationParamsStr;
         self.quality = 90;
     }
     return self;
@@ -95,12 +97,20 @@ API_AVAILABLE(ios(13.0))
         return;
     }
     
+    ALScanViewInitializationParameters *initializationParams = nil;
+    if(_initializationParamsStr){
+        initializationParams=  [ALScanViewInitializationParameters withJSONString:_initializationParamsStr error:&error];
+    }
+    
     [self.view addSubview:self.scanView];
     
     self.resultDict = [[NSMutableDictionary alloc] init];
     self.detectedBarcodes = [NSMutableArray array];
     
-    self.scanView = [ALScanViewFactory withJSONDictionary:self.config delegate:self error:&error];
+    self.scanView = [ALScanViewFactory withJSONDictionary:self.config
+                                     initializationParams:initializationParams
+                                                 delegate:self
+                                                    error:&error];
     self.scanView.delegate = self;
     
     [self configureMRZPlugin];

package/ios/ALPluginHelper.h

@@ -10,7 +10,7 @@ typedef void (^ALPluginCallback)(NSDictionary * _Nullable callbackObj, NSError *
 
 @interface ALPluginHelper : NSObject
 
-+ (void)startScan:(NSDictionary *)config finished:(ALPluginCallback)callback;
++ (void)startScan:(NSDictionary *)config initializationParamsStr:(NSString *)initializationParamsStr finished:(ALPluginCallback)callback;
 
 + (NSString *)saveImageToFileSystem:(UIImage *)image;
 

package/ios/ALPluginHelper.m

@@ -10,7 +10,7 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
 
 #pragma mark - Launch Anyline
 
-+ (void)startScan:(NSDictionary *)config finished:(ALPluginCallback)callback {
++ (void)startScan:(NSDictionary *)config initializationParamsStr:(NSString *)initializationParamsStr finished:(ALPluginCallback)callback {
     
     NSDictionary *pluginConf = config;
     
@@ -35,7 +35,8 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
             ALNFCScanViewController *nfcScanViewController = [[ALNFCScanViewController alloc] initWithLicensekey:licenseKey
                                                                                                    configuration:pluginConf
                                                                                                         uiConfig:jsonUIConf
-                                                                                                        finished:callback];            
+                                                                                         initializationParamsStr:initializationParamsStr
+                                                                                                        finished:callback];
             if (nfcScanViewController != nil) {
                 [nfcScanViewController setModalPresentationStyle:UIModalPresentationFullScreen];
                 [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:nfcScanViewController
@@ -50,6 +51,7 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
         ALPluginScanViewController *pluginScanViewController = [[ALPluginScanViewController alloc] initWithLicensekey:licenseKey
                                                                                                         configuration:pluginConf
                                                                                                       uiConfiguration:jsonUIConf
+                                                                                              initializationParamsStr:initializationParamsStr
                                                                                                              finished:callback];
         
         if ([pluginConf valueForKey:@"quality"]){

package/ios/ALPluginScanViewController.h

@@ -10,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithLicensekey:(NSString *)licenseKey
                      configuration:(NSDictionary *)config
                    uiConfiguration:(ALJSONUIConfiguration *)JSONUIConfig
+           initializationParamsStr:(NSString *)initializationParamsStr
                           finished:(ALPluginCallback)callback;
 
 @end

package/ios/ALPluginScanViewController.m

@@ -37,6 +37,8 @@
 
 @property (nonatomic, strong) NSError *scanViewError;
 
+@property (nonatomic, nullable) NSString *initializationParamsStr;
+
 @end
 
 
@@ -49,6 +51,7 @@
 - (instancetype)initWithLicensekey:(NSString *)licenseKey
                      configuration:(NSDictionary *)config
                    uiConfiguration:(ALJSONUIConfiguration *)JSONUIConfig
+           initializationParamsStr:(NSString *)initializationParamsStr
                           finished:(ALPluginCallback)callback {
 
     if (self = [super init]) {
@@ -56,7 +59,8 @@
         _callback = callback;
         _config = config;
         _uiConfig = JSONUIConfig;
-        
+        _initializationParamsStr = initializationParamsStr;
+
         self.quality = 100;
     }
     return self;
@@ -79,7 +83,18 @@
         }
     }
 
+    ALScanViewInitializationParameters *initializationParams = nil;
+    if(![self isStringEmpty:_initializationParamsStr]){
+        initializationParams =  [ALScanViewInitializationParameters withJSONString: _initializationParamsStr error:&error];
+    }
+    
+    if ([self showErrorAlertIfNeeded:error]) {
+        self.scanViewError = error;
+        return;
+    }
+        
     self.scanView = [ALScanViewFactory withJSONDictionary:self.config
+                                     initializationParams:initializationParams
                                                  delegate:self
                                                     error:&error];
 
@@ -434,6 +449,13 @@
     return YES;
 }
 
+-(BOOL)isStringEmpty:(NSString *)str {
+    if(str == nil || [str isKindOfClass:[NSNull class]] || str.length==0) {
+        return YES;
+    }
+    return NO;
+}
+
 // MARK: - Miscellaneous
 
 - (BOOL)showErrorAlertIfNeeded:(NSError *)error {

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", "53.2.0"
+  s.dependency "Anyline", "53.3.0"
   s.dependency "React"
 
-end
+end

package/ios/AnylineSDKPlugin.m

@@ -27,6 +27,8 @@ ALWrapperConfig *wrapperConfig = nil;
 
 @property (nonatomic, copy) NSString *returnMethod;
 
+@property (nonatomic, copy) NSString *initializationParamsStr;
+
 @end
 
 
@@ -46,15 +48,19 @@ RCT_EXPORT_METHOD(setupScanViewWithConfigJson:(NSString *)config scanMode:(NSStr
     self.onErrorCallback = onError;
     self.returnMethod = @"callback";
     self.config = config;
-    [self initView:scanMode];
+    [self initView:scanMode initializationParamsStr:nil];
 }
 
 RCT_EXPORT_METHOD(setup:(NSString *)config scanMode:(NSString *)scanMode onResultCallback:(RCTResponseSenderBlock)onResult onErrorCallback:(RCTResponseSenderBlock)onError) {
+    [self setupWithInitializationParameters:nil config:config scanMode:scanMode onResultCallback:onResult onErrorCallback:onError];
+}
+
+RCT_EXPORT_METHOD(setupWithInitializationParameters:(NSString * _Nullable)initializationParametersStr config:(NSString *)config scanMode:(NSString *)scanMode onResultCallback:(RCTResponseSenderBlock)onResult onErrorCallback:(RCTResponseSenderBlock)onError) {
     self.onResultCallback = onResult;
     self.onErrorCallback = onError;
     self.returnMethod = @"callback";
     self.config = config;
-    [self initView:scanMode];
+    [self initView:scanMode initializationParamsStr:initializationParametersStr];
 }
 
 RCT_EXPORT_METHOD(setupAnylineSDK:(NSString *)licenseKey
@@ -92,11 +98,16 @@ RCT_EXPORT_METHOD(setupAnylineSDKWithCacheConfig:(NSString *)licenseKey
 }
 
 RCT_EXPORT_METHOD(setupPromise:(NSString *)config scanMode:(NSString *)scanMode resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    [self setupPromiseWithInitializationParameters:nil config:config scanMode:scanMode resolver:resolve rejecter:reject];
+}
+
+RCT_EXPORT_METHOD(setupPromiseWithInitializationParameters:(NSString * _Nullable)initializationParametersStr config:(NSString *)configStr scanMode:(NSString *)scanMode resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     _resolveBlock = resolve;
     _rejectBlock = reject;
     self.returnMethod = @"promise";
-    self.config = config;
-    [self initView:scanMode];
+    self.config = configStr;
+    self.initializationParamsStr = initializationParametersStr;
+    [self initView:scanMode initializationParamsStr:self.initializationParamsStr];
 }
 
 RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
@@ -134,7 +145,7 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
 }
 
 
-- (void)initView:(NSString *)scanMode {
+- (void)initView:(NSString *)scanMode initializationParamsStr:(NSString * _Nullable)initializationParamsStr {
     NSData *data = [self.config dataUsingEncoding:NSUTF8StringEncoding];
     if (!data) {
         [NSException raise:@"Config could not be loaded from disk" format:@"Config could not be loaded from disk"];
@@ -172,6 +183,7 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
                         ALNFCScanViewController *nfcScanViewController = [[ALNFCScanViewController alloc] initWithLicensekey:self.appKey
                                                                                                                configuration:dictionary
                                                                                                                     uiConfig:self.jsonUIConf
+                                                                                                     initializationParamsStr:initializationParamsStr
                                                                                                                     finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
                             [self returnCallback:callbackObj andError:error];
                         }];
@@ -191,7 +203,9 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
                 ALPluginScanViewController *pluginScanViewController =
                 [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
                                                          configuration:dictionary
-                                                       uiConfiguration:self.jsonUIConf finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
+                                                       uiConfiguration:self.jsonUIConf
+                                               initializationParamsStr:initializationParamsStr
+                                                              finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
                     [self returnCallback:callbackObj andError:error];
                 }];
                 
@@ -204,7 +218,9 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
             ALPluginScanViewController *pluginScanViewController =
             [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
                                                      configuration:dictionary
-                                                   uiConfiguration:self.jsonUIConf finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
+                                                   uiConfiguration:self.jsonUIConf
+                                           initializationParamsStr:initializationParamsStr
+                                                          finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
                 [self returnCallback:callbackObj andError:error];
             }];
             

package/package.json

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