ilabs-flir 2.3.4 → 2.3.6

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
@@ -463,20 +464,41 @@ 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<*>? = 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<*>
+                } catch (t2: Throwable) {
+                    Log.w(TAG, "Palette discovery failed in updateAcol", t2)
+                }
+            }
+
+            val currentPalettes = sdkPalettes
+            if (currentPalettes != null && currentPalettes.isNotEmpty()) {
+                val paletteNames = currentPalettes.map { p -> 
+                    try {
+                        p?.let { it::class.java.getMethod("getName").invoke(it) as? String } ?: p?.toString() ?: ""
+                    } catch (e: Exception) { 
+                        p?.toString() ?: ""
+                    }
+                }
+                Log.d(TAG, "True FLIR Palettes: $paletteNames")
+                
+                val maxEff = currentPalettes.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}")
         }
     }
@@ -487,12 +509,35 @@ object FlirManager {
     fun generatePaletteIcons(context: Context): List<Map<String, String>> {
         val results = mutableListOf<Map<String, String>>()
         try {
-            val rawPalettes = PaletteManager.getDefaultPalettes()
-            val palettes = rawPalettes.toMutableList()
+            var rawPalettes: List<*>? = 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<*>
+                } catch (t2: Throwable) {
+                    Log.e(TAG, "Alternative package search also failed in icon generation", t2)
+                }
+            }
+
+            val currentPalettes = rawPalettes
+            if (currentPalettes == null) {
+                Log.e(TAG, "Failed to retrieve any palettes from SDK")
+                return emptyList()
+            }
+
+            val palettes = currentPalettes.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)
+            val grayIdx = palettes.indexOfFirst { p ->
+                val name = try {
+                    p?.let { it::class.java.getMethod("getName").invoke(it) as? String } ?: p?.toString() ?: ""
+                } catch (e: Exception) { p?.toString() ?: "" }
+                
+                name.equals("WhiteHot", ignoreCase = true) || name.equals("Gray", ignoreCase = true) || name.contains("gray", ignoreCase = true)
             }
             if (grayIdx > 0) {
                 val gray = palettes.removeAt(grayIdx)
@@ -503,17 +548,21 @@ object FlirManager {
             if (!dir.exists()) dir.mkdirs()
 
             for (palette in palettes) {
-                val iconFile = File(dir, "${palette.name.lowercase()}.png")
+                val name = try {
+                    palette?.let { it::class.java.getMethod("getName").invoke(it) as? String } ?: palette?.toString() ?: "unknown"
+                } catch (e: Exception) { palette?.toString() ?: "unknown" }
+
+                val iconFile = File(dir, "${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
+                            val m = palette?.let { it::class.java.getMethod("getBitmap") }
+                            m?.invoke(palette) as? Bitmap
                         } catch (e: Exception) {
                             try {
-                                val m = palette.javaClass.getMethod("getIcon")
-                                m.invoke(palette) as? Bitmap
+                                val m = palette?.let { it::class.java.getMethod("getIcon") }
+                                m?.invoke(palette) as? Bitmap
                             } catch (e2: Exception) { null }
                         }
 
@@ -523,11 +572,11 @@ object FlirManager {
                             }
                         }
                     } catch (e: Exception) {
-                        Log.w(TAG, "Failed to save icon for ${palette.name}: ${e.message}")
+                        Log.w(TAG, "Failed to save icon for $name: ${e.message}")
                     }
                 }
                 results.add(mapOf(
-                    "name" to palette.name,
+                    "name" to name,
                     "uri" to if (iconFile.exists()) "file://${iconFile.absolutePath}" else ""
                 ))
             }

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

@@ -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);
@@ -358,13 +375,36 @@ public class FlirSdkManager {
                                         if (paletteToApply != null) {
                                             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;
+                                                // 1. Try to get default palettes list safely
+                                                List<?> 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<?>) 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 (Object p : sdkPalettes) {
+                                                        String pName = "";
+                                                        try {
+                                                            pName = (String) p.getClass().getMethod("getName").invoke(p);
+                                                        } catch (Exception e) {
+                                                            pName = p.toString();
+                                                        }
+
+                                                        if (pName != null && pName.equalsIgnoreCase(paletteToApply)) {
+                                                            palette = (Palette) p;
+                                                            break;
+                                                        }
                                                     }
                                                 }
                                                 

package/package.json

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