ilabs-flir 2.3.11 → 2.3.13

package/android/Flir/src/main/java/flir/android/FlirManager.kt

@@ -212,6 +212,12 @@ object FlirManager {
         latestBitmap = null
         Log.i(TAG, "FlirManager stopped")
     }
+
+    @Synchronized
+    fun simulateContextLoss() {
+        latestBitmap = null
+        emitDeviceState(if (isStreaming) "streaming" else "connected")
+    }
     
     // Stub legacy methods
     fun startStream() { /* handled automatically by connect */ }

package/android/Flir/src/main/java/flir/android/FlirModule.kt

@@ -287,6 +287,36 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
         }
     }
 
+    @ReactMethod
+    fun simulateFlirContextLoss(promise: Promise?) {
+        try {
+            FlirManager.simulateContextLoss()
+            promise?.resolve(true)
+        } catch (e: Exception) {
+            promise?.reject("ERR_SIMULATE_LOSS", e)
+        }
+    }
+
+    @ReactMethod
+    fun pauseFlirForPreview(promise: Promise?) {
+        try {
+            FlirManager.stop()
+            promise?.resolve(true)
+        } catch (e: Exception) {
+            promise?.reject("ERR_PAUSE_FLIR", e)
+        }
+    }
+
+    @ReactMethod
+    fun resumeFlirAfterPreview(promise: Promise?) {
+        try {
+            FlirManager.startDiscovery(true)
+            promise?.resolve(true)
+        } catch (e: Exception) {
+            promise?.reject("ERR_RESUME_FLIR", e)
+        }
+    }
+
     @ReactMethod
     fun captureRadiometricSnapshot(path: String, promise: Promise?) {
         try {

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

@@ -202,8 +202,8 @@ public class FlirSdkManager {
                 // camera's WiFi Access Point before calling camera.connect().
                 if (identity.communicationInterface == CommunicationInterface.FLIR_ONE_WIRELESS) {
                     DiscoveredCamera dc = getDiscoveredCamera(identity.deviceId);
-                    if (dc != null && dc.cameraDetails != null) {
-                        String ssid = dc.cameraDetails.ssid;
+                    if (dc != null && dc.getCameraDetails() != null) {
+                        String ssid = dc.getCameraDetails().ssid;
                         Log.d(TAG, "Establishing WiFi connection to: " + ssid);
                         
                         if (!SdkWifiConnectionHelper.isConnectedToNetwork(context, ssid)) {
@@ -211,7 +211,7 @@ public class FlirSdkManager {
                             final AtomicBoolean wifiDone = new AtomicBoolean(false);
                             final AtomicBoolean wifiSuccess = new AtomicBoolean(false);
                             
-                            SdkWifiConnectionHelper.connectToWifiWithoutCode(context, dc.cameraDetails, status -> {
+                            SdkWifiConnectionHelper.connectToWifiWithoutCode(context, dc.getCameraDetails(), status -> {
                                 if (status.status == SdkWifiConnectionHelper.ConInfo.CONNECTED) {
                                     wifiSuccess.set(true);
                                     wifiDone.set(true);
@@ -257,9 +257,6 @@ public class FlirSdkManager {
                         response = camera.authenticate(identity, authName, 41 * 1000);
                         if (response.authenticationStatus == AuthenticationResponse.AuthenticationStatus.APPROVED) {
                             break;
-                        } else if (response.authenticationStatus == AuthenticationResponse.AuthenticationStatus.REJECTED) {
-                            notifyError("Authentication rejected by camera");
-                            return;
                         }
                     } while (response.authenticationStatus == AuthenticationResponse.AuthenticationStatus.PENDING && attempts < MAX_AUTH_ATTEMPTS);
 
@@ -274,10 +271,7 @@ public class FlirSdkManager {
                         stopScanInternal();
                         try { Thread.sleep(300); } catch (Exception ignored) {}
                     }
-                    camera = identity.camera;
-                    if (camera == null) {
-                        camera = new Camera();
-                    }
+                    camera = new Camera();
                 }
 
                 Log.d(TAG, "Calling camera.connect() for " + identity.deviceId);
@@ -351,9 +345,9 @@ public class FlirSdkManager {
         try {
             // RETRY MECHANISM: For Network/Wireless cameras, the connection might take 
             // a few hundred milliseconds to stabilize at the native level even after 
-            // camera.connect() returns. We retry for up to 3 seconds.
+            // camera.connect() returns. We retry for up to 10 seconds.
             int retries = 0;
-            final int MAX_RETRIES = 15; // 15 * 200ms = 3 seconds
+            final int MAX_RETRIES = 50; // 50 * 200ms = 10 seconds
             while (!camera.isConnected() && retries < MAX_RETRIES) {
                 try {
                     Thread.sleep(200);
@@ -365,9 +359,14 @@ public class FlirSdkManager {
             }
 
             if (!camera.isConnected()) {
-                Log.e(TAG, "Camera failed to report connected state after " + (retries * 200) + "ms");
-                notifyError("Camera not connected");
-                return;
+                Log.w(TAG, "Camera still reports disconnected after timeout, but attempting to check streams as fallback...");
+                List<Stream> fallbackStreams = camera.getStreams();
+                if (fallbackStreams == null || fallbackStreams.isEmpty()) {
+                    Log.e(TAG, "No streams available and camera is disconnected. Giving up.");
+                    notifyError("Camera not connected and no streams found");
+                    return;
+                }
+                Log.i(TAG, "Found " + fallbackStreams.size() + " streams despite disconnected status. Proceeding...");
             }
 
             Log.d(TAG, "Camera connected state confirmed after " + (retries * 200) + "ms");

package/ios/Flir/src/FlirManager.swift

@@ -606,6 +606,13 @@ import ThermalSDK
         // Placeholder for interface name mapping
         return "UNKNOWN"
     }
+    @objc public func simulateContextLoss() {
+        _latestImage = nil
+        DispatchQueue.main.async { [weak self] in
+            // Re-emit current state to trigger UI refresh
+            self?.emitStateChange(self?._isStreaming == true ? "streaming" : "connected")
+        }
+    }
 }
 
 #if FLIR_ENABLED

package/ios/Flir/src/FlirModule.m

@@ -429,10 +429,42 @@ RCT_EXPORT_METHOD(getConnectedDeviceInfo : (RCTPromiseResolveBlock)
   });
 }
 
-  // Assuming integrated SDK
-  if (resolve) resolve(@(YES));
+RCT_EXPORT_METHOD(simulateFlirContextLoss : (RCTPromiseResolveBlock)
+                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    // FlirState shared reset drops the current frame which simulates context loss for Metal
+    [[FlirState shared] reset];
+    if (resolve) resolve(@(YES));
+  });
+}
+
+RCT_EXPORT_METHOD(pauseFlirForPreview : (RCTPromiseResolveBlock)
+                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    id manager = flir_manager_shared();
+    if (manager && [manager respondsToSelector:sel_registerName("stop")]) {
+      atomic_store(&_isCapturing, false);
+      [[FlirState shared] reset];
+      ((void (*)(id, SEL))objc_msgSend)(manager, sel_registerName("stop"));
+    }
+    if (resolve) resolve(@(YES));
+  });
+}
+
+RCT_EXPORT_METHOD(resumeFlirAfterPreview : (RCTPromiseResolveBlock)
+                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    id manager = flir_manager_shared();
+    if (manager && [manager respondsToSelector:sel_registerName("startDiscovery")]) {
+      atomic_store(&_isCapturing, true);
+      ((void (*)(id, SEL))objc_msgSend)(manager, sel_registerName("startDiscovery"));
+    }
+    if (resolve) resolve(@(YES));
+  });
 }
 
+
+
 RCT_EXPORT_METHOD(getSDKStatus : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   if (resolve) resolve(@{@"available" : @(YES), @"arch" : @"arm64", @"platform" : @"iOS"});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.3.11",
+  "version": "2.3.13",
   "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/sync-native.js

@@ -0,0 +1,106 @@
+const fs = require('fs');
+const path = require('path');
+
+// This script applies native configuration (Info.plist, AndroidManifest) 
+// to the parent project. This is used in "bare" React Native projects 
+// that don't rely solely on Expo Prebuild.
+
+const findProjectRoot = () => {
+  let curr = __dirname;
+  while (curr !== path.parse(curr).root) {
+    if (fs.existsSync(path.join(curr, 'package.json'))) {
+      const pkg = JSON.parse(fs.readFileSync(path.join(curr, 'package.json'), 'utf8'));
+      if (pkg.name !== 'ilabs-flir') return curr;
+    }
+    curr = path.dirname(curr);
+  }
+  return null;
+};
+
+const projectRoot = findProjectRoot();
+if (!projectRoot) {
+  console.log('[ilabs-flir] Could not find parent project root. Skipping native sync.');
+  process.exit(0);
+}
+
+const flirEnabled = true; // If this script is running, it's because the package is included.
+
+console.log(`[ilabs-flir] Syncing native configuration for project at: ${projectRoot}`);
+
+// 1. iOS: Info.plist
+const findIosProjectName = () => {
+  const iosDir = path.join(projectRoot, 'ios');
+  if (!fs.existsSync(iosDir)) return null;
+  const dirs = fs.readdirSync(iosDir);
+  const xcodeProj = dirs.find(d => d.endsWith('.xcodeproj'));
+  return xcodeProj ? xcodeProj.replace('.xcodeproj', '') : null;
+};
+
+const iosProjectName = findIosProjectName();
+if (iosProjectName) {
+  const infoPlistPath = path.join(projectRoot, 'ios', iosProjectName, 'Info.plist');
+  if (fs.existsSync(infoPlistPath)) {
+    let content = fs.readFileSync(infoPlistPath, 'utf8');
+    
+    // Add External Accessory Protocols if missing
+    if (!content.includes('com.flir.rosebud.config')) {
+      const protocols = `
+	<key>UISupportedExternalAccessoryProtocols</key>
+	<array>
+		<string>com.flir.rosebud.config</string>
+		<string>com.flir.rosebud.frame</string>
+		<string>com.flir.rosebud.fileio</string>
+	</array>`;
+      
+      if (content.includes('</dict>')) {
+        content = content.replace('</dict>', `${protocols}\n</dict>`);
+        console.log('[ilabs-flir] Added External Accessory protocols to Info.plist');
+      }
+    }
+    
+    // Add Background Mode if missing
+    if (!content.includes('external-accessory') && content.includes('<key>UIBackgroundModes</key>')) {
+        content = content.replace(/<key>UIBackgroundModes<\/key>\s*<array>/, '<key>UIBackgroundModes</key>\n\t<array>\n\t\t<string>external-accessory</string>');
+        console.log('[ilabs-flir] Added external-accessory background mode');
+    } else if (!content.includes('external-accessory')) {
+        const bgMode = `
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>external-accessory</string>
+	</array>`;
+        content = content.replace('</dict>', `${bgMode}\n</dict>`);
+    }
+
+    fs.writeFileSync(infoPlistPath, content);
+  }
+}
+
+// 2. Android: AndroidManifest.xml
+const manifestPath = path.join(projectRoot, 'android/app/src/main/AndroidManifest.xml');
+if (fs.existsSync(manifestPath)) {
+  let content = fs.readFileSync(manifestPath, 'utf8');
+  
+  const permissions = [
+    'android.permission.BLUETOOTH',
+    'android.permission.BLUETOOTH_ADMIN',
+    'android.permission.BLUETOOTH_CONNECT',
+    'android.permission.BLUETOOTH_SCAN',
+    'android.permission.ACCESS_FINE_LOCATION',
+    'android.permission.INTERNET',
+    'android.permission.ACCESS_NETWORK_STATE',
+    'android.permission.ACCESS_WIFI_STATE',
+    'android.permission.CHANGE_WIFI_STATE',
+    'android.permission.CHANGE_WIFI_MULTICAST_STATE'
+  ];
+
+  permissions.forEach(perm => {
+    if (!content.includes(perm)) {
+      content = content.replace('</manifest>', `    <uses-permission android:name="${perm}" />\n</manifest>`);
+    }
+  });
+
+  fs.writeFileSync(manifestPath, content);
+  console.log('[ilabs-flir] Updated AndroidManifest.xml with required permissions');
+}
+
+console.log('[ilabs-flir] Native sync complete.');

package/src/FlirDebugScreen.tsx

@@ -0,0 +1,105 @@
+import React, { useEffect, useState } from 'react';
+import { View, Text, Button, StyleSheet, NativeModules, NativeEventEmitter } from 'react-native';
+
+const { FlirModule } = NativeModules as any;
+const FlirEmitter = new NativeEventEmitter(FlirModule);
+
+export function FlirDebugScreen() {
+  const [battery, setBattery] = useState<number | null>(null);
+  const [isCharging, setIsCharging] = useState<boolean | null>(null);
+  const [temperature, setTemperature] = useState<number | null>(null);
+  const [lastEvent, setLastEvent] = useState<any>(null);
+
+  useEffect(() => {
+    const subscription = FlirEmitter.addListener('FlirBatteryUpdated', (evt) => {
+      setBattery(evt.level);
+      setIsCharging(evt.isCharging);
+      setLastEvent(evt);
+    });
+    return () => subscription.remove();
+  }, []);
+
+  const onSimulateContextLoss = async () => {
+    try {
+      if (FlirModule && FlirModule.simulateFlirContextLoss) {
+        await FlirModule.simulateFlirContextLoss();
+        console.log('[FLIR DEBUG] Simulated context loss');
+      }
+    } catch (e) {
+      console.warn('[FLIR DEBUG] simulateContextLoss error', e);
+    }
+  };
+
+  const onRequestBattery = async () => {
+    try {
+      if (FlirModule && FlirModule.getBatteryLevel) {
+        const lvl = await FlirModule.getBatteryLevel();
+        setBattery(typeof lvl === 'number' ? lvl : null);
+      }
+      try {
+        if (FlirModule && FlirModule.isBatteryCharging) {
+          const ch = await FlirModule.isBatteryCharging();
+          setIsCharging(Boolean(ch));
+        }
+      } catch (e) { /* ignore */ }
+    } catch (e) {
+      console.warn('getBatteryLevel error', e);
+    }
+  };
+
+  const onRequestTemperature = async () => {
+    try {
+      if (FlirModule && FlirModule.getTemperatureAt) {
+        const val = await FlirModule.getTemperatureAt(80, 60);
+        setTemperature(typeof val === 'number' ? val : null);
+      }
+    } catch (e) {
+      console.warn('getTemperatureAt error', e);
+    }
+  };
+
+  const onPauseFlir = async () => {
+    try {
+      if (FlirModule && FlirModule.pauseFlirForPreview) {
+        await FlirModule.pauseFlirForPreview();
+      }
+    } catch (e) {
+      console.warn('[FLIR DEBUG] pauseFlirForPreview error', e);
+    }
+  };
+
+  const onResumeFlir = async () => {
+    try {
+      if (FlirModule && FlirModule.resumeFlirAfterPreview) {
+        await FlirModule.resumeFlirAfterPreview();
+      }
+    } catch (e) {
+      console.warn('[FLIR DEBUG] resumeFlirAfterPreview error', e);
+    }
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={styles.title}>FLIR Debug (Package)</Text>
+      <Text>Battery Level: {battery ?? '--'}</Text>
+      <Text>Charging: {isCharging == null ? '--' : isCharging ? 'Yes' : 'No'}</Text>
+      <Text>Temperature at (80,60): {temperature == null ? '--' : temperature.toFixed(1) + '°C'}</Text>
+      <Text>Last Event: {lastEvent ? JSON.stringify(lastEvent) : '--'}</Text>
+      <View style={styles.row}>
+        <Button title="Simulate Context Loss" onPress={onSimulateContextLoss} />
+        <Button title="Request Battery" onPress={onRequestBattery} />
+        <Button title="Get Temp (80,60)" onPress={onRequestTemperature} />
+      </View>
+      <View style={[styles.row, { marginTop: 8 }] }>
+        <Button title="Pause FLIR (Preview Pause)" onPress={onPauseFlir} />
+        <Button title="Resume FLIR (Preview Resume)" onPress={onResumeFlir} />
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: { padding: 12 },
+  title: { fontSize: 18, fontWeight: 'bold', marginBottom: 8 },
+  row: { flexDirection: 'row', justifyContent: 'space-between', marginTop: 12 }
+});

package/src/hooks/useFlirTemperature.ts

@@ -0,0 +1,20 @@
+import { useState, useEffect } from 'react';
+import { NativeModules, NativeEventEmitter } from 'react-native';
+
+const { FlirModule } = NativeModules as any;
+const FlirEmitter = new NativeEventEmitter(FlirModule);
+
+export function useFlirTemperature() {
+  const [temperature, setTemperature] = useState<number | null>(null);
+
+  useEffect(() => {
+    const subscription = FlirEmitter.addListener('FlirTemperatureChanged', (temp: number) => {
+      // Convert Kelvin to Celsius if raw thermal data is detected
+      const normalizedTemp = (typeof temp === 'number' && temp > 200) ? temp - 273.15 : temp;
+      setTemperature(normalizedTemp);
+    });
+    return () => subscription.remove();
+  }, []);
+
+  return temperature;
+}

package/src/index.js

@@ -1,7 +1,21 @@
-// FlirDownload removed; use `FlirModule` for runtime access to SDK features.
-
-// Re-export existing FlirModule functionality
-// Note: FlirModule should be imported from the native module
-import { NativeModules } from 'react-native';
-export const FlirModule = NativeModules.FlirModule;
-
+import { NativeModules, requireNativeComponent, Platform } from 'react-native';
+
+export const FlirModule = NativeModules.FlirModule;
+
+/**
+ * ThermalPreview Component
+ * 
+ * A high-performance native component for rendering the live thermal stream.
+ * 
+ * Props:
+ * - style: Standard React Native view styles (required: set width/height)
+ */
+export const ThermalPreview = Platform.select({
+  ios: requireNativeComponent('FlirPreviewView'),
+  android: requireNativeComponent('FLIRCameraView'),
+});
+
+export default {
+  FlirModule,
+  ThermalPreview,
+};

package/src/index.ts

@@ -4,3 +4,6 @@
 // Note: FlirModule should be imported from the native module
 import { NativeModules } from 'react-native';
 export const FlirModule = NativeModules.FlirModule;
+
+export * from './FlirDebugScreen';
+export * from './hooks/useFlirTemperature';