Skip to content

Commit

Permalink
Merge pull request #98 from BlinkID/release/4.6.0
Browse files Browse the repository at this point in the history 
Release/4.6.0
  • Loading branch information
@matvidako
matvidako authored Jan 25, 2019
2 parents 11c7d85 + 5a85390 commit 0d9c78e
Show file tree
Hide file tree
Showing 48 changed files with 2,359 additions and 1,250 deletions.
2 changes: 1 addition & 1 deletion BlinkID/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blinkid-cordova",
"version": "4.5.0",
"version": "4.6.0",
"description": "A small and powerful ID card scanning library",
"cordova": {
"id": "blinkid-cordova",
Expand Down
20 changes: 16 additions & 4 deletions BlinkID/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="blinkid-cordova"
version="4.5.0">
version="4.6.0">

<name>BlinkIdScanner</name>
<description>A small and powerful ID card scanning library</description>
Expand Down Expand Up @@ -76,6 +76,7 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SwitzerlandDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SuccessFrameGrabberRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/AustraliaDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/GermanyDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/KuwaitIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MoroccoIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MalaysiaMyKadBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand Down Expand Up @@ -112,7 +113,9 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SlovakiaCombinedRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/ColombiaIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SimNumberRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiResidencePermitBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SingaporeIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiResidencePermitFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MalaysiaMyPrFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/GermanyIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SerbiaIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand All @@ -130,12 +133,12 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/UsdlRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SloveniaIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/ItalyDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/GermanyIdOldRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/PaymentCardFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/ElitePaymentCardBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SloveniaCombinedRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SingaporeDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SerbiaCombinedRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/GermanyOldIdRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/EudlRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/CroatiaCombinedRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SingaporeChangiEmployeeIdRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand All @@ -150,6 +153,7 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/PaymentCardCombinedRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/CyprusOldIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MalaysiaMyTenteraFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/AustriaIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/IndonesiaIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SwedenDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand Down Expand Up @@ -191,6 +195,7 @@
<header-file src="src/ios/sources/Recognizers/MBRecognizerSerializers.h" />
<source-file src="src/ios/sources/Recognizers/MBRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/MBRecognizerSerializers.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyIdOldRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBAustraliaDlBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSloveniaCombinedRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBCroatiaIdBackRecognizerWrapper.h" />
Expand All @@ -211,7 +216,6 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSwitzerlandIdFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBAustraliaDlFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSingaporeDlFrontRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyOldIdRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyDlBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBEudlRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBPdf417RecognizerWrapper.h" />
Expand All @@ -221,6 +225,7 @@
<source-file src="src/ios/sources/Recognizers/Wrappers/MBIrelandDlFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBItalyDlFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBCyprusOldIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBruneiResidencePermitFrontRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSerbiaIdBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSingaporeCombinedRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBCzechiaCombinedRecognizerWrapper.m" />
Expand Down Expand Up @@ -255,6 +260,7 @@
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSwitzerlandIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBUsdlRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBPolandIdBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBruneiIdBackRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBVinRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBPaymentCardCombinedRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyPrFrontRecognizerWrapper.m" />
Expand All @@ -280,10 +286,11 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBAustriaCombinedRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBKuwaitIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSloveniaIdBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBruneiResidencePermitBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyDlFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBMoroccoIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBHongKongIdFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBPaymentCardBackRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyOldIdRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyDlBackRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSwitzerlandIdFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBAustraliaDlFrontRecognizerWrapper.h" />
Expand All @@ -303,6 +310,7 @@
<source-file src="src/ios/sources/Recognizers/Wrappers/MBElitePaymentCardBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBNewZealandDlFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBCroatiaIdBackRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyIdOldRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBAustraliaDlBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSloveniaCombinedRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBRomaniaIdFrontRecognizerWrapper.h" />
Expand All @@ -325,6 +333,7 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSingaporeCombinedRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSerbiaIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBCzechiaCombinedRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBruneiResidencePermitFrontRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBItalyDlFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBCyprusOldIdBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBIndonesiaIdFrontRecognizerWrapper.h" />
Expand All @@ -348,6 +357,7 @@
<source-file src="src/ios/sources/Recognizers/Wrappers/MBUsdlRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBPolandIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBVinRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBruneiIdBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSwitzerlandIdBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBJordanIdFrontRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyTenteraFrontRecognizerWrapper.h" />
Expand All @@ -363,7 +373,9 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBPaymentCardBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBHongKongIdFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBMoroccoIdBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyDlFrontRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSloveniaIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBruneiResidencePermitBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBKuwaitIdBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBAustriaCombinedRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBKuwaitIdFrontRecognizerWrapper.h" />
Expand Down
2 changes: 1 addition & 1 deletion BlinkID/scripts/initIOSFramework.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
HERE="$(dirname "$(test -L "$0" && readlink "$0" || echo "$0")")"
pushd "${HERE}/../src/ios/" > /dev/null

LINK='https://github.com/BlinkID/blinkid-ios/releases/download/v4.5.0/blinkid-ios_v4.5.0.zip'
LINK='https://github.com/BlinkID/blinkid-ios/releases/download/v4.6.0/blinkid-ios_v4.6.0.zip'
FILENAME='blinkid-ios.zip'

# check if Microblink framework and bundle already exist
Expand Down
6 changes: 5 additions & 1 deletion ...D/src/android/java/com/phonegap/plugins/microblink/recognizers/RecognizerSerializers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ private void registerMapping( RecognizerSerialization recognizerSerialization )
registerMapping(new AustriaIdFrontRecognizerSerialization());
registerMapping(new AustriaPassportRecognizerSerialization());
registerMapping(new BarcodeRecognizerSerialization());
registerMapping(new BruneiIdBackRecognizerSerialization());
registerMapping(new BruneiIdFrontRecognizerSerialization());
registerMapping(new BruneiResidencePermitBackRecognizerSerialization());
registerMapping(new BruneiResidencePermitFrontRecognizerSerialization());
registerMapping(new ColombiaDlFrontRecognizerSerialization());
registerMapping(new ColombiaIdBackRecognizerSerialization());
registerMapping(new ColombiaIdFrontRecognizerSerialization());
Expand All @@ -53,9 +56,10 @@ private void registerMapping( RecognizerSerialization recognizerSerialization )
registerMapping(new EudlRecognizerSerialization());
registerMapping(new GermanyCombinedRecognizerSerialization());
registerMapping(new GermanyDlBackRecognizerSerialization());
registerMapping(new GermanyDlFrontRecognizerSerialization());
registerMapping(new GermanyIdBackRecognizerSerialization());
registerMapping(new GermanyIdFrontRecognizerSerialization());
registerMapping(new GermanyOldIdRecognizerSerialization());
registerMapping(new GermanyIdOldRecognizerSerialization());
registerMapping(new GermanyPassportRecognizerSerialization());
registerMapping(new HongKongIdFrontRecognizerSerialization());
registerMapping(new IndonesiaIdFrontRecognizerSerialization());
Expand Down
7 changes: 5 additions & 2 deletions .../plugins/microblink/recognizers/serialization/AustraliaDlBackRecognizerSerialization.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ public final class AustraliaDlBackRecognizerSerialization implements RecognizerS
@Override
public Recognizer<?, ?> createRecognizer(JSONObject jsonRecognizer) {
com.microblink.entities.recognizers.blinkid.australia.AustraliaDlBackRecognizer recognizer = new com.microblink.entities.recognizers.blinkid.australia.AustraliaDlBackRecognizer();
recognizer.setDetectGlare(jsonRecognizer.optBoolean("detectGlare", true));
recognizer.setExtractAddress(jsonRecognizer.optBoolean("extractAddress", true));
recognizer.setExtractDateOfExpiry(jsonRecognizer.optBoolean("extractDateOfExpiry", true));
recognizer.setExtractLastName(jsonRecognizer.optBoolean("extractLastName", true));
recognizer.setExtractLicenceNumber(jsonRecognizer.optBoolean("extractLicenceNumber", true));
recognizer.setExtractLicenseExpiry(jsonRecognizer.optBoolean("extractLicenseExpiry", true));
recognizer.setFullDocumentImageDpi(jsonRecognizer.optInt("fullDocumentImageDpi", 250));
recognizer.setFullDocumentImageExtensionFactors(BlinkIDSerializationUtils.deserializeExtensionFactors(jsonRecognizer.optJSONObject("fullDocumentImageExtensionFactors")));
recognizer.setReturnFullDocumentImage(jsonRecognizer.optBoolean("returnFullDocumentImage", false));
return recognizer;
}
Expand All @@ -26,9 +29,9 @@ public JSONObject serializeResult(Recognizer<?, ?> recognizer) {
try {
SerializationUtils.addCommonResultData(jsonResult, result);
jsonResult.put("address", result.getAddress());
jsonResult.put("dateOfExpiry", SerializationUtils.serializeDate(result.getDateOfExpiry()));
jsonResult.put("fullDocumentImage", SerializationUtils.encodeImageBase64(result.getFullDocumentImage()));
jsonResult.put("lastName", result.getLastName());
jsonResult.put("licenceExpiry", SerializationUtils.serializeDate(result.getLicenceExpiry()));
jsonResult.put("licenceNumber", result.getLicenceNumber());
} catch (JSONException e) {
// see https://developer.android.com/reference/org/json/JSONException
Expand Down
Loading

0 comments on commit 0d9c78e

Please sign in to comment.