ilabs-flir 2.4.3 → 2.4.5

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

@@ -250,10 +250,23 @@ object FlirManager {
         return if (temp != null && !temp.isNaN()) temp else null
     }
     
-    fun getTemperatureAtNormalized(nx: Double, ny: Double): Double? {
+    fun getTemperatureAtNormalized(nx: Double, ny: Double, rotation: Int = -90): Double? {
         val bitmap = latestBitmap ?: return null
-        val px = (nx * bitmap.width).toInt().coerceIn(0, bitmap.width - 1)
-        val py = (ny * bitmap.height).toInt().coerceIn(0, bitmap.height - 1)
+        
+        // Map UI normalized (0..1) to Raw sensor normalized (0..1) based on display rotation
+        val rawCoords = when (rotation) {
+            0 -> Pair(nx, ny)
+            90, -270 -> Pair(ny, 1.0 - nx)
+            180, -180 -> Pair(1.0 - nx, 1.0 - ny)
+            270, -90 -> Pair(1.0 - ny, nx)
+            else -> Pair(1.0 - ny, nx) // Default to -90 for backward compatibility
+        }
+        
+        val rawX = rawCoords.first
+        val rawY = rawCoords.second
+        
+        val px = (rawX * bitmap.width).toInt().coerceIn(0, bitmap.width - 1)
+        val py = (rawY * bitmap.height).toInt().coerceIn(0, bitmap.height - 1)
         return getTemperatureAt(px, py)
     }
     

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

@@ -69,9 +69,9 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     }
 
     @ReactMethod
-    fun getTemperatureAtNormalized(nx: Double, ny: Double, promise: Promise?) {
+    fun getTemperatureAtNormalized(nx: Double, ny: Double, rotation: Int, promise: Promise?) {
         try {
-            val temp = FlirManager.getTemperatureAtNormalized(nx, ny)
+            val temp = FlirManager.getTemperatureAtNormalized(nx, ny, rotation)
             if (temp != null) promise?.resolve(temp) else promise?.resolve(null)
         } catch (e: Exception) {
             promise?.reject("ERR_FLIR_TEMP_NORM", e)
@@ -340,7 +340,8 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     @ReactMethod
     fun resumeFlirAfterPreview(promise: Promise?) {
         try {
-            FlirManager.startManualDiscovery()
+            // Respect the gate - do not open it blindly on resume
+            FlirManager.startDiscovery()
             promise?.resolve(true)
         } catch (e: Exception) {
             promise?.reject("ERR_RESUME_FLIR", e)

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

@@ -48,7 +48,7 @@ public class FlirSdkManager {
     private final Executor executor = Executors.newSingleThreadExecutor();
 
     // State
-    private boolean isInitialized = false;
+    private final AtomicBoolean isInitialized = new AtomicBoolean(false);
     private boolean isScanning = false;
     private Camera camera;
     private ThermalStreamer streamer;
@@ -103,32 +103,34 @@ public class FlirSdkManager {
     // ==================== INITIALIZE ====================
 
     public void initialize() {
-        if (isInitialized)
-            return;
-        try {
-            ThermalSdkAndroid.init(context);
+        if (isInitialized.compareAndSet(false, true)) {
+            Log.d(TAG, "Initializing FLIR SDK (async)...");
             
-            // 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"));
-            Log.d(TAG, "SDK initialized");
-        } catch (Throwable e) {
-            Log.e(TAG, "Critical failure during FLIR SDK initialization", e);
-            notifyError("SDK init failed: " + e.getMessage());
+            executor.execute(() -> {
+                try {
+                    ThermalSdkAndroid.init(context);
+                    
+                    // Small delay to ensure JNI linkage is stable
+                    try { Thread.sleep(100); } catch (InterruptedException ignored) {}
+                    
+                    Log.d(TAG, "FLIR SDK initialized successfully on background thread. Arch: " + System.getProperty("os.arch"));
+                } catch (Throwable t) {
+                    Log.e(TAG, "Failed to initialize FLIR SDK", t);
+                    isInitialized.set(false);
+                }
+            });
         }
     }
 
     public boolean isInitialized() {
-        return isInitialized;
+        return isInitialized.get();
     }
 
     // ==================== DISCOVERY ====================
 
     public void scan() {
         executor.execute(() -> {
-            if (!isInitialized) {
+            if (!isInitialized.get()) {
                 notifyError("SDK not initialized");
                 return;
             }

package/ios/Flir/src/FlirManager.swift

@@ -468,7 +468,7 @@ import ThermalSDK
 #endif
     }
     
-    @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
+    @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double, rotation: Int) -> Double {
 #if FLIR_ENABLED
         guard let streamer = streamer, _isStreaming else { return Double.nan }
         
@@ -477,9 +477,27 @@ import ThermalSDK
             let w = Double(thermalImage.getWidth())
             let h = Double(thermalImage.getHeight())
             
+            // Map UI normalized (0..1) to Raw sensor normalized (0..1) based on display rotation
+            var rawX = nx
+            var rawY = y
+            
+            switch rotation {
+            case 90, -270:
+                rawX = y
+                rawY = 1.0 - nx
+            case 180, -180:
+                rawX = 1.0 - nx
+                rawY = 1.0 - y
+            case 270, -90:
+                rawX = 1.0 - y
+                rawY = nx
+            default:
+                break // 0 deg or default
+            }
+            
             // Map normalized (0.0 - 1.0) to actual sensor pixels
-            let cx = max(0, min(Int(w) - 1, Int(nx * w)))
-            let cy_fixed = max(0, min(Int(h) - 1, Int(y * h)))
+            let cx = max(0, min(Int(w) - 1, Int(rawX * w)))
+            let cy_fixed = max(0, min(Int(h) - 1, Int(rawY * h)))
             
             if let measurements = thermalImage.measurements,
                let spot = try? measurements.addSpot(CGPoint(x: cx, y: cy_fixed)) {

package/ios/Flir/src/FlirModule.m

@@ -332,7 +332,8 @@ RCT_EXPORT_METHOD(getTemperatureAt : (nonnull NSNumber *)x y : (
 }
 
 RCT_EXPORT_METHOD(getTemperatureAtNormalized : (nonnull NSNumber *)nx y : (
-    nonnull NSNumber *)ny resolver : (RCTPromiseResolveBlock)
+    nonnull NSNumber *)ny rotation : (nonnull NSNumber *)rotation
+    resolver : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
     id manager = flir_manager_shared();
@@ -340,11 +341,11 @@ RCT_EXPORT_METHOD(getTemperatureAtNormalized : (nonnull NSNumber *)nx y : (
     if (manager &&
         [manager
             respondsToSelector:sel_registerName(
-                "getTemperatureAtNormalized:y:")]) {
-      temp = ((double (*)(id, SEL, double, double))objc_msgSend)(
+                "getTemperatureAtNormalized:y:rotation:")]) {
+      temp = ((double (*)(id, SEL, double, double, NSInteger))objc_msgSend)(
           manager,
-          sel_registerName("getTemperatureAtNormalized:y:"),
-          [nx doubleValue], [ny doubleValue]);
+          sel_registerName("getTemperatureAtNormalized:y:rotation:"),
+          [nx doubleValue], [ny doubleValue], [rotation integerValue]);
     }
     if (isnan(temp)) {
       if (resolve) resolve([NSNull null]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.4.3",
+  "version": "2.4.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",