Merged latest 3.16

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
 

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>(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>(InterfaceEvent.PC60Fw.EventPC60FwRtParam).observe(this.mainActivity) {
                 val data = it.data as RtParam
                 println("POD-1_SN8187: $data")

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<AndesFitTemperatureCo
                 mHeight(24.0),
                 Column(
                   children: [
-                    // Text("Please stay Still.", style: TextStyle(fontSize: 100, fontWeight: FontWeight.bold)),
-                    Text("Please Wait", style: TextStyle(fontSize: 20)),
+                    Text("Some animation of showing user how to measure the temperature.", style: TextStyle(fontSize: 20)),
                   ],
                 ),
                 mHeight(24.0),

pubspec.yaml

@@ -146,18 +146,18 @@ dependencies:
   #geofencing: any
   speech_to_text: ^6.1.1
 
-#  in_app_update: ^4.2.2
+  #  in_app_update: ^4.2.2
 
   in_app_review: ^2.0.3
 
   badges: ^3.1.2
   flutter_app_icon_badge: ^2.0.0
-#  dropdown_search: 5.0.6
+  #  dropdown_search: 5.0.6
   youtube_player_flutter: ^8.1.2
 
-#  shimmer: ^3.0.0
+  #  shimmer: ^3.0.0
   carousel_slider: ^4.0.0
-#  flutter_staggered_grid_view: ^0.7.0
+  #  flutter_staggered_grid_view: ^0.7.0
   huawei_hmsavailability: ^6.11.0+301
   huawei_location: ^6.11.0+301
   share_plus: ^6.3.4
@@ -166,7 +166,7 @@ dependencies:
   equatable: ^2.0.3
   wave: ^0.2.0
   sms_otp_auto_verify: ^2.1.0
-#  flutter_ios_voip_kit: ^0.1.0
+  #  flutter_ios_voip_kit: ^0.1.0
   google_api_availability: ^5.0.0
   open_filex: ^4.3.2
   path_provider: ^2.0.8