43.0.0-preview.3

Anyline · Jan 30, 2023 · aaf4d4f · aaf4d4f
1 parent c785a72
commit aaf4d4f
Show file tree

Hide file tree

Showing 560 changed files with 4,412 additions and 4,335 deletions.
diff --git a/AnylineExamples/Anyline Demo App/DemoApp Source/Models/ALOthersExampleManager.m b/AnylineExamples/Anyline Demo App/DemoApp Source/Models/ALOthersExampleManager.m
@@ -1,7 +1,6 @@
 #import "ALOthersExampleManager.h"
 #import "ALUniversalSerialNumberScanViewController.h"
 #import "ALContainerScanViewController.h"
-#import "ALBottlecapScanViewController.h"
 
 
 @interface ALOthersExampleManager ()
@@ -35,15 +34,10 @@ - (void)initExampleData {
                                                                      image:[UIImage imageNamed:@"vertical container scanner"]
                                                             viewController:[ALContainerScanViewController class]
                                                                      title:NSLocalizedString(@"Vertical Shipping Container", nil)];
-
-    ALExample *bottleCapScanning = [[ALExample alloc] initWithName:NSLocalizedString(@"Pepsi Code", nil)
-                                                             image:[UIImage imageNamed:@"tile_pepsicode"]
-                                                    viewController:[ALBottlecapScanViewController class]];
-
-
-    self.sectionNames = @[@"Others",];
+
+    self.sectionNames = @[ @"Others" ];
     self.examples = @{
-        self.sectionNames[0] : @[containerScanning, verticalContainerScanning, bottleCapScanning],
+        self.sectionNames[0] : @[ containerScanning, verticalContainerScanning ],
     };
 }
 

