Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/35 #8

Merged
merged 5 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<Content Include="Assets\jsonConfigs\others_config_voucher_code.json" />
<Content Include="Assets\jsonConfigs\vehicle_config_license_plate.json" />
<Content Include="Assets\jsonConfigs\energy_config_photo.json" />
<Content Include="Assets\jsonConfigs\mro_config_tin.json" />
<Content Include="Assets\jsonConfigs\mro_config_tin_universal.json" />
<Content Include="Assets\anyline_capitals.traineddata" />
<Content Include="Assets\bottlecap.traineddata" />
<Content Include="Assets\jsonConfigs\id_config_universal_id.json" />
Expand All @@ -102,6 +102,7 @@
<Content Include="Assets\jsonConfigs\vehicle_config_license_plate_us.json" />
<Content Include="Assets\jsonConfigs\vehicle_config_license_plate_africa.json" />
<Content Include="Assets\jsonConfigs\mro_config_shipping_container_vertical.json" />
<Content Include="Assets\jsonConfigs\mro_config_tin_dot.json" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\FlashIcons\torch_auto.png" />
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,50 +1,81 @@
{
"camera" : {
"captureResolution" : "1080p",
"camera": {
"captureResolution": "1080p",
"zoomGesture": true
},
"flash" : {
"flash": {
"mode": "manual",
"alignment": "bottom_right",
"imageOn": "flash_on",
"imageOff": "flash_off"
},
"viewPlugin" : {
"plugin":{
"id":"ID",
"viewPlugin": {
"plugin": {
"id": "ID",
"idPlugin": {
"universalIdConfig": {
"allowedLayouts": {
"mrz": [],
"drivingLicense": [],
"idFront": []
"idFront": [],
"insuranceCard": []
},
"drivingLicense": {
"surname": {"scanOption": 0, "minConfidence": 40},
"lastName": {"scanOption": 0, "minConfidence": 40},
"givenNames": {"scanOption": 0, "minConfidence": 40},
"firstName": {"scanOption": 0, "minConfidence": 40},
"name": {"scanOption": 0, "minConfidence": 40},
"fullName": {"scanOption": 0, "minConfidence": 40},
"dateOfBirth": {"scanOption": 0, "minConfidence": 50},
"placeOfBirth": {"scanOption": 1, "minConfidence": 50},
"dateOfIssue": {"scanOption": 0, "minConfidence": 50},
"dateOfExpiry": {"scanOption": 1, "minConfidence": 50},
"authority": {"scanOption": 1, "minConfidence": 30},
"documentNumber": {"scanOption": 0, "minConfidence": 40},
"licenseNumber": {"scanOption": 0, "minConfidence": 40},
"licenceNumber": {"scanOption": 0, "minConfidence": 40},
"categories": {"scanOption": 1, "minConfidence": 30},
"address": {"scanOption": 1}
"class": {"scanOption": 1, "minConfidence": 30},
"licenseClass": {"scanOption": 1, "minConfidence": 30},
"address": {"scanOption": 0},
"sex": {"scanOption": 1,"minConfidence": 60},
"personalNumber": {"scanOption": 1,"minConfidence": 60},
"cardNumber": {"scanOption": 1,"minConfidence": 60}
},
"idFront": {
"surname": {"scanOption": 0, "minConfidence": 60},
"givenNames": {"scanOption": 0, "minConfidence": 60},
"dateOfBirth": {"scanOption": 0, "minConfidence": 60},
"placeOfBirth": {"scanOption": 1, "minConfidence": 60},
"dateOfExpiry": {"scanOption": 1, "minConfidence": 60},
"cardAccessNumber": {"scanOption": 1, "minConfidence": 60},
"documentNumber": {"scanOption": 0, "minConfidence": 60},
"nationality": {"scanOption": 1, "minConfidence": 60}
"surname": {"scanOption": 0,"minConfidence": 60},
"lastName": {"scanOption": 0, "minConfidence": 60},
"givenNames": {"scanOption": 0,"minConfidence": 60},
"firstName": {"scanOption": 0, "minConfidence": 60},
"name": {"scanOption": 0, "minConfidence": 40},
"fullName": {"scanOption": 0, "minConfidence": 40},
"dateOfBirth": {"scanOption": 0,"minConfidence": 60},
"placeOfBirth": {"scanOption": 1,"minConfidence": 60},
"dateOfIssue": {"scanOption": 0, "minConfidence": 60},
"dateOfExpiry": {"scanOption": 1,"minConfidence": 60},
"cardAccessNumber": {"scanOption": 1,"minConfidence": 60},
"documentNumber": {"scanOption": 0,"minConfidence": 60},
"licenseNumber": {"scanOption": 0, "minConfidence": 60},
"licenceNumber": {"scanOption": 0, "minConfidence": 60},
"nationality": {"scanOption": 1,"minConfidence": 60},
"sex": {"scanOption": 1,"minConfidence": 60},
"personalNumber": {"scanOption": 1,"minConfidence": 60},
"cardNumber": {"scanOption": 1,"minConfidence": 60}
},
"insuranceCard": {
"nationality": {"scanOption": 0, "minConfidence": 50},
"surname": {"scanOption": 0, "minConfidence": 50},
"givenNames": {"scanOption": 0, "minConfidence": 50},
"dateOfBirth": {"scanOption": 0, "minConfidence": 50},
"personalNumber": {"scanOption": 0, "minConfidence": 50},
"authority": {"scanOption": 0, "minConfidence": 50},
"documentNumber": {"scanOption": 0, "minConfidence": 50},
"dateOfExpiry": {"scanOption": 0, "minConfidence": 50}
}
}
}
},
"cutoutConfig" : {
"cutoutConfig": {
"style": "animated_rect",
"maxWidthPercent": "90%",
"maxHeightPercent": "90%",
Expand All @@ -54,7 +85,7 @@
"strokeColor": "FFFFFF",
"outerColor": "000000",
"outerAlpha": 0.3,
"ratioFromSize" : {
"ratioFromSize": {
"width": 50,
"height": 31
},
Expand All @@ -68,15 +99,15 @@
},
"feedbackStrokeColor": "0099FF"
},
"scanFeedback" : {
"scanFeedback": {
"style": "CONTOUR_RECT",
"visualFeedbackRedrawTimeout": 100,
"strokeColor": "0099FF",
"fillColor" : "220099FF",
"fillColor": "220099FF",
"beepOnResult": true,
"vibrateOnResult": true,
"strokeWidth": 2
},
"cancelOnResult" : true
"cancelOnResult": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,30 @@
"id": "TIN_ID",
"ocrPlugin": {
"tinConfig": {
"scanMode": "flexible",
"scanMode": "DOT",
"upsideDownMode": "auto"
}
}
},
"cutoutConfig": {
"style": "rect",
"alignment": "top_half",
"maxWidthPercent": "99%",
"maxHeightPercent": "99%",
"strokeWidth": 1,
"width": 720,
"alignment": "center",
"maxWidthPercent": "80%",
"ratioFromSize": {
"width": 720,
"height": 144
},
"strokeWidth": 2,
"strokeColor": "FFFFFF",
"cornerRadius": 2,
"cornerRadius": 4,
"outerColor": "000000",
"outerAlpha": 0.3,
"feedbackStrokeColor": "0099FF"
"outerAlpha": 0.5,
"feedbackStrokeColor": "0099FF",
"offset": {
"x": 0,
"y": -15
}
},
"scanFeedback": {
"animation": "traverse_multi",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"camera": {
"captureResolution": "720"
},
"flash": {
"mode": "manual",
"alignment": "bottom_left"
},
"viewPlugin": {
"plugin": {
"id": "TIN_ID",
"ocrPlugin": {
"tinConfig": {
"scanMode": "UNIVERSAL",
"upsideDownMode": "auto"
}
}
},
"cutoutConfig": {
"style": "rect",
"width": 720,
"alignment": "center",
"maxWidthPercent": "80%",
"ratioFromSize": {
"width": 720,
"height": 144
},
"strokeWidth": 2,
"strokeColor": "FFFFFF",
"cornerRadius": 4,
"outerColor": "000000",
"outerAlpha": 0.5,
"feedbackStrokeColor": "0099FF",
"offset": {
"x": 0,
"y": -15
}
},
"scanFeedback": {
"animation": "traverse_multi",
"animationDuration": 250,
"style": "contour_rect",
"strokeWidth": 2,
"strokeColor": "0099FF",
"beepOnResult": false,
"vibrateOnResult": true,
"blinkAnimationOnResult": true,
"cancelOnResult": true
},
"cancelOnResult": true,
"reportingEnabled": true
}
}
2 changes: 1 addition & 1 deletion Anyline Windows UWP Examples/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ protected async override void OnNavigatedTo(NavigationEventArgs e)
await Task.Run(() =>
{
AnylineLoader.Load();
Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => LoadingView.Visibility = Visibility.Collapsed);
_ = Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => LoadingView.Visibility = Visibility.Collapsed);
});
}
}
Expand Down
6 changes: 4 additions & 2 deletions Anyline Windows UWP Examples/Model/ExampleList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ public static class ExampleList
private static readonly string LicensePlateAfrica = "License Plates - Africa";
private static readonly string UniversalSerialNumber = "Universal Serial Number";
private static readonly string VIN = "Vehicle Identification Number";
private static readonly string TIN = "Tire Identification Number";
private static readonly string TIN_UNIVERSAL = "Tire Identification Number - Universal";
private static readonly string TIN_DOT = "Tire Identification Number - DOT (North America only)";
private static readonly string ShippingContainerHorizontal = "Shipping Container - Horizontal";
private static readonly string ShippingContainerVertical = "Shipping Container - Vertical";
private static readonly string Barcode = "Barcode";
Expand Down Expand Up @@ -48,7 +49,8 @@ public static class ExampleList
new ExampleCategory("MRO", new List<ExamplePlugin>{
new ExamplePlugin(UniversalSerialNumber, "mro_config_usnr"),
new ExamplePlugin(VIN, "mro_config_vin"),
new ExamplePlugin(TIN, "mro_config_tin"),
new ExamplePlugin(TIN_UNIVERSAL, "mro_config_tin_universal"),
new ExamplePlugin(TIN_DOT, "mro_config_tin_dot"),
new ExamplePlugin(ShippingContainerHorizontal, "mro_config_shipping_container_horizontal"),
new ExamplePlugin(ShippingContainerVertical, "mro_config_shipping_container_vertical"),
}),
Expand Down
11 changes: 8 additions & 3 deletions Anyline Windows UWP Examples/ResultsPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,16 @@ protected async override void OnNavigatedTo(NavigationEventArgs e)
base.OnNavigatedTo(e);

var results = e.Parameter as Dictionary<string, object>;

if (results == null) return;

var defaultMargin = new Thickness(20, 5, 20, 5);

var foregroundColor = new SolidColorBrush(Colors.Black);

if (Application.Current.RequestedTheme == ApplicationTheme.Dark)
foregroundColor = new SolidColorBrush(Colors.White);

foreach (var result in results)
{
stackResults.Children.Add(new TextBlock { Text = result.Key, FontSize = 15, Foreground = new SolidColorBrush(Colors.Gray), Margin = defaultMargin });
Expand All @@ -49,7 +54,7 @@ protected async override void OnNavigatedTo(NavigationEventArgs e)

stackResults.Children.Add(img);
}
else if(result.Value is BitmapImage bitmap)
else if (result.Value is BitmapImage bitmap)
{
var img = new Image()
{
Expand All @@ -64,7 +69,7 @@ protected async override void OnNavigatedTo(NavigationEventArgs e)
}
else
{
stackResults.Children.Add(new TextBlock { Text = result.Value.ToString().Replace("|", " - "), FontSize = 17, Foreground = new SolidColorBrush(Colors.Black), Margin = defaultMargin, FontWeight = FontWeights.Bold });
stackResults.Children.Add(new TextBlock { Text = result.Value.ToString().Replace("|", " - "), FontSize = 17, Foreground = foregroundColor, Margin = defaultMargin, FontWeight = FontWeights.Bold });
}
stackResults.Children.Add(new Line { X1 = 0, X2 = 1, Stretch = Stretch.Fill, Stroke = new SolidColorBrush(Colors.LightGray), Margin = new Thickness(0, 10, 0, 10), StrokeThickness = 1 });
}
Expand Down
4 changes: 2 additions & 2 deletions Anyline.SDK.dll
Git LFS file not shown
4 changes: 2 additions & 2 deletions Anyline.dll
Git LFS file not shown
Binary file modified Anyline.winmd
Binary file not shown.