diff --git a/android/app/build.gradle b/android/app/build.gradle index 76178384..a83548f6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -183,7 +183,8 @@ dependencies { implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' implementation 'no.nordicsemi.android:ble:2.2.4' implementation(name: 'lepu-blepro-1.0.1', ext: 'aar') - implementation 'io.github.jeremyliao:live-event-bus-x:1.8.0' + implementation(name: 'liveeventbus-modified', ext: 'aar') +// implementation 'io.github.jeremyliao:live-event-bus-x:1.8.0' implementation 'com.guolindev.permissionx:permissionx:1.7.1' implementation 'org.apache.commons:commons-io:1.3.2' // for FileUtills in ER1 device configuration diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt index 3ec369be..97b4a367 100644 --- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt +++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt @@ -29,7 +29,7 @@ import com.cloud.diplomaticquarterapp.smart_ring_2301.BleManager import com.cloud.diplomaticquarterapp.utils.Constant import com.cloud.diplomaticquarterapp.utils.UiChannel import com.google.gson.Gson -import com.jeremyliao.liveeventbus.LiveEventBus +import com.jeremyliao.liveeventbus.LiveEventBus; import com.jstyle.blesdk2301.Util.BleSDK import com.jstyle.blesdk2301.Util.BleSDK.EnterActivityMode import com.jstyle.blesdk2301.Util.BleSDK.GetDynamicHRWithMode @@ -615,6 +615,7 @@ class BleBridge(private var flutterEngine: FlutterEngine, private var mainActivi // ECG TRACKER if (deviceName.contains("DuoEK", ignoreCase = true)) { + LiveEventBus.get(InterfaceEvent.ER2.EventEr2Info).observe(this.mainActivity) { val data = it.data as DeviceInfo println("DuoEK INFO DATA: $data") @@ -724,7 +725,9 @@ class BleBridge(private var flutterEngine: FlutterEngine, private var mainActivi } // OXYMETER - if (deviceName == "POD-1_SN8187" || deviceName == "PC-60FW") { //DONE + if (deviceName == "POD-1_SN8187" || deviceName == "PC-60FW" || deviceName == "PC-60F_SN972236") { //DONE + + //observeSticky LiveEventBus.get(InterfaceEvent.PC60Fw.EventPC60FwRtParam).observe(this.mainActivity) { val data = it.data as RtParam println("POD-1_SN8187: $data") diff --git a/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_temperature_connect_screen.dart b/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_temperature_connect_screen.dart index fbd9e69c..c699e580 100644 --- a/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_temperature_connect_screen.dart +++ b/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_temperature_connect_screen.dart @@ -45,8 +45,7 @@ class _AndesFitTemperatureConnectScreenState extends State