Merge branch 'release/24'

Anyline · Sep 24, 2020 · e704837 · e704837
2 parents 9d1560f + 190c992
commit e704837
Show file tree

Hide file tree

Showing 17 changed files with 234 additions and 187 deletions.
diff --git a/example/config.xml b/example/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.anyline.examples.cordova" version="23.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.anyline.examples.cordova" version="24.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Anyline Cordova Example</name>
     <preference name="deployment-target" value="10.0" />
     <preference name="SwiftVersion" value="4.2" />

diff --git a/example/package.json b/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anyline-cordova-example",
-  "version": "23.0.0",
+  "version": "24.0.0",
   "description": "Cordova plugin for implementing Anyline",
   "main": "index.js",
   "scripts": {
@@ -18,12 +18,9 @@
   "license": "ISC",
   "cordova": {
     "plugins": {},
-    "platforms": [
-      "android"
-    ]
+    "platforms": []
   },
   "dependencies": {
-    "cordova-android": "^9.0.0",
     "io-anyline-cordova": "file:../plugin"
   }
 }
diff --git a/example/www/js/anyline.document.js b/example/www/js/anyline.document.js
@@ -88,13 +88,16 @@ anyline.document = {
                 "vibrateOnResult": true,
                 "blinkAnimationOnResult": true
             },
-            "cancelOnResult": true
+            "cancelOnResult": false
         },
       	"document": {
-  	    "manualCaptureButton": {
-  		"buttonColor": "0099ff"
-  	    }
-  	},
+  	        "manualCaptureButton": {
+  		        "buttonColor": "0099ff"
+  	        },
+  	        "finishedButton": {
+  		        "buttonColor": "0099ff"
+  	        },
+  	    },
       quality: 90
     },
 

