capacitor-plugin-ihealth 1.1.2 → 1.1.4

package/CapacitorPluginIhealth.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   # s.vendored_frameworks = 'iHealthSDK2.7.8.a'
   s.ios.vendored_library = 'ios/Plugin/libiHealthSDK2.7.8.a'
   #  s.vendored_library = 'ios/Pods/Frameworks/iHealthSDK2.7.8.a'
-   s.preserve_paths = 'ios/Plugin/libiHealthSDK2.7.8.a'
+   s.preserve_paths = 'ios/Plugin/libiHealthSDK2.7.8.a','android/src/iHealthSDK_2.9.10.jar'
   #  s.prepare_command  = <<-CMD
   #  if [ -f $PWD/ios/Plugin/libiHealthSDK2.7.8.a ]
   #   then

package/README.md

@@ -23,7 +23,7 @@ npx cap sync
 * [`deleteDeviceData()`](#deletedevicedata)
 * [`getDeviceOfflineData()`](#getdeviceofflinedata)
 * [`startBP5SMeasurement()`](#startbp5smeasurement)
-* [`addListener([eventName: 'OnlineDeviceData', 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], ...)`](#addlistenereventname-onlinedevicedata-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)
+* [`addListener([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], ...)`](#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)
 * [Interfaces](#interfaces)
 * [Type Aliases](#type-aliases)
 
@@ -154,15 +154,15 @@ startBP5SMeasurement() => Promise<{ value: any; }>
 --------------------
 
 
-### addListener([eventName: 'OnlineDeviceData', 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], ...)
+### addListener([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], ...)
 
 ```typescript
-addListener(...args: [eventName: "OnlineDeviceData", 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
+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
 ```
 
-| Param      | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **`args`** | <code>[eventName: 'OnlineDeviceData', listenerFunc: (info: any) =&gt; void] \| [eventName: 'error', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceDatafound', listenerFunc: (info: any) =&gt; void] \| [eventName: 'StartMeasurementFinished', listenerFunc: (info: any) =&gt; void] \| [eventName: 'dataNotFound', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceConnectFail', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceDisconnect', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceDiscover', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceConnect', listenerFunc: (info: any) =&gt; void]</code> |
+| Param      | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`args`** | <code>[eventName: 'OnlineDeviceData', listenerFunc: (info: any) =&gt; void] \| [eventName: 'toast', listenerFunc: (info: any) =&gt; void] \| [eventName: 'error', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceDatafound', listenerFunc: (info: any) =&gt; void] \| [eventName: 'StartMeasurementFinished', listenerFunc: (info: any) =&gt; void] \| [eventName: 'dataNotFound', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceConnectFail', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceDisconnect', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceDiscover', listenerFunc: (info: any) =&gt; void] \| [eventName: 'deviceConnect', listenerFunc: (info: any) =&gt; void]</code> |
 
 **Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>
 

package/android/build.gradle

@@ -11,7 +11,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
+
     }
 }
 
@@ -26,6 +28,10 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
+        ndk {
+            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+        }
     }
     buildTypes {
         release {
@@ -33,6 +39,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    sourceSets {
+        main {
+            assets.srcDirs += [
+                    'src',
+            ]
+        }
+    }
     lintOptions {
         abortOnError false
     }
@@ -49,10 +62,20 @@ repositories {
 
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+//    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    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.google.code.gson:gson:2.8.9'
+    implementation 'org.greenrobot:greendao:3.2.2'
+    implementation 'no.nordicsemi.android:dfu:1.8.0'
+    implementation 'com.android.support:multidex:1.0.3'
+
 }

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:name="com.managemyhealth.plugins.ihealth.BaseApplication"
+        ></application>
 </manifest>

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

@@ -0,0 +1,51 @@
+package com.managemyhealth.plugins.ihealth;
+
+import android.app.Application;
+import android.content.Context;
+import android.util.Log;
+
+import com.ihealth.communication.manager.iHealthDevicesManager;
+
+/**
+ * <li>全局Application</li>
+ * <li>Base Application</li>
+ * <p>
+ * Created by wj on 2018/11/20
+ */
+
+public class BaseApplication extends Application {
+	private static BaseApplication mInstance;
+	//全局context
+	/**
+	 * global connect
+	 */
+	public static Context applicationContext;
+
+	@Override
+	public void onCreate() {
+		super.onCreate();
+		mInstance = this;
+		applicationContext = this;
+		init();
+	}
+
+	/**
+	 * 初始化
+	 */
+	private void init() {
+		/*
+		 * Initializes the iHealth devices manager. Can discovery available iHealth devices nearby
+		 * and connect these devices through iHealthDevicesManager.
+		 */
+		iHealthDevicesManager.getInstance().init(this, Log.VERBOSE, Log.VERBOSE);
+	}
+
+	/**
+	 * 获取BaseApplication的实例
+	 *
+	 * @return
+	 */
+	public static BaseApplication instance() {
+		return mInstance;
+	}
+}

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

@@ -0,0 +1,49 @@
+package com.managemyhealth.plugins.ihealth;
+
+public class DeviceCharacteristic {
+	String deviceName;
+	long deviceType;
+	String deviceMac;
+	int rssi;
+	boolean isSelected;
+
+	public String getDeviceName() {
+		return deviceName;
+	}
+
+	public void setDeviceName(String deviceName) {
+		this.deviceName = deviceName;
+	}
+
+	public long getDeviceType() {
+		return deviceType;
+	}
+
+	public void setDeviceType(long deviceType) {
+		this.deviceType = deviceType;
+	}
+
+	public boolean isSelected() {
+		return isSelected;
+	}
+
+	public void setSelected(boolean selected) {
+		isSelected = selected;
+	}
+
+	public int getRssi() {
+		return rssi;
+	}
+
+	public void setRssi(int rssi) {
+		this.rssi = rssi;
+	}
+
+	public String getDeviceMac() {
+		return deviceMac;
+	}
+
+	public void setDeviceMac(String deviceMac) {
+		this.deviceMac = deviceMac;
+	}
+}