cordova-plugin-mserviceinterface-2.0 1.0.80 → 1.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.80",
+  "version": "1.0.82",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.80">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.82">
     <name>mserviceinterface-2.0</name>
     <description>This plugin establishes the connection to the native interface and performs the requested task.</description>
     <author>selfservit@gmail.com</author>

package/src/ios/mInterface.h

@@ -9,6 +9,7 @@
 #import <QuickLook/QuickLook.h>
 #import "SSZipArchive.h"
 #import <MessageUI/MessageUI.h>
+#import <AVFoundation/AVFoundation.h>
 @interface mInterface : CDVPlugin <CLLocationManagerDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIAlertViewDelegate, QLPreviewControllerDelegate, QLPreviewControllerDataSource, QLPreviewItem, SSZipArchiveDelegate, UIDocumentInteractionControllerDelegate, MFMessageComposeViewControllerDelegate>
 {
 #define FILE_EXTENSION    @".png"
@@ -42,6 +43,8 @@
     UIInterfaceOrientation _lastOrientation;
 }
 @property(strong) NSString* callbackID;
+- (void)ScanBarCode:(CDVInvokedUrlCommand*)command;
+- (void)ScanQRCode:(CDVInvokedUrlCommand*)command;
 - (void)viewRoute:(CDVInvokedUrlCommand*)command;
 - (void)GetFCMUtils:(CDVInvokedUrlCommand *)command;
 -(void)GetBase64String:(CDVInvokedUrlCommand *)command;
@@ -131,4 +134,5 @@
 @property(readonly) NSURL *previewItemURL;
 @property (nonatomic, copy) NSString* fileOpenCallbackId;
 @property(nonatomic, strong) UIDocumentInteractionController *controller;
+@property (strong, nonatomic) AVCaptureSession *captureSession;
 @end

package/src/ios/mInterface.m

@@ -13,7 +13,7 @@
 #import "OneSignalPush.h"
 #import <OneSignal/OneSignal.h>
 #import <objc/runtime.h>
-
+#import <AVFoundation/AVFoundation.h>
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 @import UserNotifications;
 #endif
@@ -29,6 +29,159 @@
 @synthesize controller = docController;
 @synthesize callbackID;
 
