diff --git a/lib/pages/navigation/presentation/controllers/navigation_controller.dart b/lib/pages/navigation/presentation/controllers/navigation_controller.dart index fc7b507..7af6398 100644 --- a/lib/pages/navigation/presentation/controllers/navigation_controller.dart +++ b/lib/pages/navigation/presentation/controllers/navigation_controller.dart @@ -305,7 +305,7 @@ class NavigationViewController extends GetxController { await internalGpsLocation.changeSettings(interval: 10000); internalGpsLocationSubscription = - internalGpsLogger.onLocationChanged.listen((LocationData value) { + internalGpsLogger.onLocationChanged.listen((LocationData value) async { double? longitude; double? latitude; double? accuracy; @@ -337,7 +337,9 @@ class NavigationViewController extends GetxController { // "createdAt": DateTime.timestamp() // }); - Supabase.instance.client.from('TerepiSeged_VibratorTracker').insert({ + await Supabase.instance.client + .from('TerepiSeged_VibratorTracker') + .insert({ 'gpsType': 0, 'vibratorNumber': vehicleNumber.value, 'gpsDateTime': time.toIso8601String(), @@ -641,11 +643,14 @@ class NavigationViewController extends GetxController { if (DateTime.now().difference(lastGpsDataSaveTime).inSeconds >= 10 && gpsQuality.value > 0) { + lastGpsDataSaveTime = DateTime.now(); + _savePositionToDatabase(); + print("Save to databases: ${lastGpsDataSaveTime}"); } } - void _savePositionToDatabase() { + void _savePositionToDatabase() async { _vibratorTracker.add({ "gpsType": 1, "vibratorNumber": vehicleNumber.value, @@ -662,8 +667,9 @@ class NavigationViewController extends GetxController { "createdAt": DateTime.timestamp() }); - final res = - Supabase.instance.client.from('TerepiSeged_VibratorTracker').insert({ + final res = await Supabase.instance.client + .from('TerepiSeged_VibratorTracker') + .insert({ "gpsType": 1, "vibratorNumber": vehicleNumber.value, "gpsQuality": gpsQuality.value, @@ -675,11 +681,10 @@ class NavigationViewController extends GetxController { "eovX": eov.value.X, "horizontalError": max(gpsLatitudeError.value, gpsLongitudeError.value), "verticalError": gpsAltitudeError.value, + // "heightOfGeoid": gpsGeoidSeparation.value, "poleHeight": double.parse(gpsHeightController.text) }).select(); print(res); - - lastGpsDataSaveTime = DateTime.now(); } String getGpsQualityIndicator({required int quality}) { @@ -1078,5 +1083,6 @@ class NavigationViewController extends GetxController { void saveVehicleNumber(int vehicleNumber) { prefs.setInt('vehicleNumber', vehicleNumber); + print("Save vehicleNumber to prefs"); } } diff --git a/lib/pages/navigation/presentation/views/navigation_view.dart b/lib/pages/navigation/presentation/views/navigation_view.dart index 3c06d7f..95d0a4e 100644 --- a/lib/pages/navigation/presentation/views/navigation_view.dart +++ b/lib/pages/navigation/presentation/views/navigation_view.dart @@ -27,10 +27,10 @@ class NavigationView extends GetView { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text('Navigáció'), - Text( - "Mérés: Zalaegerszeg", - style: TextStyle(fontSize: 12.0), - ) + // Text( + // "Mérés: Zalaegerszeg", + // style: TextStyle(fontSize: 12.0), + // ) ], ), actions: [ diff --git a/lib/pages/navigation/presentation/views/settings_dialog.dart b/lib/pages/navigation/presentation/views/settings_dialog.dart index effaca0..0523a6f 100644 --- a/lib/pages/navigation/presentation/views/settings_dialog.dart +++ b/lib/pages/navigation/presentation/views/settings_dialog.dart @@ -24,20 +24,18 @@ class SettingsDialog extends StatelessWidget { controller.ntripUsernameController.text; controller.saveNtripUserName( controller.ntripUsernameController.text); - if (controller - .ntripPasswordController.text.isNotEmpty) { - controller.ntripPassword.value = - controller.ntripPasswordController.text; - controller.saveNtripPassword( - controller.ntripPasswordController.text); - } - if (controller - .vehicleNumberController.text.isNotEmpty) { - controller.vehicleNumber.value = int.parse( - controller.vehicleNumberController.text); - controller.saveVehicleNumber(int.parse( - controller.vehicleNumberController.text)); - } + } + if (controller.ntripPasswordController.text.isNotEmpty) { + controller.ntripPassword.value = + controller.ntripPasswordController.text; + controller.saveNtripPassword( + controller.ntripPasswordController.text); + } + if (controller.vehicleNumberController.text.isNotEmpty) { + controller.vehicleNumber.value = + int.parse(controller.vehicleNumberController.text); + controller.saveVehicleNumber( + int.parse(controller.vehicleNumberController.text)); } Get.back(); }, @@ -52,20 +50,20 @@ class SettingsDialog extends StatelessWidget { controller.ntripUsernameController.text; controller.saveNtripUserName( controller.ntripUsernameController.text); - if (controller - .ntripPasswordController.text.isNotEmpty) { - controller.ntripPassword.value = - controller.ntripPasswordController.text; - controller.saveNtripPassword( - controller.ntripPasswordController.text); - } - if (controller - .vehicleNumberController.text.isNotEmpty) { - controller.vehicleNumber.value = int.parse( - controller.vehicleNumberController.text); - controller.saveVehicleNumber(int.parse( - controller.vehicleNumberController.text)); - } + } + if (controller.ntripPasswordController.text.isNotEmpty) { + controller.ntripPassword.value = + controller.ntripPasswordController.text; + controller.saveNtripPassword( + controller.ntripPasswordController.text); + } + print( + "vehicleNumberController: ${controller.vehicleNumberController.text}"); + if (controller.vehicleNumberController.text.isNotEmpty) { + controller.vehicleNumber.value = + int.parse(controller.vehicleNumberController.text); + controller.saveVehicleNumber( + int.parse(controller.vehicleNumberController.text)); } Get.back(); },