dynamsoft-capture-vision-react-native 1.0.0 → 1.1.0

package/ios/RNDynamsoftCaptureVision/DYSCameraView.m

@@ -1,71 +1,113 @@
-//
-//  DYSCameraView.m
-//  RCTDynamsoftBarcodeReader
-//
-//  Created by dynamsoft on 2022/3/16.
-//
-
-#import "DYSCameraView.h"
-#import <React/RCTLog.h>
-#import "StaticClass.h"
-
-@implementation DYSCameraView
-
-@synthesize overlayVisible;
-@synthesize scanRegionVisible = _scanRegionVisible;
-@synthesize scanRegion;
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self addSubview:[StaticClass instance].view];
-    }
-    return self;
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    [StaticClass instance].view.frame = self.bounds;
-}
-
-- (void)setOverlayVisible:(BOOL)overlayVisible{
-    [StaticClass instance].view.overlayVisible = overlayVisible;
-}
-
-- (void)setScanRegionVisible:(BOOL)scanRegionVisible{
-    _scanRegionVisible = scanRegionVisible;
-    [StaticClass instance].dce.scanRegionVisible = scanRegionVisible;
-}
-
-- (BOOL)scanRegionVisible{
-    return _scanRegionVisible;
-}
-
-- (void)setScanRegion:(NSDictionary *)scanRegion{
-    if (scanRegion) {
-        NSNumber *regionTop = [scanRegion valueForKey:@"regionTop"];
-        NSNumber *regionLeft = [scanRegion valueForKey:@"regionLeft"];
-        NSNumber *regionRight = [scanRegion valueForKey:@"regionRight"];
-        NSNumber *regionBottom = [scanRegion valueForKey:@"regionBottom"];
-        NSNumber *regionMeasuredByPercentage = [scanRegion valueForKey:@"regionTop"];
-        iRegionDefinition *region = [iRegionDefinition new];
-        region.regionTop = regionTop.integerValue;
-        region.regionLeft = regionLeft.integerValue;
-        region.regionRight = regionRight.integerValue;
-        region.regionBottom = regionBottom.integerValue;
-        region.regionMeasuredByPercentage = regionMeasuredByPercentage.boolValue;
-        NSError *err = [NSError new];
-        [[StaticClass instance].dce setScanRegion:region error:&err];
-        [StaticClass instance].dce.scanRegionVisible = _scanRegionVisible;
-    }
-}
-
-- (void)open{
-    [[StaticClass instance].dce open];
-}
-
-- (void)close{
-    [[StaticClass instance].dce close];
-}
-
-@end
+//
+//  DYSCameraView.m
+//  RCTDynamsoftBarcodeReader
+//
+//  Created by dynamsoft on 2022/3/16.
+//
+
+#import "DYSCameraView.h"
+#import <React/RCTLog.h>
+#import "StaticClass.h"
+
+@implementation DYSCameraView
+
+@synthesize overlayVisible;
+@synthesize scanRegionVisible = _scanRegionVisible;
+@synthesize scanRegion;
+@synthesize torchState;
+@synthesize torchButton = _torchButton;
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        [self addSubview:[StaticClass instance].view];
+    }
+    return self;
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    [StaticClass instance].view.frame = self.bounds;
+}
+
+- (void)setOverlayVisible:(BOOL)overlayVisible{
+    [StaticClass instance].view.overlayVisible = overlayVisible;
+}
+
+- (void)setScanRegionVisible:(BOOL)scanRegionVisible{
+    _scanRegionVisible = scanRegionVisible;
+    [StaticClass instance].dce.scanRegionVisible = scanRegionVisible;
+}
+
+- (BOOL)scanRegionVisible{
+    return _scanRegionVisible;
+}
+
+- (void)setTorchState:(int)torchState{
+    if (torchState == 0) {
+        [[StaticClass instance].dce turnOnTorch];
+    }else if (torchState == 1){
+        [[StaticClass instance].dce turnOffTorch];
+    }
+}
+
+- (void)setTorchButton:(NSDictionary *)torchButton{
+    if (torchButton) {
+        NSString *torchOnImageBase64 = [torchButton valueForKey:@"torchOnImageBase64"];
+        NSString *torchOffImageBase64 = [torchButton valueForKey:@"torchOffImageBase64"];
+        BOOL visible = [[torchButton valueForKey:@"visible"] boolValue];
+        NSDictionary *dic = [torchButton valueForKey:@"location"];
+        CGRect rect;
+        if (dic) {
+            NSNumber *x = [dic valueForKey:@"x"];
+            NSNumber *y = [dic valueForKey:@"y"];
+            NSNumber *width = [dic valueForKey:@"width"];
+            NSNumber *height = [dic valueForKey:@"height"];
+            rect = CGRectMake(x.floatValue, y.floatValue, width.floatValue, height.floatValue);
+        }else{
+            rect = CGRectMake(25, 100, 45, 45);
+        }
+        
+        UIImage *torchOnImage, *torchOffImage;
+        if (torchOnImageBase64) {
+            NSData *torchOnImageData = [[NSData alloc]initWithBase64EncodedString:torchOnImageBase64 options:(NSDataBase64DecodingIgnoreUnknownCharacters)];
+            torchOnImage = [UIImage imageWithData: torchOnImageData];
+        }
+        if (torchOffImageBase64) {
+            NSData *torchOffImageData = [[NSData alloc]initWithBase64EncodedString:torchOffImageBase64 options:(NSDataBase64DecodingIgnoreUnknownCharacters)];
+            torchOffImage = [UIImage imageWithData: torchOffImageData];
+        }
+        
+        [[StaticClass instance].view setTorchButton:rect torchOnImage:torchOnImage torchOffImage:torchOffImage];
+        [[StaticClass instance].view setTorchButtonVisible:visible];
+    }
+}
+
+- (void)setScanRegion:(NSDictionary *)scanRegion{
+    if (scanRegion) {
+        NSNumber *regionTop = [scanRegion valueForKey:@"regionTop"];
+        NSNumber *regionLeft = [scanRegion valueForKey:@"regionLeft"];
+        NSNumber *regionRight = [scanRegion valueForKey:@"regionRight"];
+        NSNumber *regionBottom = [scanRegion valueForKey:@"regionBottom"];
+        NSNumber *regionMeasuredByPercentage = [scanRegion valueForKey:@"regionTop"];
+        iRegionDefinition *region = [iRegionDefinition new];
+        region.regionTop = regionTop.integerValue;
+        region.regionLeft = regionLeft.integerValue;
+        region.regionRight = regionRight.integerValue;
+        region.regionBottom = regionBottom.integerValue;
+        region.regionMeasuredByPercentage = regionMeasuredByPercentage.boolValue;
+        NSError *err = [NSError new];
+        [[StaticClass instance].dce setScanRegion:region error:&err];
+        [StaticClass instance].dce.scanRegionVisible = _scanRegionVisible;
+    }
+}
+
+- (void)open{
+    [[StaticClass instance].dce open];
+}
+
+- (void)close{
+    [[StaticClass instance].dce close];
+}
+
+@end

