Merged latest 3.16

dev_v3.13.6_BLE_Faiz
Faiz Hashmi 2 years ago
parent 34e47421a3
commit 66a9afa6f3

@ -183,7 +183,8 @@ dependencies {
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
implementation 'no.nordicsemi.android:ble:2.2.4' implementation 'no.nordicsemi.android:ble:2.2.4'
implementation(name: 'lepu-blepro-1.0.1', ext: 'aar') 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 'com.guolindev.permissionx:permissionx:1.7.1'
implementation 'org.apache.commons:commons-io:1.3.2' // for FileUtills in ER1 device configuration implementation 'org.apache.commons:commons-io:1.3.2' // for FileUtills in ER1 device configuration

@ -29,7 +29,7 @@ import com.cloud.diplomaticquarterapp.smart_ring_2301.BleManager
import com.cloud.diplomaticquarterapp.utils.Constant import com.cloud.diplomaticquarterapp.utils.Constant
import com.cloud.diplomaticquarterapp.utils.UiChannel import com.cloud.diplomaticquarterapp.utils.UiChannel
import com.google.gson.Gson 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
import com.jstyle.blesdk2301.Util.BleSDK.EnterActivityMode import com.jstyle.blesdk2301.Util.BleSDK.EnterActivityMode
import com.jstyle.blesdk2301.Util.BleSDK.GetDynamicHRWithMode import com.jstyle.blesdk2301.Util.BleSDK.GetDynamicHRWithMode
@ -615,6 +615,7 @@ class BleBridge(private var flutterEngine: FlutterEngine, private var mainActivi
// ECG TRACKER // ECG TRACKER
if (deviceName.contains("DuoEK", ignoreCase = true)) { if (deviceName.contains("DuoEK", ignoreCase = true)) {
LiveEventBus.get<InterfaceEvent>(InterfaceEvent.ER2.EventEr2Info).observe(this.mainActivity) { LiveEventBus.get<InterfaceEvent>(InterfaceEvent.ER2.EventEr2Info).observe(this.mainActivity) {
val data = it.data as DeviceInfo val data = it.data as DeviceInfo
println("DuoEK INFO DATA: $data") println("DuoEK INFO DATA: $data")
@ -724,7 +725,9 @@ class BleBridge(private var flutterEngine: FlutterEngine, private var mainActivi
} }
// OXYMETER // 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>(InterfaceEvent.PC60Fw.EventPC60FwRtParam).observe(this.mainActivity) { LiveEventBus.get<InterfaceEvent>(InterfaceEvent.PC60Fw.EventPC60FwRtParam).observe(this.mainActivity) {
val data = it.data as RtParam val data = it.data as RtParam
println("POD-1_SN8187: $data") println("POD-1_SN8187: $data")

@ -45,8 +45,7 @@ class _AndesFitTemperatureConnectScreenState extends State<AndesFitTemperatureCo
mHeight(24.0), mHeight(24.0),
Column( Column(
children: [ children: [
// Text("Please stay Still.", style: TextStyle(fontSize: 100, fontWeight: FontWeight.bold)), Text("Some animation of showing user how to measure the temperature.", style: TextStyle(fontSize: 20)),
Text("Please Wait", style: TextStyle(fontSize: 20)),
], ],
), ),
mHeight(24.0), mHeight(24.0),

Loading…
Cancel
Save