barkoder-nativescript 1.6.4 → 1.6.7

package/barkoder-nativescript.android.ts

@@ -1,6 +1,6 @@
 import { BarkoderConstants } from "./barkoder-nativescript.common";
 import * as application from "@nativescript/core/application";
-import { View } from "@nativescript/core";
+import { Color, View } from "@nativescript/core";
 import { BarkoderView } from "./barkoder-nativescript.common";
 import { ImageSource } from '@nativescript/core';
 
@@ -35,6 +35,9 @@ export class BarkoderViewAndroid extends View {
     this.nativeView = this.bkdView;
   }
 
+
+  
+
   /**
    * Initiates the barcode scanning process, allowing the application to detect and decode barcodes from the device's camera feed
    */
@@ -44,16 +47,36 @@ export class BarkoderViewAndroid extends View {
     const resultCallback = new com.barkoder.interfaces.BarkoderResultCallback({
       scanningFinished: (
         results: any[],
-        thumbnails: any[],
+        thumbnails: any, // not a true JS array!
         resultImage: any
       ) => {
+        // Convert native array to JS array first
+        const jsThumbnails = [];
+        
+        if(thumbnails != null) {
+          for (let i = 0; i < thumbnails.length; i++) {
+            jsThumbnails.push(thumbnails[i]);
+          }
+        }
+      
+
+        const convertedThumbnails = jsThumbnails.map((bitmap) => {
+          const imgSrc = new ImageSource();
+          imgSrc.setNativeSource(bitmap);
+          return imgSrc;
+        });
+
+        const convertedResultImage = new ImageSource();
+        convertedResultImage.setNativeSource(resultImage);
+
         BarkoderResultCallback.scanningFinished(
           results,
-          thumbnails,
-          resultImage
+          convertedThumbnails,
+          convertedResultImage
         );
       },
     });
+
     this.bkdView.startScanning(resultCallback);
   }
 
@@ -101,6 +124,10 @@ export class BarkoderViewAndroid extends View {
     this.bkdView.stopScanning();
   }
 
+  captureImage(): void {
+    this.bkdView.captureImage();
+  }
+
   pauseScanning(): void {
     this.bkdView.pauseScanning();
   }
@@ -127,6 +154,15 @@ export class BarkoderViewAndroid extends View {
     this.bkdView.setFlashEnabled(enabled);
   }
 
+  setARContinueScanningOnLimit(enabled: boolean): void {
+    this.bkdView.config.arConfig.setContinueScanningOnLimit(enabled);
+  }
+
+  setAREmitResultsAtSessionEndOnly(enabled: boolean): void {
+    this.bkdView.config.arConfig.emitResultsAtSessionEndOnly = enabled;
+  }
+
+
   /**
    * Retrieves the maximum available zoom factor for the device's camera
    */
@@ -244,6 +280,252 @@ export class BarkoderViewAndroid extends View {
     this.bkdView.config.setRegionOfInterestVisible(enabled);
   }
 
