Skip to content

Commit

Permalink
43.1.0-preview.1
Browse files Browse the repository at this point in the history
  • Loading branch information
aldrichanyline committed Mar 9, 2023
1 parent 85ac201 commit 364276f
Show file tree
Hide file tree
Showing 498 changed files with 3,733 additions and 3,667 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "ALOthersExampleManager.h"
#import "ALUniversalSerialNumberScanViewController.h"
#import "ALContainerScanViewController.h"

#import "ALCompositeScanViewController.h"

@interface ALOthersExampleManager ()

Expand All @@ -23,8 +23,7 @@ - (instancetype)init {

- (void)initExampleData {
self.title = @"Others";
//OCR


ALExample *containerScanning = [[ALExample alloc] initWithName:NSLocalizedString(@"Horizontal Shipping Container", nil)
image:[UIImage imageNamed:@"container serial numbers"]
viewController:[ALContainerScanViewController class]
Expand All @@ -35,9 +34,15 @@ - (void)initExampleData {
viewController:[ALContainerScanViewController class]
title:NSLocalizedString(@"Vertical Shipping Container", nil)];

self.sectionNames = @[ @"Others" ];
ALExample *parallelFirstExample = [[ALExample alloc] initWithName:NSLocalizedString(@"VIN + Barcode Parallel Either-OR", nil)
image:[UIImage imageNamed:@"vin-barcode-parallel-either-or"]
viewController:[ALCompositeScanViewController class]
title:NSLocalizedString(@"VIN + Barcode Parallel Either-OR", nil)];

self.sectionNames = @[ @"OCR", @"Composites" ];
self.examples = @{
self.sectionNames[0] : @[ containerScanning, verticalContainerScanning ],
self.sectionNames[1] : @[ parallelFirstExample ],
};
}

Expand Down
2 changes: 1 addition & 1 deletion AnylineExamples/Anyline Demo App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>43.0.0</string>
<string>43.1.0-preview.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
//
// ALContainerScanScanViewController.h
// AnylineExamples
//
// Created by Daniel Albertini on 09.04.18.
//

#import <UIKit/UIKit.h>

#import "ALBaseScanViewController.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#import <UIKit/UIKit.h>
#import "ALBaseScanViewController.h"

NS_ASSUME_NONNULL_BEGIN

@interface ALCompositeScanViewController : ALBaseScanViewController

@end

NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
#import "ALCompositeScanViewController.h"
#import <Anyline/Anyline.h>
#import "AnylineExamples-Swift.h"

NSString * const kCompositeVC_configJSONFilename = @"parallel_first_vin_barcode";

@interface ALCompositeScanViewController () <ALViewPluginCompositeDelegate>

@property (nonatomic, strong) id<ALScanViewPluginBase> scanViewPlugin;

@end

@implementation ALCompositeScanViewController

- (void)viewDidLoad {
[super viewDidLoad];
self.title = @"First of VIN + Barcode";
self.controllerType = ALScanHistoryVIN;
[self reloadScanView];
}

- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self.scanViewPlugin startWithError:nil];
}

- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
[self.scanViewPlugin stop];
}

- (void)reloadScanView {
NSDictionary *configJSONDictionary = [[self configJSONStrWithFilename:kCompositeVC_configJSONFilename] asJSONObject];

NSError *error;
ALViewPluginComposite *composite = [[ALViewPluginComposite alloc] initWithJSONDictionary:configJSONDictionary error:&error];

if ([self popWithAlertOnError:error]) {
return;
}

composite.delegate = self;

[self.scanView stopCamera];
if (self.scanView) {
[self.scanView removeFromSuperview];
}

self.scanViewPlugin = composite;

ALScanViewConfig *scanViewConfig = [ALScanViewConfig withJSONDictionary:configJSONDictionary];
self.scanView = [[ALScanView alloc] initWithFrame:CGRectZero
scanViewPlugin:composite
scanViewConfig:scanViewConfig
error:&error];

if ([self popWithAlertOnError:error]) {
return;
}

[self installScanView:self.scanView]; // call startCamera and start the plugin outside
// we've just readded the ScanView, make sure it goes beneath the other views.
[self.view sendSubviewToBack:self.scanView];
[self.scanView startCamera];
}