package/ios/RNDynamsoftCaptureVision/DYSCameraViewManager.h

@@ -1,17 +1,17 @@
-//
-//  DYSCameraViewManager.h
-//  RCTDynamsoftBarcodeReader
-//
-//  Created by dynamsoft on 2022/3/16.
-//
-
-#import <React/RCTViewManager.h>
-#import <React/RCTBridgeModule.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DYSCameraViewManager : RCTViewManager
-
-@end
-
-NS_ASSUME_NONNULL_END
+//
+//  DYSCameraViewManager.h
+//  RCTDynamsoftBarcodeReader
+//
+//  Created by dynamsoft on 2022/3/16.
+//
+
+#import <React/RCTViewManager.h>
+#import <React/RCTBridgeModule.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DYSCameraViewManager : RCTViewManager
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNDynamsoftCaptureVision/DYSCameraViewManager.m

@@ -1,77 +1,89 @@
-//
-//  DYSCameraViewManager.m
-//  RCTDynamsoftBarcodeReader
-//
-//  Created by dynamsoft on 2022/3/16.
-//
-
-#import <React/RCTUIManager.h>
-#import "DYSCameraViewManager.h"
-#import "DYSCameraView.h"
-#import "StaticClass.h"
-
-@implementation DYSCameraViewManager
-
-RCT_EXPORT_MODULE(DYSCameraView)
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        CGFloat heigth = UIScreen.mainScreen.bounds.size.height;
-        CGFloat width = UIScreen.mainScreen.bounds.size.width;
-        [StaticClass instance].view = [[DCECameraView alloc] initWithFrame:CGRectMake(0, 0, width, heigth)];
-        [StaticClass instance].dce = [[DynamsoftCameraEnhancer alloc] initWithView:[StaticClass instance].view];
-    }
-    return self;
-}
-
-+ (BOOL)requiresMainQueueSetup{
-    return YES;
-}
-
-- (UIView *)view {
-    return [[DYSCameraView alloc] init];
-}
-
-RCT_EXPORT_VIEW_PROPERTY(scanRegionVisible, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(overlayVisible, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(scanRegion, NSDictionary)
-
-RCT_EXPORT_METHOD(open:(nonnull NSNumber *)reactTag) {
-    [self.bridge.uiManager addUIBlock:
-     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-         id view = viewRegistry[reactTag];
-         if (!view || ![view isKindOfClass:[DYSCameraView class]]) {
-             RCTLogError(@"Cannot find DYSCameraView with tag #%@", reactTag);
-         } else {
-             [((DYSCameraView *)view) open];
-         }
-     }];
-}
-
-RCT_EXPORT_METHOD(close:(nonnull NSNumber *)reactTag) {
-    [self.bridge.uiManager addUIBlock:
-     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-         id view = viewRegistry[reactTag];
-         if (!view || ![view isKindOfClass:[DYSCameraView class]]) {
-             RCTLogError(@"Cannot find DYSCameraView with tag #%@", reactTag);
-         } else {
-             [((DYSCameraView *)view) close];
-         }
-     }];
-}
-
-RCT_EXPORT_METHOD(setScanRegion:(nonnull NSNumber *)reactTag
-                  scanRegion:(NSDictionary *)scanRegion) {
-    [self.bridge.uiManager addUIBlock:
-     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-         id view = viewRegistry[reactTag];
-         if (!view || ![view isKindOfClass:[DYSCameraView class]]) {
-             RCTLogError(@"Cannot find DYSCameraView with tag #%@", reactTag);
-         } else {
-             [((DYSCameraView *)view) setScanRegion:scanRegion];
-         }
-     }];
-}
-
-@end
+//
+//  DYSCameraViewManager.m
+//  RCTDynamsoftBarcodeReader
+//
+//  Created by dynamsoft on 2022/3/16.
+//
+
+#import <React/RCTUIManager.h>
+#import "DYSCameraViewManager.h"
+#import "DYSCameraView.h"
+#import "StaticClass.h"
+
+@implementation DYSCameraViewManager
+
+RCT_EXPORT_MODULE(DYSCameraView)
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        CGFloat heigth = UIScreen.mainScreen.bounds.size.height;
+        CGFloat width = UIScreen.mainScreen.bounds.size.width;
+        [StaticClass instance].view = [[DCECameraView alloc] initWithFrame:CGRectMake(0, 0, width, heigth)];
+        [StaticClass instance].dce = [[DynamsoftCameraEnhancer alloc] initWithView:[StaticClass instance].view];
+    }
+    return self;
+}
+
++ (BOOL)requiresMainQueueSetup{
+    return YES;
+}
+
+- (UIView *)view {
+    return [[DYSCameraView alloc] init];
+}
+
+- (NSDictionary *)constantsToExport
+{
+    return @{
+             @"TorchState": @{
+                 @"off": @1,
+                 @"on": @0
+             },
+    };
+}
+
+RCT_EXPORT_VIEW_PROPERTY(scanRegionVisible, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(overlayVisible, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(torchState, int)
+RCT_EXPORT_VIEW_PROPERTY(scanRegion, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(torchButton, NSDictionary)
+
+RCT_EXPORT_METHOD(open:(nonnull NSNumber *)reactTag) {
+    [self.bridge.uiManager addUIBlock:
+     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+         id view = viewRegistry[reactTag];
+         if (!view || ![view isKindOfClass:[DYSCameraView class]]) {
+             RCTLogError(@"Cannot find DYSCameraView with tag #%@", reactTag);
+         } else {
+             [((DYSCameraView *)view) open];
+         }
+     }];
+}
+
+RCT_EXPORT_METHOD(close:(nonnull NSNumber *)reactTag) {
+    [self.bridge.uiManager addUIBlock:
+     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+         id view = viewRegistry[reactTag];
+         if (!view || ![view isKindOfClass:[DYSCameraView class]]) {
+             RCTLogError(@"Cannot find DYSCameraView with tag #%@", reactTag);
+         } else {
+             [((DYSCameraView *)view) close];
+         }
+     }];
+}
+
+RCT_EXPORT_METHOD(setScanRegion:(nonnull NSNumber *)reactTag
+                  scanRegion:(NSDictionary *)scanRegion) {
+    [self.bridge.uiManager addUIBlock:
+     ^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+         id view = viewRegistry[reactTag];
+         if (!view || ![view isKindOfClass:[DYSCameraView class]]) {
+             RCTLogError(@"Cannot find DYSCameraView with tag #%@", reactTag);
+         } else {
+             [((DYSCameraView *)view) setScanRegion:scanRegion];
+         }
+     }];
+}
+
+@end

package/ios/RNDynamsoftCaptureVision/RCTDynamsoftBarcodeReader.h

@@ -1,14 +1,14 @@
-//
-//  RCTDynamsoftBarcodeReader.h
-//  RCTDynamsoftBarcodeReader
-//
-//  Created by dynamsoft on 2022/3/16.
-//
-
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-
-@interface RCTDynamsoftBarcodeReader : RCTEventEmitter <RCTBridgeModule>
-
-@end
+//
+//  RCTDynamsoftBarcodeReader.h
+//  RCTDynamsoftBarcodeReader
+//
+//  Created by dynamsoft on 2022/3/16.
+//
+
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCTDynamsoftBarcodeReader : RCTEventEmitter <RCTBridgeModule>
+
+@end