+
+
+
+
+/**
+ * Configures the flash button with custom settings, supporting NativeScript types.
+ */
+  configureFlashButton(
+    visible: boolean,
+    position: number[],
+    iconSize: number,
+    tintColor: string | Color | null,
+    backgroundColor: string | Color | null,
+    cornerRadius: number,
+    padding: number,
+    useCustomIcon: boolean,
+    flashOnIconBase64: string,
+    flashOffIconBase64: string
+  ): void {
+
+    let nativeTintColor: java.lang.Integer = null;
+    if (tintColor != null) {
+      const color = (tintColor instanceof Color)
+        ? tintColor
+        : new Color(tintColor as string);
+      nativeTintColor = java.lang.Integer.valueOf(color.android);
+    }
+
+    let nativeBackgroundColor: java.lang.Integer = null;
+    if (backgroundColor != null) {
+      const color = (backgroundColor instanceof Color)
+        ? backgroundColor
+        : new Color(backgroundColor as string);
+      nativeBackgroundColor = java.lang.Integer.valueOf(color.android);
+    }
+
+    const nativePosition = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 2);
+    nativePosition[0] = position[0];
+    nativePosition[1] = position[1];
+
+    let nativeFlashOnBitmap = null;
+    let nativeFlashOffBitmap = null;
+
+    if (useCustomIcon) {
+      nativeFlashOnBitmap = this.decodeBase64ToBitmap(flashOnIconBase64);
+      nativeFlashOffBitmap = this.decodeBase64ToBitmap(flashOffIconBase64);
+    }
+
+    this.bkdView.configureFlashButton(
+      visible,
+      nativePosition,
+      iconSize,
+      nativeTintColor,
+      nativeBackgroundColor,
+      cornerRadius,
+      padding,
+      useCustomIcon,
+      nativeFlashOnBitmap,
+      nativeFlashOffBitmap
+    );
+  }
+
+
+private decodeBase64ToBitmap(base64String: string): android.graphics.Bitmap | null {
+  if (!base64String) {
+    return null;
+  }
+  try {
+    // 1. Decode the Base64 string into a byte array
+    const decodedBytes = android.util.Base64.decode(base64String, android.util.Base64.DEFAULT);
+
+    // 2. Use BitmapFactory to create a Bitmap from the byte array
+    const bitmap = android.graphics.BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length);
+
+    return bitmap;
+  } catch (e) {
+    console.error("Error decoding Base64 string to Bitmap:", e);
+    return null;
+  }
+}
+
+  configureCloseButton(
+    visible: boolean,
+    position: number[],
+    iconSize: number,
+    tintColor: string | Color | null,
+    backgroundColor: string | Color | null,
+    cornerRadius: number,
+    padding: number,
+    useCustomIcon: boolean,
+    customIcon: string,
+    onCloseCallback?: () => void
+  ): void {
+    if (!this.bkdView) {
+      return;
+    }
+
+    // ✅ 1. Safely convert tintColor
+    let nativeTintColor: java.lang.Integer = null;
+    if (tintColor != null) {
+      const color = tintColor instanceof Color
+        ? tintColor
+        : new Color(tintColor as string);
+      nativeTintColor = java.lang.Integer.valueOf(color.android);
+    }
+
+    // ✅ 2. Safely convert backgroundColor
+    let nativeBackgroundColor: java.lang.Integer = null;
+    if (backgroundColor != null) {
+      const color = backgroundColor instanceof Color
+        ? backgroundColor
+        : new Color(backgroundColor as string);
+      nativeBackgroundColor = java.lang.Integer.valueOf(color.android);
+    }
+
+    // ✅ 3. Convert position to float[]
+    const nativePosition = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 2);
+    nativePosition[0] = position[0];
+    nativePosition[1] = position[1];
+
+    // ✅ 4. Decode base64 icon if needed
+    let customIconBitmap = null;
+    if (useCustomIcon && customIcon) {
+      customIconBitmap = this.decodeBase64ToBitmap(customIcon);
+    }
+
+    // ✅ 5. Wrap the JS callback into a native Runnable
+    const nativeCallback = onCloseCallback
+      ? new java.lang.Runnable({
+        run: () => {
+          onCloseCallback();
+        }
+      })
+      : null;
+
+    // ✅ 6. Call native Android method
+    this.bkdView.configureCloseButton(
+      visible,
+      nativePosition,
+      iconSize,
+      nativeTintColor,
+      nativeBackgroundColor,
+      cornerRadius,
+      padding,
+      useCustomIcon,
+      customIconBitmap,
+      nativeCallback
+    );
+  }
+
+
+  configureZoomButton(
+    visible: boolean,
+    position: number[], // [xDp, yDp]
+    iconSize: number,
+    tintColor: string | Color | null,
+    backgroundColor: string | Color | null,
+    cornerRadius: number,
+    padding: number,
+    useCustomIcon: boolean,
+    zoomInIconBase64: string,
+    zoomOutIconBase64: string,
+    zoomedInFactor: number,
+    zoomedOutFactor: number
+  ): void {
+    if (!this.bkdView || !global.isAndroid) {
+      return;
+    }
+
+    // ✅ 1. Safely convert tintColor
+    let nativeTintColor: java.lang.Integer = null;
+    if (tintColor != null) {
+      const color = tintColor instanceof Color
+        ? tintColor
+        : new Color(tintColor as string);
+      nativeTintColor = java.lang.Integer.valueOf(color.android);
+    }
+
+    // ✅ 2. Safely convert backgroundColor
+    let nativeBackgroundColor: java.lang.Integer = null;
+    if (backgroundColor != null) {
+      const color = backgroundColor instanceof Color
+        ? backgroundColor
+        : new Color(backgroundColor as string);
+      nativeBackgroundColor = java.lang.Integer.valueOf(color.android);
+    }
+
+    // ✅ 3. Convert Position (JS number[] -> Java float[])
+    const nativePosition = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 2);
+    nativePosition[0] = position[0];
+    nativePosition[1] = position[1];
+
+    // ✅ 4. Decode base64 icons if using custom icons
+    let nativeZoomInBitmap = null;
+    let nativeZoomOutBitmap = null;
+
+    if (useCustomIcon && zoomInIconBase64 && zoomOutIconBase64) {
+      nativeZoomInBitmap = this.decodeBase64ToBitmap(zoomInIconBase64);
+      nativeZoomOutBitmap = this.decodeBase64ToBitmap(zoomOutIconBase64);
+    }
+
+    // ✅ 5. Call native method
+    this.bkdView.configureZoomButton(
+      visible,
+      nativePosition,
+      iconSize,
+      nativeTintColor,
+      nativeBackgroundColor,
+      cornerRadius,
+      padding,
+      useCustomIcon,
+      nativeZoomInBitmap,
+      nativeZoomOutBitmap,
+      zoomedInFactor,
+      zoomedOutFactor
+    );
+  }
+
+
+// --- Placeholder for a Conversion Utility (Not part of the core wrapper, but essential) ---
+private convertToNativeBitmap(imageSource: any): any /* android.graphics.Bitmap */ {
+  if (!imageSource) {
+    return null;
+  }
+
+  // If the imageSource is already a native Bitmap (from a previous conversion/cache)
+  if (imageSource.android instanceof com.google.zxing.qrcode.encoder.ByteMatrix) { // Incorrect type, placeholder
+    // return imageSource.android; 
+  }
+
+  // Example conversion (highly simplified - you'll need the correct NativeScript helpers)
+  /* if (imageSource instanceof ImageSource) {
+      const nativeBitmap = imageSource.android;
+      return nativeBitmap;
+  } 
+  */
+
+  // For a robust wrapper, you would need to:
+  // 1. Check if the input is a file path, Base64 string, or an ImageSource object.
+  // 2. Use NativeScript's image-loading utilities to load and convert it to an 
+  //    `android.graphics.Bitmap`.
+
+  console.warn("Image conversion placeholder called. Replace with actual logic.");
+  return null; // Return null if conversion fails
+  }
+
   /**
    * Defines the Region of Interest (ROI) on the camera preview for barcode scanning, specifying an area where the application focuses on detecting barcodes
    */
