From 11853da6fba1a1ab6e2aace0289a7182681a2c72 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Mon, 13 May 2024 14:29:40 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E9=92=A5=E5=8C=99=E3=80=81=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=202?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=86=E7=A0=81=E3=80=81?= =?UTF-8?q?=E6=8C=87=E7=BA=B9=E3=80=81=E5=8D=A1=E3=80=81=E4=BA=BA=E8=84=B8?= =?UTF-8?q?=E3=80=81=E6=8E=8C=E9=9D=99=E8=84=89=E3=80=81=E8=99=B9=E8=86=9C?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E6=98=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/addCardType/addCardType_page.dart | 19 ++++++++----- .../electronicKeyDetail_page.dart | 5 ++++ .../face/addFaceType/addFaceType_page.dart | 19 ++++++++----- .../addFingerprintType_page.dart | 19 ++++++++----- .../iris/addIrisType/addIrisType_page.dart | 19 ++++++++----- .../palm/addPalmType/addPalmType_page.dart | 19 ++++++++----- .../passwordKey_perpetual_page.dart | 28 +++++++++++-------- 7 files changed, 81 insertions(+), 47 deletions(-) diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart index d7137ea9..df20d120 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart'; @@ -259,13 +260,17 @@ class _AddCardPageState extends State Widget keyBottomWidget() { return Column( children: [ - Obx(() => CommonItem( - leftTitel: "是否是管理员".tr, - rightTitle: "", - isTipsImg: false, - isHaveRightWidget: true, - rightWidget: - SizedBox(width: 60.w, height: 50.h, child: _isAdmin()))), + Obx(() => Visibility( + visible: CommonDataManage().currentKeyInfo.isLockOwner == 1 + ? true + : false, + child: CommonItem( + leftTitel: "是否是管理员".tr, + rightTitle: "", + isTipsImg: false, + isHaveRightWidget: true, + rightWidget: + SizedBox(width: 60.w, height: 50.h, child: _isAdmin())))), SizedBox(height: 10.h), Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.stressCard!.tr, diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart index e8e836bc..b0cd4e90 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart'; @@ -320,6 +321,10 @@ class _ElectronicKeyDetailPageState extends State { title: tipsTitle, tipTitle: "请输入".tr, controller: logic.getCurrentController(alertEnum), + inputFormatters: [ + FilteringTextInputFormatter.deny('\n'), + LengthLimitingTextInputFormatter(50), + ], sureClick: () { if (alertEnum == ShowAlertEnum.name) { logic.modifyKeyNameRequest(); diff --git a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart index fd62abee..b5335e2b 100644 --- a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart +++ b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/dateTool.dart'; import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; @@ -259,13 +260,17 @@ class _AddFaceTypePageState extends State Widget keyBottomWidget() { return Column( children: [ - CommonItem( - leftTitel: "是否是管理员".tr, - rightTitle: "", - isTipsImg: false, - isHaveRightWidget: true, - rightWidget: SizedBox( - width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))), + Obx(() => Visibility( + visible: CommonDataManage().currentKeyInfo.isLockOwner == 1 + ? true + : false, + child: CommonItem( + leftTitel: "是否是管理员".tr, + rightTitle: "", + isTipsImg: false, + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))))), SizedBox(height: 30.h), SubmitBtn( btnName: TranslationLoader.lanKeys!.next!.tr, diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart index a5a2754a..dd1ac43d 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart'; @@ -249,13 +250,17 @@ class _AddFingerprintTypePageState extends State with Si Widget keyBottomWidget() { return Column( children: [ - Obx(() => CommonItem( - leftTitel: "是否是管理员".tr, - rightTitle: "", - isTipsImg: false, - isHaveRightWidget: true, - rightWidget: SizedBox( - width: 60.w, height: 50.h, child: _isAdmin()))), + Obx(() => Visibility( + visible: CommonDataManage().currentKeyInfo.isLockOwner == 1 + ? true + : false, + child: CommonItem( + leftTitel: "是否是管理员".tr, + rightTitle: "", + isTipsImg: false, + isHaveRightWidget: true, + rightWidget: + SizedBox(width: 60.w, height: 50.h, child: _isAdmin())))), SizedBox(height: 10.h), Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.stressFingerprint!.tr, diff --git a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart index 0c9ab97e..9fe5a25d 100644 --- a/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart +++ b/star_lock/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/iris/addIrisType/addIrisType_logic.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/dateTool.dart'; import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; @@ -249,13 +250,17 @@ class _AddIrisTypePageState extends State { Widget keyBottomWidget() { return Column( children: [ - CommonItem( - leftTitel: "是否是管理员".tr, - rightTitle: "", - isTipsImg: false, - isHaveRightWidget: true, - rightWidget: SizedBox( - width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))), + Obx(() => Visibility( + visible: CommonDataManage().currentKeyInfo.isLockOwner == 1 + ? true + : false, + child: CommonItem( + leftTitel: "是否是管理员".tr, + rightTitle: "", + isTipsImg: false, + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))))), SizedBox(height: 30.h), SubmitBtn( btnName: TranslationLoader.lanKeys!.next!.tr, diff --git a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart index 1816a18c..b5a474fe 100644 --- a/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart +++ b/star_lock/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/palm/addPalmType/addPalmType_logic.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/dateTool.dart'; import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; @@ -249,13 +250,17 @@ class _AddPalmTypePageState extends State { Widget keyBottomWidget() { return Column( children: [ - CommonItem( - leftTitel: "是否是管理员".tr, - rightTitle: "", - isTipsImg: false, - isHaveRightWidget: true, - rightWidget: SizedBox( - width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))), + Obx(() => Visibility( + visible: CommonDataManage().currentKeyInfo.isLockOwner == 1 + ? true + : false, + child: CommonItem( + leftTitel: "是否是管理员".tr, + rightTitle: "", + isTipsImg: false, + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))))), SizedBox(height: 30.h), SubmitBtn( btnName: TranslationLoader.lanKeys!.next!.tr, diff --git a/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart b/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart index 34a60c17..c3c9d442 100644 --- a/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart +++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart @@ -335,18 +335,22 @@ class _PasswordKeyPerpetualPageState extends State // 自定义是管理员密码 Widget keyIfAdministratorWidget() { - return Column( - children: [ - // SizedBox(height: 10.h), - Obx(() => CommonItem( - leftTitel: "是否是管理员".tr, - rightTitle: "", - isTipsImg: false, - isHaveRightWidget: true, - rightWidget: SizedBox( - width: 60.w, height: 50.h, child: _isAdministrator()))), - SizedBox(height: 10.h), - ], + return Visibility( + visible: + CommonDataManage().currentKeyInfo.isLockOwner == 1 ? true : false, + child: Column( + children: [ + // SizedBox(height: 10.h), + Obx(() => CommonItem( + leftTitel: "是否是管理员".tr, + rightTitle: "", + isTipsImg: false, + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 60.w, height: 50.h, child: _isAdministrator()))), + SizedBox(height: 10.h), + ], + ), ); }