ilabs-flir 2.3.7 → 2.3.10

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

@@ -8,6 +8,7 @@ import android.util.Log;
 import com.flir.thermalsdk.ErrorCode;
 import com.flir.thermalsdk.androidsdk.ThermalSdkAndroid;
 import com.flir.thermalsdk.androidsdk.image.BitmapAndroid;
+import com.flir.thermalsdk.image.ImageBuffer;
 import com.flir.thermalsdk.image.Palette;
 import com.flir.thermalsdk.image.PaletteManager;
 import com.flir.thermalsdk.image.Point;
@@ -108,12 +109,9 @@ public class FlirSdkManager {
             
             isInitialized = true;
             Log.i(TAG, "FLIR SDK initialized successfully. Arch: " + System.getProperty("os.arch"));
+            Log.d(TAG, "SDK initialized");
         } catch (Throwable e) {
             Log.e(TAG, "Critical failure during FLIR SDK initialization", e);
-        }
-            Log.d(TAG, "SDK initialized");
-        } catch (Exception e) {
-            Log.e(TAG, "SDK init failed", e);
             notifyError("SDK init failed: " + e.getMessage());
         }
     }
@@ -364,31 +362,38 @@ public class FlirSdkManager {
                                     streamer.withThermalImage(thermalImage -> {
                                         // 1. Apply Palette
                                         if (paletteToApply != null) {
-                                                // Standard FLIR palette list from samples
-                                                String[] paletteNames = {"Gray", "Iron", "Rainbow", "Arctic", "Lava", "Coldest", "Hottest", "Wheel"};
+                                            try {
+                                                List<Palette> sdkPalettes = PaletteManager.getDefaultPalettes();
                                                 
-                                                for (String name : paletteNames) {
-                                                    if (name.equalsIgnoreCase(paletteToApply)) {
-                                                        try {
-                                                            // We still need to find the Palette object from the SDK if possible
-                                                            // But we try to do it safely
-                                                            List<Palette> sdkPalettes = PaletteManager.getDefaultPalettes();
-                                                            for (Palette p : sdkPalettes) {
-                                                                if (p.name.equalsIgnoreCase(name)) {
-                                                                    palette = p;
-                                                                    break;
-                                                                }
+                                                if (paletteToApply.equalsIgnoreCase("Gray") || paletteToApply.equalsIgnoreCase("grayscale")) {
+                                                    // User wants Gray - map to WhiteHot which is the SDK's standard grayscale
+                                                    for (Palette p : sdkPalettes) {
+                                                        if (p.name.equalsIgnoreCase("WhiteHot") || p.name.equalsIgnoreCase("White hot")) {
+                                                            thermalImage.setPalette(p);
+                                                            break;
+                                                        }
+                                                    }
+                                                } else {
+                                                    Palette palette = null;
+                                                    for (Palette p : sdkPalettes) {
+                                                        if (p.name.equalsIgnoreCase(paletteToApply)) {
+                                                            palette = p;
+                                                            break;
+                                                        }
+                                                    }
+                                                    
+                                                    if (palette != null) {
+                                                        thermalImage.setPalette(palette);
+                                                    } else if (paletteToApply.equalsIgnoreCase("Wheel")) {
+                                                        // Fallback for Wheel if not found - some SDKs use different names
+                                                        for (Palette p : sdkPalettes) {
+                                                            if (p.name.contains("Wheel") || p.name.contains("ColorWheel") || p.name.contains("Rainbow")) {
+                                                                thermalImage.setPalette(p);
+                                                                break;
                                                             }
-                                                        } catch (Throwable t) {
-                                                            Log.w(TAG, "Dynamic palette lookup failed, using fallback mechanism");
                                                         }
-                                                        break;
                                                     }
                                                 }
-                                                
-                                                if (palette != null) {
-                                                    thermalImage.setPalette(palette);
-                                                }
                                             } catch (Throwable t) {
                                                 Log.e(TAG, "Failed to apply palette: " + paletteToApply, t);
                                             }
@@ -397,8 +402,9 @@ public class FlirSdkManager {
                                         // 2. Save Radiometric Snapshot if requested
                                         if (snapshotPath != null) {
                                             try {
+                                                Log.i(TAG, "[SNAPSHOT] Attempting to save radiometric snapshot: " + snapshotPath);
                                                 thermalImage.saveAs(snapshotPath);
-                                                Log.i(TAG, "Radiometric snapshot saved to: " + snapshotPath);
+                                                Log.i(TAG, "[SNAPSHOT] ✅ Success: Radiometric snapshot saved");
                                                 if (snapshotCallback != null) {
                                                     snapshotCallback.onSnapshotSaved(snapshotPath);
                                                 }
@@ -411,12 +417,22 @@ public class FlirSdkManager {
                                         }
 
                                         // 3. Generate Bitmap for display
-                                        Bitmap bitmap = BitmapAndroid.createBitmap(streamer.getImage()).getBitMap();
-                                        if (bitmap != null) {
-                                            latestBitmap = bitmap;
-                                            if (listener != null) {
-                                                listener.onFrame(bitmap);
+                                        // We use streamer.getImage() to get the rendered image with palette applied.
+                                        try {
+                                            Bitmap newBitmap = BitmapAndroid.createBitmap(streamer.getImage()).getBitMap();
+                                            if (newBitmap != null) {
+                                                Bitmap oldBitmap = latestBitmap;
+                                                latestBitmap = newBitmap;
+                                                if (listener != null) {
+                                                    listener.onFrame(newBitmap);
+                                                }
+                                                // Recycle old bitmap to prevent memory leak
+                                                if (oldBitmap != null && oldBitmap != newBitmap) {
+                                                    oldBitmap.recycle();
+                                                }
                                             }
+                                        } catch (Exception e) {
+                                            Log.e(TAG, "Bitmap creation failed", e);
                                         }
                                     });
                                 }

package/ios/Flir/src/FlirManager.swift

@@ -191,7 +191,8 @@ import ThermalSDK
                 NSLog("[FlirManager] Network camera detected — authenticating...")
                 
                 // Use UUID-based persistent certificate name (matches FLIR sample).
-                // The camera has a bug where re-auth with a different name conflicts.
+                // The camera has a bug where re-auth with a different name can conflict,
+                // so we generate a UUID once and persist it in UserDefaults.
                 let certName = self.getPersistentCertificateName()
                 NSLog("[FlirManager] Using certificate name: \(certName)")
                 
@@ -435,7 +436,7 @@ import ThermalSDK
                 // Compiler says it is NOT optional here, so direct assignment.
                 let value = spot.getValue()
                 result = value.value
-
+                
                 try? measurements.remove(spot)
             }
         }
@@ -445,8 +446,6 @@ import ThermalSDK
 #endif
     }
     
-
-    
     @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
 #if FLIR_ENABLED
         guard let streamer = streamer, _isStreaming else { return Double.nan }
@@ -458,10 +457,10 @@ import ThermalSDK
             
             // Map normalized (0.0 - 1.0) to actual sensor pixels
             let cx = max(0, min(Int(w) - 1, Int(nx * w)))
-            let cy = max(0, min(Int(h) - 1, Int(y * h)))
+            let cy_fixed = max(0, min(Int(h) - 1, Int(y * h)))
             
             if let measurements = thermalImage.measurements,
-               let spot = try? measurements.addSpot(CGPoint(x: cx, y: cy)) {
+               let spot = try? measurements.addSpot(CGPoint(x: cx, y: cy_fixed)) {
                 result = spot.getValue().value
                 try? measurements.remove(spot)
             }
@@ -503,8 +502,6 @@ import ThermalSDK
 
     // MARK: - Battery (stub - not needed per user)
     
-    // MARK: - Battery (stub - not needed per user)
-    
     @objc public func getBatteryLevel() -> Int { return -1 }
     @objc public func isBatteryCharging() -> Bool { return false }
     
@@ -520,72 +517,29 @@ import ThermalSDK
     }
     
     @objc public func setPaletteFromAcol(_ acol: Float) {
-        // Map acol to dynamic palette names
         let palettes = getAvailablePalettes()
         let idx = Int(acol)
-        if idx >= 0 && idx < palettes.count {
-            setPalette(palettes[idx])
+        let maxEff = palettes.count
+        if maxEff > 0 {
+            let paletteIdx = idx % maxEff
+            let safeIdx = paletteIdx < 0 ? paletteIdx + maxEff : paletteIdx
+            setPalette(palettes[safeIdx])
         }
     }
 
     @objc public func getAvailablePalettes() -> [String] {
-        #if FLIR_ENABLED
-        if let streamer = streamer {
-            var names: [String] = []
-            streamer.withThermalImage { img in
-                var palettes = img.paletteManager.getDefaultPalettes().map { $0.name }
-                // Reorder: Move WhiteHot/Gray to the front
-                if let grayIdx = palettes.firstIndex(where: { $0.lowercased() == "whitehot" || $0.lowercased() == "gray" }) {
-                    let gray = palettes.remove(at: grayIdx)
-                    palettes.insert(gray, at: 0)
-                }
-                names = palettes
-            }
-            if !names.isEmpty { return names }
-        }
-        #endif
-        return ["WhiteHot", "iron", "rainbow", "arctic", "lava", "contrast", "hotcold", "medical"]
+        return ["WhiteHot", "Iron", "Rainbow", "Arctic", "Lava", "Coldest", "Hottest", "Wheel"]
     }
 
     @objc public func generatePaletteIcons() -> [[String: String]] {
+        let paletteNames = getAvailablePalettes()
         var results: [[String: String]] = []
-        #if FLIR_ENABLED
-        guard let streamer = streamer else { return [] }
-        
-        let fileManager = FileManager.default
-        let cacheDir = fileManager.urls(for: .cachesDirectory, in: .userDomainMask).first!
-        let paletteDir = cacheDir.appendingPathComponent("flir_palettes")
-        
-        if !fileManager.fileExists(atPath: paletteDir.path) {
-            try? fileManager.createDirectory(at: paletteDir, withIntermediateDirectories: true)
+        for name in paletteNames {
+            results.append([
+                "name": name,
+                "uri": "" // No URI - rely on local assets if any
+            ])
         }
-
-        streamer.withThermalImage { thermalImage in
-            var palettes = thermalImage.paletteManager.getDefaultPalettes()
-            
-            // Reorder: Move WhiteHot/Gray to the front
-            if let grayIdx = palettes.firstIndex(where: { $0.name.lowercased() == "whitehot" || $0.name.lowercased() == "gray" }) {
-                let gray = palettes.remove(at: grayIdx)
-                palettes.insert(gray, at: 0)
-            }
-
-            for palette in palettes {
-                let iconURL = paletteDir.appendingPathComponent("\(palette.name.lowercased()).png")
-                if !fileManager.fileExists(atPath: iconURL.path) {
-                    // Assuming palette.icon exists (common in FLIR SDK)
-                    if let icon = palette.icon {
-                        if let data = icon.pngData() {
-                            try? data.write(to: iconURL)
-                        }
-                    }
-                }
-                results.append([
-                    "name": palette.name,
-                    "uri": fileManager.fileExists(atPath: iconURL.path) ? iconURL.absoluteString : ""
-                ])
-            }
-        }
-        #endif
         return results
     }
 
@@ -642,20 +596,15 @@ import ThermalSDK
         return newName
     }
     
-#if FLIR_ENABLED
-    private func interfaceName(_ iface: FLIRCommunicationInterface) -> String {
-        if iface.contains(.lightning) { return "LIGHTNING" }
-        if iface.contains(.network) { return "NETWORK" }
-        if iface.contains(.flirOneWireless) { return "WIRELESS" }
-        if iface.contains(.emulator) { return "EMULATOR" }
+    private func interfaceName(_ iface: Int) -> String {
+        // Placeholder for interface name mapping
         return "UNKNOWN"
     }
-#endif
 }
 
+#if FLIR_ENABLED
 // MARK: - Discovery Delegate
 
-#if FLIR_ENABLED
 extension FlirManager: FLIRDiscoveryEventDelegate {
     public func cameraDiscovered(_ camera: FLIRDiscoveredCamera) {
         let identity = camera.identity
@@ -670,7 +619,7 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
         let deviceInfo = FlirDeviceInfo(
             deviceId: deviceId,
             name: camera.displayName ?? deviceId,
-            communicationType: interfaceName(identity.communicationInterface()),
+            communicationType: interfaceName(Int(identity.communicationInterface().rawValue)),
             isEmulator: identity.communicationInterface() == .emulator
         )
         
@@ -691,7 +640,7 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
     }
     
     public func discoveryFinished(_ iface: FLIRCommunicationInterface) {
-        NSLog("[FlirManager] Discovery finished: \(iface)")
+        NSLog("[FlirManager] Discovery finished: \(iface.rawValue)")
     }
     
     public func cameraLost(_ cameraIdentity: FLIRIdentity) {
@@ -707,11 +656,9 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
         }
     }
 }
-#endif
 
 // MARK: - Camera Delegate
 
-#if FLIR_ENABLED
 extension FlirManager: FLIRDataReceivedDelegate {
     public func onDisconnected(_ camera: FLIRCamera, withError error: Error?) {
         NSLog("[FlirManager] Camera disconnected: \(error?.localizedDescription ?? "clean")")
@@ -728,11 +675,9 @@ extension FlirManager: FLIRDataReceivedDelegate {
         }
     }
 }
-#endif
 
 // MARK: - Stream Delegate
 
-#if FLIR_ENABLED
 extension FlirManager: FLIRStreamDelegate {
     public func onError(_ error: Error) {
         NSLog("[FlirManager] Stream error: \(error)")
@@ -740,13 +685,10 @@ extension FlirManager: FLIRStreamDelegate {
     }
     
     public func onImageReceived() {
-        NSLog("[FLIR-TRACE 1️⃣] onImageReceived called on SDK thread")
-        
         // Process frame on dedicated render queue (matches sample app pattern)
         // This prevents blocking the SDK callback thread and main thread
         // Guard to skip frame if already processing (prevents backpressure/latency)
         guard !_isProcessingFrame else {
-            NSLog("[FLIR-TRACE ⏩] Skipping frame (already processing)")
             return
         }
         
@@ -754,12 +696,9 @@ extension FlirManager: FLIRStreamDelegate {
         renderQueue.async { [weak self] in
             defer { self?._isProcessingFrame = false }
             guard let self = self, self._isStreaming, let streamer = self.streamer else {
-                NSLog("[FLIR-TRACE ❌] No self, streamer or not streaming in renderQueue")
                 return
             }
             
-            NSLog("[FLIR-TRACE 2️⃣] Processing on renderQueue")
-            
             objc_sync_enter(self.stateLock)
             let currentStreamer = self.streamer
             let streaming = self._isStreaming
@@ -778,7 +717,26 @@ extension FlirManager: FLIRStreamDelegate {
                 
                 streamer.withThermalImage { thermalImage in
                     // 1. Apply Palette
-                    if let palette = thermalImage.paletteManager.getDefaultPalettes().first(where: { $0.name.lowercased() == paletteToApply.lowercased() }) {
+                    let sdkPalettes = thermalImage.paletteManager.getDefaultPalettes()
+                    var targetPalette: FLIRPalette? = nil
+                    
+                    if paletteToApply.lowercased() == "gray" || paletteToApply.lowercased() == "grayscale" {
+                        // Map Gray to WhiteHot (standard SDK name)
+                        targetPalette = sdkPalettes.first(where: { 
+                            $0.name.lowercased() == "whitehot" || $0.name.lowercased() == "white hot" 
+                        })
+                    } else {
+                        targetPalette = sdkPalettes.first(where: { $0.name.lowercased() == paletteToApply.lowercased() })
+                        
+                        // Fallback for Wheel
+                        if targetPalette == nil && paletteToApply.lowercased() == "wheel" {
+                            targetPalette = sdkPalettes.first(where: {
+                                $0.name.contains("Wheel") || $0.name.contains("ColorWheel") || $0.name.contains("Rainbow")
+                            })
+                        }
+                    }
+                    
+                    if let palette = targetPalette {
                         thermalImage.palette = palette
                     }
 
@@ -791,29 +749,23 @@ extension FlirManager: FLIRStreamDelegate {
                             NSLog("[FlirManager] Failed to save radiometric snapshot: \(error)")
                         }
                     }
+
+                    // 3. Generate UIImage for display
+                    // Grab the image while the thermal image is locked to ensure settings are applied
+                    if let image = streamer.getImage() {
+                        self._latestImage = image
+                        let width = Int(image.size.width)
+                        let height = Int(image.size.height)
+                        
+                        DispatchQueue.main.async { [weak self] in
+                            self?.delegate?.onFrameReceived(image, width: width, height: height)
+                        }
+                    }
                 }
-                
-                NSLog("[FLIR-TRACE 3️⃣] Streamer updated successfully")
             } catch {
-                NSLog("[FLIR-TRACE ❌] Streamer update failed: \(error)")
-                return
-            }
-            
-            guard let image = streamer.getImage() else {
-                NSLog("[FLIR-TRACE ❌] streamer.getImage() returned nil")
+                NSLog("[FlirManager] Streamer update failed: \(error)")
                 return
             }
-            
-            NSLog("[FLIR-TRACE 4️⃣] Got image from streamer: \(image.size.width)x\(image.size.height)")
-            
-            self._latestImage = image
-            let width = Int(image.size.width)
-            let height = Int(image.size.height)
-            
-            DispatchQueue.main.async { [weak self] in
-                NSLog("[FLIR-TRACE 5️⃣] Dispatching to delegate.onFrameReceived on main thread")
-                self?.delegate?.onFrameReceived(image, width: width, height: height)
-            }
         }
     }
 }

package/ios/Flir/src/FlirPreviewView.m

@@ -72,9 +72,6 @@
 }
 
 - (void)updateWithImage:(UIImage *)image {
-  if (!image)
-    return;
-
   dispatch_async(dispatch_get_main_queue(), ^{
     self.imageView.image = image;
   });

package/ios/Flir/src/FlirState.m

@@ -89,9 +89,6 @@ static FlirState *_sharedState = nil;
 
 - (void)updateFrame:(UIImage *)image
     withTemperatureData:(NSArray<NSNumber *> *)tempData {
-  if (!image)
-    return;
-
   dispatch_async(_accessQueue, ^{
     self.latestImage = image;
 
@@ -157,6 +154,15 @@ static FlirState *_sharedState = nil;
     self->_temperatureData = nil;
     self->_imageWidth = 0;
     self->_imageHeight = 0;
+    
+    // Notify view to clear instantly
+    if (self.onTextureUpdate) {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.onTextureUpdate) {
+          self.onTextureUpdate(nil, 7);
+        }
+      });
+    }
   });
 }
 

package/package.json

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