diff --git a/example/www/js/anyline.mrz.js b/example/www/js/anyline.mrz.js
@@ -94,65 +94,69 @@ onError: function (error) {
 },
 
 anylineMRZViewConfig: {
-    "camera" : {
-        "captureResolution" : "1080p"
+    "camera": {
+      "captureResolution": "1080p"
     },
-    "flash" : {
-        "mode" : "manual",
-        "alignment" : "bottom_left"
+    "flash": {
+      "mode": "manual",
+      "alignment": "bottom_left"
     },
     "viewPlugin" : {
-        "plugin" : {
-            "id" : "IDPlugin_ID",
-            "idPlugin" : {
-                "mrzConfig" : {
-                    "strictMode" : false,
-                    "cropAndTransformID" : false,
-                    "mrzFieldScanOptions": {
-                        "vizDateOfIssue" : "optional",
-                        "vizAddress" : "optional"
-                    }
-                }
-            }
+      "plugin" : {
+          "id" : "IDPlugin_ID",
+          "idPlugin" : {
+              "mrzConfig" : {
+                "strictMode" : false,
+                 "cropAndTransformID" : false,
+                 "mrzFieldScanOptions": {
+                   "vizAddress" : "default",
+                   "vizDateOfIssue" : "default",
+                   "vizSurname" : "default",
+                   "vizGivenNames" : "default",
+                   "vizDateOfBirth" : "default",
+                   "vizDateOfExpiry" : "default",
+                  }
+              }
+          }
+      },
+      "cutoutConfig": {
+        "style": "rect",
+        "maxWidthPercent": "90%",
+        "maxHeightPercent": "90%",
+        "width" : 972,
+        "alignment": "center",
+        "ratioFromSize": {
+          "width": 125,
+          "height": 85
         },
-        "cutoutConfig" : {
-            "style": "rect",
-            "maxWidthPercent": "90%",
-            "maxHeightPercent": "90%",
-            "alignment": "center",
-            "ratioFromSize": {
-                "width": 125,
-                "height": 85
-            },
-            "strokeWidth": 2,
-            "cornerRadius": 4,
-            "strokeColor": "FFFFFF",
-            "outerColor": "000000",
-            "outerAlpha": 0.3,
-            "cropPadding": {
-                "x": 0,
-                "y": 0
-            },
-            "cropOffset": {
-                "x": 0,
-                "y": 0
-            },
-            "feedbackStrokeColor": "0099FF",
-            "offset": {
-                "x": 0,
-                "y": 30
-            }
+        "strokeWidth": 2,
+        "cornerRadius": 4,
+        "strokeColor": "FFFFFF",
+        "outerColor": "000000",
+        "outerAlpha": 0.3,
+        "cropPadding": {
+          "x": -30,
+          "y": -90
         },
-        "scanFeedback" : {
-            "style": "rect",
-            "strokeColor": "0099FF",
-            "strokeWidth": 2,
-            "blinkOnResult": true,
-            "beepOnResult": true,
-            "vibrateOnResult": true
+        "cropOffset": {
+          "x": 0,
+          "y": 90
         },
-        "cancelOnResult" : true
-
+        "feedbackStrokeColor": "0099FF",
+        "offset": {
+          "x": 0,
+          "y": 30
+        }
+      },
+      "scanFeedback": {
+        "style": "rect",
+        "strokeColor": "0099FF",
+        "strokeWidth": 2,
+        "blinkOnResult": true,
+        "beepOnResult": true,
+        "vibrateOnResult": true
+      },
+      "cancelOnResult": true
     },
     "cropAndTransformErrorMessage": "Edges are not detected"
 },

diff --git a/example/www/js/anyline.universalId.js b/example/www/js/anyline.universalId.js
@@ -70,81 +70,84 @@ onError: function (error) {
 },
 
 anylineUniversalIdViewConfig: {
-    "camera" : {
-      "captureResolution" : "1080p",
-      "zoomGesture": true
-    },
-    "flash" : {
-      "mode": "manual",
-      "alignment": "bottom_right",
-      "imageOn": "flash_on",
-      "imageOff": "flash_off"
-    },
-    "viewPlugin" : {
-      "plugin":{
-        "id":"ID",
-        "idPlugin": {
-          "templateConfig": {
-            "drivingLicense": {
-              "surname": {"scanOption": 0, "minConfidence": 40},
-              "givenNames": {"scanOption": 0, "minConfidence": 40},
-              "dateOfBirth": {"scanOption": 0, "minConfidence": 50},
-              "placeOfBirth": {"scanOption": 1, "minConfidence": 50},
-              "dateOfIssue": {"scanOption": 0, "minConfidence": 50},
-              "dateOfExpiry": {"scanOption": 1, "minConfidence": 50},
-              "authority": {"scanOption": 1, "minConfidence": 30},
-              "documentNumber": {"scanOption": 0, "minConfidence": 40},
-              "categories": {"scanOption": 1, "minConfidence": 30},
-              "address": {"scanOption": 1}
-            },
-            "idFront": {
-              "surname": {"scanOption": 0, "minConfidence": 60},
-              "givenNames": {"scanOption": 0, "minConfidence": 60},
-              "dateOfBirth": {"scanOption": 0, "minConfidence": 60},
-              "placeOfBirth": {"scanOption": 1, "minConfidence": 60},
-              "dateOfExpiry": {"scanOption": 1, "minConfidence": 60},
-              "cardAccessNumber": {"scanOption": 1, "minConfidence": 60},
-              "documentNumber": {"scanOption": 0, "minConfidence": 60},
-              "nationality": {"scanOption": 1, "minConfidence": 60}
-            }
+  "camera" : {
+    "captureResolution" : "1080p",
+    "zoomGesture": true
+  },
+  "flash" : {
+    "mode": "manual",
+    "alignment": "bottom_right"
+  },
+  "viewPlugin" : {
+    "plugin":{
+      "id":"ID",
+      "idPlugin": {
+        "universalIdConfig": {
+          "allowedLayouts": {
+            "mrz": [],
+            "drivingLicense": [],
+            "idFront": []
+          },
+          "drivingLicense": {
+            "surname": {"scanOption": 0, "minConfidence": 40},
+            "givenNames": {"scanOption": 0, "minConfidence": 40},
+            "dateOfBirth": {"scanOption": 0, "minConfidence": 50},
+            "placeOfBirth": {"scanOption": 1, "minConfidence": 50},
+            "dateOfIssue": {"scanOption": 0, "minConfidence": 50},
+            "dateOfExpiry": {"scanOption": 1, "minConfidence": 50},
+            "authority": {"scanOption": 1, "minConfidence": 30},
+            "documentNumber": {"scanOption": 0, "minConfidence": 40},
+            "categories": {"scanOption": 1, "minConfidence": 30},
+            "address": {"scanOption": 1}
+          },
+          "idFront": {
+            "surname": {"scanOption": 0, "minConfidence": 60},
+            "givenNames": {"scanOption": 0, "minConfidence": 60},
+            "dateOfBirth": {"scanOption": 0, "minConfidence": 60},
+            "placeOfBirth": {"scanOption": 1, "minConfidence": 60},
+            "dateOfExpiry": {"scanOption": 1, "minConfidence": 60},
+            "cardAccessNumber": {"scanOption": 1, "minConfidence": 60},
+            "documentNumber": {"scanOption": 0, "minConfidence": 60},
+            "nationality": {"scanOption": 1, "minConfidence": 60}
           }
         }
+      }
+    },
+    "cutoutConfig" : {
+      "style": "rect",
+      "maxWidthPercent": "90%",
+      "maxHeightPercent": "90%",
+      "alignment": "center",
+      "strokeWidth": 2,
+      "cornerRadius": 4,
+      "strokeColor": "FFFFFF",
+      "outerColor": "000000",
+      "outerAlpha": 0.3,
+      "ratioFromSize" : {
+        "width": 50,
+        "height": 31
       },
-      "cutoutConfig" : {
-        "style": "rect",
-        "maxWidthPercent": "90%",
-        "maxHeightPercent": "90%",
-        "alignment": "center",
-        "strokeWidth": 2,
-        "cornerRadius": 4,
-        "strokeColor": "FFFFFF",
-        "outerColor": "000000",
-        "outerAlpha": 0.3,
-        "ratioFromSize" : {
-          "width": 50,
-          "height": 31
-        },
-        "cropPadding": {
-          "x": -50,
-          "y": -50
-        },
-        "cropOffset": {
-          "x": 0,
-          "y": 0
-        },
-        "feedbackStrokeColor": "0099FF"
+      "cropPadding": {
+        "x": -50,
+        "y": -50
       },
-      "scanFeedback" : {
-        "style": "CONTOUR_POINT",
-        "visualFeedbackRedrawTimeout": 100,
-        "strokeColor": "0099FF",
-        "fillColor" : "220099FF",
-        "beepOnResult": true,
-        "vibrateOnResult": true,
-        "strokeWidth": 2
+      "cropOffset": {
+        "x": 0,
+        "y": 0
       },
-      "cancelOnResult" : true
-    }
+      "feedbackStrokeColor": "0099FF"
+    },
+    "scanFeedback" : {
+      "style": "CONTOUR_RECT",
+      "visualFeedbackRedrawTimeout": 100,
+      "strokeColor": "0099FF",
+      "fillColor" : "220099FF",
+      "beepOnResult": true,
+      "vibrateOnResult": true,
+      "strokeWidth": 2
+    },
+    "cancelOnResult" : true
+  }
 },
 
 scan: function () {

diff --git a/plugin/package.json b/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "io-anyline-cordova",
-  "version": "23.0.0",
+  "version": "24.0.0",
   "description": "The cordova plugin for the Anyline SDK",
   "cordova": {
     "id": "io-anyline-cordova",

diff --git a/plugin/plugin.xml b/plugin/plugin.xml
@@ -3,7 +3,7 @@
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="io-anyline-cordova"
-        version="23.0.0">
+        version="24.0.0">
 
     <name>AnylineSDK</name>
 
@@ -44,7 +44,7 @@
         <!-- <resource-file src="src/ios/anyline_sdk/AnylineResources.bundle"/>-->
 
         <!-- Anyline Framework & Resource Bundle CocoaPods -->
-        <framework src="Anyline" type="podspec" swift-version="4.2" spec="~> 23"/>
+        <framework src="Anyline" type="podspec" swift-version="4.2" spec="~> 24"/>
 
         <!-- <podspec>
             <config>
@@ -125,6 +125,8 @@
                        target="res/layout/activity_scan_scanview.xml"/>
         <resource-file src="src/android/res/drawable/manual_picture.png"
                        target="res/drawable/manual_picture.png"/>
+        <resource-file src="src/android/res/drawable/right_arrow.png"
+                       target="res/drawable/right_arrow.png"/>
 
     </platform>
 

diff --git a/plugin/src/android/anyline.gradle b/plugin/src/android/anyline.gradle
@@ -10,7 +10,7 @@ repositories{
 dependencies {
     implementation 'com.google.firebase:firebase-ml-vision:19.0.2'
     implementation 'com.google.firebase:firebase-ml-vision-face-model:17.0.2'
-    implementation 'io.anyline:anylinesdk:23-NoDocUI@aar'
+    implementation 'io.anyline:anylinesdk:24-NoDocUI'
 //    implementation (name: 'anylinesdk-release-16', ext: 'aar')
 }