diff --git a/BlinkID/package.json b/BlinkID/package.json index 300767ed..b86590ff 100644 --- a/BlinkID/package.json +++ b/BlinkID/package.json @@ -1,6 +1,6 @@ { "name": "blinkid-cordova", - "version": "5.12.0", + "version": "5.13.0", "description": "A small and powerful ID card scanning library", "cordova": { "id": "blinkid-cordova", diff --git a/BlinkID/plugin.xml b/BlinkID/plugin.xml index 1b28fd4c..a43bb715 100644 --- a/BlinkID/plugin.xml +++ b/BlinkID/plugin.xml @@ -51,6 +51,10 @@ android:configChanges="orientation|screenSize" android:screenOrientation="portrait" > + + + + @@ -90,13 +94,13 @@ + - + - diff --git a/BlinkID/scripts/initIOSFramework.sh b/BlinkID/scripts/initIOSFramework.sh index 9cca8772..d53f70a9 100755 --- a/BlinkID/scripts/initIOSFramework.sh +++ b/BlinkID/scripts/initIOSFramework.sh @@ -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/v5.12.0/Microblink.xcframework.zip' +LINK='https://github.com/BlinkID/blinkid-ios/releases/download/v5.13.0/Microblink.xcframework.zip' FILENAME='Microblink.xcframework.zip' # check if Microblink framework and bundle already exist diff --git a/BlinkID/src/android/libBlinkID.gradle b/BlinkID/src/android/libBlinkID.gradle index 4744cbe0..85042204 100644 --- a/BlinkID/src/android/libBlinkID.gradle +++ b/BlinkID/src/android/libBlinkID.gradle @@ -6,7 +6,7 @@ repositories { } dependencies { - implementation('com.microblink:blinkid:5.12.0@aar') { + implementation('com.microblink:blinkid:5.13.0@aar') { transitive = true } } diff --git a/BlinkID/src/ios/sources/CDVMicroblinkScanner.h b/BlinkID/src/ios/sources/CDVBlinkIDScanner.h similarity index 96% rename from BlinkID/src/ios/sources/CDVMicroblinkScanner.h rename to BlinkID/src/ios/sources/CDVBlinkIDScanner.h index 26a5e815..bc4ed878 100644 --- a/BlinkID/src/ios/sources/CDVMicroblinkScanner.h +++ b/BlinkID/src/ios/sources/CDVBlinkIDScanner.h @@ -12,7 +12,7 @@ #import /** - * pdf417 plugin class. + * BlinkID plugin class. * Responds to JS calls */ @interface CDVMicroblinkScanner : CDVPlugin diff --git a/BlinkID/src/ios/sources/CDVMicroblinkScanner.m b/BlinkID/src/ios/sources/CDVBlinkIDScanner.m similarity index 90% rename from BlinkID/src/ios/sources/CDVMicroblinkScanner.m rename to BlinkID/src/ios/sources/CDVBlinkIDScanner.m index 8f8409b6..423a6c69 100644 --- a/BlinkID/src/ios/sources/CDVMicroblinkScanner.m +++ b/BlinkID/src/ios/sources/CDVBlinkIDScanner.m @@ -27,13 +27,6 @@ #import -const NSString *RESULT_LIST = @"resultList"; - -const NSString *CANCELLED = @"cancelled"; - -const int COMPRESSED_IMAGE_QUALITY = 90; - - @interface CDVPlugin () @property (nonatomic, retain) CDVInvokedUrlCommand *lastCommand; @@ -44,6 +37,11 @@ @interface CDVMicroblinkScanner () @property (nonatomic, strong) MBRecognizerCollection *recognizerCollection; @property (nonatomic) id scanningViewController; + +@property (class, nonatomic, readonly) NSString *RESULT_LIST; +@property (class, nonatomic, readonly) NSString *CANCELLED; +@property (class, nonatomic, readonly) int COMPRESSED_IMAGE_QUALITY; + @end @implementation CDVMicroblinkScanner @@ -122,8 +120,8 @@ - (void)overlayViewControllerDidFinishScanning:(MBOverlayViewController *)overla NSDictionary *resultDict; resultDict = @{ - CANCELLED: [NSNumber numberWithBool:NO], - RESULT_LIST: jsonResults + CDVMicroblinkScanner.CANCELLED: [NSNumber numberWithBool:NO], + CDVMicroblinkScanner.RESULT_LIST: jsonResults }; CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:resultDict]; @@ -143,9 +141,22 @@ - (void)overlayDidTapClose:(MBOverlayViewController *)overlayViewController { self.recognizerCollection = nil; self.scanningViewController = nil; NSDictionary *resultDict = @{ - CANCELLED : [NSNumber numberWithBool:YES] + CDVMicroblinkScanner.CANCELLED : [NSNumber numberWithBool:YES] }; CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:resultDict]; [self.commandDelegate sendPluginResult:result callbackId:self.lastCommand.callbackId]; } + ++ (NSString *)RESULT_LIST { + return @"resultList"; +} + ++ (NSString *)CANCELLED { + return @"cancelled"; +} + ++ (int)COMPRESSED_IMAGE_QUALITY { + return 90; +} + @end \ No newline at end of file diff --git a/BlinkID/www/blinkIdScanner.js b/BlinkID/www/blinkIdScanner.js index 1616eb27..00875361 100644 --- a/BlinkID/www/blinkIdScanner.js +++ b/BlinkID/www/blinkIdScanner.js @@ -634,7 +634,7 @@ BlinkID.prototype.Country = Object.freeze( Sudan: 230, Suriname: 231, SvalbardAndJanMayen: 232, - Swaziland: 233, + Eswatini: 233, Syria: 234, Tajikistan: 235, Tanzania: 236, diff --git a/Release notes.md b/Release notes.md index b7f59d89..45ee4594 100644 --- a/Release notes.md +++ b/Release notes.md @@ -1,3 +1,6 @@ +## 5.13.0 +- Updated to [Android SDK v5.13.0](https://github.com/BlinkID/blinkid-android/releases/tag/v5.13.0) and [iOS SDK v5.13.0](https://github.com/BlinkID/blinkid-ios/releases/tag/v5.13.0) + ## 5.12.0 - Updated to [Android SDK v5.12.0](https://github.com/BlinkID/blinkid-android/releases/tag/v5.12.0) and [iOS SDK v5.12.0](https://github.com/BlinkID/blinkid-ios/releases/tag/v5.12.0) diff --git a/sample_files/www/js/index.js b/sample_files/www/js/index.js index 2c435a13..1df21feb 100644 --- a/sample_files/www/js/index.js +++ b/sample_files/www/js/index.js @@ -77,8 +77,8 @@ var app = { // package name/bundleID com.microblink.sample var licenseKeys = { - android: 'sRwAAAAVY29tLm1pY3JvYmxpbmsuc2FtcGxlU9kJdZhZkGlTu9U3Potlw+N+WELcAfo3ZNjCGrjwPbX72/Lj68v4Wsf9m+5MlNQBduVAB4w8aalo+BzHOMQomzhSX//WJlF+gsu8YbPc7YiWkKgmlubu9m4LOLM6yAaUWSoHauvy6imEIN0XB9ZOLRv/lN9+3zro2jbDglRX6TXDbLNjkYIUAZfmXEBW+smfQ0606630P6TBTps2nV8Dr/ZQcQ8H18tQOsG6nzFEbJoddztEOcWCp1pzNP8wHf3W848HxYiOqjTcXoA6GxzAJKyv6U2JUFZqlkiLNWok/qY6++srGoDsh0LXCu8xVwi/2MM8/DZ3Qqa9HkHIdJ6amkeifQ==', - ios: 'sRwAAAEVY29tLm1pY3JvYmxpbmsuc2FtcGxl1BIcP4FpSuS/38JVPpankFQ/Bcr7WvDAxkCq8h6GBBsKnan7jmJz5oRDF0VOwEv8zcz2tsAexgAWBzhWNxEvz2I2UYi7CSHjlbw0ppsdoL5WCQPrg6i+aiCRIxht1V8ObYlBvqTi69Pk0HXXwmpcIt7r01khjOlXdS7Mdn89IcW2R6bcYVIjID87iTpDG+SNFZ6ITQQsyv/c7VfkyEQ/2zl2J0Yln6a1OYGNCIDhfZjlTxK4H8ovNrrwvgR66jsKv0WBx2LLajjYOVdsMLueajw8caSpUlRtSpzCMAQB3FgD5OYEhDugRChfESwa4C8tAv7h9QUzU8TMpJeg7paXnee6MA==' + android: 'sRwAAAAVY29tLm1pY3JvYmxpbmsuc2FtcGxlU9kJdZhZkGlTu9U3Oitiw6TT2FGkiyJFlAhM8pExgH/ZF5IuOoC/DbKHoiR382JaMb+r7NDBTzi88CBCEGTbXlCknk+hJObhf+9SOOJyV9scpqUqGgudxZCbR7Ao8QVhwb7XavkyHr+6j1COdVVFlV105JVZF2y7TTB/c6qKl1YLlEPsHcgQJIR15cWeLaSrM9SDq3cW66fdVqjrmXTlZOpo3r6Kzc5LWa+B/kFt7oEJGC3+E8RVD0L/BM6W0vQvCFrgz2XMss7AmHyHugG2t7xId3TBcx9Jct+EcEjICkuJ3KnzdNj8OlVIHcVAlEcLcqx90wxL', + ios: 'sRwAAAEVY29tLm1pY3JvYmxpbmsuc2FtcGxl1BIcP4FpSuS/38JVOjalnIUAO6GSoXBJSnE8F0QDNJHKEMH7o9ipBUa6gs9JVUn1xhlm+gU+CE8M5dfpDJ5dThQAwhdat7lEBlhqCWhhVnaFAwhRPzmGoBT5DPJH+/j0bMsP52KFNDIQyjJ56+N/rtC1NQc0A/5weRzGQ0mJCESXhL1iCYi/ewtO8VmzBIMsPHcbtNKVqSabeqBOvjKVdwCDodUHYD4gxp+Z5QGjWEUTqqubZcRckHLEq+55y3IRpBev7y2ZfrwTPTBvkg6icvXZzpYl9G7UQnJfsx90JCFnGbFwkzgtCyG0D4EgWxpW2TRBZU9REHXXGZqh9BdHGCmv' }; function buildResult(result, key) {