Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_3.3_BLE' into dev_3.3_BLE

Browse Source
dev_3.3_BLE
Faiz Hashmi 2 years ago
parent 70ca4071fc a271e700c7
commit 8611903db0
5 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File

36
ios/Runner.xcodeproj/project.pbxproj
Unescape Escape View File

@ -17,13 +17,17 @@
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 */; };
765948222B4FD1B500D96E03 /* SP20RTParamModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765948212B4FD1B500D96E03 /* SP20RTParamModel.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 */; };
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 */; };
@ -61,15 +65,19 @@
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
762D738C274E42650063CE73 /* ring_30Sec.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring_30Sec.caf; path = ../../assets/sounds/ring_30Sec.caf; sourceTree = "<group>"; };
762D738D274E42650063CE73 /* ring_30Sec.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ring_30Sec.mp3; path = ../../assets/sounds/ring_30Sec.mp3; sourceTree = "<group>"; };
7659480F2B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEPlatformBridgeEKG.swift; sourceTree = "<group>"; };
765948182B4E72A100D96E03 /* TupleToArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TupleToArray.swift; sourceTree = "<group>"; };
7659481A2B4E899200D96E03 /* VTECGParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VTECGParser.swift; sourceTree = "<group>"; };
7659481C2B4EBEB600D96E03 /* VTBLEUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VTBLEUtils.h; sourceTree = "<group>"; };
7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTBLEUtils.m; sourceTree = "<group>"; };
7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EKGFileDetail.swift; sourceTree = "<group>"; };
765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SP20RTParamModel.swift; sourceTree = "<group>"; };
765948232B4FE12B00D96E03 /* DoubleExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleExtension.swift; sourceTree = "<group>"; };
76801AC92AD7F7D900126C2D /* CRAP20Lib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CRAP20Lib.xcframework; path = Runner/BLE_SDKs/CRAP20Lib.xcframework; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
76F3B95E2ACEBE8D00D7A698 /* VTDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTDevice.m; sourceTree = "<group>"; };
76F3B95F2ACEBE8D00D7A698 /* VTBLEUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VTBLEUtils.m; sourceTree = "<group>"; };
76F3B9602ACEBE8E00D7A698 /* VTBLEUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VTBLEUtils.h; sourceTree = "<group>"; };
76F789972ACEA25600FC6C38 /* BLEPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEPlatformBridge.swift; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
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 = "<group>"; };
@ -154,7 +162,6 @@
children = (
76F3B95C2ACEBE2800D7A698 /* Utils */,
76F789972ACEA25600FC6C38 /* BLEPlatformBridge.swift */,
7659480F2B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift */,
);
path = Ble;
sourceTree = "<group>";
@ -162,10 +169,15 @@
76F3B95C2ACEBE2800D7A698 /* Utils */ = {
isa = PBXGroup;
children = (
76F3B9602ACEBE8E00D7A698 /* VTBLEUtils.h */,
76F3B95F2ACEBE8D00D7A698 /* VTBLEUtils.m */,
7659481C2B4EBEB600D96E03 /* VTBLEUtils.h */,
7659481D2B4EBEB600D96E03 /* VTBLEUtils.m */,
7659481A2B4E899200D96E03 /* VTECGParser.swift */,
76F3B95D2ACEBE8D00D7A698 /* VTDevice.h */,
76F3B95E2ACEBE8D00D7A698 /* VTDevice.m */,
765948182B4E72A100D96E03 /* TupleToArray.swift */,
7659481F2B4EC54400D96E03 /* EKGFileDetail.swift */,
765948212B4FD1B500D96E03 /* SP20RTParamModel.swift */,
765948232B4FE12B00D96E03 /* DoubleExtension.swift */,
);
path = Utils;
sourceTree = "<group>";
@ -440,6 +452,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 */,
@ -449,12 +462,15 @@
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 */,
765948222B4FD1B500D96E03 /* SP20RTParamModel.swift in Sources */,
E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */,
765948102B4ADE3200D96E03 /* BLEPlatformBridgeEKG.swift in Sources */,
765948202B4EC54400D96E03 /* EKGFileDetail.swift in Sources */,
765948242B4FE12B00D96E03 /* DoubleExtension.swift in Sources */,
E91B5397256AAA6500E96549 /* Extensions.swift in Sources */,
E91B5398256AAA6500E96549 /* API.swift in Sources */,
);

6
lib/config/config.dart
Unescape Escape View File

@ -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;

2
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -149,7 +149,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021";
// body['PatientID'] = 1231755; //3844083
// body['PatientID'] = 3452986; //3844083
// body['TokenID'] = "@dm!n";
// Patient ID: 3027574

4
lib/pages/landing/landing_page.dart
Unescape Escape View File

@ -574,8 +574,8 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
},
onLoginClick: () {
// login();
// Navigator.push(context, FadePage(page: BpTrackerBLE()));
Navigator.push(context, FadePage(page: SP20PulseTracker()));
Navigator.push(context, FadePage(page: BpTrackerBLE()));
// Navigator.push(context, FadePage(page: SP20PulseTracker()));
// Navigator.push(context, FadePage(page: EKG_BLE()));
// Navigator.push(context, FadePage(page: Oxymeter_BLE()));
},

2
lib/pages/medical/my_trackers/ble_models/viatom_devices/oxy_rt_param_model.dart
Unescape Escape View File

@ -3,7 +3,7 @@ class OxyRtParamModel {
bool isCheckProbe;
bool isProbeOff;
bool isPulseSearching;
double pi;
num pi;
int pr;
int spo2;

Write Preview
Loading…
Cancel
Save