ilabs-flir 2.2.27 → 2.2.30

package/android/Flir/src/main/java/flir/android/FlirSdkManager.java

@@ -133,20 +133,25 @@ public class FlirSdkManager {
     }
 
     public void stopScan() {
+        if (!isScanning) return;
+        
+        // Use a temporary flag to prevent concurrent stop calls
+        isScanning = false;
+        
         executor.execute(() -> {
-            if (!isScanning)
-                return;
             try {
+                Log.d(TAG, "Stopping discovery...");
                 DiscoveryFactory.getInstance().stop(
                         CommunicationInterface.EMULATOR,
                         CommunicationInterface.USB,
                         CommunicationInterface.NETWORK,
                         CommunicationInterface.FLIR_ONE_WIRELESS);
+                Log.d(TAG, "Discovery stopped successfully");
             } catch (Exception e) {
-                Log.e(TAG, "Stop scan failed", e);
+                // This is where the 'Receiver not registered' usually happens in SDK internals.
+                // We catch it silently as it means the SDK already cleaned up or is in a weird state.
+                Log.w(TAG, "Stop scan warning (internal SDK): " + e.getMessage());
             }
-            isScanning = false;
-            Log.d(TAG, "Discovery stopped");
         });
     }
 
@@ -179,12 +184,13 @@ public class FlirSdkManager {
                 Log.d(TAG, "Connecting to: " + identity.deviceId);
                 camera = new Camera();
 
-                // ── Authenticate for NETWORK cameras (required by FLIR SDK) ──
+                // ── Authenticate for NETWORK/WIRELESS cameras (required by FLIR SDK) ──
                 // Matches the official NetworkCamera sample app pattern.
-                // The FLIR One Edge Pro is a network camera and will reject
+                // The FLIR One Edge Pro is a network/wireless camera and will reject
                 // connections without prior authentication + trust approval.
-                if (identity.communicationInterface == CommunicationInterface.NETWORK) {
-                    Log.d(TAG, "Network camera detected — authenticating...");
+                if (identity.communicationInterface == CommunicationInterface.NETWORK || 
+                    identity.communicationInterface == CommunicationInterface.FLIR_ONE_WIRELESS) {
+                    Log.d(TAG, "Network/Wireless camera detected — authenticating...");
 
                     // Use a persistent application name (workaround for camera bug
                     // where re-auth with a different name conflicts). Same pattern
@@ -323,26 +329,28 @@ public class FlirSdkManager {
             // Start stream with simple callback (matches sample app)
             thermalStream.start(
                     unused -> {
-                        // Skip if previous frame still processing
+                        // CRITICAL: Frame processing must happen in a controlled way.
+                        // For Android, we perform streamer.update() on the callback thread 
+                        // to ensure the native frame reference remains valid.
                         if (isProcessingFrame.compareAndSet(false, true)) {
-                            executor.execute(() -> {
-                                try {
-                                    if (streamer != null && activeStream != null) {
-                                        streamer.update();
-                                        Bitmap bitmap = BitmapAndroid.createBitmap(streamer.getImage()).getBitMap();
-                                        if (bitmap != null) {
-                                            latestBitmap = bitmap;
-                                            if (listener != null) {
-                                                listener.onFrame(bitmap);
-                                            }
+                            try {
+                                if (streamer != null && activeStream != null) {
+                                    streamer.update();
+                                    
+                                    // createBitmap is safe to do here or in executor
+                                    Bitmap bitmap = BitmapAndroid.createBitmap(streamer.getImage()).getBitMap();
+                                    if (bitmap != null) {
+                                        latestBitmap = bitmap;
+                                        if (listener != null) {
+                                            listener.onFrame(bitmap);
                                         }
                                     }
-                                } catch (Exception e) {
-                                    Log.e(TAG, "Frame error", e);
-                                } finally {
-                                    isProcessingFrame.set(false);
                                 }
-                            });
+                            } catch (Exception e) {
+                                Log.e(TAG, "Frame processing error", e);
+                            } finally {
+                                isProcessingFrame.set(false);
+                            }
                         }
                     },
                     error -> {

package/app.plugin.js

@@ -178,11 +178,19 @@ const withFlirInfoPlist = (config, props = {}) => {
 
 /**
  * Adds FLIR-specific entitlements for iOS
+ * Required for FLIR One Edge Pro and network discovery
  */
 const withFlirEntitlements = (config) => {
   return withEntitlementsPlist(config, (config) => {
-    // Required to read current WiFi SSID for direct connections
+    // 1. Access Wi-Fi Information
     config.modResults['com.apple.developer.networking.wifi-info'] = true;
+    
+    // 2. Hotspot Configuration (Required for FLIR Edge)
+    config.modResults['com.apple.developer.networking.HotspotConfiguration'] = true;
+    
+    // 3. Wireless Accessory Configuration (Required for FLIR Edge)
+    config.modResults['com.apple.external-accessory.wireless-configuration'] = true;
+    
     return config;
   });
 };
@@ -247,6 +255,19 @@ const withFlirAndroidManifest = (config, props = {}) => {
 
     // WiFi feature for network cameras
     addFeature('android.hardware.wifi', false);
+    
+    // OpenGL ES 3.0 requirement (mandatory for Atlas SDK rendering)
+    const hasOpenGL = mainApplication['uses-feature'].some(
+      (f) => f.$?.['android:glEsVersion'] === '0x00030000'
+    );
+    if (!hasOpenGL) {
+      mainApplication['uses-feature'].push({
+        $: {
+          'android:glEsVersion': '0x00030000',
+          'android:required': 'true',
+        },
+      });
+    }
 
     // Network permissions (always added on Android)
     addPermission('android.permission.INTERNET');
@@ -255,13 +276,49 @@ const withFlirAndroidManifest = (config, props = {}) => {
     addPermission('android.permission.CHANGE_WIFI_STATE');
     addPermission('android.permission.CHANGE_NETWORK_STATE');
     addPermission('android.permission.CHANGE_WIFI_MULTICAST_STATE');
+    
+    // Required for Wi-Fi discovery on Android 13+ (API 33)
     addPermission('android.permission.NEARBY_WIFI_DEVICES');
+    
     addPermission('android.permission.BLUETOOTH');
     addPermission('android.permission.BLUETOOTH_ADMIN');
     addPermission('android.permission.BLUETOOTH_CONNECT');
     addPermission('android.permission.BLUETOOTH_SCAN');
     addPermission('android.permission.ACCESS_FINE_LOCATION'); // Required for BLE scanning
 
+    // =========================================================================
+    // USB AUTO-LAUNCH CONFIGURATION
+    // Allows the app to open automatically when a FLIR USB device is attached.
+    // =========================================================================
+    const activity = mainApplication.application[0].activity[0];
+    
+    // 1. Add intent filter for USB_DEVICE_ATTACHED
+    if (!activity['intent-filter']) activity['intent-filter'] = [];
+    const hasUsbIntent = activity['intent-filter'].some(filter => 
+      filter.action?.some(action => action.$['android:name'] === 'android.hardware.usb.action.USB_DEVICE_ATTACHED')
+    );
+    
+    if (!hasUsbIntent) {
+      activity['intent-filter'].push({
+        action: [{ $: { 'android:name': 'android.hardware.usb.action.USB_DEVICE_ATTACHED' } }]
+      });
+    }
+    
+    // 2. Add meta-data pointing to the flir_usb_device_filter.xml
+    if (!activity['meta-data']) activity['meta-data'] = [];
+    const hasUsbMetadata = activity['meta-data'].some(meta => 
+      meta.$['android:name'] === 'android.hardware.usb.action.USB_DEVICE_ATTACHED'
+    );
+    
+    if (!hasUsbMetadata) {
+      activity['meta-data'].push({
+        $: {
+          'android:name': 'android.hardware.usb.action.USB_DEVICE_ATTACHED',
+          'android:resource': '@xml/flir_usb_device_filter'
+        }
+      });
+    }
+
     return config;
   });
 };
@@ -284,18 +341,67 @@ const withFlirManifest = (config) => {
 };
 
 /**
- * Copies sdk-manifest.json to Android assets
+ * Copies sdk-manifest.json to Android assets AND creates the USB filter XML
  */
 const withFlirAndroidAssets = (config) => {
   return withDangerousMod(config, [
     'android',
     async (config) => {
-      const src = path.join(__dirname, 'sdk-manifest.json');
-      const dst = path.join(config.modRequest.platformProjectRoot, 'app/src/main/assets/sdk-manifest.json');
-      if (fs.existsSync(src)) {
-        fs.mkdirSync(path.dirname(dst), { recursive: true });
-        fs.copyFileSync(src, dst);
+      const projectRoot = config.modRequest.projectRoot;
+      const platformRoot = config.modRequest.platformProjectRoot;
+      
+      // 1. Copy sdk-manifest.json
+      const manifestSrc = path.join(__dirname, 'sdk-manifest.json');
+      const manifestDst = path.join(platformRoot, 'app/src/main/assets/sdk-manifest.json');
+      if (fs.existsSync(manifestSrc)) {
+        fs.mkdirSync(path.dirname(manifestDst), { recursive: true });
+        fs.copyFileSync(manifestSrc, manifestDst);
+      }
+      
+      // 2. Create flir_usb_device_filter.xml (Required for auto-launch)
+      const usbFilterXml = `<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- FLIR Vendor ID (2507) -->
+    <usb-device vendor-id="2507" />
+</resources>`;
+      
+      const xmlDst = path.join(platformRoot, 'app/src/main/res/xml/flir_usb_device_filter.xml');
+      fs.mkdirSync(path.dirname(xmlDst), { recursive: true });
+      fs.writeFileSync(xmlDst, usbFilterXml);
+      
+      return config;
+    },
+  ]);
+};
+
+/**
+ * Patch Xcode project settings (Bitcode, Linker Flags)
+ */
+const withFlirXcodeSettings = (config) => {
+  return withDangerousMod(config, [
+    'ios',
+    async (config) => {
+      const { modRequest } = config;
+      const xcodeProjectPath = path.join(modRequest.platformProjectRoot, 'ThermalCameraFx.xcodeproj/project.pbxproj');
+      
+      if (!fs.existsSync(xcodeProjectPath)) return config;
+      
+      let pbxproj = fs.readFileSync(xcodeProjectPath, 'utf8');
+      
+      // 1. Disable Bitcode (Required for FLIR SDK)
+      // Matches: ENABLE_BITCODE = YES; -> ENABLE_BITCODE = NO;
+      pbxproj = pbxproj.replace(/ENABLE_BITCODE = YES/g, 'ENABLE_BITCODE = NO');
+      
+      // 2. Add -ObjC to OTHER_LDFLAGS if not present
+      // This is a bit tricky with regex, so we look for the OTHER_LDFLAGS line
+      if (!pbxproj.includes('"-ObjC"') && !pbxproj.includes('-ObjC')) {
+          pbxproj = pbxproj.replace(
+              /OTHER_LDFLAGS = \(\n/g,
+              'OTHER_LDFLAGS = (\n\t\t\t\t"-ObjC",\n'
+          );
       }
+      
+      fs.writeFileSync(xcodeProjectPath, pbxproj, 'utf8');
       return config;
     },
   ]);
@@ -368,6 +474,7 @@ const withFlirThermalSDK = (config, props = {}) => {
   // Apply iOS modifications
   config = withFlirInfoPlist(config, props);
   config = withFlirEntitlements(config);
+  config = withFlirXcodeSettings(config);
   config = withFlirManifest(config);
 
   // Apply Android modifications

package/ios/Flir/src/FlirManager.swift

@@ -170,8 +170,8 @@ import ThermalSDK
             // ── AUTHENTICATE for network cameras ──
             // Official FLIR CameraConnector sample checks .generic camera type,
             // but FLIR One Edge Pro over network may report a different type.
-            // Check BOTH: camera type == .generic OR interface contains .network
-            let needsAuth = (camType == .generic) || iface.contains(.network)
+            // Check BOTH: camera type == .generic OR interface contains .network/.flirOneWireless
+            let needsAuth = (camType == .generic) || iface.contains(.network) || iface.contains(.flirOneWireless)
             
             if needsAuth {
                 NSLog("[FlirManager] Network camera detected — authenticating...")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.2.27",
+  "version": "2.2.30",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/scripts/fetch-binaries.js

@@ -6,8 +6,8 @@ const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
 
-let IOS_URL = 'https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip';
-let ANDROID_URL = 'https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/android.zip';
+let IOS_URL = 'https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.2/ios.zip';
+let ANDROID_URL = 'https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.2/android.zip';
 // Manifest override
 try {
   const manifest = require(path.join(__dirname, '..', 'sdk-manifest.json'));

package/sdk-manifest.json

@@ -2,9 +2,9 @@
   "version": "2.0.0",
   "sdkVersion": "5.0.0",
   "ios": {
-    "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip",
+    "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.2/ios.zip",
     "directDownload": {
-      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip",
+      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.2/ios.zip",
       "sha256": "",
       "sizeBytes": 0
     },
@@ -14,14 +14,14 @@
     "xcframeworks": [
       "ThermalSDK.xcframework",
       "MeterLink.xcframework",
-      "libavcodec.61.dylib.xcframework",
-      "libavdevice.61.dylib.xcframework",
-      "libavfilter.10.dylib.xcframework",
-      "libavformat.61.dylib.xcframework",
-      "libavutil.59.dylib.xcframework",
+      "libavcodec.62.dylib.xcframework",
+      "libavdevice.62.dylib.xcframework",
+      "libavfilter.11.dylib.xcframework",
+      "libavformat.62.dylib.xcframework",
+      "libavutil.60.dylib.xcframework",
       "liblive666.dylib.xcframework",
-      "libswresample.5.dylib.xcframework",
-      "libswscale.8.dylib.xcframework"
+      "libswresample.6.dylib.xcframework",
+      "libswscale.9.dylib.xcframework"
     ],
     "minDeploymentTarget": "13.0",
     "supportedArchitectures": [
@@ -32,7 +32,7 @@
   "android": {
    
     "directDownload": {
-      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/android.zip",
+      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.2/android.zip",
       "sha256": "",
       "sizeBytes": 0
     }