ilabs-flir 2.3.3 → 2.3.5

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")
         }
     }
@@ -453,20 +463,34 @@ object FlirManager {
             Log.d(TAG, "Updated Var.cool to $shaderIdx via reflection (raw=$rawIdx)")
 
             // If we are in FLIR mode, also notify the SDK palette using the official SDK palette list
-            val sdkPalettes = PaletteManager.getDefaultPalettes()
-            val paletteNames = sdkPalettes.map { it.name }
-            Log.d(TAG, "True FLIR Palettes: $paletteNames")
-            
-            val maxEff = sdkPalettes.size
-            val paletteIdx = rawIdx % maxEff
-            val safeIdx = if (paletteIdx < 0) paletteIdx + maxEff else paletteIdx
-            
-            val targetPaletteName = paletteNames[safeIdx]
-            Log.d(TAG, "Applying true FLIR palette: $targetPaletteName (index: $safeIdx, max: $maxEff)")
-            
-            sdkManager?.setPalette(targetPaletteName)
+            var sdkPalettes: List<Palette>? = null
+            try {
+                sdkPalettes = PaletteManager.getDefaultPalettes()
+            } catch (t: Throwable) {
+                try {
+                    val altClazz = Class.forName("com.flir.thermalsdk.image.palettes.PaletteManager")
+                    val method = altClazz.getMethod("getDefaultPalettes")
+                    sdkPalettes = method.invoke(null) as? List<Palette>
+                } catch (t2: Throwable) {
+                    Log.w(TAG, "Palette discovery failed in updateAcol", t2)
+                }
+            }
+
+            if (sdkPalettes != null) {
+                val paletteNames = sdkPalettes.map { it.name }
+                Log.d(TAG, "True FLIR Palettes: $paletteNames")
+                
+                val maxEff = sdkPalettes.size
+                val paletteIdx = rawIdx % maxEff
+                val safeIdx = if (paletteIdx < 0) paletteIdx + maxEff else paletteIdx
+                
+                val targetPaletteName = paletteNames[safeIdx]
+                Log.d(TAG, "Applying true FLIR palette: $targetPaletteName (index: $safeIdx, max: $maxEff)")
+                
+                sdkManager?.setPalette(targetPaletteName)
+            }
             
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             Log.w(TAG, "Could not update Var.cool via reflection: ${e.message}")
         }
     }
@@ -477,7 +501,36 @@ object FlirManager {
     fun generatePaletteIcons(context: Context): List<Map<String, String>> {
         val results = mutableListOf<Map<String, String>>()
         try {
-            val palettes = PaletteManager.getDefaultPalettes()
+            var rawPalettes: List<Palette>? = null
+            try {
+                rawPalettes = PaletteManager.getDefaultPalettes()
+            } catch (t: Throwable) {
+                Log.e(TAG, "PaletteManager.getDefaultPalettes() failed in icon generation", t)
+                try {
+                    val altClazz = Class.forName("com.flir.thermalsdk.image.palettes.PaletteManager")
+                    val method = altClazz.getMethod("getDefaultPalettes")
+                    rawPalettes = method.invoke(null) as? List<Palette>
+                } catch (t2: Throwable) {
+                    Log.e(TAG, "Alternative package search also failed in icon generation", t2)
+                }
+            }
+
+            if (rawPalettes == null) {
+                Log.e(TAG, "Failed to retrieve any palettes from SDK")
+                return emptyList()
+            }
+
+            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 +563,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/FlirModule.kt

@@ -144,7 +144,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             val result = com.facebook.react.bridge.Arguments.createArray()
             palettes.forEach { result.pushString(it) }
             promise?.resolve(result)
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             promise?.reject("ERR_FLIR_PALETTES", e)
         }
     }
@@ -162,7 +162,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
                 result.pushMap(map)
             }
             promise?.resolve(result)
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             promise?.reject("ERR_FLIR_PALETTE_ICONS", e)
         }
     }
@@ -306,7 +306,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
         try {
             FlirManager.updateAcol(value)
             promise?.resolve(true)
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             promise?.reject("ERR_FLIR_ACOL", e)
         }
     }
@@ -318,7 +318,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
                 FlirManager.setPalette(name)
             }
             promise?.resolve(true)
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             promise?.reject("ERR_FLIR_PALETTE", e)
         }
     }

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;
@@ -101,8 +101,25 @@ public class FlirSdkManager {
         if (isInitialized)
             return;
         try {
+        try {
+            // Explicitly load the native library to ensure JNI methods are linked
+            try {
+                System.loadLibrary("atlas_native");
+                Log.i(TAG, "Successfully loaded atlas_native library manually");
+            } catch (UnsatisfiedLinkError e) {
+                Log.w(TAG, "System.loadLibrary(atlas_native) failed (might be loaded by SDK): " + e.getMessage());
+            }
+
             ThermalSdkAndroid.init(context);
+            
+            // Small delay to ensure JNI linkage is stable
+            try { Thread.sleep(100); } catch (InterruptedException ignored) {}
+            
             isInitialized = true;
+            Log.i(TAG, "FLIR SDK initialized successfully. Arch: " + System.getProperty("os.arch"));
+        } 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);
@@ -356,13 +373,39 @@ 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;
+                                                // 1. Try to get default palettes list safely
+                                                List<Palette> sdkPalettes = null;
+                                                try {
+                                                    sdkPalettes = PaletteManager.getDefaultPalettes();
+                                                } catch (Throwable t) {
+                                                    Log.e(TAG, "PaletteManager.getDefaultPalettes() failed (Linkage Error?)", t);
+                                                    // Fallback: Try to use reflection for alternative package if suggested
+                                                    try {
+                                                        Class<?> altClazz = Class.forName("com.flir.thermalsdk.image.palettes.PaletteManager");
+                                                        java.lang.reflect.Method method = altClazz.getMethod("getDefaultPalettes");
+                                                        sdkPalettes = (List<Palette>) method.invoke(null);
+                                                        Log.i(TAG, "Successfully retrieved palettes using alternative package");
+                                                    } catch (Throwable t2) {
+                                                        Log.e(TAG, "Alternative PaletteManager search also failed", t2);
+                                                    }
+                                                }
+
+                                                if (sdkPalettes != null) {
+                                                    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.5",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",