ilabs-flir 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "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/src/index.d.ts

@@ -13,5 +13,25 @@ export interface FlirDownloadAPI {
     delete(): Promise<boolean>;
 }
 
+export interface SDKStatus {
+    available: boolean;
+    arch: string;
+    dexPath: string;
+    nativeLibPath: string;
+    dexExists: boolean;
+    nativeLibsExist: boolean;
+}
+
+export interface FlirModuleAPI {
+    getTemperatureFromColor(color: number): Promise<number>;
+    getLatestFramePath(): Promise<string | null>;
+    getTemperatureAt(x: number, y: number): Promise<number>;
+    isEmulator(): Promise<boolean>;
+    isDeviceConnected(): Promise<boolean>;
+    getConnectedDeviceInfo(): Promise<string>;
+    isSDKDownloaded(): Promise<boolean>;
+    getSDKStatus(): Promise<SDKStatus>;
+}
+
 export declare const FlirDownload: FlirDownloadAPI;
-export declare const FlirModule: any;
+export declare const FlirModule: FlirModuleAPI;

package/android/Flir/src/main/java/com/flir/thermalsdk/ErrorCodeException.java

@@ -1,14 +0,0 @@
-package com.flir.thermalsdk;
-
-public class ErrorCodeException extends Exception {
-    private final ErrorCode errorCode;
-
-    public ErrorCodeException(ErrorCode errorCode) {
-        super(errorCode.toString());
-        this.errorCode = errorCode;
-    }
-
-    public ErrorCode getErrorCode() {
-        return errorCode;
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/image/ImageBuffer.java

@@ -1,11 +0,0 @@
-package com.flir.thermalsdk.image;
-
-public interface ImageBuffer {
-    int getWidth();
-
-    int getHeight();
-
-    int getStride();
-
-    byte[] getPixelBuffer();
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/image/JavaImageBuffer.java

@@ -1,35 +0,0 @@
-package com.flir.thermalsdk.image;
-
-public class JavaImageBuffer implements ImageBuffer {
-    public final byte[] pixelBuffer;
-    public final int height;
-    public final int width;
-    public final int stride;
-
-    public JavaImageBuffer(byte[] pixelBuffer, int width, int height, int stride) {
-        this.pixelBuffer = pixelBuffer;
-        this.width = width;
-        this.height = height;
-        this.stride = stride;
-    }
-
-    @Override
-    public int getWidth() {
-        return width;
-    }
-
-    @Override
-    public int getHeight() {
-        return height;
-    }
-
-    @Override
-    public int getStride() {
-        return stride;
-    }
-
-    @Override
-    public byte[] getPixelBuffer() {
-        return pixelBuffer;
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/image/Palette.java

@@ -1,15 +0,0 @@
-package com.flir.thermalsdk.image;
-
-public class Palette {
-    public final String name;
-    public final boolean inverted;
-
-    public Palette(String name, boolean inverted) {
-        this.name = name;
-        this.inverted = inverted;
-    }
-
-    public Palette getInverted() {
-        return new Palette(name, !inverted);
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/image/PaletteManager.java

@@ -1,16 +0,0 @@
-package com.flir.thermalsdk.image;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PaletteManager {
-    public static List<Palette> getDefaultPalettes() {
-        List<Palette> palettes = new ArrayList<>();
-        palettes.add(new Palette("iron", false));
-        palettes.add(new Palette("rainbow", false));
-        palettes.add(new Palette("arctic", false));
-        palettes.add(new Palette("lava", false));
-        palettes.add(new Palette("grayscale", false));
-        return palettes;
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/image/Point.java

@@ -1,11 +0,0 @@
-package com.flir.thermalsdk.image;
-
-public class Point {
-    public final int x;
-    public final int y;
-
-    public Point(int x, int y) {
-        this.x = x;
-        this.y = y;
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/image/ThermalImage.java

@@ -1,23 +0,0 @@
-package com.flir.thermalsdk.image;
-
-public class ThermalImage {
-    public void setPalette(Palette palette) {
-        // Stub implementation
-    }
-
-    public Palette getPalette() {
-        return null;
-    }
-
-    public int getWidth() {
-        return 0;
-    }
-
-    public int getHeight() {
-        return 0;
-    }
-
-    public ThermalValue getValueAt(Point point) {
-        return new ThermalValue(0.0);
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/image/ThermalValue.java

@@ -1,9 +0,0 @@
-package com.flir.thermalsdk.image;
-
-public class ThermalValue {
-    public final double value;
-
-    public ThermalValue(double value) {
-        this.value = value;
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/live/CameraType.java

@@ -1,8 +0,0 @@
-package com.flir.thermalsdk.live;
-
-public enum CameraType {
-    FLIR_ONE,
-    FLIR_ONE_PRO,
-    FLIR_ONE_EDGE,
-    GENERIC
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/live/CommunicationInterface.java

@@ -1,16 +0,0 @@
-package com.flir.thermalsdk.live;
-
-public enum CommunicationInterface {
-    USB,
-    NETWORK,
-    FIREWIRE,
-    EMULATOR,
-    BLUETOOTH,
-    EBUS,
-    USBHSI,
-    LIGHTNING,
-    INTEGRATED,
-    FLIR_ONE_WIRELESS,
-    ACE,
-    CUSTOM
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/live/Identity.java

@@ -1,23 +0,0 @@
-package com.flir.thermalsdk.live;
-
-public class Identity {
-    public final CommunicationInterface communicationInterface;
-    public final CameraType cameraType;
-    public final IpSettings ipSettings;
-    public final String deviceId;
-
-    public Identity() {
-        this.communicationInterface = null;
-        this.cameraType = null;
-        this.ipSettings = null;
-        this.deviceId = null;
-    }
-
-    public Identity(CommunicationInterface communicationInterface, CameraType cameraType, String deviceId,
-            IpSettings ipSettings) {
-        this.communicationInterface = communicationInterface;
-        this.cameraType = cameraType;
-        this.deviceId = deviceId;
-        this.ipSettings = ipSettings;
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/live/IpSettings.java

@@ -1,9 +0,0 @@
-package com.flir.thermalsdk.live;
-
-public class IpSettings {
-    public final String ipAddress;
-
-    public IpSettings(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/live/connectivity/ConnectionStatusListener.java

@@ -1,7 +0,0 @@
-package com.flir.thermalsdk.live.connectivity;
-
-import com.flir.thermalsdk.ErrorCode;
-
-public interface ConnectionStatusListener {
-    void onDisconnected(ErrorCode errorCode);
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/live/remote/OnReceived.java

@@ -1,5 +0,0 @@
-package com.flir.thermalsdk.live.remote;
-
-public interface OnReceived<T> {
-    void onReceived(T data);
-}

package/android/Flir/src/main/java/com/flir/thermalsdk/live/remote/OnRemoteError.java

@@ -1,7 +0,0 @@
-package com.flir.thermalsdk.live.remote;
-
-import com.flir.thermalsdk.ErrorCode;
-
-public interface OnRemoteError {
-    void onRemoteError(ErrorCode error);
-}

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