ilabs-flir 1.0.3 → 1.0.5

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)
-    }
-}

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

@@ -1,236 +0,0 @@
-package flir.android;
-
-import android.util.Log;
-import com.flir.thermalsdk.ErrorCode;
-import com.flir.thermalsdk.live.CommunicationInterface;
-import com.flir.thermalsdk.live.Identity;
-import com.flir.thermalsdk.live.discovery.DiscoveredCamera;
-import com.flir.thermalsdk.live.discovery.DiscoveryEventListener;
-import com.flir.thermalsdk.live.discovery.DiscoveryFactory;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * FLIR Discovery Manager
- * Handles device discovery with 5 second timeout
- * Supports FLIR ONE and FLIR ONE Edge emulators
- * Emits discovered devices to React Native
- */
-public class FlirDiscoveryManager {
-    private static final String TAG = "FlirDiscoveryManager";
-    private static FlirDiscoveryManager instance;
-
-    private final List<Identity> discoveredDevices = new ArrayList<>();
-    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    private boolean isDiscovering = false;
-    private DiscoveryEventListener currentListener;
-
-    // Configuration variables (set by app)
-    private String flirEmulatorType = "FLIR_ONE_EDGE";
-    private boolean isEmu = false;
-
-    // Event callback interface
-    public interface DiscoveryEventCallback {
-        void onDevicesDiscovered(List<Identity> devices);
-
-        void onDiscoveryError(String error);
-
-        // Added missing methods to match usage
-        void onCameraFound(String deviceId, String cameraType, String connectionType);
-
-        void onDiscoveryError(String connectionType, String error);
-    }
-
-    private DiscoveryEventCallback eventCallback;
-
-    private FlirDiscoveryManager() {
-    }
-
-    public static synchronized FlirDiscoveryManager getInstance() {
-        if (instance == null) {
-            instance = new FlirDiscoveryManager();
-        }
-        return instance;
-    }
-
-    public void setEmulatorType(String type) {
-        this.flirEmulatorType = type;
-    }
-
-    public void setIsEmu(boolean isEmu) {
-        this.isEmu = isEmu;
-    }
-
-    public void setEventCallback(DiscoveryEventCallback callback) {
-        this.eventCallback = callback;
-    }
-
-    /**
-     * Start discovery with 5 second timeout
-     * Searches for NETWORK devices and EMULATOR (based on flirEmulatorType)
-     * Disconnects any currently connected device first
-     */
-    public void startDiscovery() {
-        if (isDiscovering) {
-            Log.d(TAG, "[FLIR] Discovery already in progress");
-            return;
-        }
-
-        // Disconnect current device before starting new discovery
-        Log.i(TAG, "[FLIR] 🔌 Disconnecting current device before discovery...");
-        FlirConnectionManager.getInstance().disconnect();
-
-        Log.i(TAG, "[FLIR] 🔍 Starting discovery (timeout based on isEmu)...");
-        isDiscovering = true;
-        discoveredDevices.clear();
-
-        // Determine emulator interface based on type
-        CommunicationInterface emulatorInterface = getEmulatorInterface();
-        Log.d(TAG, "[FLIR] Emulator type: " + flirEmulatorType + " -> " + emulatorInterface);
-
-        // Create discovery listener
-        currentListener = new DiscoveryEventListener() {
-            @Override
-            public void onCameraFound(DiscoveredCamera discoveredCamera) {
-                Identity identity = discoveredCamera.identity; // Field access
-
-                // Avoid duplicates
-                boolean alreadyAdded = false;
-                for (Identity existing : discoveredDevices) {
-                    if (existing.deviceId.equals(identity.deviceId)) {
-                        alreadyAdded = true;
-                        break;
-                    }
-                }
-
-                if (!alreadyAdded) {
-                    discoveredDevices.add(identity);
-                    String type = "UNKNOWN";
-                    if (identity.communicationInterface != null) {
-                        type = identity.communicationInterface.name();
-                    }
-                    Log.i(TAG, "[FLIR] 📡 Device found: " + identity.deviceId + " (" + type + ")");
-
-                    if (eventCallback != null) {
-                        // Use cameraType field directly (public final field)
-                        String cameraTypeStr = (identity.cameraType != null) ? identity.cameraType.toString()
-                                : "UNKNOWN";
-                        eventCallback.onCameraFound(identity.deviceId, cameraTypeStr, type);
-                    }
-                }
-            }
-
-            @Override
-            public void onDiscoveryError(CommunicationInterface iface, ErrorCode err) {
-                Log.w(TAG, "[FLIR] Discovery error on " + iface + ": " + err);
-                if (eventCallback != null) {
-                    eventCallback.onDiscoveryError(iface.name(), err.toString());
-                }
-            }
-        };
-
-        // Start scan
-        try {
-            DiscoveryFactory.getInstance().scan(
-                    currentListener,
-                    CommunicationInterface.NETWORK,
-                    emulatorInterface);
-
-            // Timeout: 0 seconds if isEmu=true (go straight to emulator), else 5 seconds
-            long timeoutSeconds = isEmu ? 0 : 5;
-            Log.d(TAG, "[FLIR] Discovery timeout: " + timeoutSeconds + "s (isEmu=" + isEmu + ")");
-
-            // Schedule timeout
-            scheduler.schedule(() -> {
-                stopDiscovery();
-                onDiscoveryComplete();
-            }, timeoutSeconds, TimeUnit.SECONDS);
-
-        } catch (Exception e) {
-            Log.e(TAG, "[FLIR] Failed to start discovery", e);
-            isDiscovering = false;
-            if (eventCallback != null) {
-                eventCallback.onDiscoveryError("Failed to start discovery: " + e.getMessage());
-            }
-        }
-    }
-
-    /**
-     * Stop discovery
-     */
-    public void stopDiscovery() {
-        if (!isDiscovering) {
-            return;
-        }
-
-        Log.d(TAG, "[FLIR] Stopping discovery...");
-        try {
-            DiscoveryFactory.getInstance().stop();
-        } catch (Exception e) {
-            Log.w(TAG, "[FLIR] Error stopping discovery", e);
-        }
-        isDiscovering = false;
-    }
-
-    /**
-     * Called when discovery completes (timeout or manual stop)
-     */
-    private void onDiscoveryComplete() {
-        Log.i(TAG, "[FLIR] ✅ Discovery complete - found " + discoveredDevices.size() + " device(s)");
-
-        // Notify callback
-        if (eventCallback != null) {
-            eventCallback.onDevicesDiscovered(new ArrayList<>(discoveredDevices));
-        }
-
-        // Auto-select first device
-        if (!discoveredDevices.isEmpty()) {
-            Identity firstDevice = discoveredDevices.get(0);
-            Log.i(TAG, "[FLIR] Auto-selecting first device: " + firstDevice.deviceId);
-            FlirConnectionManager.getInstance().selectDevice(firstDevice);
-        } else {
-            Log.w(TAG, "[FLIR] No devices found after timeout");
-        }
-    }
-
-    /**
-     * Get emulator communication interface based on flirEmulatorType
-     */
-    private CommunicationInterface getEmulatorInterface() {
-        if ("FLIR_ONE".equals(flirEmulatorType)) {
-            return CommunicationInterface.EMULATOR;
-        } else {
-            // Default to FLIR_ONE_EDGE
-            return CommunicationInterface.EMULATOR;
-        }
-    }
-
-    /**
-     * Get discovered device by ID
-     */
-    public Identity getDeviceById(String deviceId) {
-        for (Identity identity : discoveredDevices) {
-            if (identity.deviceId.equals(deviceId)) {
-                return identity;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get list of all discovered devices
-     */
-    public List<Identity> getDiscoveredDevices() {
-        return new ArrayList<>(discoveredDevices);
-    }
-
-    /**
-     * Check if discovery is in progress
-     */
-    public boolean isDiscovering() {
-        return isDiscovering;
-    }
-}

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

@@ -1,14 +0,0 @@
-package flir.android;
-
-import android.graphics.Bitmap;
-
-public class FrameDataHolder {
-    
-    public final Bitmap msxBitmap;
-    public final Bitmap dcBitmap;
-
-    public FrameDataHolder(Bitmap msxBitmap, Bitmap dcBitmap) {
-        this.msxBitmap = msxBitmap;
-        this.dcBitmap = dcBitmap;
-    }
-}