From 4c3da6d194bfc96a88b4ed721bfa99fb358357ff Mon Sep 17 00:00:00 2001
From: wuyaxi <18682150237@163.com>
Date: Fri, 13 Jun 2025 10:49:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AE=A1=E7=90=86=E5=91=98=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=BE=80=E5=A4=96=E6=8F=90=E5=8D=87=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7,=E6=94=BE=E5=88=B0=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=8F=E7=9B=AE=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicInformation_page.dart                | 28 ++++++-------
 .../lockSet/lockSet/lockSet_page.dart         | 42 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart b/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart
index 58c5a9bb..69beabba 100755
--- a/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart
+++ b/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart
@@ -133,20 +133,20 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
                     }
                   });
                 })),
-            Obx(() => Visibility(
-                  visible: state.lockBasicInfo.value.isLockOwner == 1,
-                  child: CommonItem(
-                      leftTitel: '管理员开锁密码'.tr,
-                      rightTitle: state.lockBasicInfo.value.adminPwd,
-                      isHaveLine: true,
-                      isHaveDirection: true,
-                      action: () {
-                        Get.toNamed(Routers.adminOpenLockPasswordPage,
-                            arguments: <String, LockSetInfoData>{
-                              'lockSetInfoData': state.lockSetInfoData.value
-                            });
-                      }),
-                )),
+            // Obx(() => Visibility(
+            //       visible: state.lockBasicInfo.value.isLockOwner == 1,
+            //       child: CommonItem(
+            //           leftTitel: '管理员开锁密码'.tr,
+            //           rightTitle: state.lockBasicInfo.value.adminPwd,
+            //           isHaveLine: true,
+            //           isHaveDirection: true,
+            //           action: () {
+            //             Get.toNamed(Routers.adminOpenLockPasswordPage,
+            //                 arguments: <String, LockSetInfoData>{
+            //                   'lockSetInfoData': state.lockSetInfoData.value
+            //                 });
+            //           }),
+            //     )),
             Obx(() => Visibility(
                   visible: (state.lockBasicInfo.value.lockName ?? '')
                       .contains('T9A'),
diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
index f11e9624..78f5a18a 100755
--- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
+++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
@@ -99,7 +99,7 @@ class _LockSetPageState extends State<LockSetPage>
       CommonItem(
           leftTitel: '基本信息'.tr,
           rightTitle: '',
-          isHaveLine: false,
+          isHaveLine: state.lockBasicInfo.value.isLockOwner == 1,
           isHaveDirection: true,
           action: () {
             if (!state.lockSetInfoData.value.isValid()) {
@@ -111,6 +111,25 @@ class _LockSetPageState extends State<LockSetPage>
                   'lockSetInfoData': state.lockSetInfoData.value
                 });
           }),
+      //管理员密码 需求变更：由基本信息子页面移至此处
+      Obx(() => Visibility(
+            visible: state.lockBasicInfo.value.isLockOwner == 1,
+            child: CommonItem(
+                leftTitel: '管理员开锁密码'.tr,
+                rightTitle: state.lockBasicInfo.value.adminPwd,
+                isHaveLine: false,
+                isHaveDirection: true,
+                action: () {
+                  if (!state.lockSetInfoData.value.isValid()) {
+                    EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr);
+                    return;
+                  }
+                  Get.toNamed(Routers.adminOpenLockPasswordPage,
+                      arguments: <String, LockSetInfoData>{
+                        'lockSetInfoData': state.lockSetInfoData.value
+                      });
+                }),
+          )),
       SizedBox(height: 10.h),
       // 自动闭锁
       Obx(() => Visibility(
@@ -201,7 +220,7 @@ class _LockSetPageState extends State<LockSetPage>
       CommonItem(
           leftTitel: '基本信息'.tr,
           rightTitle: '',
-          isHaveLine: false,
+          isHaveLine: state.lockBasicInfo.value.isLockOwner == 1,
           isHaveDirection: true,
           action: () {
             Get.toNamed(Routers.basicInformationPage,
@@ -209,6 +228,25 @@ class _LockSetPageState extends State<LockSetPage>
                   'lockSetInfoData': state.lockSetInfoData.value
                 });
           }),
+      //管理员密码 需求变更：由基本信息子页面移至此处
+      Obx(() => Visibility(
+            visible: state.lockBasicInfo.value.isLockOwner == 1,
+            child: CommonItem(
+                leftTitel: '管理员开锁密码'.tr,
+                rightTitle: state.lockBasicInfo.value.adminPwd,
+                isHaveLine: true,
+                isHaveDirection: true,
+                action: () {
+                  if (!state.lockSetInfoData.value.isValid()) {
+                    EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr);
+                    return;
+                  }
+                  Get.toNamed(Routers.adminOpenLockPasswordPage,
+                      arguments: <String, LockSetInfoData>{
+                        'lockSetInfoData': state.lockSetInfoData.value
+                      });
+                }),
+          )),
       SizedBox(height: 10.h),
       //by DaisyWu 田总：移至锁详情配件区
       // 门磁