ilabs-flir 1.0.3 → 1.0.4

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