capacitor-plugin-ihealth 1.1.5 → 1.1.7

package/android/build.gradle

@@ -39,13 +39,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        main {
-            assets.srcDirs += [
-                    'src',
-            ]
-        }
-    }
+//    sourceSets {
+//        main {
+//            jniLibs.srcDirs = ['libs']
+//        }
+//    }
     lintOptions {
         abortOnError false
     }
@@ -71,11 +69,15 @@ dependencies {
     implementation files('src/iHealthSDK_2.9.10.jar')
     //
     implementation 'com.alibaba:fastjson:1.2.48'
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-    implementation 'com.squareup.okio:okio:3.2.0'
+//    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+//    implementation 'com.squareup.okio:okio:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'org.greenrobot:greendao:3.2.2'
-    implementation 'no.nordicsemi.android:dfu:1.8.0'
+//    implementation 'no.nordicsemi.android:dfu:1.6.0'
     implementation 'com.android.support:multidex:1.0.3'
+//old version
+    implementation 'no.nordicsemi.android:dfu:1.9.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.8.0'
+    implementation 'com.squareup.okio:okio:2.7.0'
 
 }

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <application
         android:name="com.managemyhealth.plugins.ihealth.BaseApplication"
-        ></application>
+        >
+        <service
+            android:name="com.ido.ble.bluetooth.DeviceConnectService" android:exported="false" />
+        <service
+            android:name="com.ido.ble.dfu.DFUService" android:enabled="true" android:exported="false" />
+    </application>
 </manifest>

package/android/src/main/java/com/managemyhealth/plugins/ihealth/ihealthPlugin.java

@@ -1,7 +1,10 @@
 package com.managemyhealth.plugins.ihealth;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -9,6 +12,9 @@ import android.os.Message;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
