From 448740a85416b2061724085468e4fd1e6be4c837 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 28 Sep 2023 11:31:56 +0300 Subject: [PATCH] updates --- lib/pages/landing/landing_page.dart | 3 ++- .../my_trackers/viatom_devices/oxymeter_ble.dart | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index d36878a1..c2e2111a 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/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'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; @@ -570,7 +571,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { }, onLoginClick: () { // login(); - Navigator.push(context, FadePage(page: ECG_BLE())); + Navigator.push(context, FadePage(page: Oxymeter_BLE())); }, onMedicalFileClick: () { changeCurrentTab(1); 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 804c2616..4392f346 100644 --- a/lib/pages/medical/my_trackers/viatom_devices/oxymeter_ble.dart +++ b/lib/pages/medical/my_trackers/viatom_devices/oxymeter_ble.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/viatom_ble/ble_connect.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:permission_handler/permission_handler.dart'; class Oxymeter_BLE extends StatefulWidget { @override @@ -35,7 +36,7 @@ class _Oxymeter_BLEState extends State { return AppScaffold( appBarTitle: "Oxymeter", showNewAppBar: true, - isShowDecPage: true, + isShowDecPage: false, showNewAppBarTitle: true, backgroundColor: Color(0xffF8F8F8), body: SingleChildScrollView( @@ -45,8 +46,9 @@ class _Oxymeter_BLEState extends State { children: [ Center( child: GestureDetector( - onTap: () async { - await BleChannel.getScanningResult(); + onTap: () { + // await BleChannel.getScanningResult(); + checkBLEPermissions(); }, child: Container( width: 50, @@ -87,6 +89,13 @@ class _Oxymeter_BLEState extends State { ); } + void checkBLEPermissions() async { + [Permission.location, Permission.storage, Permission.bluetooth, Permission.bluetoothConnect, Permission.bluetoothScan].request().then((status) async { + // startBLEConnection(); + await BleChannel.getScanningResult(); + }); + } + String getSPO2(String value) { return "SpO2: " + value.split(",")[0].replaceAll("{spo2=", ""); }