@@ -478,7 +760,11 @@ export class BarkoderViewAndroid extends View {
     } else if (decodingSpeed == BarkoderConstants.DecodingSpeed.Normal) {
       this.bkdView.config.getDecoderConfig().decodingSpeed =
         com.barkoder.Barkoder.DecodingSpeed.Normal;
-    } else {
+    } else if (decodingSpeed == BarkoderConstants.DecodingSpeed.Rigorous) {
+      this.bkdView.config.getDecoderConfig().decodingSpeed =
+        com.barkoder.Barkoder.DecodingSpeed.Rigorous;
+    } 
+    else {
       console.log("Not avilbilable Decoding Speed");
     }
   }
@@ -504,6 +790,10 @@ export class BarkoderViewAndroid extends View {
         this.bkdView.config.getDecoderConfig().formattingType =
           com.barkoder.Barkoder.FormattingType.AAMVA;
         break;
+      case BarkoderConstants.FormattingType.SADL:
+        this.bkdView.config.getDecoderConfig().formattingType =
+          com.barkoder.Barkoder.FormattingType.SADL;
+            break;
     }
   }
 
@@ -662,6 +952,10 @@ export class BarkoderViewAndroid extends View {
         return this.bkdView.config.getDecoderConfig().KIX.enabled;
       case BarkoderConstants.DecoderType.JapanesePost:
         return this.bkdView.config.getDecoderConfig().JapanesePost.enabled;
+      case BarkoderConstants.DecoderType.MaxiCode:
+        return this.bkdView.config.getDecoderConfig().MaxiCode.enabled;
+      case BarkoderConstants.DecoderType.OCRText:
+        return this.bkdView.config.getDecoderConfig().OCRText.enabled;
     }
   }
 
