capacitor-plugin-ihealth 1.1.1 → 1.1.3

package/dist/docs.json

@@ -131,12 +131,12 @@
       },
       {
         "name": "addListener",
-        "signature": "(...args: [eventName: \"OnlineDeviceData\", listenerFunc: (info: any) => void] | [eventName: \"error\", listenerFunc: (info: any) => void] | [eventName: \"deviceDatafound\", listenerFunc: (info: any) => void] | [eventName: \"dataNotFound\", listenerFunc: (info: any) => void] | [eventName: \"deviceConnectFail\", listenerFunc: (info: any) => void] | [eventName: \"deviceDisconnect\", listenerFunc: (info: any) => void] | [eventName: \"deviceDiscover\", listenerFunc: (info: any) => void] | [eventName: \"deviceConnect\", listenerFunc: (info: any) => void]) => Promise<PluginListenerHandle> & PluginListenerHandle",
+        "signature": "(...args: [eventName: \"OnlineDeviceData\", listenerFunc: (info: any) => void] | [eventName: \"toast\", listenerFunc: (info: any) => void] | [eventName: \"error\", listenerFunc: (info: any) => void] | [eventName: \"deviceDatafound\", listenerFunc: (info: any) => void] | [eventName: \"StartMeasurementFinished\", listenerFunc: (info: any) => void] | [eventName: \"dataNotFound\", listenerFunc: (info: any) => void] | [eventName: \"deviceConnectFail\", listenerFunc: (info: any) => void] | [eventName: \"deviceDisconnect\", listenerFunc: (info: any) => void] | [eventName: \"deviceDiscover\", listenerFunc: (info: any) => void] | [eventName: \"deviceConnect\", listenerFunc: (info: any) => void]) => Promise<PluginListenerHandle> & PluginListenerHandle",
         "parameters": [
           {
             "name": "args",
             "docs": "",
-            "type": "[eventName: 'OnlineDeviceData', listenerFunc: (info: any) => void] | [eventName: 'error', listenerFunc: (info: any) => void] | [eventName: 'deviceDatafound', listenerFunc: (info: any) => void] | [eventName: 'dataNotFound', listenerFunc: (info: any) => void] | [eventName: 'deviceConnectFail', listenerFunc: (info: any) => void] | [eventName: 'deviceDisconnect', listenerFunc: (info: any) => void] | [eventName: 'deviceDiscover', listenerFunc: (info: any) => void] | [eventName: 'deviceConnect', listenerFunc: (info: any) => void]"
+            "type": "[eventName: 'OnlineDeviceData', listenerFunc: (info: any) => void] | [eventName: 'toast', listenerFunc: (info: any) => void] | [eventName: 'error', listenerFunc: (info: any) => void] | [eventName: 'deviceDatafound', listenerFunc: (info: any) => void] | [eventName: 'StartMeasurementFinished', listenerFunc: (info: any) => void] | [eventName: 'dataNotFound', listenerFunc: (info: any) => void] | [eventName: 'deviceConnectFail', listenerFunc: (info: any) => void] | [eventName: 'deviceDisconnect', listenerFunc: (info: any) => void] | [eventName: 'deviceDiscover', listenerFunc: (info: any) => void] | [eventName: 'deviceConnect', listenerFunc: (info: any) => void]"
           }
         ],
         "returns": "Promise<PluginListenerHandle> & PluginListenerHandle",
@@ -145,7 +145,7 @@
         "complexTypes": [
           "PluginListenerHandle"
         ],
-        "slug": "addlistenereventname-onlinedevicedata-listenerfunc-info-any--void--eventname-error-listenerfunc-info-any--void--eventname-devicedatafound-listenerfunc-info-any--void--eventname-datanotfound-listenerfunc-info-any--void--eventname-deviceconnectfail-listenerfunc-info-any--void--eventname-devicedisconnect-listenerfunc-info-any--void--eventname-devicediscover-listenerfunc-info-any--void--eventname-deviceconnect-listenerfunc-info-any--void"
+        "slug": "addlistenereventname-onlinedevicedata-listenerfunc-info-any--void--eventname-toast-listenerfunc-info-any--void--eventname-error-listenerfunc-info-any--void--eventname-devicedatafound-listenerfunc-info-any--void--eventname-startmeasurementfinished-listenerfunc-info-any--void--eventname-datanotfound-listenerfunc-info-any--void--eventname-deviceconnectfail-listenerfunc-info-any--void--eventname-devicedisconnect-listenerfunc-info-any--void--eventname-devicediscover-listenerfunc-info-any--void--eventname-deviceconnect-listenerfunc-info-any--void"
       }
     ],
     "properties": []

