diff --git a/AnylineExamples/Anyline Demo App/DemoApp Source/Models/ALOthersExampleManager.m b/AnylineExamples/Anyline Demo App/DemoApp Source/Models/ALOthersExampleManager.m index e4b05ac52..b43232f8f 100644 --- a/AnylineExamples/Anyline Demo App/DemoApp Source/Models/ALOthersExampleManager.m +++ b/AnylineExamples/Anyline Demo App/DemoApp Source/Models/ALOthersExampleManager.m @@ -30,10 +30,10 @@ - (void)initExampleData { viewController:[ALContainerScanViewController class] title:NSLocalizedString(@"Shipping Container", nil)]; - ALExample *parallelFirstExample = [[ALExample alloc] initWithName:NSLocalizedString(@"VIN + Barcode Parallel Either-OR", nil) - image:[UIImage imageNamed:@"vin-barcode-parallel-either-or"] + ALExample *parallelFirstVinBarcodeExample = [[ALExample alloc] initWithName:NSLocalizedString(@"VIN + Barcode (Parallel First)", nil) + image:[UIImage imageNamed:@"parallel_first_vin_barcode"] viewController:[ALCompositeScanViewController class] - title:NSLocalizedString(@"VIN + Barcode Parallel Either-OR", nil)]; + title:NSLocalizedString(@"VIN + Barcode (Parallel First)", nil)]; ALExample *customCMDExample = [[ALExample alloc] initWithName:NSLocalizedString(@"Custom CMD", nil) image:[UIImage imageNamed:@"custom-cmd"] @@ -44,7 +44,7 @@ - (void)initExampleData { self.sectionNames = @[ @"OCR", @"Composites" ]; self.examples = @{ self.sectionNames[0] : @[ containerScanning, customCMDExample ], - self.sectionNames[1] : @[ parallelFirstExample ], + self.sectionNames[1] : @[ parallelFirstVinBarcodeExample ], }; } diff --git a/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/ViewController/ALCompositeScanViewController.m b/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/ViewController/ALCompositeScanViewController.m index 2b4462818..996d173f3 100644 --- a/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/ViewController/ALCompositeScanViewController.m +++ b/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/ViewController/ALCompositeScanViewController.m @@ -14,7 +14,7 @@ @implementation ALCompositeScanViewController - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"First of VIN + Barcode"; + self.title = @"VIN + Barcode (Parallel First)"; self.controllerType = ALScanHistoryVIN; [self reloadScanView]; } diff --git a/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/parallel_first_vin_barcode.json b/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/parallel_first_vin_barcode.json index 8e109f90b..555dd56aa 100644 --- a/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/parallel_first_vin_barcode.json +++ b/AnylineExamples/Anyline Examples Source/Processes/Composite Scanning/parallel_first_vin_barcode.json @@ -1,10 +1,11 @@ { "cameraConfig": { + "captureResolution": "1080p", "pictureResolution": "1080p" }, "flashConfig": { - "mode": "manual_off", - "alignment": "top_left" + "mode": "manual", + "alignment": "top_right" }, "viewPluginCompositeConfig": { "id": "parallel-first-vin-barcode", @@ -15,7 +16,7 @@ "pluginConfig": { "id": "barcode", "barcodeConfig": { - "barcodeFormats": [ "ALL" ] + "barcodeFormats": ["ALL"] } }, "scanFeedbackConfig": { @@ -37,17 +38,15 @@ "vinConfig": {} }, "cutoutConfig": { - "maxWidthPercent": "70%", + "maxWidthPercent": "85%", "alignment": "top_half", - "ratioFromSize": { - "width": 689, - "height": 100 - }, + "ratioFromSize": { "width": 62, "height": 9 }, + "offset": { "x": 0, "y": 0 }, "outerColor": "000000", - "outerAlpha": 0.3, + "outerAlpha": 0, "strokeWidth": 2, - "strokeColor": "FFFFFF", - "cornerRadius": 6, + "strokeColor": "0099FF", + "cornerRadius": 4, "feedbackStrokeColor": "0099FF" }, "scanFeedbackConfig": { diff --git a/AnylineExamples/Anyline Examples Source/Utility/ALAppDemoLicenses.h b/AnylineExamples/Anyline Examples Source/Utility/ALAppDemoLicenses.h index 82c94d1a2..174643284 100644 --- a/AnylineExamples/Anyline Examples Source/Utility/ALAppDemoLicenses.h +++ b/AnylineExamples/Anyline Examples Source/Utility/ALAppDemoLicenses.h @@ -1,6 +1,6 @@ #ifndef Anyline_ALAppDemoLicenses_h #define Anyline_ALAppDemoLicenses_h -#define kDemoAppLicenseKey @"ADD YOUR LICENSE KEY HERE" +#define kDemoAppLicenseKey @"ewogICJsaWNlbnNlS2V5VmVyc2lvbiIgOiAiMy4wIiwKICAiZGVidWdSZXBvcnRpbmciIDogIm9uIiwKICAibWFqb3JWZXJzaW9uIiA6ICIzNyIsCiAgIm1heERheXNOb3RSZXBvcnRlZCIgOiAzMCwKICAiYWR2YW5jZWRCYXJjb2RlIiA6IHRydWUsCiAgIm11bHRpQmFyY29kZSIgOiB0cnVlLAogICJzdXBwb3J0ZWRCYXJjb2RlRm9ybWF0cyIgOiBbICJBTEwiIF0sCiAgInBsYXRmb3JtIiA6IFsgIkFuZHJvaWQiLCAiaU9TIiwgIldpbmRvd3MiLCAiV2ViIiwgIkpTIiBdLAogICJzY29wZSIgOiBbICJBTEwiIF0sCiAgInNob3dXYXRlcm1hcmsiIDogdHJ1ZSwKICAidG9sZXJhbmNlRGF5cyIgOiAzMCwKICAidmFsaWQiIDogIjIwMjUtMDEtMzEiLAogICJsaWNlbnNlSWQiIDogIkdycWs3RmNYNFl0c1gzc1E4aFVNTG1XZXI1bTV0Um1XYVhYU1BoR09IRW8iLAogICJpb3NJZGVudGlmaWVyIiA6IFsgImNvbS5hbnlsaW5lLmV4YW1wbGVzLnJlYWN0bmF0aXZlIiwgImNvbS5hbnlsaW5lLnhhbWFyaW4uZXhhbXBsZXMiLCAiQW55bGluZUV4YW1wbGVzQXBwLldpbmRvd3MiLCAiYW55bGluZS51d3AudGVzdHMiLCAiY29tLmFueWxpbmUuZXhhbXBsZXMuY29yZG92YSIsICJjb20uYW55bGluZS54YW1hcmluLmZvcm1zLmV4YW1wbGVzIiwgImNvbS5hbnlsaW5lLm1hdWkuZXhhbXBsZXMiLCAiY29tLmFueWxpbmUucHJvdG90eXBlcyIsICJpby5hbnlsaW5lLmV4YW1wbGVzLnNuYXBzaG90IiwgImlvLmFueWxpbmUuZmx1dHRlci5leGFtcGxlcyIsICJpby5hbnlsaW5lLkFueWxpbmVFeGFtcGxlcy5idW5kbGUiIF0sCiAgImFuZHJvaWRJZGVudGlmaWVyIiA6IFsgImNvbS5hbnlsaW5lLmV4YW1wbGVzLnJlYWN0bmF0aXZlIiwgImNvbS5hbnlsaW5lLnhhbWFyaW4uZXhhbXBsZXMiLCAiQW55bGluZUV4YW1wbGVzQXBwLldpbmRvd3MiLCAiYW55bGluZS51d3AudGVzdHMiLCAiY29tLmFueWxpbmUuZXhhbXBsZXMuY29yZG92YSIsICJjb20uYW55bGluZS54YW1hcmluLmZvcm1zLmV4YW1wbGVzIiwgImNvbS5hbnlsaW5lLm1hdWkuZXhhbXBsZXMiLCAiY29tLmFueWxpbmUucHJvdG90eXBlcyIsICJpby5hbnlsaW5lLmV4YW1wbGVzLnNuYXBzaG90IiwgImlvLmFueWxpbmUuZmx1dHRlci5leGFtcGxlcyIsICJpby5hbnlsaW5lLkFueWxpbmVFeGFtcGxlcy5idW5kbGUiIF0sCiAgIndpbmRvd3NJZGVudGlmaWVyIiA6IFsgImNvbS5hbnlsaW5lLmV4YW1wbGVzLnJlYWN0bmF0aXZlIiwgImNvbS5hbnlsaW5lLnhhbWFyaW4uZXhhbXBsZXMiLCAiQW55bGluZUV4YW1wbGVzQXBwLldpbmRvd3MiLCAiYW55bGluZS51d3AudGVzdHMiLCAiY29tLmFueWxpbmUuZXhhbXBsZXMuY29yZG92YSIsICJjb20uYW55bGluZS54YW1hcmluLmZvcm1zLmV4YW1wbGVzIiwgImNvbS5hbnlsaW5lLm1hdWkuZXhhbXBsZXMiLCAiY29tLmFueWxpbmUucHJvdG90eXBlcyIsICJpby5hbnlsaW5lLmV4YW1wbGVzLnNuYXBzaG90IiwgImlvLmFueWxpbmUuZmx1dHRlci5leGFtcGxlcyIsICJpby5hbnlsaW5lLkFueWxpbmVFeGFtcGxlcy5idW5kbGUiIF0sCiAgImpzSWRlbnRpZmllciIgOiBbICJjb20uYW55bGluZS5leGFtcGxlcy5yZWFjdG5hdGl2ZSIsICJjb20uYW55bGluZS54YW1hcmluLmV4YW1wbGVzIiwgIkFueWxpbmVFeGFtcGxlc0FwcC5XaW5kb3dzIiwgImFueWxpbmUudXdwLnRlc3RzIiwgImNvbS5hbnlsaW5lLmV4YW1wbGVzLmNvcmRvdmEiLCAiY29tLmFueWxpbmUueGFtYXJpbi5mb3Jtcy5leGFtcGxlcyIsICJjb20uYW55bGluZS5tYXVpLmV4YW1wbGVzIiwgImNvbS5hbnlsaW5lLnByb3RvdHlwZXMiLCAiaW8uYW55bGluZS5leGFtcGxlcy5zbmFwc2hvdCIsICJpby5hbnlsaW5lLmZsdXR0ZXIuZXhhbXBsZXMiLCAiaW8uYW55bGluZS5BbnlsaW5lRXhhbXBsZXMuYnVuZGxlIiBdLAogICJ3ZWJJZGVudGlmaWVyIiA6IFsgImNvbS5hbnlsaW5lLmV4YW1wbGVzLnJlYWN0bmF0aXZlIiwgImNvbS5hbnlsaW5lLnhhbWFyaW4uZXhhbXBsZXMiLCAiQW55bGluZUV4YW1wbGVzQXBwLldpbmRvd3MiLCAiYW55bGluZS51d3AudGVzdHMiLCAiY29tLmFueWxpbmUuZXhhbXBsZXMuY29yZG92YSIsICJjb20uYW55bGluZS54YW1hcmluLmZvcm1zLmV4YW1wbGVzIiwgImNvbS5hbnlsaW5lLm1hdWkuZXhhbXBsZXMiLCAiY29tLmFueWxpbmUucHJvdG90eXBlcyIsICJpby5hbnlsaW5lLmV4YW1wbGVzLnNuYXBzaG90IiwgImlvLmFueWxpbmUuZmx1dHRlci5leGFtcGxlcyIsICJpby5hbnlsaW5lLkFueWxpbmVFeGFtcGxlcy5idW5kbGUiIF0KfQoKcy9sSTJBcFFpN2ZCZzdPUi81bXFtajkweHlPLzBpbjF3TzhKVloyaEJmeWpraEI3cE92QUI1Vk5URlU3SGZmTXJ1SFAwaFkzWW8yRjBNWDhvV1AyUTRTSkxOMzh5dTNmaWYydEVxSmVFZDBCMzR0UC9qUEFwRFZmVlBZaDZ1YU5xdW9uZFloMUMwOG5jSVIwQmNiZk1VNlJrZnBTWjBpcUlROVA4WWV5aHVncUh2ZStDYTVMK0tLSEd6bnhETFIrMDhSekNoMlpqcHBZSGJHRjlONFIwMGFXaExqTTNrQTVIR3FoY2lsUlQ5RDJ6anpnd21DNmUvUlpUWmh3LzZmbkxvVU8zV1YxSENzVTFUN0VHem1RMjJseThWeFpZUlVuUnltWVI3WFN0c3dKL0h6U016aWNTTElLT0FtY3RTdEQ4QmF2bmVVSmg5Mk9nWDI0eGcyNmhRPT0=" #endif diff --git a/Documentation/html/Categories/NSArray+ALJSONExtras.html b/Documentation/html/Categories/NSArray+ALJSONExtras.html index 1753e2539..fc35b13da 100644 --- a/Documentation/html/Categories/NSArray+ALJSONExtras.html +++ b/Documentation/html/Categories/NSArray+ALJSONExtras.html @@ -106,7 +106,7 @@