QR attendance

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/login/login_screen.dart
#	lib/widgets/mark_attendance_widget.dart

android/app/src/main/AndroidManifest.xml

@@ -22,6 +22,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="Mohemm"
         android:extractNativeLibs="true"
+        android:usesCleartextTraffic="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round">
         <activity

assets/langs/ar-SA.json

@@ -530,5 +530,7 @@
   "connectHmgWifi": "قم بتوصيل HMG WIFI",
   "connectedHmgWifi": "اتصال HMG WIFI",
   "itgForms": "نماذج (ITG)",
-  "resetAdPassword": "إعادة تعيين كلمة مرور AD"
+  "resetAdPassword": "إعادة تعيين كلمة مرور AD",
+  "connectedWithHmg": "Connected With HMG",
+  "networkMustHMG": "Network Must be HMG"
 }

assets/langs/en-US.json

@@ -530,5 +530,7 @@
   "connectHmgWifi": "Connect HMG WIFI",
   "connectedHmgWifi": "Connected HMG WIFI",
   "itgForms": "ITG Forms",
-  "resetAdPassword": "Reset AD Password"
+  "resetAdPassword": "Reset AD Password",
+  "connectedWithHmg": "Connected With HMG",
+  "networkMustHMG": "Network Must be HMG"
 }

lib/api/dashboard_api_client.dart

@@ -215,4 +215,19 @@ class DashboardApiClient {
       return json;
     }, url, postParams);
   }
+
+  //Mark Fake Location
+  Future<GenericResponseModel?> checkLocelIP(String qrValue) async {
+    String url = "http://10.201.214.101:80/Services/SWP.svc/REST/CheckWifiCall";
+
+    Map<String, dynamic> postParams = {
+      "EmployeeID": AppState().memberInformationList!.eMPLOYEENUMBER,
+      "QRValue": qrValue,
+    };
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+      return responseData;
+    }, url, postParams);
+  }
 }

lib/main.dart

@@ -13,6 +13,7 @@ import 'package:mohem_flutter_app/provider/chat_call_provider.dart';
 import 'package:mohem_flutter_app/provider/chat_provider_model.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
 import 'package:mohem_flutter_app/provider/eit_provider_model.dart';
+import 'package:mohem_flutter_app/provider/hmg_connection_provider.dart';
 import 'package:mohem_flutter_app/theme/app_theme.dart';
 import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
 import 'package:month_year_picker/month_year_picker.dart';
@@ -20,6 +21,8 @@ import 'package:provider/provider.dart';
 import 'package:provider/single_child_widget.dart';
 import 'package:sizer/sizer.dart';
 
+
+
 Logger logger = Logger(
   // filter: null, // Use the default LogFilter (-> only log in debug mode)
   printer: PrettyPrinter(
@@ -73,6 +76,9 @@ Future<void> main() async {
           // ChangeNotifierProvider<ChatCallProvider>(
           //   create: (_) => ChatCallProvider(),
           // ),
+          ChangeNotifierProvider<HmgConnectionProvider>(
+            create: (_) => HmgConnectionProvider(),
+          ),
         ],
         child: const MyApp(),
       ),

lib/provider/hmg_connection_provider.dart

@@ -13,25 +13,31 @@ class HmgConnectionProvider extends ChangeNotifier {
     } else {
       isConnectedToHMG = false;
     }
-    AppState().isConnectedToHMG = isConnectedToHMG;
+    notify();
     return isConnectedToHMG;
   }
 
