ilabs-flir 1.0.3 → 1.0.5

package/android/Flir/build.gradle.kts

@@ -14,21 +14,20 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+   compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = JavaVersion.VERSION_21.toString()
     }
-    
-    java {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(21))
-        }
+
+    buildFeatures {
+        viewBinding = true
     }
 
+   
     publishing {
         singleVariant("release") {
             withJavadocJar()
@@ -37,35 +36,23 @@ android {
     }
 }
 
-repositories {
-    google()
-    mavenCentral()
-    // Resolve local AARs which will be installed into mavenLocal by CI (JitPack)
-    mavenLocal()
-    flatDir { dirs("libs") }
-}
-
 dependencies {
     // React Native
     implementation("com.facebook.react:react-native:+")
     
-    // Kotlin coroutines for async downloads
+    // Kotlin coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
     
-    // Play Feature Delivery (optional - for Play Store SDK delivery)
-    implementation("com.google.android.play:feature-delivery:2.1.0")
-    implementation("com.google.android.play:feature-delivery-ktx:2.1.0")
-    
-    // FLIR SDK - Use stub JAR for compilation (AARs are Java 21, stubs work with Java 17)
-    // The actual SDK AARs are downloaded on-demand at runtime via FlirDownload.download()
-    compileOnly(files("libs/flir-stubs.jar"))
+    // FLIR SDK - Use the actual AAR files from libs folder
+    // Using 'api' to expose SDK classes to consumers and Java source files
+    // flatDir must be configured in settings.gradle or root build.gradle
+    api(files("libs/androidsdk-release.aar"))
+    api(files("libs/thermalsdk-release.aar"))
     
     // Minimal compile deps to satisfy source references
     implementation("androidx.annotation:annotation:1.5.0")
 
-
     // Prevent duplicate SLF4J classes when a consumer also brings `org.slf4j:slf4j-api`
-    // The vendor AAR may embed slf4j classes; exclude the API from being pulled transitively
     configurations.all {
         exclude(group = "org.slf4j", module = "slf4j-api")
     }

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

@@ -3,8 +3,6 @@ package flir.android;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
-// import com.otaliastudios.cameraview.CameraView; // Removed dependency
-// import ilabs.libs.io.data.Var; // Removed dependency
 
 public final class FlirCommands {
 
@@ -27,19 +25,16 @@ public final class FlirCommands {
             String deviceId = args.getString(0);
             android.util.Log.i("CameraCommand", "[FLIR] Selecting device: " + deviceId);
 
-            // Get device from discovery manager
-            FlirDiscoveryManager discoveryMgr = FlirDiscoveryManager.getInstance();
-
-            com.flir.thermalsdk.live.Identity identity = discoveryMgr.getDeviceById(deviceId);
-
-            if (identity == null) {
+            // Get FlirManager instance and select device
+            FlirManager flirManager = FlirManager.INSTANCE;
+            if (flirManager == null) {
                 resp.putString("status", "error");
-                resp.putString("message", "Device not found: " + deviceId);
+                resp.putString("message", "FlirManager not initialized");
                 return;
             }
 
-            // Select and connect to device
-            FlirConnectionManager.getInstance().selectDevice(identity);
+            // Select device by ID (triggers connection)
+            flirManager.switchToDevice(deviceId);
 
             resp.putString("status", "ok");
             resp.putString("message", "Device selected");
@@ -71,8 +66,15 @@ public final class FlirCommands {
                 return;
             }
 
-            // Set type in discovery manager
-            FlirDiscoveryManager.getInstance().setEmulatorType(type);
+            // Get FlirManager instance and set emulator type
+            FlirManager flirManager = FlirManager.INSTANCE;
+            if (flirManager == null) {
+                resp.putString("status", "error");
+                resp.putString("message", "FlirManager not initialized");
+                return;
+            }
+
+            flirManager.setPreferredEmulatorType(type);
 
             android.util.Log.i("CameraCommand", "[FLIR] Emulator type set to: " + type);
 
@@ -96,8 +98,17 @@ public final class FlirCommands {
 
             android.util.Log.i("CameraCommand", "[FLIR] Setting palette acol=" + acol);
 
-            // Set palette via FlirConnectionManager
-            FlirConnectionManager.getInstance().setPalette(acol);
+            // Get FlirManager instance and set palette by index
+            FlirManager flirManager = FlirManager.INSTANCE;
+            if (flirManager == null) {
+                resp.putString("status", "error");
+                resp.putString("message", "FlirManager not initialized");
+                return;
+            }
+
+            // Map acol index to palette name
+            String paletteName = mapAcolToPaletteName(acol);
+            flirManager.setPalette(paletteName);
 
             resp.putString("status", "ok");
             resp.putString("message", "Palette set");
@@ -108,4 +119,18 @@ public final class FlirCommands {
             resp.putString("message", e.getMessage());
         }
     }
+    
+    private static String mapAcolToPaletteName(int acol) {
+        switch (acol) {
+            case 0: return "gray";
+            case 1: return "iron";
+            case 2: return "rainbow";
+            case 3: return "lava";
+            case 4: return "arctic";
+            case 5: return "coldest";
+            case 6: return "hottest";
+            case 7: return "contrast";
+            default: return "iron";
+        }
+    }
 }

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

@@ -1,75 +1,55 @@
 package flir.android
 
 import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import kotlinx.coroutines.*
 
+/**
+ * FlirDownloadManager - React Native module for SDK status
+ * 
+ * Since the SDK is now bundled in the AAR, this module just reports
+ * that the SDK is always available.
+ */
 class FlirDownloadManager(private val reactContext: ReactApplicationContext) : 
     ReactContextBaseJavaModule(reactContext) {
     
-    private var downloadJob: Job? = null
-    private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
-    
     override fun getName() = "FlirDownloadManager"
     
-    override fun initialize() {
-        FlirSDKLoader.init(reactContext)
-    }
-    
     @ReactMethod
     fun isFlirAvailable(promise: Promise) {
-        promise.resolve(FlirSDKLoader.isSDKAvailable(reactContext))
+        // SDK is bundled - always available
+        promise.resolve(true)
     }
     
     @ReactMethod
     fun getDownloadSize(promise: Promise) {
-        promise.resolve(FlirSDKLoader.getDownloadSize(reactContext).toDouble())
+        // No download needed
+        promise.resolve(0.0)
     }
     
     @ReactMethod
-    fun downloadFlirSDK(promise: Promise) {
-        downloadJob = scope.launch {
-            val result = FlirSDKLoader.downloadDirect(reactContext) { downloaded, total ->
-                sendEvent("FlirDownloadProgress", Arguments.createMap().apply {
-                    putDouble("bytesDownloaded", downloaded.toDouble())
-                    putDouble("totalBytes", total.toDouble())
-                    putDouble("percent", (downloaded.toDouble() / total) * 100)
-                })
-            }
-            
-            result.fold(
-                onSuccess = {
-                    sendEvent("FlirDownloadComplete", Arguments.createMap())
-                    promise.resolve(true)
-                },
-                onFailure = { error ->
-                    sendEvent("FlirDownloadError", Arguments.createMap().apply {
-                        putString("error", error.message)
-                    })
-                    promise.reject("E_DOWNLOAD", error.message, error)
-                }
-            )
-        }
+    fun getDeviceArch(promise: Promise) {
+        promise.resolve(FlirSDKLoader.getDeviceArch())
     }
     
     @ReactMethod
-    fun cancelDownload() {
-        downloadJob?.cancel()
+    fun downloadFlirSDK(promise: Promise) {
+        // SDK is bundled - no download needed
+        promise.resolve(true)
     }
     
     @ReactMethod
-    fun deleteSDK(promise: Promise) {
-        promise.resolve(FlirSDKLoader.deleteSDK(reactContext))
+    fun getSDKStatus(promise: Promise) {
+        val status = Arguments.createMap().apply {
+            putBoolean("available", true)
+            putBoolean("bundled", true)
+            putString("arch", FlirSDKLoader.getDeviceArch())
+            putString("version", "4.16.0")
+        }
+        promise.resolve(status)
     }
     
     @ReactMethod
-    fun addListener(eventName: String) {}
-    
-    @ReactMethod
-    fun removeListeners(count: Int) {}
-    
-    private fun sendEvent(name: String, params: WritableMap) {
-        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit(name, params)
+    fun cancelDownload(promise: Promise) {
+        // Nothing to cancel
+        promise.resolve(true)
     }
 }