From c9994b82697a9d90bc8e0049411b05b3eabded94 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 10 Jan 2024 14:22:29 +0300 Subject: [PATCH 1/4] iOS ECG implementation --- ios/Runner.xcodeproj/project.pbxproj | 8 ++++++++ lib/config/config.dart | 6 +++--- lib/core/service/client/base_app_client.dart | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index e10b2128..0f1df749 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -18,6 +18,8 @@ 762D738E274E42650063CE73 /* ring_30Sec.caf in Resources */ = {isa = PBXBuildFile; fileRef = 762D738C274E42650063CE73 /* ring_30Sec.caf */; }; 762D738F274E42650063CE73 /* ring_30Sec.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 762D738D274E42650063CE73 /* ring_30Sec.mp3 */; }; 765948102B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659480F2B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift */; }; + 765948192B4E72A100D96E03 /* TupleToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948182B4E72A100D96E03 /* TupleToArray.swift */; }; + 7659481B2B4E899200D96E03 /* VTECGParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659481A2B4E899200D96E03 /* VTECGParser.swift */; }; 76801ACA2AD7F7DA00126C2D /* CRAP20Lib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */; }; 76815B27275F381C00E66E94 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76815B26275F381C00E66E94 /* HealthKit.framework */; }; 76962ECE28AE5C10004EAE09 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */; }; @@ -62,6 +64,8 @@ 762D738C274E42650063CE73 /* ring_30Sec.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring_30Sec.caf; path = ../../assets/sounds/ring_30Sec.caf; sourceTree = ""; }; 762D738D274E42650063CE73 /* ring_30Sec.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ring_30Sec.mp3; path = ../../assets/sounds/ring_30Sec.mp3; sourceTree = ""; }; 7659480F2B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEPlatformBridgeEKG.swift; sourceTree = ""; }; + 765948182B4E72A100D96E03 /* TupleToArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TupleToArray.swift; sourceTree = ""; }; + 7659481A2B4E899200D96E03 /* VTECGParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VTECGParser.swift; sourceTree = ""; }; 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CRAP20Lib.xcframework; path = Runner/BLE_SDKs/CRAP20Lib.xcframework; sourceTree = ""; }; 76815B26275F381C00E66E94 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; @@ -162,10 +166,12 @@ 76F3B95C2ACEBE2800D7A698 /* Utils */ = { isa = PBXGroup; children = ( + 7659481A2B4E899200D96E03 /* VTECGParser.swift */, 76F3B9602ACEBE8E00D7A698 /* VTBLEUtils.h */, 76F3B95F2ACEBE8D00D7A698 /* VTBLEUtils.m */, 76F3B95D2ACEBE8D00D7A698 /* VTDevice.h */, 76F3B95E2ACEBE8D00D7A698 /* VTDevice.m */, + 765948182B4E72A100D96E03 /* TupleToArray.swift */, ); path = Utils; sourceTree = ""; @@ -453,6 +459,8 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, 301C79B027200DED0016307B /* OpenTokLocalVideoFactory.swift in Sources */, E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */, + 7659481B2B4E899200D96E03 /* VTECGParser.swift in Sources */, + 765948192B4E72A100D96E03 /* TupleToArray.swift in Sources */, E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */, 765948102B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift in Sources */, E91B5397256AAA6500E96549 /* Extensions.swift in Sources */, diff --git a/lib/config/config.dart b/lib/config/config.dart index 7cfc6951..21c21537 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/'; @@ -326,7 +326,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 11.4; +var VERSION_ID = 11.9; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 866adba1..44ed405a 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'] = 3452986; //3844083 + body['TokenID'] = "@dm!n"; // Patient ID: 3027574 // Mobile no.: 0502303285 From be53844c5810e4028937c4e18e8d2768dfcf5654 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 10 Jan 2024 17:16:22 +0300 Subject: [PATCH 2/4] DuoEK ECG iOS Integration done --- ios/Runner.xcodeproj/project.pbxproj | 20 ++++++++++---------- lib/core/service/client/base_app_client.dart | 4 ++-- lib/pages/landing/landing_page.dart | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 0f1df749..bdf523b5 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -17,15 +17,15 @@ 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 762D738E274E42650063CE73 /* ring_30Sec.caf in Resources */ = {isa = PBXBuildFile; fileRef = 762D738C274E42650063CE73 /* ring_30Sec.caf */; }; 762D738F274E42650063CE73 /* ring_30Sec.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 762D738D274E42650063CE73 /* ring_30Sec.mp3 */; }; - 765948102B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659480F2B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift */; }; 765948192B4E72A100D96E03 /* TupleToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948182B4E72A100D96E03 /* TupleToArray.swift */; }; 7659481B2B4E899200D96E03 /* VTECGParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659481A2B4E899200D96E03 /* VTECGParser.swift */; }; + 7659481E2B4EBEB600D96E03 /* VTBLEUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */; }; + 765948202B4EC54400D96E03 /* EKGFileDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */; }; 76801ACA2AD7F7DA00126C2D /* CRAP20Lib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */; }; 76815B27275F381C00E66E94 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76815B26275F381C00E66E94 /* HealthKit.framework */; }; 76962ECE28AE5C10004EAE09 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */; }; 76F2556127F1FFED0062C1CD /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76F2556027F1FFED0062C1CD /* PassKit.framework */; }; 76F3B9612ACEBE8E00D7A698 /* VTDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 76F3B95E2ACEBE8D00D7A698 /* VTDevice.m */; }; - 76F3B9622ACEBE8E00D7A698 /* VTBLEUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 76F3B95F2ACEBE8D00D7A698 /* VTBLEUtils.m */; }; 76F789982ACEA25600FC6C38 /* BLEPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76F789972ACEA25600FC6C38 /* BLEPlatformBridge.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -63,17 +63,17 @@ 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 762D738C274E42650063CE73 /* ring_30Sec.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring_30Sec.caf; path = ../../assets/sounds/ring_30Sec.caf; sourceTree = ""; }; 762D738D274E42650063CE73 /* ring_30Sec.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ring_30Sec.mp3; path = ../../assets/sounds/ring_30Sec.mp3; sourceTree = ""; }; - 7659480F2B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEPlatformBridgeEKG.swift; sourceTree = ""; }; 765948182B4E72A100D96E03 /* TupleToArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TupleToArray.swift; sourceTree = ""; }; 7659481A2B4E899200D96E03 /* VTECGParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VTECGParser.swift; sourceTree = ""; }; + 7659481C2B4EBEB600D96E03 /* VTBLEUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VTBLEUtils.h; sourceTree = ""; }; + 7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTBLEUtils.m; sourceTree = ""; }; + 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EKGFileDetail.swift; sourceTree = ""; }; 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CRAP20Lib.xcframework; path = Runner/BLE_SDKs/CRAP20Lib.xcframework; sourceTree = ""; }; 76815B26275F381C00E66E94 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 76F2556027F1FFED0062C1CD /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; }; 76F3B95D2ACEBE8D00D7A698 /* VTDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VTDevice.h; sourceTree = ""; }; 76F3B95E2ACEBE8D00D7A698 /* VTDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTDevice.m; sourceTree = ""; }; - 76F3B95F2ACEBE8D00D7A698 /* VTBLEUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTBLEUtils.m; sourceTree = ""; }; - 76F3B9602ACEBE8E00D7A698 /* VTBLEUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VTBLEUtils.h; sourceTree = ""; }; 76F789972ACEA25600FC6C38 /* BLEPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEPlatformBridge.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 838788A2BEDC4910F4B029A6 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; @@ -158,7 +158,6 @@ children = ( 76F3B95C2ACEBE2800D7A698 /* Utils */, 76F789972ACEA25600FC6C38 /* BLEPlatformBridge.swift */, - 7659480F2B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift */, ); path = Ble; sourceTree = ""; @@ -166,12 +165,13 @@ 76F3B95C2ACEBE2800D7A698 /* Utils */ = { isa = PBXGroup; children = ( + 7659481C2B4EBEB600D96E03 /* VTBLEUtils.h */, + 7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */, 7659481A2B4E899200D96E03 /* VTECGParser.swift */, - 76F3B9602ACEBE8E00D7A698 /* VTBLEUtils.h */, - 76F3B95F2ACEBE8D00D7A698 /* VTBLEUtils.m */, 76F3B95D2ACEBE8D00D7A698 /* VTDevice.h */, 76F3B95E2ACEBE8D00D7A698 /* VTDevice.m */, 765948182B4E72A100D96E03 /* TupleToArray.swift */, + 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */, ); path = Utils; sourceTree = ""; @@ -446,6 +446,7 @@ E91B539A256AAA6500E96549 /* MainFlutterVC.swift in Sources */, E91B539C256AAA6500E96549 /* HMG_GUEST_bkp.swift in Sources */, E91B5396256AAA6500E96549 /* GlobalHelper.swift in Sources */, + 7659481E2B4EBEB600D96E03 /* VTBLEUtils.m in Sources */, E923EFD4258645C100E3E751 /* HMG_Geofence.swift in Sources */, E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */, 76F3B9612ACEBE8E00D7A698 /* VTDevice.m in Sources */, @@ -455,14 +456,13 @@ 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 76F789982ACEA25600FC6C38 /* BLEPlatformBridge.swift in Sources */, E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */, - 76F3B9622ACEBE8E00D7A698 /* VTBLEUtils.m in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, 301C79B027200DED0016307B /* OpenTokLocalVideoFactory.swift in Sources */, E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */, 7659481B2B4E899200D96E03 /* VTECGParser.swift in Sources */, 765948192B4E72A100D96E03 /* TupleToArray.swift in Sources */, E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */, - 765948102B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift in Sources */, + 765948202B4EC54400D96E03 /* EKGFileDetail.swift in Sources */, E91B5397256AAA6500E96549 /* Extensions.swift in Sources */, E91B5398256AAA6500E96549 /* API.swift in Sources */, ); diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 44ed405a..3c98028a 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'] = 3452986; //3844083 - body['TokenID'] = "@dm!n"; + // body['PatientID'] = 3452986; //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 73499fe9..f77a61f4 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -575,8 +575,8 @@ class _LandingPageState extends State with WidgetsBindingObserver { onLoginClick: () { // login(); // Navigator.push(context, FadePage(page: BpTrackerBLE())); - Navigator.push(context, FadePage(page: SP20PulseTracker())); - // Navigator.push(context, FadePage(page: EKG_BLE())); + // Navigator.push(context, FadePage(page: SP20PulseTracker())); + Navigator.push(context, FadePage(page: EKG_BLE())); // Navigator.push(context, FadePage(page: Oxymeter_BLE())); }, onMedicalFileClick: () { From 33b0900b37b4e6d922b820ae918a03b854c28dda Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 11 Jan 2024 11:55:19 +0300 Subject: [PATCH 3/4] SP-20 device integrated with iOS --- ios/Runner.xcodeproj/project.pbxproj | 8 ++++++++ .../viatom_devices/oxy_sp20_rt_param_model.dart | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index bdf523b5..61de2376 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -21,6 +21,8 @@ 7659481B2B4E899200D96E03 /* VTECGParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659481A2B4E899200D96E03 /* VTECGParser.swift */; }; 7659481E2B4EBEB600D96E03 /* VTBLEUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */; }; 765948202B4EC54400D96E03 /* EKGFileDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */; }; + 765948222B4FD1B500D96E03 /* SP20RTParamModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */; }; + 765948242B4FE12B00D96E03 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948232B4FE12B00D96E03 /* File.swift */; }; 76801ACA2AD7F7DA00126C2D /* CRAP20Lib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */; }; 76815B27275F381C00E66E94 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76815B26275F381C00E66E94 /* HealthKit.framework */; }; 76962ECE28AE5C10004EAE09 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */; }; @@ -68,6 +70,8 @@ 7659481C2B4EBEB600D96E03 /* VTBLEUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VTBLEUtils.h; sourceTree = ""; }; 7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTBLEUtils.m; sourceTree = ""; }; 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EKGFileDetail.swift; sourceTree = ""; }; + 765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SP20RTParamModel.swift; sourceTree = ""; }; + 765948232B4FE12B00D96E03 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = ""; }; 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CRAP20Lib.xcframework; path = Runner/BLE_SDKs/CRAP20Lib.xcframework; sourceTree = ""; }; 76815B26275F381C00E66E94 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; @@ -172,6 +176,8 @@ 76F3B95E2ACEBE8D00D7A698 /* VTDevice.m */, 765948182B4E72A100D96E03 /* TupleToArray.swift */, 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */, + 765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */, + 765948232B4FE12B00D96E03 /* File.swift */, ); path = Utils; sourceTree = ""; @@ -461,8 +467,10 @@ E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */, 7659481B2B4E899200D96E03 /* VTECGParser.swift in Sources */, 765948192B4E72A100D96E03 /* TupleToArray.swift in Sources */, + 765948222B4FD1B500D96E03 /* SP20RTParamModel.swift in Sources */, E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */, 765948202B4EC54400D96E03 /* EKGFileDetail.swift in Sources */, + 765948242B4FE12B00D96E03 /* File.swift in Sources */, E91B5397256AAA6500E96549 /* Extensions.swift in Sources */, E91B5398256AAA6500E96549 /* API.swift in Sources */, ); diff --git a/lib/models/ble_devices/viatom_devices/oxy_sp20_rt_param_model.dart b/lib/models/ble_devices/viatom_devices/oxy_sp20_rt_param_model.dart index f386f684..8bcf58d9 100644 --- a/lib/models/ble_devices/viatom_devices/oxy_sp20_rt_param_model.dart +++ b/lib/models/ble_devices/viatom_devices/oxy_sp20_rt_param_model.dart @@ -3,7 +3,7 @@ class SP20RTParamModel { bool isCheckProbe; bool isProbeOff; bool isPulseSearching; - double pi; + num pi; int pr; int spo2; From a271e700c793ec1829728d0616fc88fce68b0dc0 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 11 Jan 2024 16:40:37 +0300 Subject: [PATCH 4/4] Updates --- ios/Runner.xcodeproj/project.pbxproj | 8 ++++---- lib/pages/landing/landing_page.dart | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 61de2376..5992f749 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -22,7 +22,7 @@ 7659481E2B4EBEB600D96E03 /* VTBLEUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */; }; 765948202B4EC54400D96E03 /* EKGFileDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */; }; 765948222B4FD1B500D96E03 /* SP20RTParamModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */; }; - 765948242B4FE12B00D96E03 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948232B4FE12B00D96E03 /* File.swift */; }; + 765948242B4FE12B00D96E03 /* DoubleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948232B4FE12B00D96E03 /* DoubleExtension.swift */; }; 76801ACA2AD7F7DA00126C2D /* CRAP20Lib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */; }; 76815B27275F381C00E66E94 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76815B26275F381C00E66E94 /* HealthKit.framework */; }; 76962ECE28AE5C10004EAE09 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */; }; @@ -71,7 +71,7 @@ 7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTBLEUtils.m; sourceTree = ""; }; 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EKGFileDetail.swift; sourceTree = ""; }; 765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SP20RTParamModel.swift; sourceTree = ""; }; - 765948232B4FE12B00D96E03 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = ""; }; + 765948232B4FE12B00D96E03 /* DoubleExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleExtension.swift; sourceTree = ""; }; 76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CRAP20Lib.xcframework; path = Runner/BLE_SDKs/CRAP20Lib.xcframework; sourceTree = ""; }; 76815B26275F381C00E66E94 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 76962ECD28AE5C10004EAE09 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; @@ -177,7 +177,7 @@ 765948182B4E72A100D96E03 /* TupleToArray.swift */, 7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */, 765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */, - 765948232B4FE12B00D96E03 /* File.swift */, + 765948232B4FE12B00D96E03 /* DoubleExtension.swift */, ); path = Utils; sourceTree = ""; @@ -470,7 +470,7 @@ 765948222B4FD1B500D96E03 /* SP20RTParamModel.swift in Sources */, E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */, 765948202B4EC54400D96E03 /* EKGFileDetail.swift in Sources */, - 765948242B4FE12B00D96E03 /* File.swift in Sources */, + 765948242B4FE12B00D96E03 /* DoubleExtension.swift in Sources */, E91B5397256AAA6500E96549 /* Extensions.swift in Sources */, E91B5398256AAA6500E96549 /* API.swift in Sources */, ); diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index f77a61f4..fade8225 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -574,9 +574,9 @@ class _LandingPageState extends State with WidgetsBindingObserver { }, onLoginClick: () { // login(); - // Navigator.push(context, FadePage(page: BpTrackerBLE())); + Navigator.push(context, FadePage(page: BpTrackerBLE())); // Navigator.push(context, FadePage(page: SP20PulseTracker())); - Navigator.push(context, FadePage(page: EKG_BLE())); + // Navigator.push(context, FadePage(page: EKG_BLE())); // Navigator.push(context, FadePage(page: Oxymeter_BLE())); }, onMedicalFileClick: () {