Skip to content

Commit ddb8d48

Browse files
krizaakrizaa
authored
Merge pull request #11 from blinkcard/release/v2.6.0
Release/v2.6.0
2 parents c4e6a89 + 54812c9 commit ddb8d48

23 files changed

+68
-150
lines changed

‎BlinkCard/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rootProject.allprojects {
1616
repositories {
1717
google()
1818
jcenter()
19-
maven { url 'http://maven.microblink.com' }
19+
maven { url 'https://maven.microblink.com' }
2020
}
2121
}
2222

@@ -34,7 +34,7 @@ android {
3434
}
3535

3636
dependencies {
37-
implementation('com.microblink:blinkcard:2.4.0@aar') {
37+
implementation('com.microblink:blinkcard:2.6.0@aar') {
3838
transitive = true
3939
}
4040
}

‎BlinkCard/android/src/main/java/com/microblink/blinkcard/flutter/recognizers/serialization/BlinkCardRecognizerSerialization.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public Recognizer<?> createRecognizer(JSONObject jsonObject) {
2222
recognizer.setFullDocumentImageExtensionFactors(SerializationUtils.deserializeExtensionFactors(jsonObject.optJSONObject("fullDocumentImageExtensionFactors")));
2323
recognizer.setPaddingEdge((float)jsonObject.optDouble("paddingEdge", 0.0));
2424
recognizer.setReturnFullDocumentImage(jsonObject.optBoolean("returnFullDocumentImage", false));
25-
recognizer.setSignResult(jsonObject.optBoolean("signResult", false));
2625
return recognizer;
2726
}
2827

@@ -36,8 +35,6 @@ public JSONObject serializeResult(Recognizer<?> recognizer) {
3635
jsonResult.put("cardNumberPrefix", result.getCardNumberPrefix());
3736
jsonResult.put("cardNumberValid", result.isCardNumberValid());
3837
jsonResult.put("cvv", result.getCvv());
39-
jsonResult.put("digitalSignature", SerializationUtils.encodeByteArrayToBase64(result.getDigitalSignature()));
40-
jsonResult.put("digitalSignatureVersion", (int)result.getDigitalSignatureVersion());
4138
jsonResult.put("expiryDate", SerializationUtils.serializeDate(result.getExpiryDate()));
4239
jsonResult.put("firstSideBlurred", result.isFirstSideBlurred());
4340
jsonResult.put("firstSideFullDocumentImage", SerializationUtils.encodeImageBase64(result.getFirstSideFullDocumentImage()));

‎BlinkCard/android/src/main/java/com/microblink/blinkcard/flutter/recognizers/serialization/LegacyBlinkCardEliteRecognizerSerialization.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public Recognizer<?> createRecognizer(JSONObject jsonObject) {
2222
recognizer.setFullDocumentImageDpi(jsonObject.optInt("fullDocumentImageDpi", 250));
2323
recognizer.setFullDocumentImageExtensionFactors(SerializationUtils.deserializeExtensionFactors(jsonObject.optJSONObject("fullDocumentImageExtensionFactors")));
2424
recognizer.setReturnFullDocumentImage(jsonObject.optBoolean("returnFullDocumentImage", false));
25-
recognizer.setSignResult(jsonObject.optBoolean("signResult", false));
2625
return recognizer;
2726
}
2827

@@ -34,8 +33,6 @@ public JSONObject serializeResult(Recognizer<?> recognizer) {
3433
SerializationUtils.addCommonRecognizerResultData(jsonResult, result);
3534
jsonResult.put("cardNumber", result.getCardNumber());
3635
jsonResult.put("cvv", result.getCvv());
37-
jsonResult.put("digitalSignature", SerializationUtils.encodeByteArrayToBase64(result.getDigitalSignature()));
38-
jsonResult.put("digitalSignatureVersion", (int)result.getDigitalSignatureVersion());
3936
jsonResult.put("documentDataMatch", SerializationUtils.serializeEnum(result.getDocumentDataMatch()));
4037
jsonResult.put("fullDocumentBackImage", SerializationUtils.encodeImageBase64(result.getFullDocumentBackImage()));
4138
jsonResult.put("fullDocumentFrontImage", SerializationUtils.encodeImageBase64(result.getFullDocumentFrontImage()));

‎BlinkCard/android/src/main/java/com/microblink/blinkcard/flutter/recognizers/serialization/LegacyBlinkCardRecognizerSerialization.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public Recognizer<?> createRecognizer(JSONObject jsonObject) {
2525
recognizer.setFullDocumentImageDpi(jsonObject.optInt("fullDocumentImageDpi", 250));
2626
recognizer.setFullDocumentImageExtensionFactors(SerializationUtils.deserializeExtensionFactors(jsonObject.optJSONObject("fullDocumentImageExtensionFactors")));
2727
recognizer.setReturnFullDocumentImage(jsonObject.optBoolean("returnFullDocumentImage", false));
28-
recognizer.setSignResult(jsonObject.optBoolean("signResult", false));
2928
return recognizer;
3029
}
3130

@@ -37,8 +36,6 @@ public JSONObject serializeResult(Recognizer<?> recognizer) {
3736
SerializationUtils.addCommonRecognizerResultData(jsonResult, result);
3837
jsonResult.put("cardNumber", result.getCardNumber());
3938
jsonResult.put("cvv", result.getCvv());
40-
jsonResult.put("digitalSignature", SerializationUtils.encodeByteArrayToBase64(result.getDigitalSignature()));
41-
jsonResult.put("digitalSignatureVersion", (int)result.getDigitalSignatureVersion());
4239
jsonResult.put("documentDataMatch", SerializationUtils.serializeEnum(result.getDocumentDataMatch()));
4340
jsonResult.put("fullDocumentBackImage", SerializationUtils.encodeImageBase64(result.getFullDocumentBackImage()));
4441
jsonResult.put("fullDocumentFrontImage", SerializationUtils.encodeImageBase64(result.getFullDocumentFrontImage()));

‎BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCBlinkCardRecognizerWrapper.m‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@ -(MBCRecognizer *) createRecognizer:(NSDictionary*) jsonRecognizer {
8686
recognizer.returnFullDocumentImage = [(NSNumber *)returnFullDocumentImage boolValue];
8787
}
8888

89-
}
90-
{
91-
id signResult = [jsonRecognizer valueForKey:@"signResult"];
92-
if (signResult != nil) {
93-
recognizer.signResult = [(NSNumber *)signResult boolValue];
94-
}
95-
9689
}
9790

9891
return recognizer;
@@ -111,8 +104,6 @@ -(NSDictionary *) serializeResult {
111104
[jsonResult setValue:self.result.cardNumberPrefix forKey:@"cardNumberPrefix"];
112105
[jsonResult setValue:[NSNumber numberWithBool:self.result.cardNumberValid] forKey:@"cardNumberValid"];
113106
[jsonResult setValue:self.result.cvv forKey:@"cvv"];
114-
[jsonResult setValue:[self.result.digitalSignature base64EncodedStringWithOptions:0] forKey:@"digitalSignature"];
115-
[jsonResult setValue:[NSNumber numberWithInteger:self.result.digitalSignatureVersion] forKey:@"digitalSignatureVersion"];
116107
[jsonResult setValue:[MBCSerializationUtils serializeMBDateResult:self.result.expiryDate] forKey:@"expiryDate"];
117108
[jsonResult setValue:[NSNumber numberWithBool:self.result.firstSideBlurred] forKey:@"firstSideBlurred"];
118109
[jsonResult setValue:[MBCSerializationUtils encodeMBImage:self.result.firstSideFullDocumentImage] forKey:@"firstSideFullDocumentImage"];

‎BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardEliteRecognizerWrapper.m‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@ -(MBCRecognizer *) createRecognizer:(NSDictionary*) jsonRecognizer {
8686
recognizer.returnFullDocumentImage = [(NSNumber *)returnFullDocumentImage boolValue];
8787
}
8888

89-
}
90-
{
91-
id signResult = [jsonRecognizer valueForKey:@"signResult"];
92-
if (signResult != nil) {
93-
recognizer.signResult = [(NSNumber *)signResult boolValue];
94-
}
95-
9689
}
9790

9891
return recognizer;
@@ -109,8 +102,6 @@ -(NSDictionary *) serializeResult {
109102
NSMutableDictionary* jsonResult = (NSMutableDictionary*)[super serializeResult];
110103
[jsonResult setValue:self.result.cardNumber forKey:@"cardNumber"];
111104
[jsonResult setValue:self.result.cvv forKey:@"cvv"];
112-
[jsonResult setValue:[self.result.digitalSignature base64EncodedStringWithOptions:0] forKey:@"digitalSignature"];
113-
[jsonResult setValue:[NSNumber numberWithInteger:self.result.digitalSignatureVersion] forKey:@"digitalSignatureVersion"];
114105
[jsonResult setValue:[NSNumber numberWithInteger:(self.result.documentDataMatch)] forKey:@"documentDataMatch"];
115106
[jsonResult setValue:[MBCSerializationUtils encodeMBImage:self.result.fullDocumentBackImage] forKey:@"fullDocumentBackImage"];
116107
[jsonResult setValue:[MBCSerializationUtils encodeMBImage:self.result.fullDocumentFrontImage] forKey:@"fullDocumentFrontImage"];

‎BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardRecognizerWrapper.m‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,6 @@ -(MBCRecognizer *) createRecognizer:(NSDictionary*) jsonRecognizer {
107107
recognizer.returnFullDocumentImage = [(NSNumber *)returnFullDocumentImage boolValue];
108108
}
109109

110-
}
111-
{
112-
id signResult = [jsonRecognizer valueForKey:@"signResult"];
113-
if (signResult != nil) {
114-
recognizer.signResult = [(NSNumber *)signResult boolValue];
115-
}
116-
117110
}
118111

119112
return recognizer;
@@ -130,8 +123,6 @@ -(NSDictionary *) serializeResult {
130123
NSMutableDictionary* jsonResult = (NSMutableDictionary*)[super serializeResult];
131124
[jsonResult setValue:self.result.cardNumber forKey:@"cardNumber"];
132125
[jsonResult setValue:self.result.cvv forKey:@"cvv"];
133-
[jsonResult setValue:[self.result.digitalSignature base64EncodedStringWithOptions:0] forKey:@"digitalSignature"];
134-
[jsonResult setValue:[NSNumber numberWithInteger:self.result.digitalSignatureVersion] forKey:@"digitalSignatureVersion"];
135126
[jsonResult setValue:[NSNumber numberWithInteger:(self.result.documentDataMatch)] forKey:@"documentDataMatch"];
136127
[jsonResult setValue:[MBCSerializationUtils encodeMBImage:self.result.fullDocumentBackImage] forKey:@"fullDocumentBackImage"];
137128
[jsonResult setValue:[MBCSerializationUtils encodeMBImage:self.result.fullDocumentFrontImage] forKey:@"fullDocumentFrontImage"];

‎BlinkCard/ios/blinkcard_flutter.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
Pod::Spec.new do |s|
66
s.name = 'blinkcard_flutter'
7-
s.version = '2.4.2'
7+
s.version = '2.6.0'
88
s.summary = 'Flutter plugin for BlinkCard, SDK for scanning and OCR of various credit cards.'
99
s.description = <<-DESC
1010
Flutter plugin for BlinkCard, SDK for scanning and OCR of various credit cards.
@@ -16,9 +16,9 @@ Flutter plugin for BlinkCard, SDK for scanning and OCR of various credit cards.
1616
s.source_files = 'Classes/**/*'
1717
s.public_header_files = 'Classes/**/*.h'
1818
s.dependency 'Flutter'
19-
s.platform = :ios, '9.0'
19+
s.platform = :ios, '12.0'
2020

21-
s.dependency 'MBBlinkCard', '~> 2.4.0'
21+
s.dependency 'MBBlinkCard', '~> 2.6.0'
2222

2323
# Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
2424
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }

‎BlinkCard/lib/overlay_settings.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ class OverlaySettings {
2828
OverlaySettings(this.overlaySettingsType);
2929

3030
factory OverlaySettings.fromJson(Map<String, dynamic> json) => _$OverlaySettingsFromJson(json);
31-
3231
Map<String, dynamic> toJson() => _$OverlaySettingsToJson(this);
3332
}

‎BlinkCard/lib/overlays/blinkcard_overlays.dart‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,24 @@ part 'blinkcard_overlays.g.dart';
77
/// BlinkCard overlay is best suited for scanning payment cards.
88
@JsonSerializable()
99
class BlinkCardOverlaySettings extends OverlaySettings {
10-
/// String: user instructions that are shown above camera preview while the first side of the
11-
/// document is being scanned.
12-
/// If null, default value will be used.
13-
String? firstSideInstructions;
10+
/// String: user instructions that are shown above camera preview while the first side of the
11+
/// document is being scanned.
12+
/// If null, default value will be used.
13+
String? firstSideInstructions;
1414

15-
/// String: user instructions that are shown above camera preview while the second side of the
16-
/// document is being scanned.
17-
/// If null, default value will be used.
18-
String? flipCardInstructions;
15+
/// String: user instructions that are shown above camera preview while the second side of the
16+
/// document is being scanned.
17+
/// If null, default value will be used.
18+
String? flipCardInstructions;
1919

20-
/// Defines whether glare warning will be displayed when user turn on a flashlight
21-
/// Default true
22-
bool showFlashlightWarning = true;
20+
/// Defines whether glare warning will be displayed when user turn on a flashlight
21+
/// Default true
22+
bool showFlashlightWarning = true;
2323

24-
BlinkCardOverlaySettings(): super('BlinkCardOverlaySettings');
24+
BlinkCardOverlaySettings() : super('BlinkCardOverlaySettings');
2525

26-
factory BlinkCardOverlaySettings.fromJson(Map<String, dynamic> json) => _$BlinkCardOverlaySettingsFromJson(json);
26+
factory BlinkCardOverlaySettings.fromJson(Map<String, dynamic> json) =>
27+
_$BlinkCardOverlaySettingsFromJson(json);
2728

28-
Map<String, dynamic> toJson() => _$BlinkCardOverlaySettingsToJson(this);
29+
Map<String, dynamic> toJson() => _$BlinkCardOverlaySettingsToJson(this);
2930
}

0 commit comments

Comments
 (0)