ilabs-flir 2.0.4 → 2.0.6

package/android/Flir/build.gradle.kts

@@ -1,72 +1,72 @@
-plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("maven-publish")
-}
-
-android {
-    namespace = "flir.android"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 24
-        targetSdk = 34
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-   compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-
-   
-    publishing {
-        singleVariant("release") {
-            withJavadocJar()
-            withSourcesJar()
-        }
-    }
-}
-
-dependencies {
-    // React Native
-    implementation("com.facebook.react:react-native:+")
-    
-    // Kotlin coroutines
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-    
-    // 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`
-    configurations.all {
-        exclude(group = "org.slf4j", module = "slf4j-api")
-    }
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("release") {
-            afterEvaluate {
-                from(components["release"])
-                groupId = "com.github.PraveenOjha"
-                artifactId = "Flir"
-                version = project.version.toString().ifEmpty { "unspecified" }
-            }
-        }
-    }
-}
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("maven-publish")
+}
+
+android {
+    namespace = "flir.android"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+        targetSdk = 34
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+   compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_21.toString()
+    }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
+   
+    publishing {
+        singleVariant("release") {
+            withJavadocJar()
+            withSourcesJar()
+        }
+    }
+}
+
+dependencies {
+    // React Native
+    implementation("com.facebook.react:react-native:+")
+    
+    // Kotlin coroutines
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+    
+    // 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`
+    configurations.all {
+        exclude(group = "org.slf4j", module = "slf4j-api")
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("release") {
+            afterEvaluate {
+                from(components["release"])
+                groupId = "com.github.PraveenOjha"
+                artifactId = "Flir"
+                version = project.version.toString().ifEmpty { "unspecified" }
+            }
+        }
+    }
+}

package/android/Flir/src/main/AndroidManifest.xml

@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- ============================================ -->
-    <!-- FLIR Thermal SDK Required Permissions       -->
-    <!-- These will auto-merge into your app         -->
-    <!-- ============================================ -->
-
-    <!-- USB Host feature for FLIR ONE USB devices -->
-    <!-- This is the primary interface for FLIR ONE cameras -->
-    <uses-feature
-        android:name="android.hardware.usb.host"
-        android:required="false" />
-
-    <!-- Camera support for network-based FLIR cameras (ACE series) -->
-    <!-- Set to false so app can still install on devices without cameras -->
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-
-    <!-- Camera permission for ACE cameras that use device camera -->
-    <uses-permission android:name="android.permission.CAMERA"/>
-
-    <!-- Internet permission for ACE camera internal communication -->
-    <!-- Required by ACE SDK architecture for local network communication -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <!-- ============================================ -->
-    <!-- WiFi permissions for network discovery      -->
-    <!-- Required for FLIR ONE Edge and network cams -->
-    <!-- ============================================ -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    
-    <!-- Location permission required for WiFi scanning on Android 10+ -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
-    <!-- Note: USB permissions are handled at runtime via UsbPermissionHandler -->
-    <!-- No additional USB permissions needed in manifest -->
-
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- ============================================ -->
+    <!-- FLIR Thermal SDK Required Permissions       -->
+    <!-- These will auto-merge into your app         -->
+    <!-- ============================================ -->
+
+    <!-- USB Host feature for FLIR ONE USB devices -->
+    <!-- This is the primary interface for FLIR ONE cameras -->
+    <uses-feature
+        android:name="android.hardware.usb.host"
+        android:required="false" />
+
+    <!-- Camera support for network-based FLIR cameras (ACE series) -->
+    <!-- Set to false so app can still install on devices without cameras -->
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <!-- Camera permission for ACE cameras that use device camera -->
+    <uses-permission android:name="android.permission.CAMERA"/>
+
+    <!-- Internet permission for ACE camera internal communication -->
+    <!-- Required by ACE SDK architecture for local network communication -->
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <!-- ============================================ -->
+    <!-- WiFi permissions for network discovery      -->
+    <!-- Required for FLIR ONE Edge and network cams -->
+    <!-- ============================================ -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    
+    <!-- Location permission required for WiFi scanning on Android 10+ -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <!-- Note: USB permissions are handled at runtime via UsbPermissionHandler -->
+    <!-- No additional USB permissions needed in manifest -->
+
+</manifest>

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