// MARK: - ALViewPluginCompositeDelegate

- (void)viewPluginComposite:(ALViewPluginComposite *)viewPluginComposite allResultsReceived:(NSArray<ALScanResult *> *)scanResults {
// there will be only one result - this is the way the plugin is configured
ALScanResult *scanResult = scanResults[0];

// Locate plugin using the pluginID
ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)[viewPluginComposite pluginWithID:scanResult.pluginID];
ALScanPlugin *scanPlugin = scanViewPlugin.scanPlugin;

NSArray<ALResultEntry *> *resultData = scanResult.pluginResult.fieldList.resultEntries;
NSString *resultDataJSONStr = [ALResultEntry JSONStringFromList:resultData];
__weak ALCompositeScanViewController *weakSelf = self;
[self anylineDidFindResult:resultDataJSONStr
barcodeResult:@"" // not using this, even though it's for a barcode + VIN
image:scanResult.croppedImage
scanPlugin:scanPlugin
viewPlugin:self.scanViewPlugin
completion:^{
ALResultViewController *vc = [[ALResultViewController alloc]
initWithResults:resultData];
vc.imagePrimary = scanResult.croppedImage;

[weakSelf.navigationController pushViewController:vc animated:YES];
}];
}

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"cameraConfig": {
"pictureResolution": "1080p"
},
"flashConfig": {
"mode": "manual_off",
"alignment": "top_left"
},
"viewPluginCompositeConfig": {
"id": "parallel_first_vin_barcode",
"processingMode": "parallelFirstScan",
"viewPlugins": [
{
"viewPluginConfig": {
"pluginConfig": {
"id": "barcode",
"barcodeConfig": {
"barcodeFormats": [ "ALL" ]
}
},
"scanFeedbackConfig": {
"style": "rect",
"strokeWidth": 2,
"strokeColor": "0099FF",
"fillColor": "330099FF",
"cornerRadius": 0,
"beepOnResult": false,
"vibrateOnResult": false,
"blinkAnimationOnResult": true
}
}
},
{
"viewPluginConfig": {
"pluginConfig": {
"id": "vin",
"vinConfig": {}
},
"cutoutConfig": {
"style": "rect",
"maxWidthPercent": "85%",
"alignment": "top_half",
"ratioFromSize": { "width": 62, "height": 9 },
"offset": { "x": 0, "y": 0 },
"outerColor": "000000",
"outerAlpha": 0,
"strokeWidth": 2,
"strokeColor": "0099FF",
"cornerRadius": 4,
"feedbackStrokeColor": "0099FF"
},
"scanFeedbackConfig": {
"style": "contour_rect",
"animation": "traverse_multi",
"animationDuration": 250,
"strokeWidth": 2,
"strokeColor": "0099FF",
"fillColor": "220099FF",
"beepOnResult": false,
"vibrateOnResult": false,
"blinkAnimationOnResult": true
}
}
}
]
}
}
26 changes: 26 additions & 0 deletions AnylineExamples/AnylineExamples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
036F7E59E334D31A9A5F0A1F /* id_composite_config.json in Resources */ = {isa = PBXBuildFile; fileRef = A2A3EE6CB8387C36E189E792 /* id_composite_config.json */; };
03DC0905EAC8CA8DAFC0161E /* WorkForceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D9F533C26CE1AF0173FA55D8 /* WorkForceViewController.m */; };
0497B5F83C7A3232E9DDDD60 /* ALCompositeScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F265241B8B0732E50240B8F2 /* ALCompositeScanViewController.m */; };
04FFBE2C339512AE85FE10C8 /* id_front_config.json in Resources */ = {isa = PBXBuildFile; fileRef = B89BFF9E6FF26CAC25315FAE /* id_front_config.json */; };
0522C4A4434C13E4419ED836 /* Order+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 16DB7A75A5F8AD5B606F58EE /* Order+CoreDataProperties.m */; };
05811D0CE8A832E9CBFF0411 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9A170BE2654710390ADC3DE5 /* Main.storyboard */; };
Expand All @@ -29,6 +30,7 @@
1B11D7F095261EF011C146D2 /* vin_ocr_config.json in Resources */ = {isa = PBXBuildFile; fileRef = 9AF1EDDFA2A6C01BE649FEF4 /* vin_ocr_config.json */; };
1B7D8D1B4FDAA322CD23EFC7 /* ScanAreaEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D704839C929FA2058D9E89A0 /* ScanAreaEditorViewController.swift */; };
1BDA70B0798FEBA9AED871A9 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = A55CA11F512D1EB3147C6D35 /* Reachability.m */; };
1DBCEE81DA9B14226DEB842D /* parallel_first_vin_barcode.json in Resources */ = {isa = PBXBuildFile; fileRef = C572C567B013995154E661D5 /* parallel_first_vin_barcode.json */; };
216AD56855460694DB2EAFD2 /* ALToggleControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 602AF9DF62FC564C6646D2E5 /* ALToggleControl.m */; };
21A22328A97C63E67AE854BA /* ALProductExampleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F1E78B6137D667B2BAFF771 /* ALProductExampleManager.m */; };
22B26B83986CE68386E7554B /* ScanHistory+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B93640C21B7EED6296EF3C4 /* ScanHistory+CoreDataClass.m */; };
Expand Down Expand Up @@ -434,6 +436,7 @@
C474F22983E364473A5F91A8 /* WorkforceTool+CoreDataProperties.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WorkforceTool+CoreDataProperties.m"; sourceTree = "<group>"; };
C4C91C9B86D18C08298D87D6 /* ALContainerScanViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALContainerScanViewController.m; sourceTree = "<group>"; };
C4E617625C1AA097008BADE0 /* ALLicensePlateExampleManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALLicensePlateExampleManager.m; sourceTree = "<group>"; };
C572C567B013995154E661D5 /* parallel_first_vin_barcode.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = parallel_first_vin_barcode.json; sourceTree = "<group>"; };
C693A94797CE4C0904AAA627 /* NSArray+ALExamplesAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+ALExamplesAdditions.h"; sourceTree = "<group>"; };
CC75DF6BB98F730B445F418A /* WorkForceViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WorkForceViewController.h; sourceTree = "<group>"; };
CCFB0172F33527DC467752AE /* ALConfigurationDialogViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALConfigurationDialogViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -475,9 +478,11 @@
EDB9AB28BEA5B61E6EC0ECEA /* ALUniversalSerialNumberScanViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALUniversalSerialNumberScanViewController.m; sourceTree = "<group>"; };
EE56A15754A593AB5CE2C523 /* ALJSONDownloader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALJSONDownloader.h; sourceTree = "<group>"; };
EEB003E6E30CAC9DB3C20C66 /* ALMeterReadingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALMeterReadingView.h; sourceTree = "<group>"; };
F265241B8B0732E50240B8F2 /* ALCompositeScanViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALCompositeScanViewController.m; sourceTree = "<group>"; };
F289962042BE8D33F12F6561 /* ALConfigurationDialogViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALConfigurationDialogViewController.m; sourceTree = "<group>"; };
F3BA12F0082427C9B897F096 /* ALSpaceViews.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALSpaceViews.m; sourceTree = "<group>"; };
F435C44B617D3AC0AF049A9F /* ALBarcodeBatchCountView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALBarcodeBatchCountView.h; sourceTree = "<group>"; };
F702EFFCD1962BFDB8C83AAE /* ALCompositeScanViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALCompositeScanViewController.h; sourceTree = "<group>"; };
F79688067905522060BCFE75 /* ALHeaderCollectionReusableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ALHeaderCollectionReusableView.m; sourceTree = "<group>"; };
F86E7080D32D1E1EDC89BD88 /* license_plate_af_config.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = license_plate_af_config.json; sourceTree = "<group>"; };
F8D01F5681E0B6B8860858B0 /* mrz_nfc_config.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = mrz_nfc_config.json; sourceTree = "<group>"; };
Expand Down Expand Up @@ -644,6 +649,15 @@
path = ViewController;
sourceTree = "<group>";
};
32C94BD80CC1D46E1D49BB0F /* Composite Scanning */ = {
isa = PBXGroup;
children = (
C572C567B013995154E661D5 /* parallel_first_vin_barcode.json */,
5E637A13853C11CC31EC1041 /* ViewController */,
);
path = "Composite Scanning";
sourceTree = "<group>";
};
388930835AE5FC35528C20F7 /* Components */ = {
isa = PBXGroup;
children = (
Expand All @@ -659,6 +673,7 @@
39FD7DEACEA11059C80A4485 /* Processes */ = {
isa = PBXGroup;
children = (
32C94BD80CC1D46E1D49BB0F /* Composite Scanning */,
51FADB476B4BBF2F567D5EAF /* Energy */,
);
path = Processes;
Expand Down Expand Up @@ -839,6 +854,15 @@
path = MRZ;
sourceTree = "<group>";
};
5E637A13853C11CC31EC1041 /* ViewController */ = {
isa = PBXGroup;
children = (
F702EFFCD1962BFDB8C83AAE /* ALCompositeScanViewController.h */,
F265241B8B0732E50240B8F2 /* ALCompositeScanViewController.m */,
);
path = ViewController;
sourceTree = "<group>";
};
5FBF17AEF0C355A1F3C242B0 /* Barcode settings */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1255,6 +1279,7 @@
0EDA113E63BC700CEF98F86E /* meter_config.json in Resources */,
928506238F97E4339010FB34 /* mrz_config.json in Resources */,
C206A70E2DC25AB00C539498 /* mrz_nfc_config.json in Resources */,
1DBCEE81DA9B14226DEB842D /* parallel_first_vin_barcode.json in Resources */,
120B9C0ED222249242CDF755 /* parallel_meter_barcode_config.json in Resources */,
2311BF58E7C0C70EADF84D27 /* sample_barcode_config.json in Resources */,
CC67FAA55F51DF471B2E95E4 /* sample_barcode_fullframe_config.json in Resources */,
Expand Down Expand Up @@ -1294,6 +1319,7 @@
BCBE543B8A4F2D0438610730 /* ALBaseViewController.m in Sources */,
F7BFE2085451648DD83A41FB /* ALBundleInfoViewController.m in Sources */,
9AEE556559232DFCD1E18C3A /* ALCheckbox.m in Sources */,
0497B5F83C7A3232E9DDDD60 /* ALCompositeScanViewController.m in Sources */,
D221E2CBB91120179EF6758D /* ALConfigurationDialogViewController.m in Sources */,
344179C6F252F1984A5761FE /* ALContainerScanViewController.m in Sources */,
169B4C9E31B54A76C796C481 /* ALCustomBarButton.m in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Documentation/html/Categories/NSArray+ALJSONExtras.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/html/Categories/NSData+ALJSONExtras.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ <h4 class="method-subtitle">Declared In</h4>
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/html/Categories/NSString+ALJSONExtras.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ <h4 class="method-subtitle">Declared In</h4>
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/html/Classes/ALAamva.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ <h3 class="method-title"><code><a href="#//api/name/bodyPart">&nbsp;&nbsp;bodyPa
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/html/Classes/ALAllowedLayouts.html
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ <h3 class="method-title"><code><a href="#//api/name/mrz">&nbsp;&nbsp;mrz</a></co
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/html/Classes/ALAlphabet.html
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ <h3 class="method-title"><code><a href="#//api/name/latin">+&nbsp;latin</a></cod
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/html/Classes/ALArabic.html
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ <h4 class="method-subtitle">Declared In</h4>
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-02-06</p>
<p class="copyright">Copyright &copy; 2023 Anyline GmbH. All rights reserved. Updated: 2023-03-09</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Loading

0 comments on commit 364276f

Please sign in to comment.