From 7e49dac7bd1cfa2709e46332415d6bd64094e888 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 8 Jan 2024 09:26:30 +0300 Subject: [PATCH] Updates --- ios/Runner/AppDelegate.swift | 2 ++ lib/pages/landing/landing_page.dart | 5 +++-- .../my_trackers/viatom_devices/ekg_tracker_ble.dart | 2 +- .../my_trackers/viatom_devices/oxymeter_ble.dart | 4 ++-- lib/viatom_ble/ble_connect.dart | 11 ++++++++--- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 61b6c0af..be0d961d 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -35,12 +35,14 @@ var userNotificationCenterDelegate:UNUserNotificationCenterDelegate? = nil flutterViewController = mainViewController HMGPlatformBridge.initialize(flutterViewController: flutterViewController) BLEPlatformBridge.initialize(flutterViewController: flutterViewController) + BLEPlatformBridgeEKG.initialize(flutterViewController: flutterViewController) // platform initialization for EKG OpenTokPlatformBridge.initialize(flutterViewController: flutterViewController, registrar: self.registrar(forPlugin: "open-tok")) }else if let mainViewController = initialViewController(){ // platform initialization suppose to be in background flutterViewController = mainViewController HMGPlatformBridge.initialize(flutterViewController: flutterViewController) BLEPlatformBridge.initialize(flutterViewController: flutterViewController) + BLEPlatformBridgeEKG.initialize(flutterViewController: flutterViewController) // platform initialization for EKG OpenTokPlatformBridge.initialize(flutterViewController: flutterViewController, registrar: self.registrar(forPlugin: "open-tok")) } } diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index d93c2a0c..7209328e 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -573,8 +573,9 @@ class _LandingPageState extends State with WidgetsBindingObserver { }, onLoginClick: () { // login(); - Navigator.push(context, FadePage(page: BpTrackerBLE())); - // Navigator.push(context, FadePage(page: EKG_BLE())); + // Navigator.push(context, FadePage(page: BpTrackerBLE())); + Navigator.push(context, FadePage(page: EKG_BLE())); + // Navigator.push(context, FadePage(page: Oxymeter_BLE())); }, onMedicalFileClick: () { changeCurrentTab(1); diff --git a/lib/pages/medical/my_trackers/viatom_devices/ekg_tracker_ble.dart b/lib/pages/medical/my_trackers/viatom_devices/ekg_tracker_ble.dart index 5a590543..74ac9365 100644 --- a/lib/pages/medical/my_trackers/viatom_devices/ekg_tracker_ble.dart +++ b/lib/pages/medical/my_trackers/viatom_devices/ekg_tracker_ble.dart @@ -164,7 +164,7 @@ class _EKG_BLEState extends State { parseEKGRealTimeDataObject(event['data']); } }); - await BleChannel.getScanningResult(["oximeter", "ekg"]); + await BleChannel.getScanningResult(["ekg", "DuoEK"]); }, textColor: Colors.white, ), diff --git a/lib/pages/medical/my_trackers/viatom_devices/oxymeter_ble.dart b/lib/pages/medical/my_trackers/viatom_devices/oxymeter_ble.dart index 9277018c..a4792c08 100644 --- a/lib/pages/medical/my_trackers/viatom_devices/oxymeter_ble.dart +++ b/lib/pages/medical/my_trackers/viatom_devices/oxymeter_ble.dart @@ -17,8 +17,8 @@ class _Oxymeter_BLEState extends State { final oxymeterValueNotifier = ValueNotifier("start"); - // String deviceName = "CheckMeO2"; - String deviceName = "POD"; + String deviceName = "CheckMeO2"; + // String deviceName = "POD"; @override void dispose() { diff --git a/lib/viatom_ble/ble_connect.dart b/lib/viatom_ble/ble_connect.dart index ef9c53a0..acddde2b 100644 --- a/lib/viatom_ble/ble_connect.dart +++ b/lib/viatom_ble/ble_connect.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:flutter/services.dart'; class BleChannel { @@ -5,12 +7,16 @@ class BleChannel { static const platform_ios_ekg = MethodChannel('BLE-Platform-Bridge-IOS-EKG'); - //BLE-Platform-Bridge static Future getScanningResult(List deviceType) async { try { + String result; print("----------Flutter Init -------"); - final String result = await platform.invokeMethod('scan', deviceType); + if (Platform.isIOS && deviceType[0] == "ekg") { + result = await platform_ios_ekg.invokeMethod('scanEKG', deviceType); + } else { + result = await platform.invokeMethod('scan', deviceType); + } print("----------Flutter Result -------"); print(result); return result; @@ -66,5 +72,4 @@ class BleChannel { return "Error: $e"; } } - }