From 97fefd842306d9384e4edfe3f8d5bca457553385 Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 Date: Wed, 1 Jan 2025 14:47:41 +0300 Subject: [PATCH] huawei swipe fixes --- lib/controllers/api_routes/api_manager.dart | 12 ++++++++---- lib/controllers/providers/api/user_provider.dart | 2 +- .../swipe_module/utils/swipe_general_utils.dart | 11 ++++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/controllers/api_routes/api_manager.dart b/lib/controllers/api_routes/api_manager.dart index 70ddece5..235f6dba 100644 --- a/lib/controllers/api_routes/api_manager.dart +++ b/lib/controllers/api_routes/api_manager.dart @@ -57,6 +57,7 @@ class ApiManager { Future post( String url, { Map headers, + bool showToast = true, @required Map body, }) async { headers ??= {}; @@ -80,12 +81,15 @@ class ApiManager { if (response.statusCode == 401) { showLoginDialog(); } else { - if (jsonDecode(response.body) is Map) { - final message = jsonDecode(response.body)["message"]; - if (message != null && message.toString().isNotEmpty) { - Fluttertoast.showToast(msg: message ?? "", toastLength: Toast.LENGTH_LONG); + if(showToast){ + if (jsonDecode(response.body) is Map) { + final message = jsonDecode(response.body)["message"]; + if (message != null && message.toString().isNotEmpty) { + Fluttertoast.showToast(msg: message ?? "", toastLength: Toast.LENGTH_LONG); + } } } + } } catch (ex) {} diff --git a/lib/controllers/providers/api/user_provider.dart b/lib/controllers/providers/api/user_provider.dart index 598ac3d6..38a604c8 100644 --- a/lib/controllers/providers/api/user_provider.dart +++ b/lib/controllers/providers/api/user_provider.dart @@ -193,7 +193,7 @@ class UserProvider extends ChangeNotifier { notifyListeners(); Response response; try { - response = await ApiManager.instance.post(URLs.swipeUrl, body: model.toJson()); + response = await ApiManager.instance.post(URLs.swipeUrl, body: model.toJson(),showToast: false); swipeResponse = SwipeModel.fromJson(json.decode(response.body)); if (response.statusCode >= 200 && response.statusCode < 300) { isUserConfirmSwipe = true; diff --git a/lib/new_views/swipe_module/utils/swipe_general_utils.dart b/lib/new_views/swipe_module/utils/swipe_general_utils.dart index 6a3a0f3f..da82af95 100644 --- a/lib/new_views/swipe_module/utils/swipe_general_utils.dart +++ b/lib/new_views/swipe_module/utils/swipe_general_utils.dart @@ -157,7 +157,7 @@ class SwipeGeneralUtils { (Location location) async { hideLoading(context); await locationService.removeLocationUpdates(requestCode); - handleSwipeOperation(swipeType: attendanceType, context: context); + handleSwipeOperation(swipeType: attendanceType, context: context,lat:location.latitude ,long:location.longitude ); requestCode = 0; }, ); @@ -234,13 +234,13 @@ class SwipeGeneralUtils { // } } - void handleSwipeOperation({@required SwipeTypeEnum swipeType, double lat, double lang, BuildContext context}) { + void handleSwipeOperation({@required SwipeTypeEnum swipeType, double lat, double long, BuildContext context}) { switch (swipeType) { case SwipeTypeEnum.NFC: - handleNfcAttendance(latitude: lat, longitude: lang, context: context); + handleNfcAttendance(latitude: lat, longitude: long, context: context); return; case SwipeTypeEnum.QR: - performQrCodeAttendance(latitude: lat, longitude: lang, context: context); + performQrCodeAttendance(latitude: lat, longitude: long, context: context); return; case SwipeTypeEnum.Wifi: //TODO need to implement. @@ -333,6 +333,7 @@ class SwipeGeneralUtils { final swipeResponse = await userProvider.makeSwipe(model: swipeModel); + if (swipeResponse.isSuccess) { hideLoading(context); Navigator.pushNamed(context, SwipeSuccessView.routeName); @@ -361,7 +362,7 @@ class SwipeGeneralUtils { markFakeAttendance(swipeType.name, position.latitude.toString() ?? "", position.longitude.toString() ?? "", context); } else { hideLoading(context); - handleSwipeOperation(swipeType: swipeType, lat: position.latitude, lang: position.longitude, context: context); + handleSwipeOperation(swipeType: swipeType, lat: position.latitude, long: position.longitude, context: context); } }, () {