@regulaforensics/cordova-plugin-document-reader-api 6.3.1 → 6.4.0

package/.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,39 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[BR] "
+labels: bug
+assignees: ''
+
+---
+
+**Before Submitting, be sure to**
+- [ ] Update to the latest stable version.
+- [ ] Read and follow the guides described in the [documentation](https://docs.regulaforensics.com?utm_source=github).
+- [ ] Try to reproduce in our demo project.
+- [ ] Search for your issue in the existing GitHub issues.
+
+**Bug Description**
+<!--A clear and concise description of what the bug is.-->
+
+**Steps To Reproduce**
+<!--
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+-->
+
+**Expected behavior**
+<!--A clear and concise description of what you expected to happen.-->
+
+**Screenshots**
+<!--If applicable, add screenshots to help explain your issue.-->
+
+**Environment:**
+ - Device: <!--[e.g. iPhone 12]-->
+ - OS: <!--[e.g. iOS]-->
+ - OS version: <!--[e.g. 10.0]-->
+
+**Additional context**
+<!--Add any other context about the problem here.-->

package/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Regula Help Center
+    url: https://support.regulaforensics.com/hc/requests/new?utm_source=github
+    about: Please submit any requests here

package/.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,20 @@
+---
+name: Feature Request
+about: Suggest an idea for this product
+title: "[FR] "
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->
+
+**Describe the solution you'd like**
+<!--A clear and concise description of what you want to happen.-->
+
+**Describe alternatives you've considered**
+<!--A clear and concise description of any alternative solutions or features you've considered.-->
+
+**Additional context**
+<!--Add any other context or screenshots about the feature request here.-->

package/example/package.json

@@ -16,8 +16,8 @@
     "cordova-android": "^9.0.0",
     "cordova-ios": "^6.1.1",
     "cordova-plugin-add-swift-support": "^2.0.2",
-    "@regulaforensics/cordova-plugin-document-reader-api": "^6.3.1",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^6.3.0",
+    "@regulaforensics/cordova-plugin-document-reader-api": "^6.4.0",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^6.4.0",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-image-picker": "^1.1.3",
     "cordova-plugin-android-permissions": "1.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "description": "Cordova plugin for reading and validation of identification documents (API framework)",
   "cordova": {
     "id": "@regulaforensics/cordova-plugin-document-reader-api",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-document-reader-api" version="6.3.1"
+<plugin id="cordova-plugin-document-reader-api" version="6.4.0"
   xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
@@ -25,7 +25,7 @@
     <podspec>
       <config/>
       <pods>
-        <pod name="DocumentReader" spec="~> 6.3.2494" />
+        <pod name="DocumentReader" spec="~> 6.4.2552" />
       </pods>
     </podspec>
   </platform>

package/src/android/DocumentReader.java

@@ -9,7 +9,7 @@ import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.nfc.NfcAdapter;
 import android.nfc.tech.IsoDep;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.os.Bundle;
 import android.util.Base64;
 
@@ -24,6 +24,7 @@ import com.regula.documentreader.api.enums.DocReaderAction;
 import com.regula.documentreader.api.errors.DocumentReaderException;
 import com.regula.documentreader.api.internal.core.CoreScenarioUtil;
 import com.regula.documentreader.api.params.DocReaderConfig;
+import com.regula.documentreader.api.params.ImageInputData;
 import com.regula.documentreader.api.params.ImageInputParam;
 import com.regula.documentreader.api.params.rfid.PKDCertificate;
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer;
@@ -227,6 +228,9 @@ public class DocumentReader extends CordovaPlugin {
                 case "stopRFIDReader":
                     stopRFIDReader(callback);
                     break;
+                case "stopRFIDReaderWithErrorMessage":
+                    stopRFIDReaderWithErrorMessage(callback, args(0));
+                    break;
                 case "stopScanner":
                     stopScanner(callback);
                     break;
@@ -332,9 +336,6 @@ public class DocumentReader extends CordovaPlugin {
                 case "initializeReaderWithDatabase":
                     initializeReaderWithDatabase(callback, args(0), args(1));
                     break;
-                case "recognizeImageFrame":
-                    recognizeImageFrame(callback, args(0), args(1));
-                    break;
                 case "recognizeImageWithOpts":
                     recognizeImageWithOpts(callback, args(0), args(1));
                     break;
@@ -344,12 +345,12 @@ public class DocumentReader extends CordovaPlugin {
                 case "showScannerWithCameraIDAndOpts":
                     showScannerWithCameraIDAndOpts(callback, args(0), args(1));
                     break;
-                case "recognizeImageWithImageInputParams":
-                    recognizeImageWithImageInputParams(callback, args(0), args(1));
-                    break;
                 case "recognizeImageWithCameraMode":
                     recognizeImageWithCameraMode(callback, args(0), args(1));
                     break;
+                case "recognizeImagesWithImageInputs":
+                    recognizeImagesWithImageInputs(callback, args(0));
+                    break;
             }
         } catch (Exception ignored) {
         }
@@ -523,10 +524,6 @@ public class DocumentReader extends CordovaPlugin {
         callback.success();
     }
 
-    private void recognizeImageWithImageInputParams(@SuppressWarnings("unused") Callback callback, String base64Image, final JSONObject params) throws JSONException {
-        Instance().recognizeImage(Helpers.bitmapFromBase64(base64Image), new ImageInputParam(params.getInt("width"), params.getInt("height"), params.getInt("type")), getCompletion());
-    }
-
     private void recognizeImageWithOpts(Callback callback, String base64Image, final JSONObject opts) throws JSONException {
         RegulaConfig.setConfig(Instance(), opts, getContext());
         recognizeImage(callback, base64Image);
@@ -545,6 +542,14 @@ public class DocumentReader extends CordovaPlugin {
         Instance().recognizeImages(images, getCompletion());
     }
 
+    private void recognizeImagesWithImageInputs(@SuppressWarnings("unused") Callback callback, JSONArray base64Images) throws JSONException {
+        stopBackgroundRFID();
+        ImageInputData[] images = new ImageInputData[base64Images.length()];
+        for (int i = 0; i < images.length; i++)
+            images[i] = JSONConstructor.ImageInputDataFromJSON(base64Images.getJSONObject(i));
+        Instance().recognizeImages(images, getCompletion());
+    }
+
     private void removeDatabase(Callback callback) {
         callback.success(Instance().removeDatabase(getContext()));
     }
@@ -578,10 +583,6 @@ public class DocumentReader extends CordovaPlugin {
         callback.success();
     }
 
-    private void recognizeImageFrame(@SuppressWarnings("unused") Callback callback, String base64Image, final JSONObject opts) throws JSONException {
-        Instance().recognizeImageFrame(Helpers.bitmapFromBase64(base64Image), new ImageInputParam(opts.getInt("width"), opts.getInt("height"), opts.getInt("type")), getCompletion());
-    }
-
     private void recognizeVideoFrame(@SuppressWarnings("unused") Callback callback, String byteString, final JSONObject opts) throws JSONException {
         stopBackgroundRFID();
         Instance().recognizeVideoFrame(byteString.getBytes(), new ImageInputParam(opts.getInt("width"), opts.getInt("height"), opts.getInt("type")), getCompletion());
@@ -700,6 +701,10 @@ public class DocumentReader extends CordovaPlugin {
         callback.error("getCameraSessionIsPaused() is an ios-only method");
     }
 
+    private void stopRFIDReaderWithErrorMessage(Callback callback, String message) {
+        callback.error("stopRFIDReaderWithErrorMessage() is an ios-only method");
+    }
+
     @SuppressWarnings("unused")
     private void recognizeImageWithCameraMode(Callback callback, String base64, boolean mode) {
         callback.error("recognizeImageWithCameraMode() is an ios-only method");

package/src/android/JSONConstructor.java

@@ -16,6 +16,7 @@ import com.regula.documentreader.api.enums.eRPRM_Lights;
 import com.regula.documentreader.api.errors.DocumentReaderException;
 import com.regula.documentreader.api.internal.core.CoreDetailedScenario;
 import com.regula.documentreader.api.params.FaceMetaData;
+import com.regula.documentreader.api.params.ImageInputData;
 import com.regula.documentreader.api.params.rfid.TccParams;
 import com.regula.documentreader.api.params.rfid.authorization.PAAttribute;
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer;
@@ -360,6 +361,42 @@ class JSONConstructor {
         return result;
     }
 
+    static ImageInputData ImageInputDataFromJSON(JSONObject input) {
+        ImageInputData result = new ImageInputData(null);
+        int pageIndex = 0;
+        int light = 6;
+        int type = 254;
+        int width = 0;
+        int height = 0;
+        Bitmap bitmap;
+        byte[] imgBytes;
+
+        try {
+            if(input.has("pageIndex"))
+                pageIndex = input.optInt("pageIndex");
+            if(input.has("light"))
+                pageIndex = input.optInt("light");
+            if(input.has("type"))
+                pageIndex = input.optInt("type");
+            if (input.has("bitmap")) {
+                bitmap = Helpers.bitmapFromBase64(input.getString("bitmap"));
+                result = new ImageInputData(bitmap, light, pageIndex);
+            }
+            if (input.has("imgBytes")) {
+                JSONArray jsonArray_data = input.getJSONArray("data");
+                byte[] data = new byte[jsonArray_data.length()];
+                for (int i = 0; i < jsonArray_data.length(); i++)
+                    data[i] = (byte) jsonArray_data.get(i);
+                imgBytes = data;
+                result = new ImageInputData(imgBytes, width, height, light, pageIndex);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
     static Throwable ThrowableFromJSON(JSONObject jsonObject) {
         return new Throwable();
     }
@@ -1184,6 +1221,23 @@ class JSONConstructor {
         return result;
     }
 
+    static JSONObject generateImageInputData(ImageInputData input) {
+        JSONObject result = new JSONObject();
+        if (input == null) return result;
+        try {
+            result.put("pageIndex", input.getPageIndex());
+            result.put("light", input.getLight());
+            result.put("type", input.getType());
+            result.put("width", input.getWidth());
+            result.put("height", input.getHeight());
+            result.put("bitmap", generateBitmap(input.getBitmap()));
+            result.put("imgBytes", generateByteArray(input.getImgBytes()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
     static JSONObject generateDocumentReaderResults(DocumentReaderResults input, Context context) {
         JSONObject result = new JSONObject();
         if (input == null) return result;

package/src/android/RegulaConfig.java

@@ -103,6 +103,8 @@ class RegulaConfig {
             editor.setManualMultipageMode(opts.getBoolean("manualMultipageMode"));
         if (opts.has("exposure"))
             editor.setExposure(BigDecimal.valueOf(opts.getDouble("exposure")).floatValue());
+        if (opts.has("rfidTimeout"))
+            editor.setRfidTimeout(opts.getInt("rfidTimeout"));
 
         editor.apply();
     }
@@ -331,6 +333,8 @@ class RegulaConfig {
             editor.setHologramAnimationImageMatrix(matrixFromFloatArray(floatArrayFromJson(opts.getJSONArray("hologramAnimationImageMatrix"))));
         if (opts.has("hologramAnimationImageScaleType"))
             editor.setHologramAnimationImageScaleType(ScaleType.valueOf(opts.getString("hologramAnimationImageScaleType")));
+        if (opts.has("uiCustomizationLayer"))
+            editor.setUiCustomizationLayer(opts.getJSONObject("uiCustomizationLayer"));
 
         editor.applyImmediately(context);
     }
@@ -371,6 +375,7 @@ class RegulaConfig {
         object.put("recordScanningProcess", functionality.doRecordProcessingVideo());
         object.put("manualMultipageMode", functionality.isManualMultipageMode());
         object.put("exposure", functionality.getExposure());
+        object.put("rfidTimeout", functionality.getRfidTimeout());
 
         return object;
     }
@@ -435,6 +440,7 @@ class RegulaConfig {
         object.put("hologramAnimationPositionMultiplier", customization.getHologramAnimationPositionMultiplier());
         object.put("hologramAnimationImageMatrix", customization.getHologramAnimationImageMatrix());
         object.put("hologramAnimationImageScaleType", customization.getHologramAnimationImageScaleType());
+        object.put("uiCustomizationLayer", customization.getUiCustomizationLayer());
 
         return object;
     }

package/src/android/build.gradle

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-	implementation ('com.regula.documentreader:api:6.3.6946'){
+	implementation ('com.regula.documentreader:api:6.4.7224'){
         transitive = true
     }
 }

package/src/ios/RGLDocumentReader.m

@@ -178,6 +178,8 @@ typedef void (^Callback)(NSString* response);
         [self startRFIDReader :successCallback :errorCallback];
     else if([action isEqualToString:@"stopRFIDReader"])
         [self stopRFIDReader :successCallback :errorCallback];
+    else if([action isEqualToString:@"stopRFIDReaderWithErrorMessage"])
+        [self stopRFIDReaderWithErrorMessage :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"stopScanner"])
         [self stopScanner :successCallback :errorCallback];
     else if([action isEqualToString:@"deinitializeReader"])
@@ -248,18 +250,16 @@ typedef void (^Callback)(NSString* response);
         [self setTCCParams :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"initializeReaderWithDatabase"])
         [self initializeReaderWithDatabase :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
-    else if([action isEqualToString:@"recognizeImageFrame"])
-        [self recognizeImageFrame :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImageWithOpts"])
         [self recognizeImageWithOpts :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeVideoFrame"])
         [self recognizeVideoFrame :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"showScannerWithCameraIDAndOpts"])
         [self showScannerWithCameraIDAndOpts :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
-    else if([action isEqualToString:@"recognizeImageWithImageInputParams"])
-        [self recognizeImageWithImageInputParams :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImageWithCameraMode"])
         [self recognizeImageWithCameraMode :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
+    else if([action isEqualToString:@"recognizeImagesWithImageInputs"])
+        [self recognizeImagesWithImageInputs :[args objectAtIndex:0] :successCallback :errorCallback];
     else
         [self result:[NSString stringWithFormat:@"%@/%@", @"method not implemented: ", action] :errorCallback];
 }
@@ -282,8 +282,10 @@ typedef void (^Callback)(NSString* response);
     [self result:@"showScannerWithCameraID() is an android-only method" :errorCallback];
 }
 
-- (void) recognizeImageFrame:(NSString*)base64 :(NSDictionary*)opts :(Callback)successCallback :(Callback)errorCallback{
-    [self result:@"recognizeImageFrame() is an android-only method" :errorCallback];
+- (void) stopRFIDReaderWithErrorMessage:(NSMutableString*)message :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared stopRFIDReaderWithErrorMessage:message completion:^() {
+        [self result:@"" :successCallback];
+    }];
 }
 
 - (void) recognizeImageWithOpts:(NSString*)base64 :(NSDictionary*)opts :(Callback)successCallback :(Callback)errorCallback{
@@ -298,10 +300,6 @@ typedef void (^Callback)(NSString* response);
     [self result:@"showScannerWithCameraIDAndOpts() is an android-only method" :errorCallback];
 }
 
-- (void) recognizeImageWithImageInputParams:(NSString*)base64 :(NSDictionary*)params :(Callback)successCallback :(Callback)errorCallback{
-    [self result:@"recognizeImageWithImageInputParams() is an android-only method" :errorCallback];
-}
-
 - (void) getLicenseMessage:(Callback)successCallback :(Callback)errorCallback{
     [self result:@"getLicenseMessage() is an android-only method" :successCallback];
 }
@@ -367,6 +365,15 @@ typedef void (^Callback)(NSString* response);
         });
 }
 
+- (void) recognizeImagesWithImageInputs:(NSArray*)input :(Callback)successCallback :(Callback)errorCallback{
+        NSMutableArray<RGLImageInput*>* images = [[NSMutableArray alloc] init];
+        for(__strong NSDictionary* image in input)
+            [images addObject:[RGLWJSONConstructor RGLImageInputFromJson: image]];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [RGLDocReader.shared recognizeImagesWithImageInputs:images completion:[self getCompletion]];
+        });
+}
+
 - (void) recognizeImageWithCameraMode:(NSMutableString*)base64 :(BOOL)cameraMode :(Callback)successCallback :(Callback)errorCallback{
     [self recognizeImageWith :base64 :cameraMode :successCallback :errorCallback];
 }

package/src/ios/RGLWJSONConstructor.h

@@ -12,6 +12,7 @@
 +(NSMutableDictionary* _Nonnull)generateNSDictionary:(NSDictionary<NSNumber*, NSNumber*>* _Nullable)input;
 +(RGLPKDCertificate* _Nullable)RGLPKDCertificateFromJson:(NSDictionary* _Nullable) dict;
 +(RGLTCCParams* _Nonnull)RGLTCCParamsFromJson:(NSDictionary* _Nonnull)input;
++(RGLImageInput* _Nonnull)RGLImageInputFromJson:(NSDictionary* _Nonnull)input;
 +(NSInteger)generateDocReaderAction:(RGLDocReaderAction)action;
 +(NSInteger)generateRFIDCompleteAction:(RGLRFIDCompleteAction)action;
 +(NSInteger)generateRFIDNotificationAction:(RGLRFIDNotificationAction)action;

package/src/ios/RGLWJSONConstructor.m

@@ -35,6 +35,20 @@
     return [[RGLTCCParams alloc] initWithServiceTAURLString:serviceTAURLString servicePAURLString:servicePAURLString pfxCertURLString:pfxCertURLString pfxCertData: pfxCertData pfxPassPhrase:pfxPassPhrase];
 }
 
++(RGLImageInput*)RGLImageInputFromJson:(NSDictionary*)input {
+    NSInteger pageIndex = 0;
+    if([input valueForKey:@"pageIndex"] != nil)
+        pageIndex = [[input valueForKey:@"pageIndex"] integerValue];
+    NSInteger light = 6;
+    if([input valueForKey:@"light"] != nil)
+        pageIndex = [[input valueForKey:@"light"] integerValue];
+    if([input valueForKey:@"bitmap"] != nil){
+        UIImage* image = [UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:[input valueForKey:@"bitmap"] options:NSDataBase64DecodingIgnoreUnknownCharacters]];
+        return [[RGLImageInput alloc] initWithImage:image light:light pageIndex:pageIndex];
+    }
+    return nil;
+}
+
 +(NSMutableDictionary*)generateCGPoint:(CGPoint)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
 
@@ -107,6 +121,9 @@
         case RGLDocReaderActionError:
             result = 3;
             break;
+        case RGLDocReaderActionProcessTimeout:
+            result = 10;
+            break;
         default:
             break;
     }
@@ -118,7 +135,7 @@
     NSInteger result = 0;
     switch (input) {
         case RGLRFIDCompleteActionComplete:
-            result = 10;
+            result = 999;
             break;
         case RGLRFIDCompleteActionError:
             result = 3;
@@ -136,6 +153,29 @@
     return result;
 }
 
++(NSNumber*)generateRGLImageQualityCheckType:(RGLImageQualityCheckType)value {
+    if(value == RGLImageQualityCheckTypeImageGlares)
+        return @0;
+    else if(value == RGLImageQualityCheckTypeImageFocus)
+        return @1;
+    else if(value == RGLImageQualityCheckTypeImageResolution)
+        return @2;
+    else if(value == RGLImageQualityCheckTypeImageColorness)
+        return @3;
+    else if(value == RGLImageQualityCheckTypeImagePerspective)
+        return @4;
+    else if(value == RGLImageQualityCheckTypeImageBounds)
+        return @5;
+    else if(value == RGLImageQualityCheckTypeScreenCapture)
+        return @6;
+    else if(value == RGLImageQualityCheckTypePortrait)
+        return @7;
+    else if(value == RGLImageQualityCheckTypeHandwritten)
+        return @8;
+    else
+        return @0;
+}
+
 +(NSInteger)generateRFIDNotificationAction:(RGLRFIDNotificationAction)input {
     return 5;
 }
@@ -155,6 +195,9 @@
         case 3:
             result[@"results"] = [self generateRGLDocumentReaderResults:results];
             break;
+        case 10:
+            result[@"results"] = [self generateRGLDocumentReaderResults:results];
+            break;
         case 5:
             result[@"results"] = [self generateResultsWithNotification:[self generateRGLRFIDNotify:notify]];
             break;
@@ -164,7 +207,7 @@
         case 8:
             result[@"results"] = [self generateRGLDocumentReaderResults:results];
             break;
-        case 10:
+        case 999:
             result[@"results"] = [self generateResultsWithRFID :results :1];
             action = 1;
             break;
@@ -400,7 +443,7 @@
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return result;
 
-    result[@"type"] = input.type;
+    result[@"type"] = [self generateRGLImageQualityCheckType:input.type];
     result[@"result"] = @(input.result);
     result[@"featureType"] = @(input.featureType);
     result[@"boundRects"] = [self generateNSArrayCGRect:input.boundRects];

package/src/ios/RegulaConfig.m

@@ -550,6 +550,8 @@
         customization.hologramAnimationPositionMultiplier = [[options valueForKey:@"hologramAnimationPositionMultiplier"] floatValue];
     if([options valueForKey:@"hologramAnimationImage"] != nil)
         customization.hologramAnimationImage = [self imageFromBase64:[options valueForKey:@"hologramAnimationImage"]];
+    if([options valueForKey:@"uiCustomizationLayer"] != nil)
+        customization.customUILayerJSON = [options valueForKey:@"uiCustomizationLayer"];
 }
 
 +(void)setFunctionality:(NSDictionary*)options :(RGLFunctionality*)functionality {
@@ -755,6 +757,7 @@
     result[@"toolbarSize"] = [NSNumber numberWithFloat:customization.toolbarSize];
     result[@"hologramAnimationImageContentMode"] = [NSNumber numberWithInteger:[self NSIntegerWithUIViewContentMode:customization.hologramAnimationImageContentMode]];
     result[@"hologramAnimationPositionMultiplier"] = [NSNumber numberWithFloat:customization.hologramAnimationPositionMultiplier];
+    result[@"uiCustomizationLayer"] = customization.customUILayerJSON;
     result[@"hologramAnimationImage"] = [UIImageJPEGRepresentation(customization.hologramAnimationImage, 1.0) base64EncodedStringWithOptions:0];
     if(customization.customLabelStatus != nil)
         result[@"customLabelStatus"] = customization.customLabelStatus.string;

package/www/DocumentReader.js

@@ -983,6 +983,26 @@ class DocumentReaderUvFiberElement {
     }
 }
 
+class ImageInputData {
+    static fromJson(jsonObject) {
+        if (jsonObject == null) return null
+        const result = new ImageInputData()
+
+        result.pageIndex = jsonObject["pageIndex"]
+        result.light = jsonObject["light"]
+        result.type = jsonObject["type"]
+        result.width = jsonObject["width"]
+        result.height = jsonObject["height"]
+        result.bitmap = jsonObject["bitmap"]
+        result.imgBytes = []
+        if (jsonObject["imgBytes"] != null)
+            for (const i in jsonObject["imgBytes"])
+                result.imgBytes.push(jsonObject["imgBytes"][i])
+
+        return result
+    }
+}
+
 class DocumentReaderResults {
     getTextFieldValueByType({ fieldType, lcid = 0, source = -1, original = false }) {
         if (this.textResult == null) return null
@@ -1219,13 +1239,13 @@ const diDocType = {
     dtIdentityCard: 12,
     dtDiplomaticPassport: 13,
     dtServicePassport: 14,
-    dtSeamansIdentityDocument: 15,
-    dtIdentityCardforResidence: 16,
-    dtTraveldocument: 17,
+    dtSeamanIdentityDocument: 15,
+    dtIdentityCardForResidence: 16,
+    dtTravelDocument: 17,
     dtOther: 99,
     dtVisaID2: 29,
     dtVisaID3: 30,
-    dtRegistrationCertificate: 31,
+    dtRegistrationCertificate: 206,
     dtNationalIdentityCard: 20,
     dtSocialIdentityCard: 21,
     dtAliensIdentityCard: 22,
@@ -1242,10 +1262,10 @@ const diDocType = {
     dtChauffeurLicenseUnder18: 36,
     dtChauffeurLicenseUnder21: 37,
     dtCommercialDrivingLicense: 38,
-    dtCommercialDrivingLicenseIndtuctionalPermit: 39,
+    dtCommercialDrivingLicenseInstructionalPermit: 39,
     dtCommercialDrivingLicenseUnder18: 40,
     dtCommercialDrivingLicenseUnder21: 41,
-    dtCommercialIndtuctionPermit: 42,
+    dtCommercialInstructionPermit: 42,
     dtCommercialNewPermit: 43,
     dtConcealedCarryLicense: 44,
     dtConcealedFirearmPermit: 45,
@@ -1253,9 +1273,9 @@ const diDocType = {
     dtDepartmentOfVeteransAffairsIdentityCard: 47,
     dtDiplomaticDrivingLicense: 48,
     dtDrivingLicense: 49,
-    dtDrivingLicenseIndtuctionalPermit: 50,
-    dtDrivingLicenseIndtuctionalPermitUnder18: 51,
-    dtDrivingLicenseIndtuctionalPermitUnder21: 52,
+    dtDrivingLicenseInstructionalPermit: 50,
+    dtDrivingLicenseInstructionalPermitUnder18: 51,
+    dtDrivingLicenseInstructionalPermitUnder21: 52,
     dtDrivingLicenseLearnersPermit: 53,
     dtDrivingLicenseLearnersPermitUnder18: 54,
     dtDrivingLicenseLearnersPermitUnder21: 55,
@@ -1263,8 +1283,8 @@ const diDocType = {
     dtDrivingLicenseNoviceUnder18: 57,
     dtDrivingLicenseNoviceUnder21: 58,
     dtDrivingLicenseRegisteredOffender: 59,
-    dtDrivingLicenseRedtictedUnder18: 60,
-    dtDrivingLicenseRedtictedUnder21: 61,
+    dtDrivingLicenseRestrictedUnder18: 60,
+    dtDrivingLicenseRestrictedUnder21: 61,
     dtDrivingLicenseTemporaryVisitor: 62,
     dtDrivingLicenseTemporaryVisitorUnder18: 63,
     dtDrivingLicenseTemporaryVisitorUnder21: 64,
@@ -1289,8 +1309,8 @@ const diDocType = {
     dtGenevaConventionsIdentityCard: 83,
     dtGraduatedDrivingLicenseUnder18: 84,
     dtGraduatedDrivingLicenseUnder21: 85,
-    dtGraduatedIndtuctionPermitUnder18: 86,
-    dtGraduatedIndtuctionPermitUnder21: 87,
+    dtGraduatedInstructionPermitUnder18: 86,
+    dtGraduatedInstructionPermitUnder21: 87,
     dtGraduatedLicenseUnder18: 88,
     dtGraduatedLicenseUnder21: 89,
     dtHandgunCarryPermit: 90,
@@ -1304,16 +1324,16 @@ const diDocType = {
     dtIdentityCardUnder21: 98,
     dtIgnitionInterlockPermit: 100,
     dtImmigrantVisa: 101,
-    dtIndtuctionPermit: 102,
-    dtIndtuctionPermitUnder18: 103,
-    dtIndtuctionPermitUnder21: 104,
+    dtInstructionPermit: 102,
+    dtInstructionPermitUnder18: 103,
+    dtInstructionPermitUnder21: 104,
     dtInterimDrivingLicense: 105,
     dtInterimIdentityCard: 106,
     dtIntermediateDrivingLicense: 107,
     dtIntermediateDrivingLicenseUnder18: 108,
     dtIntermediateDrivingLicenseUnder21: 109,
     dtJuniorDrivingLicense: 110,
-    dtLearnerIndtuctionalPermit: 111,
+    dtLearnerInstructionalPermit: 111,
     dtLearnerLicense: 112,
     dtLearnerLicenseUnder18: 113,
     dtLearnerLicenseUnder21: 114,
@@ -1350,9 +1370,9 @@ const diDocType = {
     dtRacingAndGamingComissionCard: 145,
     dtRefugeeTravelDocument: 146,
     dtRenewalPermit: 147,
-    dtRedtictedCommercialDrivingLicense: 148,
-    dtRedtictedDrivingLicense: 149,
-    dtRedtictedPermit: 150,
+    dtRestrictedCommercialDrivingLicense: 148,
+    dtRestrictedDrivingLicense: 149,
+    dtRestrictedPermit: 150,
     dtSeasonalPermit: 151,
     dtSeasonalResidentIdentityCard: 152,
     dtSeniorCitizenIdentityCard: 153,
@@ -1362,9 +1382,9 @@ const diDocType = {
     dtTemporaryDrivingLicenseUnder18: 157,
     dtTemporaryDrivingLicenseUnder21: 158,
     dtTemporaryIdentityCard: 159,
-    dtTemporaryIndtuctionPermitIdentityCard: 160,
-    dtTemporaryIndtuctionPermitIdentityCardUnder18: 161,
-    dtTemporaryIndtuctionPermitIdentityCardUnder21: 162,
+    dtTemporaryInstructionPermitIdentityCard: 160,
+    dtTemporaryInstructionPermitIdentityCardUnder18: 161,
+    dtTemporaryInstructionPermitIdentityCardUnder21: 162,
     dtTemporaryVisitorDrivingLicense: 163,
     dtTemporaryVisitorDrivingLicenseUnder18: 164,
     dtTemporaryVisitorDrivingLicenseUnder21: 165,
@@ -1387,15 +1407,15 @@ const diDocType = {
     dtCertificateOfCitizenship: 182,
     dtAddressCard: 183,
     dtAirportImmigrationCard: 184,
-    dtAlienRegidtationCard: 185,
+    dtAlienRegistrationCard: 185,
     dtAPEHCard: 186,
-    dtCoupontoDrivingLicense: 187,
+    dtCouponToDrivingLicense: 187,
     dtCrewMemberCertificate: 188,
     dtDocumentForReturn: 189,
     dtECard: 190,
     dtEmploymentCard: 191,
     dtHKSARImmigrationForm: 192,
-    dtImmigrantcard: 193,
+    dtImmigrantCard: 193,
     dtLabourCard: 194,
     dtLaissezPasser: 195,
     dtLawyerIdentityCertificate: 196,
@@ -1407,7 +1427,7 @@ const diDocType = {
     dtPassportOfficial: 202,
     dtPassportProvisional: 203,
     dtPassportSpecial: 204,
-    dtPermissiontotheLocalBorderTraffic: 205,
+    dtPermissionToTheLocalBorderTraffic: 205,
     dtSEDESOLCard: 207,
     dtSocialCard: 208,
     dtTBCard: 209,
@@ -1440,6 +1460,10 @@ const diDocType = {
     dtInterimInstructionalPermit: 236,
     dtCertificateOfCompetency: 237,
     dtCertificateOfProficiency: 238,
+    dtTradeLicense: 239,
+    dtPassportPage: 240,
+    dtInvoice: 241,
+    dtPassengerLocatorForm: 242,
 }
 
 const DocFormat = {
@@ -1458,7 +1482,10 @@ const DocReaderAction = {
     ERROR: 3,
     NOTIFICATION: 5,
     PROCESS_WHITE_UV_IMAGES: 6,
+    PROCESS_WHITE_FLASHLIGHT: 7,
     MORE_PAGES_AVAILABLE: 8,
+    PROCESS_IR_FRAME: 9,
+    TIMEOUT: 10,
 }
 
 const DocReaderFrame = {
@@ -3364,7 +3391,7 @@ const eRFID_ErrorCodes = {
             case -2046820094:
                 return "LAYER6: ISO7816_B_03 \"Mutual authentication failure\""
             case -2046820093:
-                return "null"
+                return "LAYER6: ISO7816_B_03 \"Mutual authentication failure data\""
             case -2046819840:
                 return "LAYER6: SM failure – MAC missing"
             case -2046819839:
@@ -3500,13 +3527,20 @@ const eRPRM_Lights = {
     NONE: 0,
     RPRM_LIGHT_UV: 128,
     RPRM_LIGHT_WHITE_FULL: 6,
+    RPRM_LIGHT_IR: 16777216,
+    RPRM_Light_IR_TOP: 8,
+    RPRM_Light_IR_SIDE: 16,
+    RPRM_Light_IR_Full: 24,
+    RPRM_LIGHT_OVD: 67108864,
 
     getTranslation: function (value) {
         switch (value) {
-            case this.RPRM_LIGHT_UV:
-                return "UV"
-            case this.RPRM_LIGHT_WHITE_FULL:
+            case 6:
                 return "Visible light"
+            case 24:
+                return "IR"
+            case 128:
+                return "UV"
             default:
                 return value
         }
@@ -4194,6 +4228,10 @@ const eVisualFieldType = {
     FT_VACCINATION_CERTIFICATE_IDENTIFIER: 644,
     FT_FIRST_NAME: 645,
     FT_DATE_OF_ARRIVAL: 646,
+    FT_SECOND_NAME: 647,
+    FT_THIRD_NAME: 648,
+    FT_FOURTH_NAME: 649,
+    FT_LAST_NAME: 650,
 
     getTranslation: function (value) {
         switch (value) {
@@ -5388,7 +5426,15 @@ const eVisualFieldType = {
             case 645:
                 return "First name"
             case 646:
-                return "null"
+                return "Date of arrival"
+            case 647:
+                return "Second name"
+            case 648:
+                return "Third name"
+            case 649:
+                return "Fourth name"
+            case 650:
+                return "Last name"
             default:
                 return value
         }
@@ -6049,6 +6095,7 @@ DocumentReader.startNewPage = (successCallback, errorCallback) => cordova.exec(s
 DocumentReader.startNewSession = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["startNewSession"])
 DocumentReader.startRFIDReader = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["startRFIDReader"])
 DocumentReader.stopRFIDReader = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["stopRFIDReader"])
+DocumentReader.stopRFIDReaderWithErrorMessage = (message, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["stopRFIDReaderWithErrorMessage", message])
 DocumentReader.stopScanner = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["stopScanner"])
 DocumentReader.deinitializeReader = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["deinitializeReader"])
 DocumentReader.isAuthenticatorAvailableForUse = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["isAuthenticatorAvailableForUse"])
@@ -6084,12 +6131,11 @@ DocumentReader.provideTASignature = (certificates, successCallback, errorCallbac
 DocumentReader.parseCoreResults = (json, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["parseCoreResults", json])
 DocumentReader.setTCCParams = (params, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["setTCCParams", params])
 DocumentReader.initializeReaderWithDatabase = (license, db, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["initializeReaderWithDatabase", license, db])
-DocumentReader.recognizeImageFrame = (image, params, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeImageFrame", image, params])
 DocumentReader.recognizeImageWithOpts = (image, options, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeImageWithOpts", image, options])
 DocumentReader.recognizeVideoFrame = (byteString, params, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeVideoFrame", byteString, params])
 DocumentReader.showScannerWithCameraIDAndOpts = (cameraID, options, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["showScannerWithCameraIDAndOpts", cameraID, options])
-DocumentReader.recognizeImageWithImageInputParams = (image, params, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeImageWithImageInputParams", image, params])
 DocumentReader.recognizeImageWithCameraMode = (image, mode, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeImageWithCameraMode", image, mode])
+DocumentReader.recognizeImagesWithImageInputs = (images, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeImagesWithImageInputs", images])
 
 DocumentReader.DocumentReaderResults = DocumentReaderResults
 DocumentReader.Enum = Enum