ilabs-flir 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "FLIR Thermal SDK for React Native - On-Demand Download",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/sdk-manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "1.0.1",
   "sdkVersion": "4.16.0",
   "ios": {
     "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.0/ios-sdk.zip",
@@ -19,12 +19,19 @@
     ]
   },
   "android": {
-    "playFeatureModule": "flir_sdk",
-    "directDownload": {
-      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.0/android-sdk.zip",
-      "sha256": "d4901615e39e396126bde0dbccd4a234e64cda1d6f9464a30e317e1c5cb9c5e9",
-      "sizeBytes": 103912094,
-      "files": ["thermalsdk-release.aar", "androidsdk-release.aar"]
+    "packages": {
+      "arm64-v8a": {
+        "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/flir-sdk-arm64-v8a.zip",
+        "sizeBytes": 36328411
+      },
+      "armeabi-v7a": {
+        "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/flir-sdk-armeabi-v7a.zip",
+        "sizeBytes": 33248516
+      },
+      "x86_64": {
+        "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/flir-sdk-x86_64.zip",
+        "sizeBytes": 38421590
+      }
     }
   }
 }

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

@@ -1,224 +0,0 @@
-package flir.android;
-
-import android.graphics.Bitmap;
-import android.util.Log;
-
-import com.flir.thermalsdk.androidsdk.image.BitmapAndroid;
-import com.flir.thermalsdk.image.ThermalImage;
-import com.flir.thermalsdk.live.Camera;
-import com.flir.thermalsdk.live.CommunicationInterface;
-import com.flir.thermalsdk.live.ConnectParameters;
-import com.flir.thermalsdk.live.Identity;
-import com.flir.thermalsdk.live.connectivity.ConnectionStatusListener;
-import com.flir.thermalsdk.live.discovery.DiscoveryEventListener;
-import com.flir.thermalsdk.live.discovery.DiscoveryFactory;
-import com.flir.thermalsdk.live.streaming.Stream;
-import com.flir.thermalsdk.live.streaming.ThermalStreamer;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.Objects;
-
-public class CameraHandler {
-
-    private static final String TAG = "CameraHandler";
-
-    private StreamDataListener streamDataListener;
-
-    public interface StreamDataListener {
-        void images(FrameDataHolder dataHolder);
-
-        void images(Bitmap msxBitmap, Bitmap dcBitmap);
-    }
-
-    LinkedList<Identity> foundCameraIdentities = new LinkedList<>();
-
-    private Camera camera;
-
-    private Stream connectedStream;
-    private ThermalStreamer streamer;
-    // Cache the latest ThermalImage delivered by the streamer
-    private ThermalImage latestThermalImage;
-
-    public CameraHandler() {
-        Log.d(TAG, "CameraHandler constr");
-    }
-
-    public void startDiscovery(DiscoveryEventListener cameraDiscoveryListener, DiscoveryStatus discoveryStatus) {
-        DiscoveryFactory.getInstance().scan(cameraDiscoveryListener, CommunicationInterface.EMULATOR,
-                CommunicationInterface.USB);
-        discoveryStatus.started();
-    }
-
-    public void stopDiscovery(DiscoveryStatus discoveryStatus) {
-        DiscoveryFactory.getInstance().stop(CommunicationInterface.EMULATOR, CommunicationInterface.USB);
-        discoveryStatus.stopped();
-    }
-
-    public synchronized void connect(Identity identity, ConnectionStatusListener connectionStatusListener)
-            throws IOException {
-        Log.d(TAG, "connect identity: " + identity);
-        camera = new Camera();
-        camera.connect(identity, connectionStatusListener, new ConnectParameters());
-    }
-
-    public synchronized void disconnect() {
-        Log.d(TAG, "disconnect");
-        if (camera == null) {
-            return;
-        }
-        if (connectedStream == null) {
-            return;
-        }
-
-        if (connectedStream.isStreaming()) {
-            connectedStream.stop();
-        }
-        camera.disconnect();
-        camera = null;
-    }
-
-    public synchronized void startStream(StreamDataListener listener) {
-        this.streamDataListener = listener;
-        if (camera == null || !camera.isConnected()) {
-            Log.e(TAG, "startStream, failed, camera was null or not connected");
-            return;
-        }
-        connectedStream = camera.getStreams().get(0);
-        if (connectedStream.isThermal()) {
-            streamer = new ThermalStreamer(connectedStream);
-        } else {
-            Log.e(TAG, "startStream, failed, no thermal stream available for the camera");
-            return;
-        }
-        connectedStream.start(
-                unused -> {
-                    streamer.update();
-                    final Bitmap[] dcBitmap = new Bitmap[1];
-                    streamer.withThermalImage(thermalImage -> {
-                        try {
-                            // Cache the latest ThermalImage for sampling
-                            latestThermalImage = thermalImage;
-                            // TODO: Re-enable fusion when SDK is available at runtime
-                            // if (thermalImage.getFusion() != null && thermalImage.getFusion().getPhoto()
-                            // != null) {
-                            // dcBitmap[0] = BitmapAndroid.createBitmap(thermalImage.getFusion().getPhoto())
-                            // .getBitMap();
-                            // }
-                            // The streamer.getImage() returns the ImageBuffer expected by BitmapAndroid
-                            // final Bitmap thermalPixels =
-                            // BitmapAndroid.createBitmap(streamer.getImage()).getBitMap();
-                            // if (streamDataListener != null) streamDataListener.images(thermalPixels,
-                            // dcBitmap[0]);
-                        } catch (Exception e) {
-                            Log.e(TAG, "thermal bitmap creation error", e);
-                        }
-                    });
-                },
-                error -> Log.e(TAG, "Streaming error: " + error));
-    }
-
-    public synchronized Double getTemperatureAt(int x, int y) {
-        try {
-            if (streamer == null)
-                return null;
-            ThermalImage img = latestThermalImage;
-            if (img == null)
-                return null;
-
-            java.lang.reflect.Method[] methods = img.getClass().getMethods();
-            for (java.lang.reflect.Method m : methods) {
-                String name = m.getName().toLowerCase();
-                Class<?>[] params = m.getParameterTypes();
-
-                if ((name.contains("get") || name.contains("value") || name.contains("temperature"))
-                        && params.length == 2
-                        && (params[0] == int.class || params[0] == Integer.class || params[0] == double.class
-                                || params[0] == float.class)
-                        && (params[1] == int.class || params[1] == Integer.class || params[1] == double.class
-                                || params[1] == float.class)) {
-                    try {
-                        Object res = null;
-                        if (params[0] == int.class && params[1] == int.class) {
-                            res = m.invoke(img, x, y);
-                        } else if (params[0] == double.class && params[1] == double.class) {
-                            res = m.invoke(img, (double) x, (double) y);
-                        } else if (params[0] == float.class && params[1] == float.class) {
-                            res = m.invoke(img, (float) x, (float) y);
-                        } else {
-                            res = m.invoke(img, Integer.valueOf(x), Integer.valueOf(y));
-                        }
-                        if (res instanceof Number) {
-                            return ((Number) res).doubleValue();
-                        }
-                    } catch (Exception e) {
-                    }
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "getTemperatureAt error", e);
-        }
-        return null;
-    }
-
-    public void add(Identity identity) {
-        foundCameraIdentities.add(identity);
-    }
-
-    public Identity getCppEmulator() {
-        for (Identity foundCameraIdentity : foundCameraIdentities) {
-            if (foundCameraIdentity.deviceId.contains("C++ Emulator")) {
-                return foundCameraIdentity;
-            }
-        }
-        return null;
-    }
-
-    public Identity getFlirOneEmulator() {
-        for (Identity foundCameraIdentity : foundCameraIdentities) {
-            if (foundCameraIdentity.deviceId.contains("EMULATED FLIR ONE")) {
-                return foundCameraIdentity;
-            }
-        }
-        return null;
-    }
-
-    public Identity getFlirOne() {
-        for (Identity foundCameraIdentity : foundCameraIdentities) {
-            if (foundCameraIdentity.communicationInterface == CommunicationInterface.USB)
-                return foundCameraIdentity;
-        }
-        return null;
-    }
-
-    public String getDeviceInfo() {
-        if (camera == null)
-            return "N/A";
-        try {
-            if (camera.getRemoteControl() == null)
-                return "N/A";
-            return camera.getRemoteControl().cameraInformation().getSync().displayName;
-        } catch (Exception e) {
-            return "N/A";
-        }
-    }
-
-    public void setPalette(String name) {
-        if (latestThermalImage != null) {
-            java.util.List<com.flir.thermalsdk.image.Palette> palettes = com.flir.thermalsdk.image.PaletteManager
-                    .getDefaultPalettes();
-            for (com.flir.thermalsdk.image.Palette p : palettes) {
-                if (p.name.equalsIgnoreCase(name)) {
-                    latestThermalImage.setPalette(p);
-                    break;
-                }
-            }
-        }
-    }
-
-    public interface DiscoveryStatus {
-        void started();
-
-        void stopped();
-    }
-}

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

@@ -1,354 +0,0 @@
-package flir.android;
-
-import android.graphics.Bitmap;
-import android.util.Log;
-import com.flir.thermalsdk.ErrorCodeException;
-import com.flir.thermalsdk.androidsdk.image.BitmapAndroid;
-import com.flir.thermalsdk.image.Palette;
-import com.flir.thermalsdk.image.PaletteManager;
-import com.flir.thermalsdk.live.Camera;
-import com.flir.thermalsdk.live.CommunicationInterface;
-import com.flir.thermalsdk.live.ConnectParameters;
-import com.flir.thermalsdk.live.Identity;
-import com.flir.thermalsdk.ErrorCode;
-import com.flir.thermalsdk.live.connectivity.ConnectionStatusListener;
-import com.flir.thermalsdk.live.remote.OnRemoteError;
-import com.flir.thermalsdk.live.remote.OnReceived;
-import com.flir.thermalsdk.live.streaming.Stream;
-import com.flir.thermalsdk.live.streaming.ThermalStreamer;
-import java.net.InetAddress;
-import java.util.List;
-
-public class FlirConnectionManager {
-    private static final String TAG = "FlirConnectionManager";
-    private static FlirConnectionManager instance;
-
-    private Camera camera;
-    private ThermalStreamer thermalStreamer;
-    private Identity currentIdentity;
-    private boolean isStreaming = false;
-    private Palette currentPalette;
-    private Bitmap latestFrame;
-
-    // Event callback interface
-    public interface ConnectionEventCallback {
-        void onConnectionStatusChanged(boolean connected, String deviceId);
-
-        void onError(String message);
-    }
-
-    private ConnectionEventCallback eventCallback;
-
-    // Callback for frame updates
-    public interface FrameCallback {
-        void onFrameReceived(Bitmap frame);
-    }
-
-    private FrameCallback frameCallback;
-
-    private FlirConnectionManager() {
-        // Default to Iron palette
-        List<Palette> palettes = PaletteManager.getDefaultPalettes();
-        currentPalette = palettes.stream()
-                .filter(p -> "iron".equalsIgnoreCase(p.name))
-                .findFirst()
-                .orElse(palettes.get(0));
-    }
-
-    public static synchronized FlirConnectionManager getInstance() {
-        if (instance == null) {
-            instance = new FlirConnectionManager();
-        }
-        return instance;
-    }
-
-    public void setEventCallback(ConnectionEventCallback callback) {
-        this.eventCallback = callback;
-    }
-
-    public void selectDevice(Identity identity) {
-        Log.i(TAG, "[FLIR] 📱 Selecting device: " + identity.deviceId);
-
-        // ALWAYS disconnect from current device first
-        if (isStreaming || camera != null) {
-            Log.i(TAG, "[FLIR] 🔌 Disconnecting from current device...");
-            stopStreaming();
-            disconnect();
-        }
-
-        currentIdentity = identity;
-
-        // Connect in background
-        new Thread(() -> {
-            try {
-                connectToDevice();
-                startStreaming();
-            } catch (Exception e) {
-                Log.e(TAG, "[FLIR] Failed to connect/stream", e);
-                emitError("Failed to connect: " + e.getMessage());
-            }
-        }).start();
-    }
-
-    private void connectToDevice() throws Exception {
-        Log.i(TAG, "[FLIR] 🔌 Connecting to: " + currentIdentity.deviceId);
-
-        camera = new Camera();
-
-        // Authenticate for network cameras
-        if (currentIdentity.communicationInterface == CommunicationInterface.NETWORK) {
-            if (currentIdentity.ipSettings != null) {
-                String ipAddress = currentIdentity.ipSettings.ipAddress;
-                // Use generic app name or allow injection if needed
-                String appName = "ThermalCameraApp";
-                Log.d(TAG, "[FLIR] Authenticating network camera at " + ipAddress);
-                // authenticate method might vary, assuming simple overload or need to check SDK
-                // camera.authenticate(InetAddress.getByName(ipAddress), appName, ...);
-            }
-        }
-
-        // Connect to device
-        camera.connect(
-                currentIdentity,
-                errorCode -> {
-                    Log.w(TAG, "[FLIR] ❌ Connection error: " + errorCode);
-                    emitError("Connection error: " + errorCode.toString());
-                },
-                new ConnectParameters());
-
-        Log.i(TAG, "[FLIR] ✅ Connected successfully");
-        emitConnectionStatus(true);
-    }
-
-    // ... authenticate method ...
-
-    private void startStreaming() {
-        if (camera == null) {
-            Log.w(TAG, "[FLIR] Cannot start streaming - no camera connected");
-            return;
-        }
-
-        // Find thermal stream
-        Stream thermalStream = camera.getStreams().stream()
-                .filter(Stream::isThermal)
-                .findFirst()
-                .orElse(null);
-
-        if (thermalStream == null) {
-            Log.w(TAG, "[FLIR] No thermal stream available");
-            emitError("No thermal stream available");
-            return;
-        }
-
-        Log.i(TAG, "[FLIR] 🎥 Starting thermal stream...");
-
-        thermalStreamer = new ThermalStreamer(thermalStream);
-
-        thermalStream.start(
-                unused -> {
-                    // Update stream in background
-                    new Thread(FlirConnectionManager.this::updateFrame).start();
-                },
-                error -> {
-                    Log.w(TAG, "[FLIR] Stream error: " + error);
-                    emitError("Stream error: " + error.toString());
-                });
-
-        isStreaming = true;
-        Log.i(TAG, "[FLIR] ✅ Streaming started");
-    }
-
-    private synchronized void updateFrame() {
-        if (thermalStreamer == null)
-            return;
-
-        try {
-            thermalStreamer.update();
-        } catch (NullPointerException e) {
-            // Skip first few frames that may have errors
-            return;
-        }
-
-        // Get image buffer
-        var imageBuffer = thermalStreamer.getImage();
-        if (imageBuffer == null)
-            return;
-
-        // Apply palette and get bitmap
-        thermalStreamer.withThermalImage(thermalImage -> {
-            if (currentPalette != null) {
-                thermalImage.setPalette(currentPalette);
-            }
-
-            try {
-                // BitmapAndroid.createBitmap accepts ImageBuffer interface
-                Bitmap bmp = BitmapAndroid.createBitmap(imageBuffer).getBitMap();
-                if (bmp != null) {
-                    latestFrame = bmp;
-
-                    // Notify callback
-                    if (frameCallback != null) {
-                        frameCallback.onFrameReceived(bmp);
-                    }
-                }
-            } catch (IllegalArgumentException e) {
-                // Ignore invalid frames
-            }
-        });
-    }
-
-    public void stopStreaming() {
-        if (!isStreaming)
-            return;
-
-        Log.i(TAG, "[FLIR] Stopping stream...");
-
-        if (camera != null && camera.getStreams() != null) {
-            camera.getStreams().forEach(stream -> {
-                try {
-                    if (stream.isStreaming()) {
-                        stream.stop();
-                    }
-                } catch (Exception e) {
-                    Log.w(TAG, "[FLIR] Error stopping stream", e);
-                }
-            });
-        }
-
-        thermalStreamer = null;
-        isStreaming = false;
-        Log.d(TAG, "[FLIR] Stream stopped");
-    }
-
-    public void disconnect() {
-        if (camera == null)
-            return;
-
-        Log.i(TAG, "[FLIR] Disconnecting...");
-
-        stopStreaming();
-
-        try {
-            camera.disconnect();
-        } catch (Exception e) {
-            Log.w(TAG, "[FLIR] Error disconnecting", e);
-        }
-
-        camera = null;
-        currentIdentity = null;
-        latestFrame = null;
-
-        emitConnectionStatus(false);
-        Log.d(TAG, "[FLIR] Disconnected");
-    }
-
-    public void setPalette(int acol) {
-        String paletteName = mapAcolToPalette(acol);
-
-        List<Palette> palettes = PaletteManager.getDefaultPalettes();
-        Palette newPalette = palettes.stream()
-                .filter(p -> paletteName.equalsIgnoreCase(p.name))
-                .findFirst()
-                .orElse(currentPalette);
-
-        if (newPalette != currentPalette) {
-            currentPalette = newPalette;
-            Log.i(TAG, "[FLIR] 🎨 Palette changed to: " + paletteName + " (acol=" + acol + ")");
-        }
-    }
-
-    private String mapAcolToPalette(int acol) {
-        switch (acol) {
-            case 1:
-                return "iron";
-            case 2:
-                return "rainbow";
-            case 3:
-                return "arctic";
-            case 4:
-                return "lava";
-            case 5:
-                return "grayscale";
-            case 6:
-                return "ironbow";
-            case 7:
-                return "medical";
-            case 8:
-                return "rainbow_hc";
-            case 9:
-                return "contrast";
-            case 10:
-                return "fusion";
-            case 11:
-                return "arctic2";
-            case 12:
-                return "coldest";
-            case 13:
-                return "hottest";
-            case 14:
-                return "wheel";
-            default:
-                return "iron";
-        }
-    }
-
-    public double getTemperatureAt(int x, int y) {
-        if (thermalStreamer == null) {
-            Log.w(TAG, "[FLIR] Cannot query temperature - no active stream");
-            return Double.NaN;
-        }
-
-        try {
-            final double[] temp = { Double.NaN };
-
-            thermalStreamer.withThermalImage(thermalImage -> {
-                try {
-                    // Get image dimensions from ImageBase (parent class)
-                    int width = thermalImage.getWidth();
-                    int height = thermalImage.getHeight();
-
-                    // Clamp coordinates
-                    int clampedX = Math.max(0, Math.min(x, width - 1));
-                    int clampedY = Math.max(0, Math.min(y, height - 1));
-
-                    // Query temperature using Point
-                    temp[0] = thermalImage.getValueAt(new com.flir.thermalsdk.image.Point(clampedX, clampedY)).value;
-
-                    Log.d(TAG, "[FLIR] 🌡️ Temperature at (" + x + "," + y + "): " + temp[0] + "°C");
-                } catch (Exception e) {
-                    Log.w(TAG, "[FLIR] Error getting temperature", e);
-                }
-            });
-
-            return temp[0];
-        } catch (Exception e) {
-            Log.w(TAG, "[FLIR] Failed to query temperature", e);
-            return Double.NaN;
-        }
-    }
-
-    public Bitmap getLatestFrame() {
-        return latestFrame;
-    }
-
-    public void setFrameCallback(FrameCallback callback) {
-        this.frameCallback = callback;
-    }
-
-    public boolean isStreaming() {
-        return isStreaming;
-    }
-
-    private void emitConnectionStatus(boolean connected) {
-        if (eventCallback != null) {
-            eventCallback.onConnectionStatusChanged(connected,
-                    currentIdentity != null ? currentIdentity.deviceId : null);
-        }
-    }
-
-    private void emitError(String message) {
-        if (eventCallback != null) {
-            eventCallback.onError(message);
-        }
-    }
-}

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

@@ -1,11 +0,0 @@
-package flir.android
-
-object FlirController {
-    @JvmStatic
-    var cameraHandler: CameraHandler? = null
-
-    @JvmStatic
-    fun getTemperatureAt(x: Int, y: Int): Double? {
-        return cameraHandler?.getTemperatureAt(x, y)
-    }
-}