@@ -1,136 +1,136 @@
-package flir.android;
-
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.WritableMap;
-
-public final class FlirCommands {
-
-    private FlirCommands() {
-        // No instances
-    }
-
-    /**
-     * Command 59: selectFlirDevice - Select FLIR device by ID
-     * Args: [deviceId: string]
-     */
-    public static void handleSelectFlirDevice(Object root, WritableMap resp, @Nullable ReadableArray args) {
-        try {
-            if (args == null || args.size() < 1) {
-                resp.putString("status", "error");
-                resp.putString("message", "deviceId required");
-                return;
-            }
-
-            String deviceId = args.getString(0);
-            android.util.Log.i("CameraCommand", "[FLIR] Selecting device: " + deviceId);
-
-            // Get FlirManager instance and select device
-            FlirManager flirManager = FlirManager.INSTANCE;
-            if (flirManager == null) {
-                resp.putString("status", "error");
-                resp.putString("message", "FlirManager not initialized");
-                return;
-            }
-
-            // Select device by ID (triggers connection)
-            flirManager.switchToDevice(deviceId);
-
-            resp.putString("status", "ok");
-            resp.putString("message", "Device selected");
-            resp.putString("deviceId", deviceId);
-        } catch (Exception e) {
-            android.util.Log.w("CameraCommand", "[FLIR] Device selection failed", e);
-            resp.putString("status", "error");
-            resp.putString("message", e.getMessage());
-        }
-    }
-
-    /**
-     * Command 60: setFlirEmulatorType - Set FLIR emulator type
-     * Args: [type: "FLIR_ONE" | "FLIR_ONE_EDGE"]
-     */
-    public static void handleSetFlirEmulatorType(Object root, WritableMap resp, @Nullable ReadableArray args) {
-        try {
-            if (args == null || args.size() < 1) {
-                resp.putString("status", "error");
-                resp.putString("message", "emulator type required");
-                return;
-            }
-
-            String type = args.getString(0);
-
-            if (!"FLIR_ONE".equals(type) && !"FLIR_ONE_EDGE".equals(type)) {
-                resp.putString("status", "error");
-                resp.putString("message", "Invalid type. Use FLIR_ONE or FLIR_ONE_EDGE");
-                return;
-            }
-
-            // 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);
-
-            resp.putString("status", "ok");
-            resp.putString("message", "Emulator type set");
-            resp.putString("emulatorType", type);
-        } catch (Exception e) {
-            android.util.Log.w("CameraCommand", "[FLIR] Set emulator type failed", e);
-            resp.putString("status", "error");
-            resp.putString("message", e.getMessage());
-        }
-    }
-
-    /**
-     * Command 61: setFlirPalette - Set FLIR thermal palette
-     * Args: [acol: number] - palette index
-     */
-    public static void handleSetFlirPalette(Object root, WritableMap resp, @Nullable ReadableArray args) {
-        try {
-            int acol = args != null && args.size() > 0 ? (int) args.getDouble(0) : 1;
-
-            android.util.Log.i("CameraCommand", "[FLIR] Setting palette acol=" + 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");
-            resp.putInt("acol", acol);
-        } catch (Exception e) {
-            android.util.Log.w("CameraCommand", "[FLIR] Set palette failed", e);
-            resp.putString("status", "error");
-            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 flir.android;
+
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableMap;
+
+public final class FlirCommands {
+
+    private FlirCommands() {
+        // No instances
+    }
+
+    /**
+     * Command 59: selectFlirDevice - Select FLIR device by ID
+     * Args: [deviceId: string]
+     */
+    public static void handleSelectFlirDevice(Object root, WritableMap resp, @Nullable ReadableArray args) {
+        try {
+            if (args == null || args.size() < 1) {
+                resp.putString("status", "error");
+                resp.putString("message", "deviceId required");
+                return;
+            }
+
+            String deviceId = args.getString(0);
+            android.util.Log.i("CameraCommand", "[FLIR] Selecting device: " + deviceId);
+
+            // Get FlirManager instance and select device
+            FlirManager flirManager = FlirManager.INSTANCE;
+            if (flirManager == null) {
+                resp.putString("status", "error");
+                resp.putString("message", "FlirManager not initialized");
+                return;
+            }
+
+            // Select device by ID (triggers connection)
+            flirManager.switchToDevice(deviceId);
+
+            resp.putString("status", "ok");
+            resp.putString("message", "Device selected");
+            resp.putString("deviceId", deviceId);
+        } catch (Exception e) {
+            android.util.Log.w("CameraCommand", "[FLIR] Device selection failed", e);
+            resp.putString("status", "error");
+            resp.putString("message", e.getMessage());
+        }
+    }
+
+    /**
+     * Command 60: setFlirEmulatorType - Set FLIR emulator type
+     * Args: [type: "FLIR_ONE" | "FLIR_ONE_EDGE"]
+     */
+    public static void handleSetFlirEmulatorType(Object root, WritableMap resp, @Nullable ReadableArray args) {
+        try {
+            if (args == null || args.size() < 1) {
+                resp.putString("status", "error");
+                resp.putString("message", "emulator type required");
+                return;
+            }
+
+            String type = args.getString(0);
+
+            if (!"FLIR_ONE".equals(type) && !"FLIR_ONE_EDGE".equals(type)) {
+                resp.putString("status", "error");
+                resp.putString("message", "Invalid type. Use FLIR_ONE or FLIR_ONE_EDGE");
+                return;
+            }
+
+            // 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);
+
+            resp.putString("status", "ok");
+            resp.putString("message", "Emulator type set");
+            resp.putString("emulatorType", type);
+        } catch (Exception e) {
+            android.util.Log.w("CameraCommand", "[FLIR] Set emulator type failed", e);
+            resp.putString("status", "error");
+            resp.putString("message", e.getMessage());
+        }
+    }
+
+    /**
+     * Command 61: setFlirPalette - Set FLIR thermal palette
+     * Args: [acol: number] - palette index
+     */
+    public static void handleSetFlirPalette(Object root, WritableMap resp, @Nullable ReadableArray args) {
+        try {
+            int acol = args != null && args.size() > 0 ? (int) args.getDouble(0) : 1;
+
+            android.util.Log.i("CameraCommand", "[FLIR] Setting palette acol=" + 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");
+            resp.putInt("acol", acol);
+        } catch (Exception e) {
+            android.util.Log.w("CameraCommand", "[FLIR] Set palette failed", e);
+            resp.putString("status", "error");
+            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/FlirFrameCache.kt

@@ -1,6 +1,6 @@
-package flir.android
-
-object FlirFrameCache {
-    @JvmStatic
-    var latestFramePath: String? = null
-}
+package flir.android
+
+object FlirFrameCache {
+    @JvmStatic
+    var latestFramePath: String? = null
+}