Skip to content

Commit

Permalink
Merge pull request #34 from BlinkID/release/v3.5.0
Browse files Browse the repository at this point in the history
Release/v3.5.0
  • Loading branch information
i1E authored Mar 17, 2017
2 parents 6dbaa14 + 6d9f137 commit 99ff9c3
Show file tree
Hide file tree
Showing 146 changed files with 15,824 additions and 708 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
public class Config {
// obtain your licence key at http://microblink.com/login or
// contact us at http://help.microblink.com
public static final String LICENSE_KEY = "O6MQN44I-7RBXJRS7-UEA7EFPF-ACFWHLW7-TJZFP3Y6-NILAYDM7-JDHZRECF-LFJSEZWQ";
public static final String LICENSE_KEY = "MSHLU4AX-CBMEPGOI-RN7IJWQZ-UEOLNT4Y-GD4K5X42-OJL66HTK-CYGA2P3E-O4CIHSF2";
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,58 +13,62 @@
import android.widget.ListView;
import android.widget.Toast;

import com.microblink.libresult.extract.BaseRecognitionResultExtractor;
import com.microblink.libresult.extract.IBaseRecognitionResultExtractor;
import com.microblink.libresult.extract.RecognitionResultEntry;
import com.microblink.libresult.extract.austria.AustrianIDBackSideRecognitionResultExtractor;
import com.microblink.libresult.extract.austria.AustrianIDFrontSideRecognitionResultExtractor;
import com.microblink.libresult.extract.barcode.BardecoderRecognitionResultExtractor;
import com.microblink.libresult.extract.BaseRecognitionResultExtractor;
import com.microblink.libresult.extract.barcode.Pdf417RecognitionResultExtractor;
import com.microblink.libresult.extract.barcode.ZXingRecognitionResultExtractor;
import com.microblink.libresult.extract.blinkInput.BlinkOcrRecognitionResultExtractor;
import com.microblink.libresult.extract.croatia.CroatianIDBackSideRecognitionResultExtractor;
import com.microblink.libresult.extract.croatia.CroatianIDFrontSideRecognitionResultExtractor;
import com.microblink.libresult.extract.czechia.CzechIDBackSideRecognitionResultExtractor;
import com.microblink.libresult.extract.czechia.CzechIDFrontSideRecognitionResultExtractor;
import com.microblink.libresult.extract.eudl.EUDLRecognitionResultExtractor;
import com.microblink.libresult.extract.germany.GermanIDFrontSideRecognitionResultExtractor;
import com.microblink.libresult.extract.germany.GermanIDMRZSideRecognitionResultExtractor;
import com.microblink.libresult.extract.IBaseRecognitionResultExtractor;
import com.microblink.libresult.extract.malaysia.IKadRecognitionResultExtractor;
import com.microblink.libresult.extract.mrtd.MRTDRecognitionResultExtractor;
import com.microblink.libresult.extract.malaysia.MyKadRecognitionResultExtractor;
import com.microblink.libresult.extract.barcode.Pdf417RecognitionResultExtractor;
import com.microblink.libresult.extract.RecognitionResultEntry;
import com.microblink.libresult.extract.eudl.EUDLRecognitionResultExtractor;
import com.microblink.libresult.extract.mrtd.MRTDRecognitionResultExtractor;
import com.microblink.libresult.extract.romania.RomanianIDFrontSideRecognitionResultExtractor;
import com.microblink.libresult.extract.serbia.SerbianIDBackRecognitionResultExtractor;
import com.microblink.libresult.extract.serbia.SerbianIDFrontRecognitionResultExtractor;
import com.microblink.libresult.extract.singapore.SingaporeIDFrontRecognitionResultExtractor;
import com.microblink.libresult.extract.simnumber.SimNumberRecognitionResultExtractor;
import com.microblink.libresult.extract.singapore.SingaporeIDBackRecognitionResultExtractor;
import com.microblink.libresult.extract.singapore.SingaporeIDFrontRecognitionResultExtractor;
import com.microblink.libresult.extract.slovakia.SlovakIDBackSideRecognitionResultExtractor;
import com.microblink.libresult.extract.slovakia.SlovakIDFrontSideRecognitionResultExtractor;
import com.microblink.libresult.extract.barcode.ZXingRecognitionResultExtractor;
import com.microblink.libresult.extract.slovenia.SlovenianIDBackRecognitionResultExtractor;
import com.microblink.libresult.extract.slovenia.SlovenianIDFrontRecognitionResultExtractor;
import com.microblink.locale.LanguageUtils;
import com.microblink.recognizers.BaseRecognitionResult;
import com.microblink.recognizers.blinkbarcode.bardecoder.BarDecoderScanResult;
import com.microblink.recognizers.blinkbarcode.pdf417.Pdf417ScanResult;
import com.microblink.recognizers.blinkbarcode.simnumber.SimNumberScanResult;
import com.microblink.recognizers.blinkbarcode.zxing.ZXingScanResult;
import com.microblink.recognizers.blinkid.austria.back.AustrianIDBackSideRecognitionResult;
import com.microblink.recognizers.blinkid.austria.front.AustrianIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.croatia.back.CroatianIDBackSideRecognitionResult;
import com.microblink.recognizers.blinkid.croatia.front.CroatianIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.czechia.back.CzechIDBackSideRecognitionResult;
import com.microblink.recognizers.blinkid.czechia.front.CzechIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.eudl.EUDLRecognitionResult;
import com.microblink.recognizers.blinkid.germany.front.GermanIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.germany.mrz.GermanIDMRZSideRecognitionResult;
import com.microblink.recognizers.blinkid.malaysia.IKadRecognitionResult;
import com.microblink.recognizers.blinkid.malaysia.MyKadRecognitionResult;
import com.microblink.recognizers.blinkid.mrtd.MRTDRecognitionResult;
import com.microblink.recognizers.blinkid.eudl.EUDLRecognitionResult;
import com.microblink.recognizers.blinkid.romania.front.RomanianIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.serbia.back.SerbianIDBackSideRecognitionResult;
import com.microblink.recognizers.blinkid.serbia.front.SerbianIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.singapore.back.SingaporeIDBackRecognitionResult;
import com.microblink.recognizers.blinkid.singapore.front.SingaporeIDFrontRecognitionResult;
import com.microblink.recognizers.blinkid.slovakia.back.SlovakIDBackSideRecognitionResult;
import com.microblink.recognizers.blinkid.slovakia.front.SlovakIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.slovenia.back.SlovenianIDBackSideRecognitionResult;
import com.microblink.recognizers.blinkid.slovenia.front.SlovenianIDFrontSideRecognitionResult;
import com.microblink.recognizers.blinkid.singapore.back.SingaporeIDBackRecognitionResult;
import com.microblink.recognizers.blinkid.singapore.front.SingaporeIDFrontRecognitionResult;
import com.microblink.recognizers.blinkocr.BlinkOCRRecognitionResult;

import java.util.List;
Expand Down Expand Up @@ -132,6 +136,8 @@ public void onCreate(Bundle savedInstanceState) {
mResultExtractor = new GermanIDMRZSideRecognitionResultExtractor(getActivity());
} else if (mData instanceof GermanIDFrontSideRecognitionResult) {
mResultExtractor = new GermanIDFrontSideRecognitionResultExtractor(getActivity());
} else if (mData instanceof RomanianIDFrontSideRecognitionResult) {
mResultExtractor = new RomanianIDFrontSideRecognitionResultExtractor(getActivity());
} else if (mData instanceof SlovakIDBackSideRecognitionResult) {
mResultExtractor = new SlovakIDBackSideRecognitionResultExtractor(getActivity());
} else if (mData instanceof SlovakIDFrontSideRecognitionResult) {
Expand All @@ -156,6 +162,8 @@ public void onCreate(Bundle savedInstanceState) {
mResultExtractor = new ZXingRecognitionResultExtractor(getActivity());
} else if (mData instanceof BarDecoderScanResult) {
mResultExtractor = new BardecoderRecognitionResultExtractor(getActivity());
} else if (mData instanceof SimNumberScanResult) {
mResultExtractor = new SimNumberRecognitionResultExtractor(getActivity());
} else if (mData instanceof BlinkOCRRecognitionResult) {
mResultExtractor = new BlinkOcrRecognitionResultExtractor(getActivity());
} else if (mData instanceof MyKadRecognitionResult) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
package com.microblink.libresult.extract.romania;

import android.content.Context;

import com.microblink.libresult.R;
import com.microblink.libresult.extract.RecognitionResultEntry;
import com.microblink.libresult.extract.mrtd.MRTDRecognitionResultExtractor;
import com.microblink.recognizers.BaseRecognitionResult;
import com.microblink.recognizers.blinkid.romania.front.RomanianIDFrontSideRecognitionResult;
import com.microblink.util.Log;

import java.util.List;

/**
* Created by Boris on 03/03/17.
*/

public class RomanianIDFrontSideRecognitionResultExtractor extends MRTDRecognitionResultExtractor {
public RomanianIDFrontSideRecognitionResultExtractor(Context context) {
super(context);
}

@Override
public List<RecognitionResultEntry> extractData(BaseRecognitionResult result) {

if (result == null) {
return mExtractedData;
}

if (result instanceof RomanianIDFrontSideRecognitionResult) {
RomanianIDFrontSideRecognitionResult romanianIdFrontResult = (RomanianIDFrontSideRecognitionResult) result;

mExtractedData.add(mBuilder.build(
R.string.PPLastName,
romanianIdFrontResult.getLastName()
));

mExtractedData.add(mBuilder.build(
R.string.PPFirstName,
romanianIdFrontResult.getFirstName()
));

mExtractedData.add(mBuilder.build(
R.string.PPIdentityCardNumber,
romanianIdFrontResult.getIdentityCardNumber()
));

mExtractedData.add(mBuilder.build(
R.string.PPSeries,
romanianIdFrontResult.getIdentityCardSeries()
));

mExtractedData.add(mBuilder.build(
R.string.PPCNP,
romanianIdFrontResult.getCNP()
));

mExtractedData.add(mBuilder.build(
R.string.PPParentNames,
romanianIdFrontResult.getParentNames()
));

mExtractedData.add(mBuilder.build(
R.string.PPNationality,
romanianIdFrontResult.getNationality()
));

mExtractedData.add(mBuilder.build(
R.string.PPPlaceOfBirth,
romanianIdFrontResult.getPlaceOfBirth()
));

mExtractedData.add(mBuilder.build(
R.string.PPAddress,
romanianIdFrontResult.getAddress()
));

mExtractedData.add(mBuilder.build(
R.string.PPIssuingAuthority,
romanianIdFrontResult.getIssuedBy()
));

mExtractedData.add(mBuilder.build(
R.string.PPSex,
romanianIdFrontResult.getSex()
));

mExtractedData.add(mBuilder.build(
R.string.PPValidFrom,
romanianIdFrontResult.getValidFrom()
));

mExtractedData.add(mBuilder.build(
R.string.PPValidUntil,
romanianIdFrontResult.getValidUntil()
));

Log.e(this, "Before super");
super.extractMRZData(romanianIdFrontResult);
Log.e(this, "After super");
}

return mExtractedData;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.microblink.libresult.extract.simnumber;

import android.content.Context;

import com.microblink.libresult.R;
import com.microblink.libresult.extract.IBaseRecognitionResultExtractor;
import com.microblink.libresult.extract.RecognitionResultEntry;
import com.microblink.recognizers.BaseRecognitionResult;
import com.microblink.recognizers.blinkbarcode.simnumber.SimNumberScanResult;

import java.util.ArrayList;
import java.util.List;

/**
* Created by Boris on 03/02/17.
*/
public class SimNumberRecognitionResultExtractor implements IBaseRecognitionResultExtractor {


private RecognitionResultEntry.Builder mBuilder;
private List<RecognitionResultEntry> mExtractedData;

public SimNumberRecognitionResultExtractor(Context context) {
mBuilder = new RecognitionResultEntry.Builder(context);
mExtractedData = new ArrayList<>();
}

@Override
public List<RecognitionResultEntry> extractData(BaseRecognitionResult result) {

if (result == null){
return mExtractedData;
}

if (result instanceof SimNumberScanResult){
// result is obtained by scanning of sim number
SimNumberScanResult simNumberResult = (SimNumberScanResult) result;

mExtractedData.add(mBuilder.build(
R.string.PPSimNumber,
simNumberResult.getSimNumber()
));
}

return mExtractedData;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<string name="PPBarcodeRawData">Barcode raw data</string>
<string name="PPBarcodeType">Barcode type</string>
<string name="PPExtendedBarcodeData">Extended barcode data</string>
<string name="PPSimNumber">Sim number</string>

<!-- MyKad specific -->
<string name="PPFullName">Full name</string>
Expand Down Expand Up @@ -67,4 +68,12 @@
<string name="PPPassportNumber">Passport number</string>
<string name="PPSector">Sector</string>

<!-- Romanian specific -->
<string name="PPIdentityCardNumber">Identity card number</string>
<string name="PPSeries">Series</string>
<string name="PPCNP">CNP</string>
<string name="PPParentNames">Parent names</string>
<string name="PPValidFrom">Valid from</string>
<string name="PPValidUntil">Valid until</string>

</resources>
4 changes: 2 additions & 2 deletions BlinkIDDemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.0'
}
}

Expand All @@ -19,7 +19,7 @@ allprojects {
// versions of libraries that all modules require

project.ext {
blinkIdVersion = '3.4.1'
blinkIdVersion = '3.5.0'
compileSdkVersion = 25
targetSdkVersion = 25
buildToolsVersion = '25.0.2'
Expand Down
4 changes: 2 additions & 2 deletions BlinkIDDemo/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Sep 30 14:38:40 CEST 2016
#Fri Mar 17 12:53:27 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
Binary file modified LibBlinkID-javadoc.jar
Binary file not shown.
Binary file modified LibBlinkID.aar
Binary file not shown.
Loading

0 comments on commit 99ff9c3

Please sign in to comment.