@regulaforensics/ionic-native-document-reader 6.4.0 → 6.6.0

package/example/config.xml

@@ -12,7 +12,6 @@
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
     <preference name="ScrollEnabled" value="false" />
-    <preference name="android-minSdkVersion" value="19" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreenDuration" value="300" />
@@ -23,13 +22,20 @@
         <framework src="com.android.support:appcompat-v7:+" />
         <config-file parent="/*" target="AndroidManifest.xml">
             <uses-permission android:name="android.permission.NFC" />
+            <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+            <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
         </config-file>
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <activity android:label="@string/multi_app_name" android:name="com.synconset.MultiImageChooserActivity" android:theme="@style/Theme.AppCompat.Light" />
         </config-file>
-        <preference name="android-minSdkVersion" value="22" />
-        <preference name="android-compileSdkVersion" value="29" />
+        
+        <preference name="android-minSdkVersion" value="21" />
+        <preference name="android-targetSdkVersion" value="33" />
         <preference name="AndroidXEnabled" value="true" />
+        <preference name="GradlePluginKotlinEnabled" value="true" />
+        <preference name="GradlePluginKotlinCodeStyle" value="official" />
+        <preference name="GradlePluginKotlinVersion" value="1.7.10" />
+
         <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
         <allow-intent href="market:*" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />

package/example/package.json

@@ -19,18 +19,18 @@
     "@angular/platform-browser": "~13.3.2",
     "@angular/platform-browser-dynamic": "~13.3.2",
     "@angular/router": "~13.3.2",
-    "@ionic-native/android-permissions": "^5.28.0",
-    "@ionic-native/core": "^5.28.0",
-    "@ionic-native/file": "^5.28.0",
-    "@ionic-native/image-picker": "^5.28.0",
-    "@ionic-native/splash-screen": "^5.28.0",
-    "@ionic-native/status-bar": "^5.28.0",
+    "@awesome-cordova-plugins/android-permissions": "^5.28.0",
+    "@awesome-cordova-plugins/core": "^5.28.0",
+    "@awesome-cordova-plugins/file": "^5.28.0",
+    "@awesome-cordova-plugins/image-picker": "^5.28.0",
+    "@awesome-cordova-plugins/splash-screen": "^5.28.0",
+    "@awesome-cordova-plugins/status-bar": "^5.28.0",
     "@ionic/angular": "^6.0.15",
     "@ionic/cordova-builders": "^6.1.0",
     "cordova-ios": "^6.2.0",
-    "@regulaforensics/cordova-plugin-document-reader-api": "^6.4.0",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^6.4.0",
-    "@regulaforensics/ionic-native-document-reader": "^6.4.0",
+    "@regulaforensics/cordova-plugin-document-reader-api": "6.6.0",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "6.6.0",
+    "@regulaforensics/ionic-native-document-reader": "6.6.0",
     "cordova-android": "^10.1.1",
     "cordova-plugin-add-swift-support": "^2.0.2",
     "cordova-plugin-android-permissions": "^1.1.0",
@@ -98,4 +98,4 @@
       "ios"
     ]
   }
-}
+}

package/example/src/app/app.component.spec.ts

@@ -2,8 +2,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed, async } from '@angular/core/testing';
 
 import { Platform } from '@ionic/angular';
-import { SplashScreen } from '@ionic-native/splash-screen/ngx';
-import { StatusBar } from '@ionic-native/status-bar/ngx';
+import { SplashScreen } from '@awesome-cordova-plugins/splash-screen/ngx';
+import { StatusBar } from '@awesome-cordova-plugins/status-bar/ngx';
 
 import { AppComponent } from './app.component';
 

package/example/src/app/app.component.ts

@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
 import { Platform } from '@ionic/angular';
