ilabs-flir 2.2.16 → 2.2.18

package/ios/Flir/src/FlirManager.swift

@@ -54,8 +54,6 @@ import ThermalSDK
     
     // MARK: - Singleton
     
-    @objc public static let shared = FlirManager()
-    
     // MARK: - Properties
     @objc public weak var delegate: FlirManagerDelegate?
     
@@ -326,9 +324,7 @@ import ThermalSDK
 #endif
     }
     
-    @objc public func getTemperatureAtPoint(_ x: Int, y: Int) -> Double {
-        return getTemperatureAt(x: x, y: y)
-    }
+
     
     @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
         guard let img = latestImage else { return Double.nan }

package/ios/Flir/src/FlirModule.m

@@ -310,8 +310,12 @@ RCT_EXPORT_METHOD(getTemperatureAt : (nonnull NSNumber *)x y : (
     nonnull NSNumber *)y resolver : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    double temp = [[FLIRManager shared] getTemperatureAtPoint:[x intValue]
-                                                            y:[y intValue]];
+    id manager = flir_manager_shared();
+    double temp = NAN;
+    if (manager && [manager respondsToSelector:sel_registerName("getTemperatureAtPoint:y:")]) {
+      temp = ((double (*)(id, SEL, int, int))objc_msgSend)(
+          manager, sel_registerName("getTemperatureAtPoint:y:"), [x intValue], [y intValue]);
+    }
     if (isnan(temp)) {
       resolve([NSNull null]);
     } else {
@@ -406,7 +410,11 @@ RCT_EXPORT_METHOD(getSDKStatus : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(getBatteryLevel : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    int level = [[FLIRManager shared] getBatteryLevel];
+    id manager = flir_manager_shared();
+    int level = -1;
+    if (manager && [manager respondsToSelector:sel_registerName("getBatteryLevel")]) {
+      level = ((int (*)(id, SEL))objc_msgSend)(manager, sel_registerName("getBatteryLevel"));
+    }
     resolve(@(level));
   });
 }
@@ -414,7 +422,11 @@ RCT_EXPORT_METHOD(getBatteryLevel : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(isBatteryCharging : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    BOOL ch = [[FLIRManager shared] isBatteryCharging];
+    id manager = flir_manager_shared();
+    BOOL ch = NO;
+    if (manager && [manager respondsToSelector:sel_registerName("isBatteryCharging")]) {
+      ch = ((BOOL (*)(id, SEL))objc_msgSend)(manager, sel_registerName("isBatteryCharging"));
+    }
     resolve(@(ch));
   });
 }
@@ -422,7 +434,10 @@ RCT_EXPORT_METHOD(isBatteryCharging : (RCTPromiseResolveBlock)
 RCT_EXPORT_METHOD(setPreferSdkRotation : (BOOL)prefer resolver : (
     RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    [[FLIRManager shared] setPreferSdkRotation:prefer];
+    id manager = flir_manager_shared();
+    if (manager && [manager respondsToSelector:sel_registerName("setPreferSdkRotation:")]) {
+      ((void (*)(id, SEL, BOOL))objc_msgSend)(manager, sel_registerName("setPreferSdkRotation:"), prefer);
+    }
     resolve(@(YES));
   });
 }
@@ -430,7 +445,11 @@ RCT_EXPORT_METHOD(setPreferSdkRotation : (BOOL)prefer resolver : (
 RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   dispatch_async(dispatch_get_main_queue(), ^{
-    BOOL v = [[FLIRManager shared] isPreferSdkRotation];
+    id manager = flir_manager_shared();
+    BOOL v = NO;
+    if (manager && [manager respondsToSelector:sel_registerName("isPreferSdkRotation")]) {
+      v = ((BOOL (*)(id, SEL))objc_msgSend)(manager, sel_registerName("isPreferSdkRotation"));
+    }
     resolve(@(v));
   });
 }

package/package.json

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

package/ios/Flir/src/FLIRManagerShim.swift

@@ -1,104 +0,0 @@
-import Foundation
-import UIKit
-
-/// ObjC-compatible shim that forwards to FlirManager
-/// This provides a clean API for native consumers (FilterDataProvider, etc.)
-@objc public class FLIRManager: NSObject {
-    @objc public static let shared = FLIRManager()
-    
-    private override init() {
-        super.init()
-    }
-
-    // MARK: - SDK Availability
-    
-    @objc public func isAvailable() -> Bool {
-        return FlirManager.isSDKAvailable
-    }
-    
-    @objc public static var isSDKAvailable: Bool {
-        return FlirManager.isSDKAvailable
-    }
-
-    // MARK: - Temperature APIs
-    
-    @objc public func getTemperatureAtPoint(x: Int, y: Int) -> Double {
-        return FlirManager.shared.getTemperatureAtPoint(x, y: y)
-    }
-
-    @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
-        return FlirManager.shared.getTemperatureAtNormalized(nx, y: y)
-    }
-
-    // MARK: - Battery APIs
-    
-    @objc public func getBatteryLevel() -> Int {
-        return FlirManager.shared.getBatteryLevel()
-    }
-
-    @objc public func isBatteryCharging() -> Bool {
-        return FlirManager.shared.isBatteryCharging()
-    }
-
-    // MARK: - Rotation Preference
-    
-    @objc public func setPreferSdkRotation(_ prefer: Bool) {
-        FlirManager.shared.setPreferSdkRotation(prefer)
-    }
-
-    @objc public func isPreferSdkRotation() -> Bool {
-        return FlirManager.shared.isPreferSdkRotation()
-    }
-
-    // MARK: - Frame Access
-    
-    @objc public func latestFrameImage() -> UIImage? {
-        return FlirManager.shared.latestImage
-    }
-    
-    @objc public var latestImage: UIImage? {
-        return FlirManager.shared.latestImage
-    }
-
-    // MARK: - Discovery & Connection
-    
-    @objc public func startDiscovery() {
-        FlirManager.shared.startDiscovery()
-    }
-
-    @objc public func stopDiscovery() {
-        FlirManager.shared.stopDiscovery()
-    }
-    
-    @objc public var isConnected: Bool {
-        return FlirManager.shared.isConnected
-    }
-    
-    @objc public var isStreaming: Bool {
-        return FlirManager.shared.isStreaming
-    }
-    
-    @objc public var isEmulator: Bool {
-        return FlirManager.shared.isEmulator
-    }
-
-    // MARK: - Palette Control
-    
-    @objc public func setPalette(_ name: String) {
-        FlirManager.shared.setPalette(name)
-    }
-    
-    @objc public func setPaletteFromAcol(_ acol: Float) {
-        FlirManager.shared.setPaletteFromAcol(acol)
-    }
-    
-    // MARK: - Client Lifecycle
-    
-    @objc public func retainClient(_ clientId: String) {
-        FlirManager.shared.retainClient(clientId)
-    }
-    
-    @objc public func releaseClient(_ clientId: String) {
-        FlirManager.shared.releaseClient(clientId)
-    }
-}