diff --git a/lib/main.dart b/lib/main.dart index a0e039d..f29f4e6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,6 +4,7 @@ import 'package:get/get.dart'; import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/index/index_binding.dart'; import 'package:rogapp/routes/app_pages.dart'; +import 'package:rogapp/utils/location_controller.dart'; import 'package:rogapp/utils/string_values.dart'; import 'package:shared_preferences/shared_preferences.dart'; // import 'package:is_lock_screen/is_lock_screen.dart'; @@ -87,25 +88,32 @@ class _MyAppState extends State with WidgetsBindingObserver { @override void didChangeAppLifecycleState(AppLifecycleState state) { + LocationController locationController = Get.find(); + DestinationController destinationController = Get.find(); switch (state) { case AppLifecycleState.resumed: + locationController.resumePositionStream(); //print("RESUMED"); restoreGame(); break; case AppLifecycleState.inactive: + locationController.resumePositionStream(); //print("INACTIVE"); break; case AppLifecycleState.paused: + locationController.resumePositionStream(); //print("PAUSED"); saveGameState(); break; case AppLifecycleState.detached: + locationController.resumePositionStream(); //print("DETACHED"); saveGameState(); break; case AppLifecycleState.hidden: + locationController.resumePositionStream(); //print("DETACHED"); saveGameState(); break; diff --git a/lib/pages/index/index_page.dart b/lib/pages/index/index_page.dart index 1fc7327..e94084d 100644 --- a/lib/pages/index/index_page.dart +++ b/lib/pages/index/index_page.dart @@ -28,12 +28,12 @@ class IndexPage extends GetView { appBar: AppBar( title: Text("add_location".tr), actions: [ - IconButton( - onPressed: () { - DatabaseService ds = DatabaseService(); - ds.updateDatabase(); - }, - icon: const Icon(Icons.ten_k_sharp)), + // IconButton( + // onPressed: () { + // DatabaseService ds = DatabaseService(); + // ds.updateDatabase(); + // }, + // icon: const Icon(Icons.ten_k_sharp)), IconButton( onPressed: () async { diff --git a/lib/utils/location_controller.dart b/lib/utils/location_controller.dart index 4b691e9..3e3edbd 100644 --- a/lib/utils/location_controller.dart +++ b/lib/utils/location_controller.dart @@ -117,7 +117,9 @@ class LocationController extends GetxController { // print(position == null // ? 'Unknown' // : '${position.latitude.toString()}, ${position.longitude.toString()}'); - currentPosition.value = position; + if (position?.accuracy != null && position!.accuracy <= 15) { + currentPosition.value = position; + } // LogManager().addLog( // "GPS : ${position!.latitude.toString()}, ${position.longitude.toString()} - ${DateTime.now().hour}:${DateTime.now().minute}:${DateTime.now().second}:${DateTime.now().microsecond}"); @@ -125,8 +127,8 @@ class LocationController extends GetxController { // Resume stream if it was paused previously if (isStreamPaused) { - positionStream?.resume(); isStreamPaused = false; + positionStream.resume(); } }