diff --git a/AnylineExamples/Anyline Examples Source/Barcode/ViewController/ALPDF417ScanViewController.m b/AnylineExamples/Anyline Examples Source/Barcode/ViewController/ALPDF417ScanViewController.m
@@ -91,7 +91,7 @@ - (void)showResultControllerWithResults:(ALScanResult *)scanResult {
 
     NSAssert(barcodesFound.count > 0, @"no barcodes found");
 
-    NSArray <ALResultEntry *> *resultData = scanResult.pluginResult.barcodeResult.resultEntryList;
+    NSArray<ALResultEntry *> *resultData = scanResult.pluginResult.fieldList.resultEntries;
     NSString *resultDataJSONStr = [ALResultEntry JSONStringFromList:resultData];
 
     __weak __block typeof(self) weakSelf = self;

diff --git a/...Examples/Anyline Examples Source/Bottlecap/ViewController/ALBottlecapScanViewController.h b/...Examples/Anyline Examples Source/Bottlecap/ViewController/ALBottlecapScanViewController.h
diff --git a/...Examples/Anyline Examples Source/Bottlecap/ViewController/ALBottlecapScanViewController.m b/...Examples/Anyline Examples Source/Bottlecap/ViewController/ALBottlecapScanViewController.m
diff --git a/AnylineExamples/Anyline Examples Source/Bottlecap/bottlecap_config.json b/AnylineExamples/Anyline Examples Source/Bottlecap/bottlecap_config.json
diff --git a/AnylineExamples/Anyline Examples Source/Bottlecap/pepsi_code_scanner.ale b/AnylineExamples/Anyline Examples Source/Bottlecap/pepsi_code_scanner.ale
diff --git a/AnylineExamples/Anyline Examples Source/Bottlecap/trained_models/PepsiCo.any b/AnylineExamples/Anyline Examples Source/Bottlecap/trained_models/PepsiCo.any
diff --git a/...Examples/Anyline Examples Source/Container/ViewController/ALContainerScanViewController.m b/...Examples/Anyline Examples Source/Container/ViewController/ALContainerScanViewController.m
@@ -8,7 +8,6 @@
 @interface ALContainerScanViewController () <ALScanPluginDelegate>
 
 @property (nonatomic, strong) ALScanViewPlugin *scanViewPlugin;
-// @property (nullable, nonatomic, strong) ALScanView *scanView;
 
 @property (assign, nonatomic) BOOL isVertical;
 
@@ -30,7 +29,6 @@ - (void)viewDidLoad {
     [self reloadScanView];
 
     [self setColors];
-
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -90,7 +88,7 @@ - (void)reloadScanView {
 #pragma mark -- ALScanPluginDelegate
 
 - (void)scanPlugin:(ALScanPlugin *)scanPlugin resultReceived:(ALScanResult *)scanResult {
-    NSArray <ALResultEntry*> *resultData = scanResult.pluginResult.containerResult.resultEntryList;
+    NSArray<ALResultEntry*> *resultData = scanResult.pluginResult.fieldList.resultEntries;
     NSString *resultDataJSONStr = [ALResultEntry JSONStringFromList:resultData];
     __weak ALContainerScanViewController *weakSelf = self;
     [self anylineDidFindResult:resultDataJSONStr

diff --git a/...amples/Anyline Examples Source/Container/horizontal_container_scanner_capture_config.json b/...amples/Anyline Examples Source/Container/horizontal_container_scanner_capture_config.json
@@ -23,7 +23,7 @@
             "alignment": "top_half",
             "ratioFromSize": {
                 "width": 62,
-                "height": 9,
+                "height": 9
             },
             "offset": {
                 "x": 0,

diff --git a/...Examples/Anyline Examples Source/Container/vertical_container_scanner_capture_config.json b/...Examples/Anyline Examples Source/Container/vertical_container_scanner_capture_config.json
@@ -23,7 +23,7 @@
             "alignment": "center",
             "ratioFromSize": {
                 "width": 9,
-                "height": 62,
+                "height": 62
             },
             "offset": {
                 "x": 0,

diff --git a/AnylineExamples/Anyline Examples Source/ID/ViewController/ALUniversalIDScanViewController.m b/AnylineExamples/Anyline Examples Source/ID/ViewController/ALUniversalIDScanViewController.m
@@ -540,16 +540,9 @@ - (void)scanPlugin:(ALScanPlugin *)scanPlugin resultReceived:(ALScanResult *)sca
     if (scanResult.pluginResult.barcodeResult) {
         self.barcodeResult = scanResult.pluginResult.barcodeResult;
     }
-
-    ALUniversalIDResult *IDResult = scanResult.pluginResult.universalIDResult;
-
-    [self addResultsAtIndex:IDResult.resultEntryList.mutableCopy];
-
-    NSArray *pdf417ResultsList = self.barcodeResult.resultEntryList;
-    if (pdf417ResultsList.count > 0) {
-        [self addResultsAtIndex:pdf417ResultsList.mutableCopy];
-    }
-
+
+    [self addResultsAtIndex:scanResult.pluginResult.fieldList.resultEntries.mutableCopy];
+
     if (scanResult.faceImage && !self.faceImage) { // save only the first face image that is scanned
         // front side will have a first chance to do so, then the back side.
         // so if both sides have photos, the front pic will be used.
@@ -568,7 +561,9 @@ - (void)scanPlugin:(ALScanPlugin *)scanPlugin resultReceived:(ALScanResult *)sca
             }];
         });
     } else {
-
+
+        ALUniversalIDResult *IDResult = scanResult.pluginResult.universalIDResult;
+
         // if it was barcode, wait for ID before returning
         [self stopTroubleScanningTimeout];
 

diff --git a/AnylineExamples/Anyline Examples Source/ID/universal_id_front_config.json b/AnylineExamples/Anyline Examples Source/ID/universal_id_front_config.json
@@ -71,7 +71,7 @@
             "feedbackStrokeColor": "0099FF"
         },
         "scanFeedbackConfig" : {
-            "style": "CONTOUR_RECT",
+            "style": "contour_rect",
             "visualFeedbackRedrawTimeout": 100,
             "strokeColor": "0099FF",
             "fillColor" : "220099FF",

diff --git a/...s/Anyline Examples Source/License Plate/ViewController/ALLicensePlateScanViewController.m b/...s/Anyline Examples Source/License Plate/ViewController/ALLicensePlateScanViewController.m
@@ -34,53 +34,35 @@ - (void)viewDidLoad {
     } else if ([self.title isEqualToString:@"African License Plate"] || [self.title isEqualToString:@"AF License Plate"]) {
         licensePlateConfigJSONFile = kLicensePlateScanVC_configAF;
     }
-
-    id JSONConfigObj = [[self configJSONStrWithFilename:licensePlateConfigJSONFile] asJSONObject];
-
+
     NSError *error;
-    self.scanViewPlugin = [ALScanViewPluginFactory withJSONDictionary:JSONConfigObj error:&error];
-
-    if ([self popWithAlertOnError:error]) {
-        return;
-    }
-
-    self.scanViewConfig = [[ALScanViewConfig alloc] initWithJSONDictionary:JSONConfigObj error:nil];
-
-    self.scanView = [[ALScanView alloc] initWithFrame:CGRectZero
-                                       scanViewPlugin:self.scanViewPlugin
-                                       scanViewConfig:self.scanViewConfig
-                                                error:&error];
-
+    NSString *path = [[NSBundle mainBundle] pathForResource:licensePlateConfigJSONFile ofType:@"json"];
+    self.scanView = [ALScanViewFactory withConfigFilePath:path delegate:self error:&error];
     if ([self popWithAlertOnError:error]) {
         return;
     }
 
     [self installScanView:self.scanView];
-
-    ALScanViewPlugin *scanViewPlugin = self.scanViewPlugin;
-
-    scanViewPlugin.scanPlugin.delegate = self;
-
     [self.scanView startCamera];
-
+
+    self.scanViewPlugin = (ALScanViewPlugin *)self.scanView.scanViewPlugin;
+
     self.controllerType = ALScanHistoryLicensePlates;
 }
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     // We use this subroutine to start Anyline. The reason it has its own subroutine is
     // so that we can later use it to restart the scanning process.
-    [self.scanViewPlugin startWithError:nil];
+    NSError *error;
+    [self.scanViewPlugin startWithError:&error];
 }
 
-
 // MARK: - Handle & present results
 
 - (void)scanPlugin:(ALScanPlugin *)scanPlugin resultReceived:(ALScanResult *)scanResult {
     [self enableLandscapeOrientation:NO];
-    ALLicensePlateResult *result = scanResult.pluginResult.licensePlateResult;
-
-    NSArray <ALResultEntry *> *resultData = result.resultEntryList;
+    NSArray <ALResultEntry *> *resultData = scanResult.pluginResult.fieldList.resultEntries;
     NSString *resultString = [ALResultEntry JSONStringFromList:resultData];
     UIImage *image = scanResult.croppedImage;