ilabs-flir 2.3.3 → 2.3.4

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

@@ -85,8 +85,18 @@ object FlirManager {
     }
     fun getAvailablePalettes(): List<String> {
         return try {
-            PaletteManager.getDefaultPalettes().map { it.name }
-        } catch (e: Exception) {
+            val palettes = PaletteManager.getDefaultPalettes().map { it.name }.toMutableList()
+            // Move WhiteHot/Gray to the front
+            val grayIdx = palettes.indexOfFirst { 
+                it.equals("WhiteHot", ignoreCase = true) || it.equals("Gray", ignoreCase = true) || it.contains("gray", ignoreCase = true) 
+            }
+            if (grayIdx > 0) {
+                val gray = palettes.removeAt(grayIdx)
+                palettes.add(0, gray)
+            }
+            palettes
+        } catch (t: Throwable) {
+            Log.e(TAG, "Failed to get available palettes from SDK", t)
             listOf("grayscale", "iron", "rainbow", "arctic", "lava", "contrast", "hotcold", "medical")
         }
     }
@@ -477,7 +487,18 @@ object FlirManager {
     fun generatePaletteIcons(context: Context): List<Map<String, String>> {
         val results = mutableListOf<Map<String, String>>()
         try {
-            val palettes = PaletteManager.getDefaultPalettes()
+            val rawPalettes = PaletteManager.getDefaultPalettes()
+            val palettes = rawPalettes.toMutableList()
+            
+            // Reorder: Move WhiteHot/Gray to the front
+            val grayIdx = palettes.indexOfFirst { 
+                it.name.equals("WhiteHot", ignoreCase = true) || it.name.equals("Gray", ignoreCase = true) || it.name.contains("gray", ignoreCase = true)
+            }
+            if (grayIdx > 0) {
+                val gray = palettes.removeAt(grayIdx)
+                palettes.add(0, gray)
+            }
+
             val dir = File(context.cacheDir, "flir_palettes")
             if (!dir.exists()) dir.mkdirs()
 
@@ -510,8 +531,8 @@ object FlirManager {
                     "uri" to if (iconFile.exists()) "file://${iconFile.absolutePath}" else ""
                 ))
             }
-        } catch (e: Exception) {
-            Log.e(TAG, "Palette icon generation error", e)
+        } catch (t: Throwable) {
+            Log.e(TAG, "Palette icon generation error", t)
         }
         return results
     }

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

@@ -51,7 +51,7 @@ public class FlirSdkManager {
     private Stream activeStream;
     private final List<Identity> discoveredDevices = Collections.synchronizedList(new ArrayList<>());
     private volatile Bitmap latestBitmap;
-    private volatile String currentPaletteName = "iron";
+    private volatile String currentPaletteName = "WhiteHot";
     private final AtomicBoolean isProcessingFrame = new AtomicBoolean(false);
     private boolean useHalfScale = false;
     private String pendingSnapshotPath = null;
@@ -356,13 +356,23 @@ public class FlirSdkManager {
                                     streamer.withThermalImage(thermalImage -> {
                                         // 1. Apply Palette
                                         if (paletteToApply != null) {
-                                            Palette palette = 
-                                                PaletteManager.getDefaultPalettes().stream()
-                                                    .filter(p -> p.name.equalsIgnoreCase(paletteToApply))
-                                                    .findFirst()
-                                                    .orElse(null);
-                                            if (palette != null) {
-                                                thermalImage.setPalette(palette);
+                                            try {
+                                                Palette palette = null;
+                                                // Try modern way if available (via image's palette manager)
+                                                // Otherwise fallback to static PaletteManager
+                                                List<Palette> sdkPalettes = PaletteManager.getDefaultPalettes();
+                                                for (Palette p : sdkPalettes) {
+                                                    if (p.name.equalsIgnoreCase(paletteToApply)) {
+                                                        palette = p;
+                                                        break;
+                                                    }
+                                                }
+                                                
+                                                if (palette != null) {
+                                                    thermalImage.setPalette(palette);
+                                                }
+                                            } catch (Throwable t) {
+                                                Log.e(TAG, "Failed to apply palette: " + paletteToApply, t);
                                             }
                                         }
 

package/ios/Flir/src/FlirManager.swift

@@ -67,7 +67,7 @@ import ThermalSDK
     private let stateLock = NSObject()
     
     // Palette and Snapshot state
-    private var currentPaletteName: String = "iron"
+    private var currentPaletteName: String = "WhiteHot"
     private var pendingSnapshotPath: String?
     
     // Dedicated render queue for frame processing (matches sample app pattern)
@@ -530,22 +530,21 @@ import ThermalSDK
 
     @objc public func getAvailablePalettes() -> [String] {
         #if FLIR_ENABLED
-        // We use a dummy thermal image to access palette manager if no streamer exists,
-        // but typically PaletteManager.getDefaultPalettes() might be static or available via streamer
         if let streamer = streamer {
             var names: [String] = []
             streamer.withThermalImage { img in
-                names = img.paletteManager.getDefaultPalettes().map { $0.name }
+                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 }
         }
-        
-        // Fallback: Try to get from a temporary thermal image if possible, 
-        // but FLIR SDK often requires a valid image. 
-        // For now, return a standard list if we can't get it dynamically, 
-        // or try to find a static way.
         #endif
-        return ["iron", "rainbow", "grayscale", "arctic", "lava", "contrast", "hotcold", "medical"]
+        return ["WhiteHot", "iron", "rainbow", "arctic", "lava", "contrast", "hotcold", "medical"]
     }
 
     @objc public func generatePaletteIcons() -> [[String: String]] {
@@ -562,7 +561,14 @@ import ThermalSDK
         }
 
         streamer.withThermalImage { thermalImage in
-            let palettes = thermalImage.paletteManager.getDefaultPalettes()
+            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) {

package/package.json

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