-  void connectWithHmgNetwork() async {
+  Future<bool> connectWithHmgNetwork() async {
     try {
-      bool isConnected = await WiFiForIoTPlugin.connect("MOHEMM-CONNECT", password: "0987654321", joinOnce: Platform.isIOS ? false : true, security: NetworkSecurity.WPA, withInternet: false);
+      // bool isConnected = await WiFiForIoTPlugin.connect(AppState().getMohemmWifiSSID ?? "",
+      //     password: AppState().getMohemmWifiPassword ?? "", joinOnce: Platform.isIOS ? false : true, security: NetworkSecurity.WPA, withInternet: false);
+
+      bool isConnected = await WiFiForIoTPlugin.connect("HMG-MOHEMM", password: "M0hemm@1212", joinOnce: Platform.isIOS ? false : true, security: NetworkSecurity.WPA, withInternet: false);
+
 
       if (isConnected) {
         await WiFiForIoTPlugin.forceWifiUsage(true);
         await Future.delayed(const Duration(seconds: 2));
         isConnectedToHMG = true;
-
+        notify();
       }
+      return isConnectedToHMG;
     } catch (e) {
       isConnectedToHMG = false;
-      AppState().isConnectedToHMG = isConnectedToHMG;
+      notify();
       print("----------------o----");
       print(e);
+      return isConnectedToHMG;
     }
   }
 
@@ -39,8 +45,17 @@ class HmgConnectionProvider extends ChangeNotifier {
     if (Platform.isAndroid) {
       await WiFiForIoTPlugin.forceWifiUsage(false);
     }
+
+    bool isDone = await WiFiForIoTPlugin.disconnect();
+    if (isDone) {
       isConnectedToHMG = false;
+      notify();
+    }
+    return isDone;
+  }
+
+  void notify() {
     AppState().isConnectedToHMG = isConnectedToHMG;
-    return await WiFiForIoTPlugin.disconnect();
+    notifyListeners();
   }
 }

lib/ui/landing/dashboard_screen.dart

@@ -26,6 +26,7 @@ import 'package:mohem_flutter_app/ui/landing/widget/services_widget.dart';
 import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
 import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_banner.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
+import 'package:mohem_flutter_app/widgets/button/hmg_connectivity_button.dart';
 import 'package:mohem_flutter_app/widgets/mark_attendance_widget.dart';
 import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart';
 import 'package:mohem_flutter_app/widgets/shimmer/offers_shimmer_widget.dart';
@@ -357,7 +358,15 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                                                               showMyBottomSheet(
                                                                 context,
                                                                 callBackFunc: () {},
-                                                                child: MarkAttendanceWidget(model, isFromDashboard: true),
+                                                                child: Column(
+                                                                  children: [
+                                                                    const Padding(
+                                                                      padding: EdgeInsets.all(8.0),
+                                                                      child: HmgConnectivityButton(),
+                                                                    ),
+                                                                    MarkAttendanceWidget(model, isFromDashboard: true),
+                                                                  ],
+                                                                ),
                                                               );
                                                             }),
                                                           ],

lib/ui/landing/today_attendance_screen2.dart

@@ -9,10 +9,12 @@ import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
+import 'package:mohem_flutter_app/widgets/button/hmg_connectivity_button.dart';
 import 'package:mohem_flutter_app/widgets/circular_step_progress_bar.dart';
 import 'package:mohem_flutter_app/widgets/mark_attendance_widget.dart';
 import 'package:nfc_manager/nfc_manager.dart';
 import 'package:provider/provider.dart';