package/dist/esm/definitions.d.ts

@@ -28,5 +28,5 @@ export interface ihealthPlugin {
     startBP5SMeasurement(): Promise<{
         value: any;
     }>;
-    addListener(...args: [eventName: 'OnlineDeviceData', listenerFunc: (info: any) => void] | [eventName: 'error', listenerFunc: (info: any) => void] | [eventName: 'deviceDatafound', listenerFunc: (info: any) => void] | [eventName: 'dataNotFound', listenerFunc: (info: any) => void] | [eventName: 'deviceConnectFail', listenerFunc: (info: any) => void] | [eventName: 'deviceDisconnect', listenerFunc: (info: any) => void] | [eventName: 'deviceDiscover', listenerFunc: (info: any) => void] | [eventName: 'deviceConnect', listenerFunc: (info: any) => void]): Promise<PluginListenerHandle> & PluginListenerHandle;
+    addListener(...args: [eventName: 'OnlineDeviceData', listenerFunc: (info: any) => void] | [eventName: 'toast', listenerFunc: (info: any) => void] | [eventName: 'error', listenerFunc: (info: any) => void] | [eventName: 'deviceDatafound', listenerFunc: (info: any) => void] | [eventName: 'StartMeasurementFinished', listenerFunc: (info: any) => void] | [eventName: 'dataNotFound', listenerFunc: (info: any) => void] | [eventName: 'deviceConnectFail', listenerFunc: (info: any) => void] | [eventName: 'deviceDisconnect', listenerFunc: (info: any) => void] | [eventName: 'deviceDiscover', listenerFunc: (info: any) => void] | [eventName: 'deviceConnect', listenerFunc: (info: any) => void]): Promise<PluginListenerHandle> & PluginListenerHandle;
 }

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import { PluginListenerHandle } from \"@capacitor/core\";\n\nexport interface ihealthPlugin {\n  authoriseiHealthSdk(): Promise<{ value: any }>;\n  isBluetoothEnabled(): Promise<{ value: any }>;\n\tinitialiseCentralManager(): Promise<{ value: any }>;\n  scanDiscover(options: Object): Promise<{ value: any }>;\n\tconnectDevice(options: Object): Promise<any>;\n  getConnectedDeviceInstance(options: Object): Promise<{ value: any }>;\n\tdisconnectDevice(): Promise<{ value: any }>;\n  deleteDeviceData(): Promise<{ value: any }>;\n  getDeviceOfflineData(): Promise<{ value: any }>;\n  startBP5SMeasurement(): Promise<{ value: any }>;\n  addListener(...args: [eventName: 'OnlineDeviceData', listenerFunc: (info: any) => void] |[eventName: 'error', listenerFunc: (info: any) => void] | [eventName: 'deviceDatafound', listenerFunc: (info: any) => void] | [eventName: 'dataNotFound', listenerFunc: (info: any) => void]|[eventName: 'deviceConnectFail', listenerFunc: (info: any) => void] | [eventName: 'deviceDisconnect', listenerFunc: (info: any) => void] | [eventName: 'deviceDiscover', listenerFunc: (info: any) => void] | [eventName: 'deviceConnect', listenerFunc: (info: any) => void]): Promise<PluginListenerHandle> & PluginListenerHandle;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import { PluginListenerHandle } from \"@capacitor/core\";\n\nexport interface ihealthPlugin {\n  authoriseiHealthSdk(): Promise<{ value: any }>;\n  isBluetoothEnabled(): Promise<{ value: any }>;\n\tinitialiseCentralManager(): Promise<{ value: any }>;\n  scanDiscover(options: Object): Promise<{ value: any }>;\n\tconnectDevice(options: Object): Promise<any>;\n  getConnectedDeviceInstance(options: Object): Promise<{ value: any }>;\n\tdisconnectDevice(): Promise<{ value: any }>;\n  deleteDeviceData(): Promise<{ value: any }>;\n  getDeviceOfflineData(): Promise<{ value: any }>;\n  startBP5SMeasurement(): Promise<{ value: any }>;\n  addListener(...args: [eventName: 'OnlineDeviceData', listenerFunc: (info: any) => void] | [eventName: 'toast', listenerFunc: (info: any) => void] |[eventName: 'error', listenerFunc: (info: any) => void] | [eventName: 'deviceDatafound', listenerFunc: (info: any) => void] | [eventName: 'StartMeasurementFinished', listenerFunc: (info: any) => void] | [eventName: 'dataNotFound', listenerFunc: (info: any) => void]|[eventName: 'deviceConnectFail', listenerFunc: (info: any) => void] | [eventName: 'deviceDisconnect', listenerFunc: (info: any) => void] | [eventName: 'deviceDiscover', listenerFunc: (info: any) => void] | [eventName: 'deviceConnect', listenerFunc: (info: any) => void]): Promise<PluginListenerHandle> & PluginListenerHandle;\n}\n"]}