@@ -707,6 +1001,8 @@ export class BarkoderViewAndroid extends View {
     this.bkdView.config.getDecoderConfig().RoyalMail.enabled = false;
     this.bkdView.config.getDecoderConfig().KIX.enabled = false;
     this.bkdView.config.getDecoderConfig().JapanesePost.enabled = false;
+    this.bkdView.config.getDecoderConfig().MaxiCode.enabled = false;
+    this.bkdView.config.getDecoderConfig().OCRText.enabled = false;
     decoders.forEach((dt: BarkoderConstants.DecoderType) => {
       switch (dt) {
         case BarkoderConstants.DecoderType.Aztec:
@@ -823,6 +1119,12 @@ export class BarkoderViewAndroid extends View {
         case BarkoderConstants.DecoderType.JapanesePost:
           this.bkdView.config.getDecoderConfig().JapanesePost.enabled = true;
           break;
+        case BarkoderConstants.DecoderType.MaxiCode:
+          this.bkdView.config.getDecoderConfig().MaxiCode.enabled = true;
+            break;
+        case BarkoderConstants.DecoderType.OCRText:
+          this.bkdView.config.getDecoderConfig().OCRText.enabled = true;
+          break;
         default:
           break;
       }
@@ -1072,6 +1374,10 @@ export class BarkoderViewAndroid extends View {
     this.bkdView.config.getDecoderConfig().maximumResultsCount = maximumResultsCount;
   }
 
+  setARResultLimit(resultLimit: number): void {
+    this.bkdView.config.arConfig.resultLimit = resultLimit;
+  }
+
   /**
    * Sets the delay in milliseconds for considering duplicate barcodes during scanning
    */
@@ -1079,6 +1385,29 @@ export class BarkoderViewAndroid extends View {
     this.bkdView.config.getDecoderConfig().duplicatesDelayMs = duplicateDelayMs;
   }
 
+  getSadlImageFromExtra(extra: any): ImageSource | null {
+    if (!extra || !global.isAndroid) {
+      return null;
+    }
+
+    try {
+      const bitmap =
+        com.barkoder.BarkoderHelper.sadlImage(extra);
+
+      if (!bitmap) {
+        return null;
+      }
+
+      const imageSource = new ImageSource();
+      imageSource.setNativeSource(bitmap);
+      return imageSource;
+
+    } catch (e) {
+      console.error('Failed to extract SADL image:', e);
+      return null;
+    }
+  }
+
   /**
    * Sets the caching duration (in milliseconds) for multi-code results
    */
@@ -1107,6 +1436,26 @@ export class BarkoderViewAndroid extends View {
     return this.bkdView.config.getDecoderConfig().duplicatesDelayMs;
   }
 
+  setARImageResultEnabled(enabled: boolean): void {
+    this.bkdView.config.arConfig.imageResultEnabled = enabled
+  }
+
+  setARBarcodeThumbnailOnResultEnabled(enabled: boolean): void {
+    this.bkdView.config.arConfig.barcodeThumbnailOnResult = enabled
+  }
+
+  isARImageResultEnabled(): any {
+    return this.bkdView.config.arConfig.imageResultEnabled
+  }
+
+  isARBarcodeThumbnailOnResultEnabled(): any {
+    return this.bkdView.config.arConfig.barcodeThumbnailOnResult
+  }
+
+  getCurrentZoomFactor(): any {
+    return this.bkdView.getCurrentZoomFactor()
+  }
+
   /**
    * Sets whether the Direct Part Marking (DPM) mode for Datamatrix barcodes is enabled.
    */
@@ -1278,6 +1627,10 @@ export class BarkoderViewAndroid extends View {
     com.barkoder.Barkoder.SetCustomOption(this.bkdView.config.getDecoderConfig(), string, mode);
   }
 
+  setCustomOptionGlobal(string: string, mode: number): void {
+    com.barkoder.Barkoder.SetCustomOptionGlobal(string, mode);
+  }
+
   setDynamicExposure(mode : number) : void {
     this.bkdView.setDynamicExposure(mode);
   }
@@ -1522,3 +1875,8 @@ export class BarkoderViewAndroid extends View {
     }
   }
 }
+function bitmapToImageSource(bitmap: android.graphics.Bitmap): ImageSource {
+  const imageSource = new ImageSource();
+  imageSource.setNativeSource(bitmap); // This is the key method
+  return imageSource;
+}

package/barkoder-nativescript.common.ts

@@ -59,7 +59,9 @@ export enum DecoderType {
   AustralianPost = 35,
   RoyalMail = 36,
   KIX = 37,
-  JapanesePost = 38
+  JapanesePost = 38,
+  MaxiCode = 39,
+  OCRText = 40
 
 }
 
@@ -67,13 +69,15 @@ export enum FormattingType {
   Disabled = 0,
   Automatic = 1,
   GS1 = 2,
-  AAMVA = 3
+  AAMVA = 3,
+  SADL = 4
 }
 
 export enum DecodingSpeed {
   Fast = 0,
   Normal = 1,
-  Slow = 2
+  Slow = 2,
+  Rigorous = 3
 }
 
 export enum BarkoderResolution {
@@ -235,6 +239,8 @@ export class DekoderConfig {
   royalMail?: BarcodeConfig;
   kix?: BarcodeConfig;
   japanasePost?: BarcodeConfig;
+  maxicode?: BarcodeConfig;
+  ocrText?: BarcodeConfig;
   general?: GeneralSettings;
 
   constructor(config: Partial<DekoderConfig>) {
@@ -282,6 +288,8 @@ export class DekoderConfig {
       'Royal Mail': this.royalMail?.toMap(),
       'KIX': this.kix?.toMap(),
       'Japanase Post': this.japanasePost?.toMap(),
+      'MaxiCode': this.maxicode?.toMap(),
+      'OCR Text': this.maxicode?.toMap(),
       'general': this.general?.toMap()
     }