+import 'package:sizer/sizer.dart';
 import 'package:wifi_iot/wifi_iot.dart';
 
 class TodayAttendanceScreen2 extends StatefulWidget {
@@ -50,7 +52,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen2> {
           icon: const Icon(Icons.arrow_back_ios, color: Colors.white),
           onPressed: () => Navigator.pop(context),
         ),
-        // actions: [
+        actions: [
           // IconButton(
           //   onPressed: () {
           //     data.fetchAttendanceTracking(context);
@@ -60,7 +62,9 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen2> {
           //     color: Colors.white,
           //   ),
           // )
-        // ],
+          HmgConnectivityButton(),
+          12.width,
+        ],
       ),
       backgroundColor: MyColors.backgroundBlackColor,
       body: Consumer<DashboardProviderModel>(
@@ -69,6 +73,7 @@ class _TodayAttendanceScreenState extends State<TodayAttendanceScreen2> {
                   ? const Center(child: CircularProgressIndicator())
                   : Column(
                       children: [
+                        8.height,
                         Container(
                           width: double.infinity,
                           color: MyColors.backgroundBlackColor,

lib/ui/login/login_screen.dart

@@ -195,8 +195,8 @@ class _LoginScreenState extends State<LoginScreen> {
       isAppOpenBySystem = (ModalRoute.of(context)!.settings.arguments ?? true) as bool;
       if (!kReleaseMode) {
         // username.text = "15444"; // Maha User
-        // username.text = "15153"; // Tamer User
-        // password.text = "Abcd@12345";
+        username.text = "15153"; // Tamer User
+        password.text = "tata@1234";
 
         // username.text = "206535"; // Hashim User
         // password.text = "Namira786";

lib/widgets/button/hmg_connectivity_button.dart

@@ -1,21 +1,61 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
+import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/provider/hmg_connection_provider.dart';
 import 'package:provider/provider.dart';
+import 'package:shimmer/shimmer.dart';
+
+class HmgConnectivityButton extends StatefulWidget {
+  const HmgConnectivityButton({Key? key}) : super(key: key);
+
+  @override
+  State<HmgConnectivityButton> createState() => _HmgConnectivityButtonState();
+}
+
+class _HmgConnectivityButtonState extends State<HmgConnectivityButton> with SingleTickerProviderStateMixin  {
+
+
+  late Animation<Color?> animation;
+  late AnimationController controller;
+
+  @override
+  void initState() {
+    super.initState();
+    controller = AnimationController(
+      duration: const Duration(milliseconds: 1500),
+      vsync: this,
+    );
+    CurvedAnimation curve = CurvedAnimation(parent: controller, curve: Curves.linear);
+    animation = ColorTween(begin: Colors.transparent, end:MyColors.gradiantStartColor).animate(curve);
+
+    animation.addStatusListener((status) {
+      if (status == AnimationStatus.completed) {
+        controller.reverse();
+      } else if (status == AnimationStatus.dismissed) {
+        controller.forward();
+      }
+      setState(() {});
+    });
+    controller.forward();
+  }
 
-class HmgConnectivityButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    Provider.of<HmgConnectionProvider>(context, listen: false).checkHmgNetworkConnectivity();
-    return Consumer<HmgConnectionProvider>(
-      builder: (_, HmgConnectionProvider foo, __) {
+    // Provider.of<HmgConnectionProvider>(context, listen: false).checkHmgNetworkConnectivity();
+    return Row(
+      children: [
+        Consumer<HmgConnectionProvider>(
+          builder: (_, HmgConnectionProvider provider, __) {
+            return AnimatedBuilder(
+                animation: animation,
+                builder: (BuildContext context, Widget? child) {
                   return Container(
                     height: 45,
-          padding: const EdgeInsets.only(left: 12, right: 12),
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(200.0),
                       gradient: const LinearGradient(
@@ -28,23 +68,48 @@ class HmgConnectivityButton extends StatelessWidget {
                         ],
                       ),
                     ),
+                    child: Container(
+                      padding: const EdgeInsets.only(left: 12, right: 12),
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.circular(200.0),
+                        color: animation.value,
+                      ),
                       child: InkWell(
-            onTap: (){
-
+                        onTap: () async {
+                          if (provider.isConnectedToHMG) {
+                            Utils.showLoading(context);
+                            await provider.closeWifiRequest();
+                            Utils.hideLoading(context);
+                          } else {
+                            Utils.showLoading(context);
+                            await provider.connectWithHmgNetwork();
+                            Utils.hideLoading(context);
+                          }
                         },
                         child: Row(
                           children: [
-                const Icon(
+                            Icon(
                               Icons.wifi,
-                  color: Colors.white,
+                              color: provider.isConnectedToHMG ? Colors.white : Colors.grey[700],
+                              size: 16,
                             ),
-                12.width,
-                LocaleKeys.connectHmgWifi.tr().toText18(color: Colors.white),
+                            8.width,
+                            provider.isConnectedToHMG ? LocaleKeys.connectedHmgWifi.tr().toText12(color: Colors.white) : LocaleKeys.connectHmgWifi.tr().toText12(color: Colors.white),
                           ],
                         ),
                       ),
+                    ),
                   );
+                });
           },
+        ),
+      ],
     );
   }
+
+  @override
+  void dispose() {
+    controller.dispose();
+    super.dispose();
+  }
 }

lib/widgets/mark_attendance_widget.dart

@@ -4,10 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:geolocator/geolocator.dart';
-import 'package:huawei_location/location/fused_location_provider_client.dart';
-import 'package:huawei_location/location/location_request.dart';
-import 'package:huawei_location/location/location_settings_request.dart';
-import 'package:huawei_location/permission/permission_handler.dart';
+
+// import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:mohem_flutter_app/api/dashboard_api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
@@ -18,6 +16,7 @@ import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/models/generic_response_model.dart';
 import 'package:mohem_flutter_app/models/privilege_list_model.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
+import 'package:mohem_flutter_app/provider/hmg_connection_provider.dart';
 import 'package:mohem_flutter_app/ui/dialogs/success_dialog.dart';
 import 'package:mohem_flutter_app/widgets/dialogs/confirm_dialog.dart';
 import 'package:mohem_flutter_app/widgets/dialogs/dialogs.dart';
@@ -25,8 +24,7 @@ import 'package:mohem_flutter_app/widgets/location/Location.dart';
 import 'package:mohem_flutter_app/widgets/nfc/nfc_reader_sheet.dart';
 import 'package:mohem_flutter_app/widgets/qr_scanner_dialog.dart';
 import 'package:nfc_manager/nfc_manager.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:platform_device_id/platform_device_id.dart';
+import 'package:provider/provider.dart';
 import 'package:wifi_iot/wifi_iot.dart';
 
 class MarkAttendanceWidget extends StatefulWidget {
@@ -45,8 +43,6 @@ class MarkAttendanceWidget extends StatefulWidget {
 class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
   bool isNfcEnabled = false, isNfcLocationEnabled = false, isQrEnabled = false, isQrLocationEnabled = false, isWifiEnabled = false, isWifiLocationEnabled = false;
 
-  int _locationUpdateCbId = 0;
-
   @override
   void initState() {
     super.initState();
@@ -54,8 +50,6 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
   }
 
   void checkAttendanceAvailability() async {
-    String? deviceID = await PlatformDeviceId.getDeviceId;
-    print("Platform Device ID: $deviceID");
     bool isAvailable = await NfcManager.instance.isAvailable();
     setState(() {
       AppState().privilegeListModel!.forEach((PrivilegeListModel element) {
@@ -76,36 +70,6 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
     });
   }
 
-  void checkHuaweiLocationPermission(String attendanceType) async {
-    PermissionHandler permissionHandler = PermissionHandler();
-
-    if (await permissionHandler.hasLocationPermission()) {
-      getHuaweiCurrentLocation(attendanceType);
-    } else {
-      bool has = await requestPermissions();
-      if (has) {
-        getHuaweiCurrentLocation(attendanceType);
-      } else {
-        showDialog(
-          context: context,
-          builder: (BuildContext cxt) => ConfirmDialog(
-            message: "You need to give location permission to mark attendance",
-            onTap: () {
-              Navigator.pop(context);
-            },
-          ),
-        );
-      }
-    }
-  }
-
-  Future<bool> requestPermissions() async {
-    var result = await [
-      Permission.location,
-    ].request();
-    return (result[Permission.location] == PermissionStatus.granted || result[Permission.locationAlways] == PermissionStatus.granted);
-  }
-
   @override
   void dispose() {
     super.dispose();
@@ -115,7 +79,22 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
 
   @override
   Widget build(BuildContext context) {
+    return Consumer<HmgConnectionProvider>(builder: (_, HmgConnectionProvider provider, __) {
       return Container(
+        decoration: BoxDecoration(
+          borderRadius: const BorderRadius.only(topLeft: Radius.circular(25), topRight: Radius.circular(25)),
+          color: provider.isConnectedToHMG ? MyColors.greenColor : MyColors.pinkDarkColor,
+        ),
+        width: double.infinity,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(left: 25, right: 25, top: 10, bottom: 10),
+              // child: (provider.isConnectedToHMG ? LocaleKeys.connectedWithHmg.tr() : LocaleKeys.networkMustHMG.tr()).toText12(color: Colors.white),
+              child: (provider.isConnectedToHMG ? "Connected With HMG" : "Network Must be HMG").toText12(color: Colors.white),
+            ),
+            Container(
               padding: EdgeInsets.only(left: 21, right: 21, bottom: 21, top: widget.topPadding),
               decoration: const BoxDecoration(borderRadius: BorderRadius.only(topLeft: Radius.circular(25), topRight: Radius.circular(25)), color: Colors.white),
               width: double.infinity,
@@ -133,117 +112,70 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
                         SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: (MediaQuery.of(context).size.width < 550) ? 3 : 5, childAspectRatio: 1 / 1, crossAxisSpacing: 8, mainAxisSpacing: 8),
                     children: <Widget>[
                       // if (isNfcEnabled)
-              attendanceMethod("NFC", "assets/images/nfc.svg", isNfcEnabled, () {
-                // if (isNfcLocationEnabled) {
-                  if (AppState().getIsHuawei) {
-                    checkHuaweiLocationPermission("NFC");
-                  } else {
-                    Location.getCurrentLocation((Position position, bool isMocked) {
+                      attendanceMethod("NFC", "assets/images/nfc.svg", isNfcEnabled, provider.isConnectedToHMG, () async {
+                        if (await provider.checkHmgNetworkConnectivity()) {
+                          if (isNfcLocationEnabled) {
+                            Location.getCurrentLocation((Position? latlng, bool isMocked) {
                               if (isMocked) {
-                        markFakeAttendance("NFC", position.latitude.toString() ?? "", position.longitude.toString() ?? "");
+                                markFakeAttendance("NFC", latlng?.latitude.toString() ?? "", latlng?.longitude.toString() ?? "", provider: provider);
                               } else {
-                        performNfcAttendance(widget.model, lat: position.latitude.toString() ?? "", lng: position.longitude.toString() ?? "");
+                                performNfcAttendance(widget.model, lat: latlng?.latitude.toString() ?? "", lng: latlng?.longitude.toString() ?? "", provider: provider);
                               }
                             }, context);
+                          } else {
+                            performNfcAttendance(widget.model, provider: provider);
+                          }
+                        } else {
+                          Utils.showToast("Please connect with the HMG internet to mark attendance");
                         }
-                // } else {
-                //   performNfcAttendance(widget.model);
-                // }
                       }),
                       if (isWifiEnabled)
-                attendanceMethod("Wifi", "assets/images/wufu.svg", isWifiEnabled, () {
-                  // if (isWifiLocationEnabled) {
-                    if (AppState().getIsHuawei) {
-                      checkHuaweiLocationPermission("WIFI");
-                    } else {
-                      Location.getCurrentLocation((Position position, bool isMocked) {
+                        attendanceMethod("Wifi", "assets/images/wufu.svg", isWifiEnabled, provider.isConnectedToHMG, () async {
+                          if (await provider.checkHmgNetworkConnectivity()) {
+                            if (isWifiLocationEnabled) {
+                              Location.getCurrentLocation((Position? latlng, bool isMocked) {
                                 if (isMocked) {
-                          markFakeAttendance("WIFI", position.latitude.toString() ?? "", position.longitude.toString() ?? "");
+                                  markFakeAttendance("WIFI", latlng?.latitude.toString() ?? "", latlng?.longitude.toString() ?? "", provider: provider);
                                 } else {
-                          performWifiAttendance(widget.model, lat: position.latitude.toString() ?? "", lng: position.longitude.toString() ?? "");
+                                  performWifiAttendance(widget.model, lat: latlng?.latitude.toString() ?? "", lng: latlng?.longitude.toString() ?? "", provider: provider);
                                 }
                               }, context);
+                            } else {
+                              performWifiAttendance(widget.model, provider: provider);
                             }
-                  // } else {
-                  //   performWifiAttendance(widget.model);
-                  // }
+                          } else {
+                            Utils.showToast("Please connect with the HMG internet to mark attendance");
+                          }
+
+                          // connectWifi();
                         }),
                       if (isQrEnabled)
-                attendanceMethod("QR", "assets/images/ic_qr.svg", isQrEnabled, () async {
+                        attendanceMethod("QR", "assets/images/ic_qr.svg", isQrEnabled, provider.isConnectedToHMG, () async {
                           // if (isQrLocationEnabled) {
-                    if (AppState().getIsHuawei) {
-                      checkHuaweiLocationPermission("QR");
-                    } else {
-                      Location.getCurrentLocation((Position position, bool isMocked) {
-                        if (isMocked) {
-                          markFakeAttendance("QR", position.latitude.toString() ?? "", position.longitude.toString() ?? "");
-                        } else {
-                          performQrCodeAttendance(widget.model, lat: position.latitude.toString() ?? "", lng: position.longitude.toString() ?? "");
-                        }
-                      }, context);
-                    }
+                          //   Location.getCurrentLocation((Position? latlng, bool isMocked) {
+                          //     if (isMocked) {
+                          //       markFakeAttendance("QR", latlng?.latitude.toString() ?? "", latlng?.longitude.toString() ?? "", provider: provider);
+                          //     } else {
+                          //       performQrCodeAttendance(widget.model, lat: latlng?.latitude.toString() ?? "", lng: latlng?.longitude.toString() ?? "");
+                          //     }
+                          //   }, context);
                           // } else {
                           //   performQrCodeAttendance(widget.model);
                           // }
-                  // performQrCodeAttendance(model);
+                          performQrCodeAttendance(widget.model);
                         }),
                     ],
                   )
                 ],
               ),
-    );
-  }
-
-  void getHuaweiCurrentLocation(String attendanceType) {
-    try {
-      FusedLocationProviderClient locationService = FusedLocationProviderClient();
-      LocationRequest locationRequest = LocationRequest();
-      locationRequest.priority = LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY;
-      locationRequest.interval = 1000;
-      List<LocationRequest> locationRequestList = <LocationRequest>[locationRequest];
-      LocationSettingsRequest locationSettingsRequest = LocationSettingsRequest(requests: locationRequestList);
-
-      locationService.checkLocationSettings(locationSettingsRequest).then((settings) async {
-        await locationService.getLastLocation().then((value) {
-          if (value.latitude == null || value.longitude == null) {
-            showDialog(
-              context: context,
-              builder: (BuildContext cxt) => ConfirmDialog(
-                message: "Unable to get your location, Please check your location settings & try again.",
-                onTap: () {
-                  Navigator.pop(context);
-                },
+            ),
+          ],
         ),
       );
-          } else {
-            if (attendanceType == "QR") {
-              performQrCodeAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? "");
-            }
-            if (attendanceType == "WIFI") {
-              performWifiAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? "");
-            }
-            if (attendanceType == "NFC") {
-              performNfcAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? "");
-            }
-          }
-        }).catchError((error) {
-          print("HUAWEI LOCATION getLastLocation ERROR!!!!!");
-          print(error);
-        });
-      }).catchError((error) {
-        print("HUAWEI LOCATION checkLocationSettings ERROR!!!!!");
-        print(error);
-        if (error.code == "LOCATION_SETTINGS_NOT_AVAILABLE") {
-          // Location service not enabled.
-        }
     });
-    } catch (error) {
-      print("HUAWEI LOCATION ERROR!!!!!");
-      print(error);
-    }
   }
 
-  Future<void> performNfcAttendance(DashboardProviderModel model, {String lat = "0", String lng = "0"}) async {
+  Future<void> performNfcAttendance(DashboardProviderModel model, {String lat = "0", String lng = "0", required HmgConnectionProvider provider}) async {
     if (Platform.isIOS) {
       Utils.readNFc(onRead: (String nfcId) async {
         Utils.showLoading(context);
@@ -270,6 +202,7 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
               isDismissable: true,
               child: SuccessDialog(widget.isFromDashboard),
             );
+            provider.closeWifiRequest();
           }
         } catch (ex) {
           Utils.hideLoading(context);
@@ -301,6 +234,7 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
               isDismissable: false,
               child: SuccessDialog(widget.isFromDashboard),
             );
+            provider.closeWifiRequest();
           }
         } catch (ex) {
           print(ex);
@@ -326,54 +260,28 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
     }
   }
 
-  Future<void> performWifiAttendance(DashboardProviderModel model, {String lat = "0", String lng = "0"}) async {
+  Future<void> performWifiAttendance(DashboardProviderModel model, {String lat = "0", String lng = "0", required HmgConnectionProvider provider}) async {
     if (Platform.isAndroid) {
       if (!(await checkSession())) {
         return;
       }
     }
     Utils.showLoading(context);
-    bool isConnected = await WiFiForIoTPlugin.connect(AppState().getMohemmWifiSSID ?? "",
-        password: AppState().getMohemmWifiPassword ?? "", joinOnce: Platform.isIOS ? false : true, security: NetworkSecurity.WPA, withInternet: false);
-
-    if (Platform.isIOS) {
-      if (await WiFiForIoTPlugin.getSSID() == AppState().getMohemmWifiSSID) {
-        isConnected = true;
-      } else {
-        isConnected = false;
-      }
-    }
-
-    if (isConnected && AppState().isAuthenticated) {
-      await WiFiForIoTPlugin.forceWifiUsage(true);
+    if (AppState().isAuthenticated) {
       await Future.delayed(const Duration(seconds: 6));
       try {
         GenericResponseModel? g = await DashboardApiClient().markAttendance(pointType: 3, nfcValue: "", isGpsRequired: isWifiLocationEnabled, lat: lat, long: lng);
         bool status = await model.fetchAttendanceTracking(context);
         Utils.hideLoading(context);
-        await closeWifiRequest();
-        if (g?.messageStatus == 2) {
-          showDialog(
-            barrierDismissible: true,
-            context: context,
-            builder: (cxt) => ConfirmDialog(
-              message: g?.errorEndUserMessage ?? "",
-              onTap: () {
-                Navigator.pop(context);
-              },
-              onCloseTap: () {},
-            ),
-          );
-        } else {
+
         showMDialog(
           context,
           backgroundColor: Colors.transparent,
           isDismissable: false,
           child: SuccessDialog(widget.isFromDashboard),
         );
-        }
+        provider.closeWifiRequest();
       } catch (ex) {
-        await closeWifiRequest();
         Utils.hideLoading(context);
         Utils.handleException(ex, context, null);
       }
@@ -382,7 +290,7 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
         Utils.hideLoading(context);
         Utils.confirmDialog(context, LocaleKeys.comeNearHMGWifi.tr());
       } else {
-        await closeWifiRequest();
+        // await closeWifiRequest();
       }
     }
   }
@@ -401,40 +309,43 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
       ),
     );
     if (qrCodeValue != null) {
+      print("-----------f---");
+      print(qrCodeValue);
+      Utils.showToast(qrCodeValue);
+      // Utils.showLoading(context);
+      checkLocalIP(qrCodeValue);
+      // try {
+      //   GenericResponseModel? g = await DashboardApiClient().markAttendance(pointType: 1, isGpsRequired: isQrLocationEnabled, lat: lat, long: lng, QRValue: qrCodeValue);
+      //   bool status = await model.fetchAttendanceTracking(context);
+      //   Utils.hideLoading(context);
+      //   showMDialog(
+      //     context,
+      //     backgroundColor: Colors.transparent,
+      //     isDismissable: true,
+      //     child: SuccessDialog(widget.isFromDashboard),
+      //   );
+      // } catch (ex) {
+      //   print(ex);
+      //   Utils.hideLoading(context);
+      //   Utils.handleException(ex, context, null);
+      // }
+    }
+  }
+
+  void checkLocalIP(String qrValue) async {
     Utils.showLoading(context);
     try {
-        GenericResponseModel? g = await DashboardApiClient().markAttendance(pointType: 1, isGpsRequired: isQrLocationEnabled, lat: lat, long: lng, QRValue: qrCodeValue);
-        bool status = await model.fetchAttendanceTracking(context);
+      await DashboardApiClient().checkLocelIP(qrValue);
       Utils.hideLoading(context);
-        if (g?.messageStatus == 2) {
-          showDialog(
-            barrierDismissible: true,
-            context: context,
-            builder: (cxt) => ConfirmDialog(
-              message: g?.errorEndUserMessage ?? "",
-              onTap: () {
-                Navigator.pop(context);
-              },
-              onCloseTap: () {},
-            ),
-          );
-        } else {
-          showMDialog(
-            context,
-            backgroundColor: Colors.transparent,
-            isDismissable: true,
-            child: SuccessDialog(widget.isFromDashboard),
-          );
-        }
+      Utils.confirmDialog(context, "Local Ip called");
     } catch (ex) {
       print(ex);
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);
     }
   }
-  }
 
-  void markFakeAttendance(String sourceName, String lat, String long) async {
+  void markFakeAttendance(String sourceName, String lat, String long, {required HmgConnectionProvider provider}) async {
     Utils.showLoading(context);
     try {
       await DashboardApiClient().markFakeLocation(sourceName: sourceName, lat: lat, long: long);
@@ -447,11 +358,11 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
     }
   }
 
-  Widget attendanceMethod(String title, String image, bool isEnabled, VoidCallback onPress) => Container(
+  Widget attendanceMethod(String title, String image, bool isEnabled, bool isHmgNetworkAvailable, VoidCallback onPress) => Container(
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(15),
-          color: isEnabled ? null : Colors.grey.withOpacity(.5),
-          gradient: isEnabled
+          color: isHmgNetworkAvailable && isEnabled ? null : Colors.grey.withOpacity(.5),
+          gradient: isHmgNetworkAvailable && isEnabled
               ? const LinearGradient(
                   transform: GradientRotation(.64),
                   begin: Alignment.topRight,

pubspec.yaml

@@ -75,6 +75,7 @@ dependencies:
   auto_size_text: ^3.0.0
   pull_to_refresh: ^2.0.0
   #  lottie json animations
+  file: ^6.1.4
   lottie: any
   #  Marathon Card Swipe
   appinio_swiper: ^1.1.1