@@ -45,6 +51,7 @@ import org.json.JSONTokener;
 
 import java.util.Calendar;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -109,10 +116,61 @@ public class ihealthPlugin extends Plugin {
 
     ihealthPlugin context = this;
 
+    @RequiresApi(api = Build.VERSION_CODES.S)
+    private void checkMultiplePermissions() {
+        String[] permissions = {
+                Manifest.permission.BLUETOOTH_SCAN,
+                Manifest.permission.BLUETOOTH,
+                Manifest.permission.BLUETOOTH_ADMIN,
+                Manifest.permission.BLUETOOTH_CONNECT,
+                Manifest.permission.BLUETOOTH_ADVERTISE,
+
+                // Add more permissions as needed
+        };
+
+        List<String> permissionsToRequest = new ArrayList<>();
+
+
+        // Check each permission
+        for (String permission : permissions) {
+            permissionsToRequest.add(permission);
+        }
+        for (String permission : permissions) {
+            if (ContextCompat.checkSelfPermission(this.getActivity(), permission) != PackageManager.PERMISSION_GRANTED) {
+                // Permission not granted
+                permissionsToRequest.add(permission);
+            }
+        }
+
+        // If there are permissions to request, request them
+        if (!permissionsToRequest.isEmpty()) {
+            showLog("asking permissions---------------");
+            ActivityCompat.requestPermissions(this.getActivity(), permissionsToRequest.toArray(new String[0]), 111);
+        } else {
+            // All permissions are already granted
+            // Do your work here
+        }
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled()) {
+        }
+        if (bluetoothAdapter.isEnabled()) {
+        }else{
+            try{
+                bluetoothAdapter.enable();
+            }catch(Exception e){
+
+            }
+        }
+
+
+        }
+
     @PluginMethod
     public void authoriseiHealthSdk(PluginCall call) {
 
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            checkMultiplePermissions();
+        }
 
         showLog("authorizeSDK() CALLED");
         try {
@@ -259,7 +317,15 @@ public class ihealthPlugin extends Plugin {
         mScanClientCallbackId = iHealthDevicesManager.getInstance().registerClientCallback(miHealthDevicesCallback);
         DiscoveryTypeEnum discoveryTypeEnum = getDiscoveryTypeEnum(deviceModel);
         if (discoveryTypeEnum!= null) {
-            iHealthDevicesManager.getInstance().startDiscovery(discoveryTypeEnum);
+           try {
+               showLog("inside selectPT3SBTAndScan");
+                iHealthDevicesManager.getInstance().startDiscovery(discoveryTypeEnum);
+               showLog("after inside selectPT3SBTAndScan");
+
+            }catch (Exception e ){
+               showLog("wriiefegef");
+               showLog(e.toString());
+           }
         }
     }
     public void selectHS4SAndScan(){
@@ -332,24 +398,29 @@ public class ihealthPlugin extends Plugin {
                     deviceDiscover=true;
                 }
                 isDevicePairingReq=true;
-                boolean request = iHealthDevicesManager.getInstance().connectDevice("", mac, deviceType);
-                showLog(String.valueOf(request));
-                mConnectDeviceClientCallbackId = iHealthDevicesManager.getInstance().registerClientCallback(miHealthDevicesCallback);
+                try{
+                    boolean request = iHealthDevicesManager.getInstance().connectDevice("", mac, deviceType);
+                    showLog(String.valueOf(request));
+                    mConnectDeviceClientCallbackId = iHealthDevicesManager.getInstance().registerClientCallback(miHealthDevicesCallback);
 
 
-                if (request) {
-                    eventData.put("deviceConnect", "success");
-                    if(!deviceConnect){
-                        notifyListeners("deviceConnect", eventData);
-                        deviceConnect=true;
-                    }
-                    iHealthDevicesManager.getInstance().stopDiscovery();
-                } else {
-                    eventData.put("deviceConnectFail", "failed");
-                   if(!deviceConnectFail) {
-                        notifyListeners("deviceConnectFail", eventData);
-                        deviceConnectFail=true;
+                    if (request) {
+                        eventData.put("deviceConnect", "success");
+                        if (!deviceConnect) {
+                            notifyListeners("deviceConnect", eventData);
+                            deviceConnect = true;
+                        }
+                        iHealthDevicesManager.getInstance().stopDiscovery();
+                    } else {
+                        eventData.put("deviceConnectFail", "failed");
+                        if (!deviceConnectFail) {
+                            notifyListeners("deviceConnectFail", eventData);
+                            deviceConnectFail = true;
+                        }
                     }
+                }catch (Exception e){
+                    showLog("Ecccc----------");
+                    showLog(e.toString());
                 }
             }
             else {
@@ -408,7 +479,16 @@ public class ihealthPlugin extends Plugin {
                             iHealthDevicesManager.getInstance().addCallbackFilterForDeviceType(mClientCallbackId, deviceType);
 
                             mPt3sbtControl = iHealthDevicesManager.getInstance().getPt3sbtDevice(deviceMac);
-                            mPt3sbtControl.setTime();
+//                            long delayMillis = 2000; // 2 seconds
+//                            Handler handler2 = new Handler();
+//                            handler2.postDelayed(new Runnable() {
+//                                @Override
+//                                public void run() {
+
+
+//                                }
+//                            }, delayMillis);
+//                            mPt3sbtControl.setTime();
                             mPt3sbtControl.getHistoryData();
                             showLog(" mPt3sbtControl.getHistoryData();");
                             break;
@@ -871,19 +951,16 @@ public class ihealthPlugin extends Plugin {
                             showLog("message: " + message);
                             break;
                         case Pt3sbtProfile.ACTION_GET_HISTORY_DATA:
+
                             try {
                                 JSONObject object = new JSONObject(message);
                                 JSObject result = new JSObject();
                                 result.put("deviceDataArr", object);
                                 result.put("deviceModel", "PT3SBT");
-                                //result.put("time", formattedDate);
                                 if(!offlineDataFound){
                                     notifyListeners("deviceDatafound", result);
                                     offlineDataFound= true;
-
-
-//                                    mPt3sbtControl.
-
+                                    mPt3sbtControl.deleteHistory();
                                 }
                             } catch (JSONException e) {
                                 JSObject pt3sbterror1 = new JSObject();
@@ -1642,7 +1719,7 @@ public class ihealthPlugin extends Plugin {
                                 if(!offlineDataFound){
                                     notifyListeners("deviceDatafound", result);
                                     offlineDataFound =true;
-                                    mHs4SControl.measureOnline(0,0);
+                                    mHs4SControl.measureOnline(01,0);
 
                                 }
                             } catch (JSONException e) {
@@ -1723,7 +1800,7 @@ public class ihealthPlugin extends Plugin {
                             }
                             break;
                         case HsProfile.ACTION_NO_HISTORICALDATA:
-                            mHs4SControl.measureOnline(0,0);
+                            mHs4SControl.measureOnline(01,0);
 
                             JSObject wsNoDataResult = new JSObject();
                             wsNoDataResult.put("message", "Data not found");

package/package.json

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