ilabs-flir 2.3.5 → 2.3.7

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

@@ -10,6 +10,7 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.flir.thermalsdk.live.Identity
+import com.flir.thermalsdk.image.Palette
 import com.flir.thermalsdk.image.PaletteManager
 import java.io.File
 import java.io.FileOutputStream
@@ -29,6 +30,10 @@ object FlirManager {
     private val lastEmitMs = AtomicLong(0)
     private val minEmitIntervalMs = 100L // ~10 fps max for RN events
     
+    // Cached palette list to avoid repeated JNI calls (especially if linkage is unstable)
+    private var cachedPalettes: List<*>? = null
+    private var cachedPaletteNames: List<String>? = null
+    
     // State
     private var isInitialized = false
     private var isScanning = false
@@ -462,33 +467,18 @@ object FlirManager {
             coolField.set(null, shaderIdx)
             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
-            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)
-            }
+            // Standard FLIR palette list from samples
+            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}")
@@ -501,70 +491,23 @@ object FlirManager {
     fun generatePaletteIcons(context: Context): List<Map<String, String>> {
         val results = mutableListOf<Map<String, String>>()
         try {
-            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()
+            // Standard FLIR palette list from samples
+            val paletteNames = listOf("Gray", "Iron", "Rainbow", "Arctic", "Lava", "Coldest", "Hottest", "Wheel")
             
-            // 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()
 
-            for (palette in palettes) {
-                val iconFile = File(dir, "${palette.name.lowercase()}.png")
-                if (!iconFile.exists()) {
-                    try {
-                        // Common method names for palette preview in FLIR SDK: getBitmap(), getIcon()
-                        val bitmap = try {
-                            val m = palette.javaClass.getMethod("getBitmap")
-                            m.invoke(palette) as? Bitmap
-                        } catch (e: Exception) {
-                            try {
-                                val m = palette.javaClass.getMethod("getIcon")
-                                m.invoke(palette) as? Bitmap
-                            } catch (e2: Exception) { null }
-                        }
-
-                        bitmap?.let {
-                            FileOutputStream(iconFile).use { out ->
-                                it.compress(Bitmap.CompressFormat.PNG, 100, out)
-                            }
-                        }
-                    } catch (e: Exception) {
-                        Log.w(TAG, "Failed to save icon for ${palette.name}: ${e.message}")
-                    }
-                }
+            for (name in paletteNames) {
+                val iconFile = File(dir, "${name.lowercase()}.png")
+                // Note: We'll rely on the app to provide these icons or they will be generated by the SDK if possible.
+                // For now, we return the names and the cache path.
                 results.add(mapOf(
-                    "name" to palette.name,
+                    "name" to name,
                     "uri" to if (iconFile.exists()) "file://${iconFile.absolutePath}" else ""
                 ))
             }
         } catch (t: Throwable) {
-            Log.e(TAG, "Palette icon generation error", t)
+            Log.e(TAG, "Palette icon list generation error", t)
         }
         return results
     }

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

@@ -101,15 +101,6 @@ 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
@@ -373,31 +364,25 @@ public class FlirSdkManager {
                                     streamer.withThermalImage(thermalImage -> {
                                         // 1. Apply Palette
                                         if (paletteToApply != null) {
-                                            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;
+                                                // Standard FLIR palette list from samples
+                                                String[] paletteNames = {"Gray", "Iron", "Rainbow", "Arctic", "Lava", "Coldest", "Hottest", "Wheel"};
+                                                
+                                                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;
+                                                                }
+                                                            }
+                                                        } catch (Throwable t) {
+                                                            Log.w(TAG, "Dynamic palette lookup failed, using fallback mechanism");
                                                         }
+                                                        break;
                                                     }
                                                 }
                                                 

package/package.json

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