ilabs-flir 2.3.7 → 2.3.8

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

@@ -34,6 +34,9 @@ object FlirManager {
     private var cachedPalettes: List<*>? = null
     private var cachedPaletteNames: List<String>? = null
     
+    // Cached reflection for performance
+    private var coolField: java.lang.reflect.Field? = null
+    
     // State
     private var isInitialized = false
     private var isScanning = false
@@ -122,15 +125,6 @@ object FlirManager {
         
         isInitialized = true
         Log.i(TAG, "FlirManager initialized")
-        
-        // Generate palette icons on background thread
-        Thread {
-            try {
-                generatePaletteIcons(context)
-            } catch (e: Exception) {
-                Log.e(TAG, "Initial palette icon generation failed", e)
-            }
-        }.start()
     }
     
     /**
@@ -450,38 +444,32 @@ object FlirManager {
     fun forceEmulatorMode(type: String = "FLIR_ONE_EDGE") { startDiscovery() }
     fun setPreferredEmulatorType(type: String) { }
     fun updateAcol(value: Float) {
-        Log.d(TAG, "updateAcol: $value")
-        // Use reflection to update ilabs.libs.io.data.Var.cool to avoid circular dependency
+        // Log.v(TAG, "updateAcol: $value")
         try {
-            val varClass = Class.forName("ilabs.libs.io.data.Var")
-            val coolField = varClass.getField("cool")
+            if (coolField == null) {
+                val varClass = Class.forName("ilabs.libs.io.data.Var")
+                coolField = varClass.getField("cool")
+            }
             
-            // Modular logic for palettes: if index > 7, wrap around (17 mod 8)
-            // But we keep shader variants (14, 15, 16) as-is if within that range
             val rawIdx = value.toInt()
             var shaderIdx = rawIdx
             if (shaderIdx > 16) {
                 shaderIdx = shaderIdx % 16 // Shader loop
             }
             
-            coolField.set(null, shaderIdx)
-            Log.d(TAG, "Updated Var.cool to $shaderIdx via reflection (raw=$rawIdx)")
+            coolField?.set(null, shaderIdx)
 
-            // Standard FLIR palette list from samples
+            // Standard FLIR palette list
             val paletteNames = listOf("Gray", "Iron", "Rainbow", "Arctic", "Lava", "Coldest", "Hottest", "Wheel")
-            Log.d(TAG, "Using hardcoded FLIR Palettes: $paletteNames")
-            
             val maxEff = paletteNames.size
             val paletteIdx = rawIdx % maxEff
             val safeIdx = if (paletteIdx < 0) paletteIdx + maxEff else paletteIdx
             
             val targetPaletteName = paletteNames[safeIdx]
-            Log.d(TAG, "Applying FLIR palette: $targetPaletteName (index: $safeIdx, max: $maxEff)")
-            
             sdkManager?.setPalette(targetPaletteName)
             
         } catch (e: Throwable) {
-            Log.w(TAG, "Could not update Var.cool via reflection: ${e.message}")
+            Log.w(TAG, "updateAcol reflection failed: ${e.message}")
         }
     }
 

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

@@ -108,12 +108,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,6 +361,8 @@ public class FlirSdkManager {
                                     streamer.withThermalImage(thermalImage -> {
                                         // 1. Apply Palette
                                         if (paletteToApply != null) {
+                                            try {
+                                                Palette palette = null;
                                                 // Standard FLIR palette list from samples
                                                 String[] paletteNames = {"Gray", "Iron", "Rainbow", "Arctic", "Lava", "Coldest", "Hottest", "Wheel"};
                                                 

package/ios/Flir/src/FlirManager.swift

@@ -520,72 +520,34 @@ 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 ["Gray", "Iron", "Rainbow", "Arctic", "Lava", "Coldest", "Hottest", "Wheel"]
     }
 
     @objc public func generatePaletteIcons() -> [[String: String]] {
-        var results: [[String: String]] = []
-        #if FLIR_ENABLED
-        guard let streamer = streamer else { return [] }
-        
+        let paletteNames = getAvailablePalettes()
         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)
-        }
-
-        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 : ""
-                ])
-            }
+        var results: [[String: String]] = []
+        for name in paletteNames {
+            let iconURL = paletteDir.appendingPathComponent("\(name.lowercased()).png")
+            results.append([
+                "name": name,
+                "uri": fileManager.fileExists(atPath: iconURL.path) ? iconURL.absoluteString : ""
+            ])
         }
-        #endif
         return results
     }
 

package/package.json

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