package/ios/Plugin/ihealthPlugin.swift

@@ -355,6 +355,11 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
             selector: #selector(self.deviceConnectFail),
             name: Notification.Name(connectfail),
             object: nil)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.onlineMeasurementForPT3SBT),
+            name: Notification.Name("PT3SBTNotificationGetResult"),
+            object: nil)
     }
     
     @objc func deviceDiscover(notification:NSNotification) {
@@ -452,6 +457,9 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
         default:
             break
         }
+        call.resolve([
+            "success": "success"
+        ])
     }
     @objc func getDeviceOfflineData(_ call: CAPPluginCall) {
         
@@ -636,6 +644,7 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
         }, errorBlock: { error in
             
         })
+        self.notifyListeners("StartMeasurementFinished", data: nil)
     }
     func getBP5SDeviceInstances() {
         
@@ -652,9 +661,10 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
         }, errorBlock: { err in
             
         })
-        // DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-        //     self.startBP5SMeasurement()
-        // }
+         DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+            // self.startBP5SMeasurement()
+             self.getBP5SOfflineData()
+         }
     }
     func getBG5SInstances() {
         
@@ -674,7 +684,13 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
             
         })
         DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-            self.startBG5SMeasurement()
+            self.myBBG5SDevice?.setUnit(BGUnit.mmolPL, successBlock: {
+                self.startBG5SMeasurement()
+            }, errorBlock: { Error, msg in
+                self.startBG5SMeasurement()
+            })
+            
+            
         }
     }
     
@@ -701,7 +717,7 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
     }
     
     func getPT3SBTInstances() {
-        
+       
         if let devices = PT3SBTController.shareIHPT().getAllCurrentPT3SBTInstace() as? [PT3SBT] {
             for device in devices {
                 
@@ -715,10 +731,13 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
             }
         }
         myPT3SBTDevice?.commandFunction({ data in
+            //self.getPT3SBSOfflineData()
         }, disposeErrorBlock: { error in
+            //self.getPT3SBSOfflineData()
         })
         DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-            self.startPT3SBTMeasurement()
+            //self.startPT3SBTMeasurement()
+            self.getPT3SBSOfflineData()
         }
         
     }
@@ -733,7 +752,8 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
             }
         }
         DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-            self.startHS4SMeasurement()
+           
+            self.getHS4SOfflineData()
         }
     }
     func getHS2SInstances() {
@@ -963,7 +983,6 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
                 
                 if(count == 0) {
                     let userData = ["count": count] as [String : Any]
-                    
                     self.notifyListeners("dataNotFound", data: userData)
                 } else {
                     self.myPT3SBTDevice?.commandGetMemorryData({ data in
@@ -973,7 +992,7 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
                         }
                         let userData = ["result": deviceDataArr, "deviceModel": "PT3SBT", "deviceMacAddress": self.deviceMacAddress,"isFromLive":false] as [String : Any]
                         self.notifyListeners("deviceDatafound", data: userData)
-                        //self.deleteDataFromPT3SBT()
+                        self.deleteDataFromPT3SBT()
                     }, disposeErrorBlock: { error in
                         
                         let userData = ["error": error] as [String : Any]
@@ -1007,11 +1026,12 @@ public class ihealthPlugin: CAPPlugin,CBCentralManagerDelegate,BG5SDelegate {
             let userData = ["result": deviceDataArr, "deviceModel": "HS4S", "deviceMacAddress": self.deviceMacAddress,"isFromLive":false] as [String : Any]
             print(" deviceDatafound >> \(userData)")
             self.notifyListeners("deviceDatafound", data: userData)
-            
+            self.startHS4SMeasurement()
         }, finishTransmission: {
             print(" finished")
         }, disposeErrorBlock: { error in
             print(" disposeErrorBlock >> \(error)")
+            self.startHS4SMeasurement()
             self.HS4SError(errorID: error)
         })
     }
@@ -1193,12 +1213,13 @@ timerCount = timerCount+1
                 let userData = ["result": bp5sData, "deviceModel": "BP5S", "deviceMacAddress": self.deviceMacAddress,"isFromLive":true] as [String : Any]
                 self.notifyListeners("deviceDatafound", data: userData)
             }, errorBlock: { err in
-                
+                let userData = ["error": "BP5S measurement stopped."] as [String : Any]
+                self.notifyListeners("error", data: userData)
             })
         }, errorBlock: { error in
             
         })
