sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 管理员密码往外提升一个层级,放到基本信息栏目下面

Browse Source
This commit is contained in:
wuyaxi 2025-06-13 10:49:18 +08:00
parent 0e1c03645a
commit 4c3da6d194
2 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart
View File

@ -133,20 +133,20 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
} }
}); });
})), })),
Obx(() => Visibility( // Obx(() => Visibility(
visible: state.lockBasicInfo.value.isLockOwner == 1, // visible: state.lockBasicInfo.value.isLockOwner == 1,
child: CommonItem( // child: CommonItem(
leftTitel: '管理员开锁密码'.tr, // leftTitel: '管理员开锁密码'.tr,
rightTitle: state.lockBasicInfo.value.adminPwd, // rightTitle: state.lockBasicInfo.value.adminPwd,
isHaveLine: true, // isHaveLine: true,
isHaveDirection: true, // isHaveDirection: true,
action: () { // action: () {
Get.toNamed(Routers.adminOpenLockPasswordPage, // Get.toNamed(Routers.adminOpenLockPasswordPage,
arguments: <String, LockSetInfoData>{ // arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value // 'lockSetInfoData': state.lockSetInfoData.value
}); // });
}), // }),
)), // )),
Obx(() => Visibility( Obx(() => Visibility(
visible: (state.lockBasicInfo.value.lockName ?? '') visible: (state.lockBasicInfo.value.lockName ?? '')
.contains('T9A'), .contains('T9A'),

42
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -99,7 +99,7 @@ class _LockSetPageState extends State<LockSetPage>
CommonItem( CommonItem(
leftTitel: '基本信息'.tr, leftTitel: '基本信息'.tr,
rightTitle: '', rightTitle: '',
isHaveLine: false, isHaveLine: state.lockBasicInfo.value.isLockOwner == 1,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
if (!state.lockSetInfoData.value.isValid()) { if (!state.lockSetInfoData.value.isValid()) {
@ -111,6 +111,25 @@ class _LockSetPageState extends State<LockSetPage>
'lockSetInfoData': state.lockSetInfoData.value '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), SizedBox(height: 10.h),
// 自动闭锁 // 自动闭锁
Obx(() => Visibility( Obx(() => Visibility(
@ -201,7 +220,7 @@ class _LockSetPageState extends State<LockSetPage>
CommonItem( CommonItem(
leftTitel: '基本信息'.tr, leftTitel: '基本信息'.tr,
rightTitle: '', rightTitle: '',
isHaveLine: false, isHaveLine: state.lockBasicInfo.value.isLockOwner == 1,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.basicInformationPage, Get.toNamed(Routers.basicInformationPage,
@ -209,6 +228,25 @@ class _LockSetPageState extends State<LockSetPage>
'lockSetInfoData': state.lockSetInfoData.value '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), SizedBox(height: 10.h),
//by DaisyWu 田总：移至锁详情配件区 //by DaisyWu 田总：移至锁详情配件区
// 门磁 // 门磁