+
+ 
+// Inside the @implementation block
+- (void)ScanBarCode:(CDVInvokedUrlCommand*)command {
+    self.callbackID = command.callbackId;
+ 
+    // Initialize the AVCaptureSession
+    self.captureSession = [[AVCaptureSession alloc] init];
+    AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+ 
+    NSError *error = nil;
+    AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice:device error:&error];
+ 
+    if (!input) {
+        CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[error localizedDescription]];
+        [self.commandDelegate sendPluginResult:result callbackId:self.callbackID];
+        return;
+    }
+ 
+    [self.captureSession addInput:input];
+ 
+    AVCaptureMetadataOutput *output = [[AVCaptureMetadataOutput alloc] init];
+    [self.captureSession addOutput:output];
+ 
+    // Support both QR codes and barcodes
+    NSArray *supportedTypes = @[AVMetadataObjectTypeQRCode,
+                                AVMetadataObjectTypeEAN13Code,
+                                AVMetadataObjectTypeEAN8Code,
+                                AVMetadataObjectTypeCode128Code,
+                                AVMetadataObjectTypeUPCECode];
+ 
+    [output setMetadataObjectTypes:supportedTypes];
+    [output setMetadataObjectsDelegate:self queue:dispatch_get_main_queue()];
+ 
+    // Add the video preview layer
+    dispatch_async(dispatch_get_main_queue(), ^{
+        AVCaptureVideoPreviewLayer *previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:self.captureSession];
+        previewLayer.frame = self.viewController.view.bounds;
+        previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
+ 
+        // Retain reference to the layer
+        objc_setAssociatedObject(self, @selector(previewLayer), previewLayer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        [self.viewController.view.layer addSublayer:previewLayer];
+        
+        // Add an "X" close button
+        UIButton *closeButton = [UIButton buttonWithType:UIButtonTypeSystem];
+        closeButton.frame = CGRectMake(self.viewController.view.frame.size.width - 50, 50, 40, 40); // Position: Top-right corner
+        [closeButton setTitle:@"✕" forState:UIControlStateNormal]; // Unicode "X"
+        closeButton.titleLabel.font = [UIFont boldSystemFontOfSize:24];
+        [closeButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        closeButton.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.7];
+        closeButton.layer.cornerRadius = 20;
+        closeButton.clipsToBounds = YES;
+        [closeButton addTarget:self action:@selector(closeScanner) forControlEvents:UIControlEventTouchUpInside];
+ 
+        [self.viewController.view addSubview:closeButton];
+        objc_setAssociatedObject(self, @selector(closeScanner), closeButton, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    });
+ 
+    // Start scanning on a background thread
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [self.captureSession startRunning];
+    });
+}
+- (void)closeScanner {
+    // Stop the capture session
+    [self.captureSession stopRunning];
+ 
+    // Remove the preview layer and close button
+    dispatch_async(dispatch_get_main_queue(), ^{
+        AVCaptureVideoPreviewLayer *previewLayer = objc_getAssociatedObject(self, @selector(previewLayer));
+        [previewLayer removeFromSuperlayer];
+ 
+        UIButton *closeButton = objc_getAssociatedObject(self, @selector(closeScanner));
+        [closeButton removeFromSuperview];
+    });
+ 
+    // Notify JavaScript that scanning was cancelled
+    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Scanning cancelled"];
+    [self.commandDelegate sendPluginResult:result callbackId:self.callbackID];
+}
+- (void)ScanQRCode:(CDVInvokedUrlCommand*)command {
+    self.callbackID = command.callbackId;
+ 
+    // Initialize the AVCaptureSession
+    self.captureSession = [[AVCaptureSession alloc] init];
+    AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+ 
+    NSError *error = nil;
+    AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice:device error:&error];
+ 
+    if (!input) {
+        CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[error localizedDescription]];
+        [self.commandDelegate sendPluginResult:result callbackId:self.callbackID];
+        return;
+    }
+ 
+    [self.captureSession addInput:input];
+ 
+    AVCaptureMetadataOutput *output = [[AVCaptureMetadataOutput alloc] init];
+    [self.captureSession addOutput:output];
+ 
+    [output setMetadataObjectTypes:@[AVMetadataObjectTypeQRCode, AVMetadataObjectTypeEAN13Code]];
+    [output setMetadataObjectsDelegate:self queue:dispatch_get_main_queue()];
+ 
+    // Add the video preview layer
+    dispatch_async(dispatch_get_main_queue(), ^{
+        AVCaptureVideoPreviewLayer *previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:self.captureSession];
+        previewLayer.frame = self.viewController.view.bounds;
+        previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
+ 
+        // Retain reference to the layer
+        objc_setAssociatedObject(self, @selector(previewLayer), previewLayer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        [self.viewController.view.layer addSublayer:previewLayer];
+        // Add an "X" close button
+        UIButton *closeButton = [UIButton buttonWithType:UIButtonTypeSystem];
+        closeButton.frame = CGRectMake(self.viewController.view.frame.size.width - 50, 50, 40, 40); // Position: Top-right corner
+        [closeButton setTitle:@"✕" forState:UIControlStateNormal]; // Unicode "X"
+        closeButton.titleLabel.font = [UIFont boldSystemFontOfSize:24];
+        [closeButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        closeButton.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.7];
+        closeButton.layer.cornerRadius = 20;
+        closeButton.clipsToBounds = YES;
+        [closeButton addTarget:self action:@selector(closeScanner) forControlEvents:UIControlEventTouchUpInside];
+ 
+        [self.viewController.view addSubview:closeButton];
+        objc_setAssociatedObject(self, @selector(closeScanner), closeButton, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    });
+ 
+    // Start scanning on a background thread
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [self.captureSession startRunning];
+    });
+}
+ 
+- (void)captureOutput:(AVCaptureOutput *)output didOutputMetadataObjects:(NSArray<__kindof AVMetadataObject *> *)metadataObjects fromConnection:(AVCaptureConnection *)connection {
+    if (metadataObjects.count > 0) {
+        [self.captureSession stopRunning];
+ 
+        AVMetadataMachineReadableCodeObject *metadataObj = metadataObjects.firstObject;
+        NSString *scannedCode = metadataObj.stringValue;
+ 
+        // Remove the preview layer on the main thread
+        dispatch_async(dispatch_get_main_queue(), ^{
+            AVCaptureVideoPreviewLayer *previewLayer = objc_getAssociatedObject(self, @selector(previewLayer));
+            [previewLayer removeFromSuperlayer];
+        });
+ 
+        CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:scannedCode];
+        [self.commandDelegate sendPluginResult:result callbackId:self.callbackID];
+    }
+}
+
 - (void)viewRoute:(CDVInvokedUrlCommand*)command {
     CDVPluginResult* pluginResult = nil;