From af2ef694df2014bd145194ed01895edcf31f7eb9 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Tue, 21 May 2024 17:11:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=20=E5=85=B6=E4=BB=96-?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86=E5=91=98-=E7=94=B5?=
 =?UTF-8?q?=E5=AD=90=E9=92=A5=E5=8C=99=E9=87=8C=E7=9A=84=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=AF=A6=E6=83=85=E5=A4=9A=E4=BA=86?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common/XSConstantMacro/XSConstantMacro.dart          | 9 +++++++++
 .../electronicKeyDetail/electronicKeyDetail_logic.dart   | 8 +++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/common/XSConstantMacro/XSConstantMacro.dart b/lib/common/XSConstantMacro/XSConstantMacro.dart
index a3d32886..e54e7b70 100755
--- a/lib/common/XSConstantMacro/XSConstantMacro.dart
+++ b/lib/common/XSConstantMacro/XSConstantMacro.dart
@@ -70,4 +70,13 @@ class XSConstantMacro {
   static int catEyeWorkModeStayCapture = 2; //逗留抓拍模式
   static int catEyeWorkModeRealTimeMonitoring = 3; //实时监控模式
   static int catEyeWorkModeCustom = 4; //自定义模式
+
+  //管理员类型
+  static int userTypeSuperAdmin = 110301; //超级管理员
+  static int userTypeAuthorizedAdmin = 110302; //授权管理员
+
+
+  //电子钥匙类型
+  static int keyRightAdmin = 1; //管理钥匙
+  static int keyRightOrdinary = 2; //普通钥匙
 }
diff --git a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart
index 708938d8..6b38b259 100755
--- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart
+++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart
@@ -255,16 +255,18 @@ class ElectronicKeyDetailLogic extends BaseGetXController {
 
   Future<void> openModalBottomSheet(BuildContext context) async {
     List<String> textList = <String>[];
-    if (state.itemData.value.keyRight == 1) {
+    final bool isAdminKey = state.itemData.value.keyRight == 1;
+    final bool isLockOwner = CommonDataManage().currentKeyInfo.isLockOwner == 1;
+    if (isAdminKey) {
       // 授权管理员
       textList = <String>[
         if (state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen)
           '取消冻结'.tr
         else
           '冻结'.tr,
-        // '取消授权'.tr
+        if (isLockOwner) '取消授权'.tr
       ];
-    } else if (CommonDataManage().currentKeyInfo.isLockOwner == 1) {
+    } else if (isLockOwner) {
       // 锁拥有者
       if (state.keyType.value == 1 || state.keyType.value == 2) {
         textList = <String>[