1,修复电子钥匙、授权管理员详情修改姓名过长失败问题

2,自定义密码、指纹、卡、人脸、掌静脉、虹膜模块根据角色是否可以设置是管理员权限
This commit is contained in:
Daisy 2024-05-13 14:29:40 +08:00
parent f20bfe7eef
commit 11853da6fb
7 changed files with 81 additions and 47 deletions

View File

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.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/pickers.dart';
import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart'; import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart';
@ -259,13 +260,17 @@ class _AddCardPageState extends State<AddCardPage>
Widget keyBottomWidget() { Widget keyBottomWidget() {
return Column( return Column(
children: [ children: [
Obx(() => CommonItem( Obx(() => Visibility(
leftTitel: "是否是管理员".tr, visible: CommonDataManage().currentKeyInfo.isLockOwner == 1
rightTitle: "", ? true
isTipsImg: false, : false,
isHaveRightWidget: true, child: CommonItem(
rightWidget: leftTitel: "是否是管理员".tr,
SizedBox(width: 60.w, height: 50.h, child: _isAdmin()))), rightTitle: "",
isTipsImg: false,
isHaveRightWidget: true,
rightWidget:
SizedBox(width: 60.w, height: 50.h, child: _isAdmin())))),
SizedBox(height: 10.h), SizedBox(height: 10.h),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.stressCard!.tr, leftTitel: TranslationLoader.lanKeys!.stressCard!.tr,

View File

@ -1,5 +1,6 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart';
@ -320,6 +321,10 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
title: tipsTitle, title: tipsTitle,
tipTitle: "请输入".tr, tipTitle: "请输入".tr,
controller: logic.getCurrentController(alertEnum), controller: logic.getCurrentController(alertEnum),
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(50),
],
sureClick: () { sureClick: () {
if (alertEnum == ShowAlertEnum.name) { if (alertEnum == ShowAlertEnum.name) {
logic.modifyKeyNameRequest(); logic.modifyKeyNameRequest();

View File

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.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/dateTool.dart';
import 'package:star_lock/tools/pickers/pickers.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/date_mode.dart';
@ -259,13 +260,17 @@ class _AddFaceTypePageState extends State<AddFaceTypePage>
Widget keyBottomWidget() { Widget keyBottomWidget() {
return Column( return Column(
children: [ children: [
CommonItem( Obx(() => Visibility(
leftTitel: "是否是管理员".tr, visible: CommonDataManage().currentKeyInfo.isLockOwner == 1
rightTitle: "", ? true
isTipsImg: false, : false,
isHaveRightWidget: true, child: CommonItem(
rightWidget: SizedBox( leftTitel: "是否是管理员".tr,
width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))), rightTitle: "",
isTipsImg: false,
isHaveRightWidget: true,
rightWidget: SizedBox(
width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))))),
SizedBox(height: 30.h), SizedBox(height: 30.h),
SubmitBtn( SubmitBtn(
btnName: TranslationLoader.lanKeys!.next!.tr, btnName: TranslationLoader.lanKeys!.next!.tr,

View File

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.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/pickers.dart';
import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart'; import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart';
@ -249,13 +250,17 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> with Si
Widget keyBottomWidget() { Widget keyBottomWidget() {
return Column( return Column(
children: [ children: [
Obx(() => CommonItem( Obx(() => Visibility(
leftTitel: "是否是管理员".tr, visible: CommonDataManage().currentKeyInfo.isLockOwner == 1
rightTitle: "", ? true
isTipsImg: false, : false,
isHaveRightWidget: true, child: CommonItem(
rightWidget: SizedBox( leftTitel: "是否是管理员".tr,
width: 60.w, height: 50.h, child: _isAdmin()))), rightTitle: "",
isTipsImg: false,
isHaveRightWidget: true,
rightWidget:
SizedBox(width: 60.w, height: 50.h, child: _isAdmin())))),
SizedBox(height: 10.h), SizedBox(height: 10.h),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.stressFingerprint!.tr, leftTitel: TranslationLoader.lanKeys!.stressFingerprint!.tr,

View File

@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/iris/addIrisType/addIrisType_logic.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/dateTool.dart';
import 'package:star_lock/tools/pickers/pickers.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/date_mode.dart';
@ -249,13 +250,17 @@ class _AddIrisTypePageState extends State<AddIrisTypePage> {
Widget keyBottomWidget() { Widget keyBottomWidget() {
return Column( return Column(
children: [ children: [
CommonItem( Obx(() => Visibility(
leftTitel: "是否是管理员".tr, visible: CommonDataManage().currentKeyInfo.isLockOwner == 1
rightTitle: "", ? true
isTipsImg: false, : false,
isHaveRightWidget: true, child: CommonItem(
rightWidget: SizedBox( leftTitel: "是否是管理员".tr,
width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))), rightTitle: "",
isTipsImg: false,
isHaveRightWidget: true,
rightWidget: SizedBox(
width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))))),
SizedBox(height: 30.h), SizedBox(height: 30.h),
SubmitBtn( SubmitBtn(
btnName: TranslationLoader.lanKeys!.next!.tr, btnName: TranslationLoader.lanKeys!.next!.tr,

View File

@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/palm/addPalmType/addPalmType_logic.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/dateTool.dart';
import 'package:star_lock/tools/pickers/pickers.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/date_mode.dart';
@ -249,13 +250,17 @@ class _AddPalmTypePageState extends State<AddPalmTypePage> {
Widget keyBottomWidget() { Widget keyBottomWidget() {
return Column( return Column(
children: [ children: [
CommonItem( Obx(() => Visibility(
leftTitel: "是否是管理员".tr, visible: CommonDataManage().currentKeyInfo.isLockOwner == 1
rightTitle: "", ? true
isTipsImg: false, : false,
isHaveRightWidget: true, child: CommonItem(
rightWidget: SizedBox( leftTitel: "是否是管理员".tr,
width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))), rightTitle: "",
isTipsImg: false,
isHaveRightWidget: true,
rightWidget: SizedBox(
width: 60.w, height: 50.h, child: Obx(() => _isAdmin()))))),
SizedBox(height: 30.h), SizedBox(height: 30.h),
SubmitBtn( SubmitBtn(
btnName: TranslationLoader.lanKeys!.next!.tr, btnName: TranslationLoader.lanKeys!.next!.tr,

View File

@ -335,18 +335,22 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
// //
Widget keyIfAdministratorWidget() { Widget keyIfAdministratorWidget() {
return Column( return Visibility(
children: [ visible:
// SizedBox(height: 10.h), CommonDataManage().currentKeyInfo.isLockOwner == 1 ? true : false,
Obx(() => CommonItem( child: Column(
leftTitel: "是否是管理员".tr, children: [
rightTitle: "", // SizedBox(height: 10.h),
isTipsImg: false, Obx(() => CommonItem(
isHaveRightWidget: true, leftTitel: "是否是管理员".tr,
rightWidget: SizedBox( rightTitle: "",
width: 60.w, height: 50.h, child: _isAdministrator()))), isTipsImg: false,
SizedBox(height: 10.h), isHaveRightWidget: true,
], rightWidget: SizedBox(
width: 60.w, height: 50.h, child: _isAdministrator()))),
SizedBox(height: 10.h),
],
),
); );
} }