diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index fade8225..75730132 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -573,8 +573,8 @@ class _LandingPageState extends State with WidgetsBindingObserver { changeCurrentTab(1); }, onLoginClick: () { - // login(); - Navigator.push(context, FadePage(page: BpTrackerBLE())); + 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: Oxymeter_BLE())); diff --git a/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_spirometer_connect_screen.dart b/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_spirometer_connect_screen.dart index ea06b3a4..30277e87 100644 --- a/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_spirometer_connect_screen.dart +++ b/lib/pages/medical/my_trackers/ble_device_type_screens/andesfit_device_types/andesfit_spirometer_connect_screen.dart @@ -31,6 +31,7 @@ class _AndesFitSpirometerConnectScreenState extends State { @override void dispose() { + FlutterBluePlus.stopScan(); myTrackersVm.resetList(); super.dispose(); } @@ -44,6 +46,7 @@ class _BleDevicesScreenState extends State { } void onDeviceTapped(BleDeviceModel device) { + FlutterBluePlus.stopScan(); switch (device.deviceType) { case TrackerTypeEnum.OxymeterTracker: if (myTrackersVm.isDeviceFromAndesFit(device.name)) { diff --git a/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart b/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart index 80e5bd0a..2a3cf561 100644 --- a/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart +++ b/lib/pages/medical/my_trackers/my_trackers_view_model/my_trackers_view_model.dart @@ -288,7 +288,9 @@ class MyTrackersViewModel extends ChangeNotifier { } Future checkBLEPermissions() async { - return [Permission.location, Permission.storage, Permission.bluetooth, Permission.bluetoothConnect, Permission.bluetoothScan].request(); + return [Permission.location, Permission.storage, Permission.bluetooth, Permission.bluetoothConnect, Permission.bluetoothScan].request().then((value) { + print(value); + }); } Future startSearchingForTracker() async { @@ -409,10 +411,11 @@ class MyTrackersViewModel extends ChangeNotifier { }); filterOutTheSearchedDevicesFlutter(bleDevices); }); - FlutterBluePlus.startScan( - timeout: const Duration(seconds: 10), - androidUsesFineLocation: false, - ); + FlutterBluePlus.startScan(timeout: const Duration(seconds: 10), androidUsesFineLocation: false, + // withServices: [Guid(BLEUtils.TEMPERATURE_SERVICE)] + ).catchError((err) { + debugPrint(err.toString()); + }); } } @@ -448,7 +451,7 @@ class MyTrackersViewModel extends ChangeNotifier { (Timer timer) async { log("I will stop scan after: $secondsToWaitForNativeScan"); - if (secondsToWaitForNativeScan == 0) { + if (secondsToWaitForNativeScan <= 0) { secondsToWaitForNativeScan--; timer.cancel(); timerToWaitForNativeScan.cancel(); @@ -761,7 +764,7 @@ class MyTrackersViewModel extends ChangeNotifier { characteristic.onValueReceived.listen((event) { print("onValueReceived Stream"); print(event); - updateCurrentTempInCelsius(convertIntListToHex(event)); + updateCurrentTempInCelsius(convertIntListToHexTemp(event)); String currentTempInFahrenheit = ((num.parse(currentTempInCelsius) * 1.8) + 32).toStringAsFixed(1); String tempCurrentTempInCelsius = currentTempInCelsius + "\u2103" + " / " + currentTempInFahrenheit + "\u2109"; updateCurrentTempInCelsius(tempCurrentTempInCelsius); @@ -777,19 +780,33 @@ class MyTrackersViewModel extends ChangeNotifier { await device.connect(timeout: Duration(seconds: 35)); } - String convertIntListToHex(List byteArray) { + String convertIntListToHexTemp(List byteArray) { String b = (byteArray.map((x) { return x.toRadixString(16); })).join(";"); List hexString = b.split(";"); print("HexString: $hexString"); - String returnString = hexString[2] + hexString[3]; + String returnString = hexString[3] + hexString[2] + hexString[1]; print("Temp Hex String: $returnString"); final number = int.parse(returnString, radix: 16); - print("Temp Number: ${number * 0.1}"); - - return (number * 0.1).toStringAsFixed(1); - } + print("Temp Number: ${number * 0.01}"); + + return (number * 0.01).toStringAsFixed(1); + } + + // String convertIntListToHex(List byteArray) { + // String b = (byteArray.map((x) { + // return x.toRadixString(16); + // })).join(";"); + // List hexString = b.split(";"); + // print("HexString: $hexString"); + // String returnString = hexString[2] + hexString[3]; + // print("Temp Hex String: $returnString"); + // final number = int.parse(returnString, radix: 16); + // print("Temp Number: ${number * 0.1}"); + // + // return (number * 0.1).toStringAsFixed(1); + // } StreamSubscription bloodSugarValuesStream; diff --git a/lib/pages/medical/my_trackers/temperature.dart b/lib/pages/medical/my_trackers/temperature.dart index b6f61779..f8c77790 100644 --- a/lib/pages/medical/my_trackers/temperature.dart +++ b/lib/pages/medical/my_trackers/temperature.dart @@ -32,7 +32,7 @@ class _TemperatureHomePageState extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).temperature, showNewAppBar: true, - isShowDecPage: true, + isShowDecPage: false, showNewAppBarTitle: true, backgroundColor: Color(0xffF8F8F8), body: SingleChildScrollView(