From b6a3ae23805fb085d460dc38dd8eb870b59235d2 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 11 Dec 2023 17:17:51 +0300 Subject: [PATCH] updates EKG --- .../kotlin/com/cloud/diplomaticquarterapp/ble/BleBridge.kt | 2 +- lib/config/config.dart | 4 ++-- lib/core/service/client/base_app_client.dart | 4 ++-- lib/pages/landing/landing_page.dart | 5 +++-- .../my_trackers/viatom_devices/ekg_tracker_ble.dart | 7 ++++--- 5 files changed, 12 insertions(+), 10 deletions(-) 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 aaceea38..221ab5f4 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 @@ -223,7 +223,7 @@ class BleBridge( val fileNames = it.data as ArrayList println("DuoEK FileNames List: $fileNames") val returnData = - mapOf("type" to "fileList", "data" to fileNames.toString()) + mapOf("type" to "fileList", "data" to fileNames) // eventSink?.success(fileNames.toString()) eventSink?.success(returnData) } diff --git a/lib/config/config.dart b/lib/config/config.dart index c5f6b164..7cfc6951 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -20,8 +20,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; -// var BASE_URL = 'https://uat.hmgwebservices.com/'; -var BASE_URL = 'https://hmgwebservices.com/'; +var BASE_URL = 'https://uat.hmgwebservices.com/'; +// var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 43ac6df8..866adba1 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -149,8 +149,8 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; - body['PatientID'] = 1231755; //3844083 - body['TokenID'] = "@dm!n"; + // body['PatientID'] = 1231755; //3844083 + // body['TokenID'] = "@dm!n"; // Patient ID: 3027574 // Mobile no.: 0502303285 diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 0b478007..0e107160 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -19,6 +19,7 @@ import 'package:diplomaticquarterapp/pages/landing/home_page_2.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart'; import 'package:diplomaticquarterapp/pages/medical/my_trackers/ecg_ble.dart'; import 'package:diplomaticquarterapp/pages/medical/my_trackers/spirometer.dart'; +import 'package:diplomaticquarterapp/pages/medical/my_trackers/viatom_devices/ekg_tracker_ble.dart'; import 'package:diplomaticquarterapp/pages/medical/my_trackers/viatom_devices/oxymeter_ble.dart'; import 'package:diplomaticquarterapp/pages/medical/my_trackers/weight_scale_ble.dart'; import 'package:diplomaticquarterapp/pages/videocall-webrtc-rnd/webrtc/start_video_call.dart'; @@ -570,8 +571,8 @@ class _LandingPageState extends State with WidgetsBindingObserver { changeCurrentTab(1); }, onLoginClick: () { - login(); - // Navigator.push(context, FadePage(page: Oxymeter_BLE())); + // login(); + Navigator.push(context, FadePage(page: EKG_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 ffa0f6bf..b33cac73 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 @@ -61,7 +61,7 @@ class _EKG_BLEState extends State { ekgValueNotifier.value = event['data']; } if (event['type'] == "fileList") { - parseEKGFilesList(event['data'].toString().split(",")); + parseEKGFilesList(event['data']); } }); await BleChannel.getScanningResult(["oximeter", "ekg"]); @@ -124,9 +124,10 @@ class _EKG_BLEState extends State { ); } - void parseEKGFilesList(dynamic filesListArray) { + void parseEKGFilesList(List filesListArray) { + List filesList = filesListArray.toString().replaceAll("[", "").replaceAll("]", "").split(","); print("received files list: $filesListArray"); - ekgValueNotifier.value = filesListArray.toString(); + ekgValueNotifier.value = filesListArray.toString().replaceAll("[", "").replaceAll("]", ""); } Widget getFilesListWidget() {