ilabs-flir 2.0.1 → 2.0.3

package/app.plugin.js

@@ -377,5 +377,5 @@ const withFlirThermalSDK = (config, props = {}) => {
 module.exports = createRunOncePlugin(
   withFlirThermalSDK,
   'ilabs-flir',
-  '2.0.1'
+  '2.0.3'
 );

package/ios/Flir/SDKLoader/FlirSDKLoader.swift

@@ -234,15 +234,15 @@ public class FlirSDKLoader: RCTEventEmitter {
     }
     
     private func unzip(_ source: URL, to destination: URL) throws {
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/usr/bin/unzip")
-        process.arguments = ["-o", "-q", source.path, "-d", destination.path]
-        try process.run()
-        process.waitUntilExit()
-        guard process.terminationStatus == 0 else {
-            throw NSError(domain: "FlirSDK", code: Int(process.terminationStatus),
-                userInfo: [NSLocalizedDescriptionKey: "Unzip failed with exit code \(process.terminationStatus)"])
-        }
+        // let process = Process()
+        // process.executableURL = URL(fileURLWithPath: "/usr/bin/unzip")
+        // process.arguments = ["-o", "-q", source.path, "-d", destination.path]
+        // try process.run()
+        // process.waitUntilExit()
+        // guard process.terminationStatus == 0 else {
+        //     throw NSError(domain: "FlirSDK", code: Int(process.terminationStatus),
+        //         userInfo: [NSLocalizedDescriptionKey: "Unzip failed with exit code \(process.terminationStatus)"])
+        // }
     }
     
     private func directorySize(_ url: URL) -> Int64? {

package/ios/Flir/src/FlirModule.m

@@ -22,13 +22,20 @@
 // Forward declare Swift class
 @class FlirManager;
 
-@interface FlirModule() <FLIRDiscoveryEventDelegate, FLIRDataReceivedDelegate, FLIRStreamDelegate>
+@interface FlirModule() 
+#if FLIR_SDK_AVAILABLE
+<FLIRDiscoveryEventDelegate, FLIRDataReceivedDelegate, FLIRStreamDelegate>
+#endif
+
+#if FLIR_SDK_AVAILABLE
 @property (nonatomic, strong) FLIRDiscovery *discovery;
 @property (nonatomic, strong) FLIRCamera *camera;
 @property (nonatomic, strong) FLIRStream *stream;
 @property (nonatomic, strong) FLIRThermalStreamer *streamer;
 @property (nonatomic, strong) FLIRIdentity *connectedIdentity;
 @property (nonatomic, strong) NSMutableDictionary<NSString *, FLIRIdentity *> *identityMap;
+#endif
+
 @property (nonatomic, strong) NSMutableArray<NSDictionary *> *discoveredDevices;
 @property (nonatomic, assign) BOOL isScanning;
 @property (nonatomic, assign) BOOL isConnected;
@@ -48,7 +55,9 @@ RCT_EXPORT_MODULE(FlirModule);
 
 - (instancetype)init {
     if (self = [super init]) {
+#if FLIR_SDK_AVAILABLE
         _identityMap = [NSMutableDictionary new];
+#endif
         _discoveredDevices = [NSMutableArray new];
         _isScanning = NO;
         _isConnected = NO;
@@ -525,6 +534,7 @@ RCT_EXPORT_METHOD(getLatestFramePath:(RCTPromiseResolveBlock)resolve
     [[FlirEventEmitter shared] sendDeviceEvent:@"FlirStateChanged" body:body];
 }
 
+#if FLIR_SDK_AVAILABLE
 - (NSString *)communicationInterfaceName:(FLIRCommunicationInterface)iface {
     if (iface & FLIRCommunicationInterfaceLightning) return @"LIGHTNING";
     if (iface & FLIRCommunicationInterfaceNetwork) return @"NETWORK";
@@ -533,6 +543,7 @@ RCT_EXPORT_METHOD(getLatestFramePath:(RCTPromiseResolveBlock)resolve
     if (iface & FLIRCommunicationInterfaceUSB) return @"USB";
     return @"UNKNOWN";
 }
+#endif
 
 #pragma mark - FLIRDiscoveryEventDelegate
 

package/package.json

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

package/ios/Flir/Framework/ThermalSDK/FLIRBattery.h

@@ -1,76 +0,0 @@
-//
-//  FLIRBattery.h
-//  ThermalSDK
-//
-//  Created by FLIR on 2020-07-02.
-//  Copyright © 2020 Teledyne FLIR. All rights reserved.
-//
-
-/**
- ChargingState
- */
-typedef NS_ENUM(NSUInteger, FLIRChargingState)
-{
-    /** Indicates that the battery is not charging because the camera is in "developer mode". */
-    DEVELOPER,
-    /**  Indicates that the battery is not charging because the camera is not connected to an external power supply. */
-    NOCHARGING,
-    /**  Indicates that the battery is charging from external power. */
-    MANAGEDCHARGING,
-
-    /** Indicates that the battery is charging the iPhone.
-
-      This field indicates that IF there is an iPhone plugged in, it will
-      be receiving power from the RBPDevice battery. However, it is still possible
-      for the RBPDevice to be in this "mode" EVEN IF THERE IS NO IPHONE ATTACHED.
-     */
-    CHARGINGSMARTPHONE,
-
-    /**  Indicates that a charging fault occurred (overheat, etc.) */
-    FAULT,
-    /**  Indicates that a charging heat fault occured */
-    FAULTHEAT,
-    /**  Indicates that a charging fault occured due to low current from the charging source */
-    FAULTBADCHARGER,
-    /**  Indicates that a charging fault exists but the iPhone is being charged */
-    CHARGINGSMARTPHONEFAULTHEAT,
-    /**  Indicates that the device is in charge-only mode */
-    MANAGEDCHARGINGONLY,
-    /**  Indicates that the device is in phone-charging-only mode */
-    CHARGINGSMARTPHONEONLY,
-    /**  Indicates that a valid battery charging state was not available. */
-    BAD
-};
-
-/**
-* Camera battery status monitoring interface
-*/
-@interface FLIRBattery : NSObject
-/** Get charging state.
- *
- * In certain cases (e.g. in case of FLIR ONE prior to starting streaming) the battery charging state value may not be available.
- * When the value is not available a "ChargingState.BAD" value is returned.
- * In the same time the "percentage" can return negative value indicating battery percentage is also not available.
- *
- * See Battery::percentage
- */
-- (FLIRChargingState) getChargingState;
-/** Remaining battery percentage.
- *
- * Valid value range from 0 to 100 where 0 is empty and 100 is full.
- * In certain cases (e.g. in case of FLIR ONE prior to starting streaming) the battery percentage value may not be available.
- * When the value is not available, an invalid (negative) value is returned.
- * In the same time the "chargingState" can return "ChargingState.BAD" indicating state is also not available.
- *
- * See Battery::chargingState
- */
-- (int)getPercentage;
-/** Subscribes for battery charging state notifications. */
-- (BOOL)subscribeChargingState: (out NSError * _Nullable *_Nullable) error;
-/** Revokes subscription for battery charging state. */
-- (void)unsubscribeChargingState;
-/** Subscribes for remaining battery power notifications. */
-- (BOOL)subscribePercentage: (out NSError * _Nullable *_Nullable) error;
-/** Revokes subscription for remaining battery power. */
-- (void)unsubscribePercentage;
-@end

package/ios/Flir/Framework/ThermalSDK/FLIRCalibration.h

@@ -1,108 +0,0 @@
-//
-//  FLIRCalibration.h
-//  ThermalSDK
-//
-//  Created by FLIR on 2020-07-02.
-//  Copyright © 2020 Teledyne FLIR. All rights reserved.
-//
-
-#pragma once
-
-/**
- Shutter state
- */
-
-typedef NS_ENUM(NSUInteger, FLIRShutterState) {
-    /// Represents an invalid shutter state. This value should be treated as an error.
-    invalid,
-    
-    /// Represents the "device powered off" shutter state.
-    off,
-    
-    /// Represents the "device powered on" state of the hardware shutter.
-    on,
-    
-    /// Represents the NUC state of the hardware shutter.
-    nuc,
-    
-    /// Indicates that a corrupted/invalid shutter state was detected.
-    bad,
-    
-    /// Indicates a unknown state
-    unknown_state
-};
-
-/**
- NUC state
- */
-
-typedef NS_ENUM(NSUInteger, FLIRNucState) {
-    /**
-     * Indicates that the *last* NUC (Non-Uniform Calibration) is invalid.
-     */
-    INVALID,
-    /**
-     * Indicates that there is NUC activity in progress.
-     */
-    PROGRESS,
-    /**
-     * Indicates that thermal pixel values are radiometrically calibrated.
-     */
-    VALID_RAD,
-    /**
-     * Indicates that thermal pixels are calibrated enough to yield an image, but are not yet radiometrically calibrated.
-     */
-    VALID_IMG,
-    /**
-     * Indicates that an NUC is desired.
-     */
-    DESIRED,
-    /**
-     * Indicated that approximate radiometric values are being given.
-     */
-    RAD_APPROX,
-    /**
-     * Indicates that a corrupted/invalid NUC state was detected.
-     */
-    BAD_STATE,
-    /**
-     * Indicates a unknown state.
-     */
-    UNKNOWN
-};
-
-
-/**
-* Camera calibration control interface.
-*/
-@interface FLIRCalibration : NSObject
-/** Get calibration state. */
--(BOOL)getActive;
-/** Process a one point NUC (Non-uniformity correction) with a black body method. */
--(BOOL)performNUC: (out NSError * _Nullable *_Nullable)error;;
-/** Subscribes for camera NUC state notifications. */
--(BOOL)subscribeCalibrationState: (out NSError * _Nullable *_Nullable)error;
-/** Revokes subscription for camera NUC state notifications. */
--(void)unsubscribeCalibrationState;
-/** Get NUC state
- * @note The state of some cameras (FLIR ONE notably) is `UNKNOWN` until streaming is started.
- */
-- (FLIRNucState)getNucState;
-/** NUC interval (max interval between each automatic NUC in seconds) */
-- (int)getNucInterval;
-/** NUC interval (max interval between each automatic NUC in seconds)
- *  For FLIR One setting nucInterval to 0 disables automatic nuc, any other value enables automatic nuc
- */
--(BOOL)setNucInterval: (int)nucInterval error: (out NSError * _Nullable *_Nullable)error;
-
-/** Subscribes for shutter state notifications */
--(BOOL)subscribeShutterState: (out NSError * _Nullable *_Nullable)error;
-/** Revokes subscription for shutter state notifications */
--(void)unsubscribeShutterState;
-
-/** Get shutter state
- * @note The state of some cameras (FLIR ONE notably) is `unknown_state` until streaming is started.
- */
-- (FLIRShutterState)getShutterState;
-@end
-

package/ios/Flir/Framework/ThermalSDK/FLIRCamera.h

@@ -1,156 +0,0 @@
-//
-//  FLIRCamera.h
-//  FLIR Thermal SDK
-//
-//  Created on 2018-05-07.
-//  Copyright © 2019 Teledyne FLIR. All rights reserved.
-//
-//  Manages any FLIR camera.
-//
-
-#pragma once
-
-#import <Foundation/Foundation.h>
-#import <CoreGraphics/CoreGraphics.h>
-
-#import "FLIRIdentity.h"
-#import "FLIRRemoteControl.h"
-#import "FLIRThermalImage.h"
-
-@class FLIRStream;
-
-/** Streaming options */
-typedef NS_OPTIONS(NSUInteger, StreamingOptions) {
-    STREAMING_NO_OPENGL = 1
-};
-
-/**
- *  Block to accept a thermal image from a live stream.
- */
-typedef void (^ FLIRThermalImageBlock)(FLIRThermalImage * _Nonnull);
-
-/**
- ChargingState
- */
-typedef NS_ENUM(NSUInteger, FLIRAuthenticationStatus)
-{
-    pending, //will encapsulate both success upload and waiting to be approved
-    approved,
-    unknown
-};
-
-@class FLIRCamera;
-
-/**
- *  Delegate to return events from a connectad camera.
- */
-@protocol FLIRDataReceivedDelegate <NSObject>
-
-#pragma mark - Required event handlers
-/**
- *  This event is raised when the camera is disconnected unexpectedly, if this method is
- *  implemented in the app, and if the delegate has been initialised.
- *
- *  @param  camera  The camera.
- *  @param  error   An error code.
- */
--(void)onDisconnected:(FLIRCamera *_Nonnull) camera withError:(nullable NSError *)error;
-
-@optional
-#pragma mark - Optional event handlers
-
-@end
-
-@class FLIRCameraImport;
-
-/**
- *  The interface to a FLIR camera of any kind.
- *
- *  Note: This class is not guaranteed to be thread-safe, so calls must be synchronized if a Camera object is accessed from multiple threads.
- *
- */
-@interface FLIRCamera : NSObject
-
-+ (NSString* _Nonnull)getFrom:(FLIRIdentity * _Nonnull)identity code:(NSUInteger)code;
-
-/**
- *  A delegate to handle the events in FLIRDataReceivedDelegate.
- */
-@property (weak, nullable) id<FLIRDataReceivedDelegate> delegate;
-
-/**
- *  Initialize a camera instance with specified identity.
- *
- *  Important
- *  During development do not call `-[FLIRCamera authenticate:trustedConnectionName:]`
- *  with the same "trustedConnectionName" between two application installs.
- *  During the call to `-[FLIRCamera authenticate:trustedConnectionName:]` authentication files are create and
- *  uploaded with the "trustedConnectionName" as the "key" to the camera,
- *  new authentication files can't be used with the same "trustedConnectionName"
- *  to connect to the camera.
- *  We recommended generate a trustedConnectionName and store it as `Preferences`
- *
- * @param identity the identity of the camera instance to be initialized.
- */
--(FLIRAuthenticationStatus) authenticate:(FLIRIdentity *_Nonnull)identity trustedConnectionName:(NSString *_Nullable) name;
-/**
- *  Connect with the camera. This function is blocking.
- *
- *  @param identity the identity of the camera instance to connect to.
- */
--(BOOL)connect:(FLIRIdentity * _Nonnull)identity error:(out NSError * _Nullable * _Nonnull)error;
-
-/**
- *  Connect with the camera. This function is blocking.
- *
- *  @param identity the identity of the camera instance to connect to.
- *  @param code a code that can be present in some cameras when connecting.
- */
-- (BOOL)connect:(FLIRIdentity * _Nonnull)identity code: (NSUInteger)code error:(out NSError * _Nullable * _Nonnull)error;
-
-/**
- *  Disconnect from the camera.  This function is blocking.
- *  Disconnecting from a Flir One Edge will also disconnect from the camera's WiFi hotspot
- */
--(void)disconnect;
-
-/**
- *  Get the connection status.
- */
--(BOOL)isConnected;
-
-/**
- *  Get the connected camera identity.
- *
- *  @return The identity of the currently connected camera or null if no camera is connected.
- */
--(nullable FLIRIdentity *)getIdentity;
-
-/**
- *  Get camera remote controller.
- *
- *  @return nullptr returned if the camera isn't in connected state
- */
--(nullable FLIRRemoteControl *)getRemoteControl;
-
--(nullable FLIRCameraImport *) getImport;
-
-/**
- *  Return all streams availbable on this camera, see @ref FLIRStream.
- *  @note the implementation for thermal streaming for network cameras is still in experimental stage.
- */
-- (NSArray<FLIRStream *> * _Nonnull)getStreams;
-
-/**
- *  Check if we're in frame grabbing state.
- */
--(BOOL)isGrabbing;
-
-/**
- *  Get license information for software used in camera, if available
- *  The returned data is utf8 encoded text
- */
-
-- (NSData* _Nullable)getLicenseDataData;
-
-@end

package/ios/Flir/Framework/ThermalSDK/FLIRCameraDeviceInfo.h

@@ -1,53 +0,0 @@
-//
-//  FLIRCameraDeviceInfo.h
-//
-//  Copyright © 2019 Teledyne FLIR. All rights reserved.
-//
-
-#pragma once
-
-#import <Foundation/Foundation.h>
-
-/**
- *  Camera device information.
- */
-@interface FLIRCameraDeviceInfo : NSObject
-
-/**
- *  @property hostName
- */
-@property (readonly) NSString *hostName;
-
-/**
- *  @property productName
- */
-@property (readonly) NSString *productName;
-
-/**
- *   @property ipAddress
- */
-@property (readonly) NSString *ipAddress;
-
-/**
- *   @property imageWidth
- */
-@property (readonly) NSNumber *imageWidth;
-
-/**
- *   @property imageHeight
- */
-@property (readonly) NSNumber *imageHeight;
-
-/**
- *   @property netService
- */
-@property (readonly) NSNetService* netService;
-
-/**
- *   Create a new FLIRCameraDeviceInfo from a NSNetService
- *
- *  @param source netService
- */
--(void) create:(id)source;
-
-@end

package/ios/Flir/Framework/ThermalSDK/FLIRCameraEvent.h

@@ -1,132 +0,0 @@
-//
-//  FLIRCameraEvent.h
-//  FLIR Thermal SDK
-//
-//  Copyright © 2019 Teledyne FLIR. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "FLIRCameraDeviceInfo.h"
-#import "FLIRIdentity.h"
-
-/**
- *
- * Camera event.
- *
- * Handles events from a remotely connected camera
- *
- */
-
-@interface FLIRCameraEvent : NSObject
-
-/**
- Event
-
- - ImageSavedInCamera: the event
- */
-typedef NS_ENUM(NSInteger, CameraEvent) {
-    /** Image was saved in the camera */
-    ImageSavedInCamera = 0,
-    /** Connection was lost */
-    CameraConnectionLost = 1, // Always on
-};
-
-/**
- * Event
- * CameraConnectionLost
- *
- * CameraConnectionLost event will be posted to NSNotificationCenter defaultCenter when camera is lost
- * This event is always enabled when listening for ImageSavedInCamera
- * event is separated from the discovery events
- * object param always nil
- *
- *    [[NSNotificationCenter defaultCenter] addObserver:self
- *                                             selector:@selector(CameraConnectionLost:)
- *                                                 name:@"CameraConnectionLost"
- *                                               object:nil];
- *
- */
-
-/**
- *  Create a camera event object
- *
- *  @param cameraDeviceInfo the camera device to listen for events from
- *
- *  @return FLIRCameraEvent object
- */
-- (instancetype) initWithCameraDeviceInfo:(FLIRCameraDeviceInfo *) cameraDeviceInfo;
-
-/**
- *  Create a camera event object
- *
- *  @param ipAddress the camera ipAddress to listen for events from
- *
- *  @return FLIRCameraEvent object
- */
-- (instancetype) initWithCameraIpAddress:(NSString *) ipAddress;
-
-/**
- *  Create a camera event object
- *
- *  @param identity the camera identity to listen for events from
- *
- *  @return FLIRCameraEvent object
- */
-- (instancetype) initWithIdentity:(FLIRIdentity *) identity;
-
-/**
- * start listen for events
- *
- * posts the event to NSNotificationCenter defaultCenter
- *
- * event with id ImageSavedInCamera will post a named event "ImageSavedInCamera" to the notification center
- *
- * the notification object is a `FLIRFileReference` instance containing the full path to the image that was saved
- *
- * this image can be downloaded from the camera via FTP
- *
- *
- * typedef NS_ENUM(NSInteger, CameraEvent) {
- *
- * - ImageSavedInCamera = 0,
- * - CameraConnectionLost = 1, // Always on
- *
- *};
- *
- *	[[NSNotificationCenter defaultCenter] addObserver:self
- *											 selector:@selector(imageSavedInCamera:)
- *												 name:@"ImageSavedInCamera"
- *											   object:nil];
- *
- *	self.cameraEvent = [[FLIRCameraEvent alloc] initWithCameraDeviceInfo:self.cameraDeviceInfo];
- *	[self.cameraEvent listenForEvent:ImageSavedInCamera];
- *
- * Event
- * CameraConnectionLost Always on when listening for ImageSavedInCamera
- *
- * CameraConnectionLost event will be posted to NSNotificationCenter defaultCenter when camera is lost
- *
- * This event is always enabled when listening for ImageSavedInCamera
- *
- * event is separated from the discovery events
- *
- * object param always nil
- *
- *  [[NSNotificationCenter defaultCenter] addObserver:self
- *                                           selector:@selector(CameraConnectionLost:)
- *                                               name:@"CameraConnectionLost"
- *                                             object:nil];
- *
- *  @param eventID the event to listen for
- *
- *  @return true if succesful
- */
-
-- (BOOL) listenForEvent:(CameraEvent) eventID;
-
-/**
- *  stop listen for events
- */
-- (void) stopListening;
-
-@end