react-native-scanbot-barcode-scanner-sdk 6.2.2-beta.2 → 6.2.2-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -24,6 +24,8 @@
|
|
|
24
24
|
|
|
25
25
|
self.vc = [[UIViewController alloc] init];
|
|
26
26
|
self.vc.view = self;
|
|
27
|
+
[self setBackgroundColor:UIColor.blackColor];
|
|
28
|
+
|
|
27
29
|
self.scannerViewController = [RNScanbotBarcodeScannerViewControllerWrapper initController];
|
|
28
30
|
self.scannerViewController.delegate = self;
|
|
29
31
|
self.scannerViewController.trackingOverlayController.delegate = self;
|
|
@@ -46,7 +48,7 @@
|
|
|
46
48
|
self.vc = nil;
|
|
47
49
|
self.barcodeItemOverlayViewLoadingText = nil;
|
|
48
50
|
self.barcodeItemOverlayViewBinders = nil;
|
|
49
|
-
|
|
51
|
+
|
|
50
52
|
[super removeFromSuperview];
|
|
51
53
|
}
|
|
52
54
|
|
|
@@ -205,7 +207,7 @@
|
|
|
205
207
|
}
|
|
206
208
|
|
|
207
209
|
- (void) setOverlayBarcodeItemOverlayViewBinder:(BOOL) value {
|
|
208
|
-
|
|
210
|
+
|
|
209
211
|
if(value){
|
|
210
212
|
self.barcodeItemOverlayViewBinders = [[NSMutableDictionary alloc] init];
|
|
211
213
|
}
|
|
@@ -239,7 +241,7 @@
|
|
|
239
241
|
NSString *result = [RNScanbotBarcodeScannerViewControllerWrapper jsonFromResultOrNil:codes];
|
|
240
242
|
if(result != nil){
|
|
241
243
|
self.onBarcodeScannerResult(@{@"result":result});
|
|
242
|
-
|
|
244
|
+
|
|
243
245
|
[RNScanbotBarcodeScannerViewControllerWrapper addBarcodeItemOverlayViewInitialBinderInDictionary:self.barcodeItemOverlayViewBinders
|
|
244
246
|
loadingText:self.barcodeItemOverlayViewLoadingText
|
|
245
247
|
barcodes:codes];
|
|
@@ -267,11 +269,11 @@
|
|
|
267
269
|
|
|
268
270
|
NSString * _Nonnull barcodeItemUuid = [BarcodeItem uuidFor:barcode];
|
|
269
271
|
NSDictionary * _Nullable barcodeItemOverlayViewBinding = nil;
|
|
270
|
-
|
|
272
|
+
|
|
271
273
|
if (self.barcodeItemOverlayViewBinders != nil) {
|
|
272
274
|
barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:barcodeItemUuid];
|
|
273
275
|
}
|
|
274
|
-
|
|
276
|
+
|
|
275
277
|
return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodePolygonStyle:barcode
|
|
276
278
|
barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding
|
|
277
279
|
controller:self.scannerViewController];
|
|
@@ -282,25 +284,25 @@
|
|
|
282
284
|
|
|
283
285
|
NSString * _Nonnull barcodeItemUuid = [BarcodeItem uuidFor:barcode];
|
|
284
286
|
NSDictionary * _Nullable barcodeItemOverlayViewBinding = nil;
|
|
285
|
-
|
|
287
|
+
|
|
286
288
|
if (self.barcodeItemOverlayViewBinders != nil) {
|
|
287
289
|
barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:barcodeItemUuid];
|
|
288
290
|
}
|
|
289
|
-
|
|
291
|
+
|
|
290
292
|
return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodeOverlayViewTextStyle:barcode
|
|
291
293
|
barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding
|
|
292
294
|
controller:self.scannerViewController];
|
|
293
295
|
}
|
|
294
296
|
|
|
295
297
|
- (NSString * _Nonnull)barcodeTrackingOverlay:(SBSDKBarcodeTrackingOverlayController * _Nonnull)controller overrideTextFor:(SBSDKBarcodeScannerResult * _Nonnull)barcode proposedString:(NSString * _Nonnull)proposedString {
|
|
296
|
-
|
|
298
|
+
|
|
297
299
|
NSString * _Nonnull barcodeItemUuid = [BarcodeItem uuidFor:barcode];
|
|
298
300
|
NSDictionary * _Nullable barcodeItemOverlayViewBinding = nil;
|
|
299
|
-
|
|
301
|
+
|
|
300
302
|
if (self.barcodeItemOverlayViewBinders != nil) {
|
|
301
303
|
barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:barcodeItemUuid];
|
|
302
304
|
}
|
|
303
|
-
|
|
305
|
+
|
|
304
306
|
return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodeOverlayViewText:barcodeItemUuid
|
|
305
307
|
proposedString:proposedString
|
|
306
308
|
barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding];
|
|
@@ -35,20 +35,22 @@ using namespace facebook::react;
|
|
|
35
35
|
_scanningEnabled = true;
|
|
36
36
|
_barcodeItemOverlayViewLoadingText = nil;
|
|
37
37
|
_barcodeItemOverlayViewBinders = nil;
|
|
38
|
-
|
|
38
|
+
|
|
39
39
|
self.vc = [[UIViewController alloc] init];
|
|
40
40
|
self.vc.view = self;
|
|
41
|
+
[self setBackgroundColor:UIColor.blackColor];
|
|
42
|
+
|
|
41
43
|
self.scannerViewController = [RNScanbotBarcodeScannerViewControllerWrapper initController];
|
|
42
44
|
self.scannerViewController.delegate = self;
|
|
43
45
|
self.scannerViewController.trackingOverlayController.delegate = self;
|
|
44
46
|
}
|
|
45
|
-
|
|
47
|
+
|
|
46
48
|
return self;
|
|
47
49
|
}
|
|
48
50
|
|
|
49
51
|
- (void)didMoveToWindow {
|
|
50
52
|
[super didMoveToWindow];
|
|
51
|
-
|
|
53
|
+
|
|
52
54
|
if(self.window) {
|
|
53
55
|
if (self.vc == nil){
|
|
54
56
|
self.vc = [[UIViewController alloc] init];
|
|
@@ -63,7 +65,7 @@ using namespace facebook::react;
|
|
|
63
65
|
self.vc = nil;
|
|
64
66
|
self.barcodeItemOverlayViewLoadingText = nil;
|
|
65
67
|
self.barcodeItemOverlayViewBinders = nil;
|
|
66
|
-
|
|
68
|
+
|
|
67
69
|
static const auto defaultProps = std::make_shared<const ScanbotBarcodeScannerViewProps>();
|
|
68
70
|
_props = defaultProps;
|
|
69
71
|
[super prepareForRecycle];
|
|
@@ -206,9 +208,9 @@ using namespace facebook::react;
|
|
|
206
208
|
[RNScanbotBarcodeScannerViewControllerWrapper setOverlayTextFormat:self.scannerViewController
|
|
207
209
|
value:decodedConfig.textFormat];
|
|
208
210
|
}
|
|
209
|
-
|
|
211
|
+
|
|
210
212
|
self.barcodeItemOverlayViewLoadingText = [self toNSString:newViewProps.overlayLoadingTextValue];
|
|
211
|
-
|
|
213
|
+
|
|
212
214
|
if(newViewProps.overlayBarcodeItemOverlayViewBinder != oldViewProps.overlayBarcodeItemOverlayViewBinder){
|
|
213
215
|
self.barcodeItemOverlayViewBinders = [[NSMutableDictionary alloc] init];
|
|
214
216
|
}
|
|
@@ -249,7 +251,7 @@ using namespace facebook::react;
|
|
|
249
251
|
if (result != nil){
|
|
250
252
|
const auto &eventEmitter = std::dynamic_pointer_cast<const facebook::react::ScanbotBarcodeScannerViewEventEmitter>(_eventEmitter);
|
|
251
253
|
eventEmitter->onBarcodeScannerResult(facebook::react::ScanbotBarcodeScannerViewEventEmitter::OnBarcodeScannerResult{.result = std::string([result UTF8String])});
|
|
252
|
-
|
|
254
|
+
|
|
253
255
|
[RNScanbotBarcodeScannerViewControllerWrapper addBarcodeItemOverlayViewInitialBinderInDictionary:self.barcodeItemOverlayViewBinders
|
|
254
256
|
loadingText:self.barcodeItemOverlayViewLoadingText
|
|
255
257
|
barcodes:codes];
|
|
@@ -272,11 +274,11 @@ using namespace facebook::react;
|
|
|
272
274
|
|
|
273
275
|
NSString * _Nonnull barcodeItemUuid = [BarcodeItem uuidFor:barcode];
|
|
274
276
|
NSDictionary * _Nullable barcodeItemOverlayViewBinding = nil;
|
|
275
|
-
|
|
277
|
+
|
|
276
278
|
if (self.barcodeItemOverlayViewBinders != nil) {
|
|
277
279
|
barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:barcodeItemUuid];
|
|
278
280
|
}
|
|
279
|
-
|
|
281
|
+
|
|
280
282
|
return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodePolygonStyle:barcode
|
|
281
283
|
barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding
|
|
282
284
|
controller:self.scannerViewController];
|
|
@@ -284,28 +286,28 @@ using namespace facebook::react;
|
|
|
284
286
|
}
|
|
285
287
|
|
|
286
288
|
- (SBSDKBarcodeTrackedViewTextStyle *)barcodeTrackingOverlay:(SBSDKBarcodeTrackingOverlayController *)controller textStyleFor:(SBSDKBarcodeScannerResult *)barcode {
|
|
287
|
-
|
|
289
|
+
|
|
288
290
|
NSString * _Nonnull barcodeItemUuid = [BarcodeItem uuidFor:barcode];
|
|
289
291
|
NSDictionary * _Nullable barcodeItemOverlayViewBinding = nil;
|
|
290
|
-
|
|
292
|
+
|
|
291
293
|
if (self.barcodeItemOverlayViewBinders != nil) {
|
|
292
294
|
barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:barcodeItemUuid];
|
|
293
295
|
}
|
|
294
|
-
|
|
296
|
+
|
|
295
297
|
return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodeOverlayViewTextStyle:barcode
|
|
296
298
|
barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding
|
|
297
299
|
controller:self.scannerViewController];
|
|
298
300
|
}
|
|
299
301
|
|
|
300
302
|
- (NSString * _Nonnull)barcodeTrackingOverlay:(SBSDKBarcodeTrackingOverlayController * _Nonnull)controller overrideTextFor:(SBSDKBarcodeScannerResult * _Nonnull)barcode proposedString:(NSString * _Nonnull)proposedString {
|
|
301
|
-
|
|
303
|
+
|
|
302
304
|
NSString * _Nonnull barcodeItemUuid = [BarcodeItem uuidFor:barcode];
|
|
303
305
|
NSDictionary * _Nullable barcodeItemOverlayViewBinding = nil;
|
|
304
|
-
|
|
306
|
+
|
|
305
307
|
if (self.barcodeItemOverlayViewBinders != nil) {
|
|
306
308
|
barcodeItemOverlayViewBinding = [self.barcodeItemOverlayViewBinders objectForKey:barcodeItemUuid];
|
|
307
309
|
}
|
|
308
|
-
|
|
310
|
+
|
|
309
311
|
return [RNScanbotBarcodeScannerViewControllerWrapper scannedBarcodeOverlayViewText:barcodeItemUuid
|
|
310
312
|
proposedString:proposedString
|
|
311
313
|
barcodeItemOverlayViewBinding:barcodeItemOverlayViewBinding];
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-scanbot-barcode-scanner-sdk",
|
|
3
3
|
"title": "Scanbot Barcode Scanner SDK for React Native",
|
|
4
|
-
"version": "6.2.2-beta.
|
|
4
|
+
"version": "6.2.2-beta.3",
|
|
5
5
|
"description": "Scanbot Barcode Scanner SDK React Native Plugin for Android and iOS",
|
|
6
6
|
"main": "lib/commonjs/index",
|
|
7
7
|
"module": "lib/module/index",
|