-import { SplashScreen } from '@ionic-native/splash-screen/ngx';
-import { StatusBar } from '@ionic-native/status-bar/ngx';
+import { SplashScreen } from '@awesome-cordova-plugins/splash-screen/ngx';
+import { StatusBar } from '@awesome-cordova-plugins/status-bar/ngx';
 
 @Component({
   selector: 'app-root',

package/example/src/app/app.module.ts

@@ -3,8 +3,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { RouteReuseStrategy } from '@angular/router';
 
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
-import { SplashScreen } from '@ionic-native/splash-screen/ngx';
-import { StatusBar } from '@ionic-native/status-bar/ngx';
+import { SplashScreen } from '@awesome-cordova-plugins/splash-screen/ngx';
+import { StatusBar } from '@awesome-cordova-plugins/status-bar/ngx';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';

package/example/src/app/home/home.module.ts

@@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common';
 import { IonicModule } from '@ionic/angular';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import { ImagePicker } from "@ionic-native/image-picker/ngx";
-import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
+import { ImagePicker } from "@awesome-cordova-plugins/image-picker/ngx";
+import { AndroidPermissions } from '@awesome-cordova-plugins/android-permissions/ngx';
 import { DocumentReader } from '@regulaforensics/ionic-native-document-reader/ngx';
 
 import { HomePage } from './home.page';

package/example/src/app/home/home.page.ts

@@ -1,11 +1,12 @@
 import { Component, ViewChild, ElementRef } from '@angular/core'
-import { File } from '@ionic-native/file'
-import { ImagePicker } from '@ionic-native/image-picker/ngx'
-import { AndroidPermissions } from '@ionic-native/android-permissions/ngx'
+import { File } from '@awesome-cordova-plugins/file'
+import { ImagePicker } from '@awesome-cordova-plugins/image-picker/ngx'
+import { AndroidPermissions } from '@awesome-cordova-plugins/android-permissions/ngx'
 import { Platform } from '@ionic/angular'
 import { DocumentReader, DocumentReaderScenario, Enum, DocumentReaderCompletion, DocumentReaderResults, DocumentReaderNotification } from '@regulaforensics/ionic-native-document-reader/ngx';
 
 var doRfid: boolean = false
+var isReadingRfidCustomUi: boolean = false
 var isReadingRfid: boolean = false
 var rfidUIHeader: string = "Reading RFID"
 var rfidUIHeaderColor: string = "black"
@@ -62,7 +63,10 @@ export class HomePage {
             app.status.nativeElement.innerHTML = "Downloading database: " + r + "%"
           else {
             app.status.nativeElement.innerHTML = "Loading......"
-            DocumentReader.initializeReader(license).then(m => onInitialized()).catch(error1)
+            DocumentReader.initializeReader({
+              license: license,
+              delayedNNLoad: true
+            }).then(m => onInitialized()).catch(error1)
           }
         })
       })
@@ -105,8 +109,8 @@ export class HomePage {
     }
 
     function updateUI() {
-      app.mainUI.nativeElement.style.display = isReadingRfid ? "none" : ""
-      app.rfidUI.nativeElement.style.display = isReadingRfid ? "" : "none"
+      app.mainUI.nativeElement.style.display = isReadingRfidCustomUi ? "none" : ""
+      app.rfidUI.nativeElement.style.display = isReadingRfidCustomUi ? "" : "none"
       app.rfidUIHeader.nativeElement.innerHTML = rfidUIHeader
       app.rfidUIHeader.nativeElement.style.color = rfidUIHeaderColor
       app.rfidDescription.nativeElement.innerHTML = rfidDescription
@@ -119,12 +123,12 @@ export class HomePage {
     }
 
     function handleCompletion(completion: DocumentReaderCompletion) {
-      if (isReadingRfid && (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR))
+      if (isReadingRfidCustomUi && (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR))
         hideRfidUI()
-      if (isReadingRfid && completion.action === Enum.DocReaderAction.NOTIFICATION)
+      if (isReadingRfidCustomUi && completion.action === Enum.DocReaderAction.NOTIFICATION)
         updateRfidUI(completion.results.documentReaderNotification)
       if (completion.action === Enum.DocReaderAction.COMPLETE)
-        if (isReadingRfid) {
+        if (isReadingRfidCustomUi) {
           if (completion.results.rfidResult !== 1)
             restartRfidUI()
           else {
@@ -134,18 +138,22 @@ export class HomePage {
         }
         else
           handleResults(completion.results)
+      if (completion.action === Enum.DocReaderAction.TIMEOUT)
+        handleResults(completion.results)
+      if (completion.action === Enum.DocReaderAction.CANCEL || completion.action === Enum.DocReaderAction.ERROR)
+        isReadingRfid = false
     }
 
     function showRfidUI() {
       // show animation
-      isReadingRfid = true
+      isReadingRfidCustomUi = true
       updateUI()
     }
 
     function hideRfidUI() {
       // show animation
       restartRfidUI()
-      isReadingRfid = false
+      isReadingRfidCustomUi = false
       rfidUIHeader = "Reading RFID"
       rfidUIHeaderColor = "black"
       updateUI()
@@ -177,8 +185,7 @@ export class HomePage {
     }
 
     function usualRFID() {
-      doRfid = false
-      app.rfidCheckbox["el"].checked = false
+      isReadingRfid = true
       var notification = "rfidNotificationCompletionEvent"
       var paCert = "paCertificateCompletionEvent"
       var taCert = "taCertificateCompletionEvent"
@@ -264,20 +271,13 @@ export class HomePage {
 
     function handleResults(results: DocumentReaderResults) {
       clearResults()
-      if (doRfid && results != null && results.chipPage != 0) {
-        var accessKey = results.getTextFieldValueByType({ fieldType: 51 })
-        if (accessKey != null && accessKey != "") {
-          accessKey = accessKey.replace(/^/g, '').replace(/\n/g, '')
-          DocumentReader.setRfidScenario({ mMrz: accessKey, mPacePasswordType: 1, })
-        } else {
-          accessKey = results.getTextFieldValueByType({ fieldType: 159 })
-          if (accessKey != null && accessKey != "")
-            DocumentReader.setRfidScenario({ mMrz: accessKey, mPacePasswordType: 2, })
-        }
+      if (doRfid && !isReadingRfid && results != null && results.chipPage != 0) {
         // customRFID()
         usualRFID()
-      } else
+      } else {
+        isReadingRfid = false
         displayResults(results)
+      }
     }
 
     function displayResults(results: DocumentReaderResults) {