From 6f9787605a3e674bd4fd590424a81a8cede25439 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Fri, 30 May 2025 16:39:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E3=80=81=E4=BA=BA=E8=84=B8=E3=80=81=E6=8C=87=E7=BA=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=A1=AE=E8=AE=A4=E7=AA=97=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockDetail/card/cardDetail/cardDetail_page.dart    |  3 +--
 .../lockDetail/face/faceDetail/faceDetail_page.dart    | 10 +++-------
 .../fingerprintDetail/fingerprintDetail_page.dart      |  3 +--
 lib/tools/baseGetXController.dart                      | 10 ++++++++++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
index 8d8140e6..8dcc731a 100755
--- a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
+++ b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
@@ -220,8 +220,7 @@ class _CardDetailPageState extends State<CardDetailPage> with RouteAware {
                   left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
               padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
               onClick: () async {
-                final bool isNetWork =
-                    await LockMainLogic.to()?.judgeTheNetwork() ?? false;
+                final bool isNetWork = await logic.isConnected();
                 if (!isNetWork) {
                   return;
                 }
diff --git a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
index e4af7a36..71a0c6c0 100755
--- a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
+++ b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -49,9 +48,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
           Obx(() => lockDataListItem('姓名'.tr, state.typeName.value, () {
                 // showCupertinoAlertDialog(context);
                 ShowTipView().showTFViewAlertDialog(
-                    state.changeNameController,
-                    '修改姓名'.tr,
-                    '修改姓名'.tr, () {
+                    state.changeNameController, '修改姓名'.tr, '修改姓名'.tr, () {
                   if (state.changeNameController.text.isEmpty) {
                     logic.showToast('请输入姓名'.tr);
                     return;
@@ -178,7 +175,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
           Visibility(
             visible: !F.isSKY,
             child: Obx(
-                  () => CommonItem(
+              () => CommonItem(
                 leftTitel: '是否为管理员'.tr,
                 rightTitle: '',
                 isTipsImg: false,
@@ -215,8 +212,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
                   left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
               padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
               onClick: () async {
-                final bool isNetWork =
-                    await LockMainLogic.to()?.judgeTheNetwork() ?? false;
+                final bool isNetWork = await logic.isConnected();
                 if (!isNetWork) {
                   return;
                 }
diff --git a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
index fc018b40..0f61aa7c 100755
--- a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
+++ b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
@@ -222,8 +222,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
                   left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
               padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
               onClick: () async {
-                final bool isNetWork =
-                    await LockMainLogic.to()?.judgeTheNetwork() ?? false;
+                final bool isNetWork = await logic.isConnected();
                 if (!isNetWork) {
                   return;
                 }
diff --git a/lib/tools/baseGetXController.dart b/lib/tools/baseGetXController.dart
index 9393acfc..901cb9ff 100755
--- a/lib/tools/baseGetXController.dart
+++ b/lib/tools/baseGetXController.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
@@ -175,6 +176,13 @@ class BaseGetXController extends GetxController {
         });
   }
 
+  /// 判断网络是否连接
+  Future<bool> isConnected() async {
+    final List<ConnectivityResult> connectResults =
+    await Connectivity().checkConnectivity();
+    return !connectResults.contains(ConnectivityResult.none);
+  }
+
   String getUseKeyTypeStr(int? startDate, int? endDate, int? keyType) {
     String useDateStr = '';
     if (keyType == XSConstantMacro.keyTypeTime) {
@@ -241,6 +249,8 @@ class BaseGetXController extends GetxController {
     }
     return result;
   }
+
+
 }
 
 ///Extension_Int