-        
+       // self.notifyListeners("StartMeasurementFinished", data: nil)
     }
    
     func startPT3SBTMeasurement(){
@@ -1208,9 +1229,12 @@ timerCount = timerCount+1
             selector: #selector(self.onlineMeasurementForPT3SBT),
             name: Notification.Name("PT3SBTNotificationGetResult"),
             object: nil)
+         //DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+            // self.notifyListeners("StartMeasurementFinished", data: nil)
+         //}
+        
     }
     @objc func onlineMeasurementForPT3SBT(notification:NSNotification){
-        let notifyObject = notification.userInfo
         guard let userInfo = notification.userInfo as NSDictionary? as? [String: Any] else {return}
        // self.bridge?.viewController?.showToast(message: "PT3SBT \(userInfo)")
         let userData = ["result": [userInfo], "deviceModel": "PT3SBT", "deviceMacAddress": self.deviceMacAddress,"isFromLive":true] as [String : Any]
@@ -1240,8 +1264,9 @@ timerCount = timerCount+1
             }
             
         }, withErrorBlock: { err in
-            self.bridge?.viewController?.showToast(message: "PO3 start error else:\(err)")
+           // self.bridge?.viewController?.showToast(message: "PO3 start error else:\(err)")
         })
+        self.notifyListeners("StartMeasurementFinished", data: nil)
     }
     func startBG5SMeasurement(){
         self.myBBG5SDevice?.startMeasure(BGMeasureMode.noBlood, withSuccessBlock: {
@@ -1249,6 +1274,7 @@ timerCount = timerCount+1
         }, errorBlock: { err, msg in
             
         })
+        self.notifyListeners("StartMeasurementFinished", data: nil)
     }
     func startHS2SMeasurement(){
         if let user = self.healthUser{
@@ -1268,7 +1294,7 @@ timerCount = timerCount+1
 
             })
         }
-        
+        self.notifyListeners("StartMeasurementFinished", data: nil)
         
     }
     func startHS4SMeasurement(){
@@ -1285,9 +1311,9 @@ timerCount = timerCount+1
             self.notifyListeners("deviceDatafound", data: userData)
             //self.bridge?.viewController?.showToast(message: "stable weight:\(hs4sData)")
         }, disposeErrorBlock: { err in
-            self.bridge?.viewController?.showToast(message: "error in hs4s start\(err)")
+           // self.bridge?.viewController?.showToast(message: "error in hs4s start\(err)")
         })
-        
+        self.notifyListeners("StartMeasurementFinished", data: nil)
     }
     
     // MARK: Error CallBack Methods
@@ -1460,11 +1486,17 @@ timerCount = timerCount+1
     }
     
     public func device(_ device: BG5S!, stripStateDidUpdate state: BG5SStripState) {
-        print(" BG5S >> stripStateDidUpdate")
+        print(" BG5S >> stripStateDidUpdate \(state.rawValue)")
+        if(state.rawValue == 0){
+            self.notifyListeners("toast", data: ["message":"strip inserted"])
+        }else if(state.rawValue == 1){
+            self.notifyListeners("toast", data: ["message":"strip removed"])
+        }
     }
     
     public  func deviceDropBlood(_ device: BG5S!) {
         print(" BG5S >> deviceDropBlood")
+        self.notifyListeners("toast", data: ["message":"blood drop received"])
     }
     
     public func device(_ device: BG5S!, dataID: String!, measureReult result: Int) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-ihealth",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "capacitor plugin to integrate ihealth sdk",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",