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

1，开锁页-电子钥匙-详情里操作对永久的普通钥匙冻结和解冻，实际锁列表页授权和普通钥匙未改变状态

Browse Source 
2，修复发出的授权管理员永久时限并在超级管理员端操作冻结未生效问题
This commit is contained in:
“DaisyWu” 2024-07-18 17:05:45 +08:00
parent f86c35a5ee
commit bfe66f89f3
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/main/lockMian/lockList/lockList_logic.dart
View File

@ -131,6 +131,7 @@ class LockListLogic extends BaseGetXController {
String getKeyEffective(LockListInfoItemEntity keyInfo) { String getKeyEffective(LockListInfoItemEntity keyInfo) {
// 当是限时、循环的时候 // 当是限时、循环的时候
if (keyInfo.keyType == XSConstantMacro.keyTypeTime || if (keyInfo.keyType == XSConstantMacro.keyTypeTime ||
keyInfo.keyType == XSConstantMacro.keyTypeLong ||
keyInfo.keyType == XSConstantMacro.keyTypeLoop) { keyInfo.keyType == XSConstantMacro.keyTypeLoop) {
// 当是正常使用跟待接收状态的时候 // 当是正常使用跟待接收状态的时候
if (keyInfo.keyStatus == XSConstantMacro.keyStatusNormalUse || if (keyInfo.keyStatus == XSConstantMacro.keyStatusNormalUse ||
@ -154,6 +155,10 @@ class LockListLogic extends BaseGetXController {
XSConstantMacro.keyStatusFrozen, XSConstantMacro.keyStatusFrozen,
XSConstantMacro.keyStatusExpired, XSConstantMacro.keyStatusExpired,
]; ];
final bool isLongFrozenStatus =
keyInfo.keyType == XSConstantMacro.keyTypeLong &&
keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen;
final DateTime endDate = final DateTime endDate =
DateTime.fromMillisecondsSinceEpoch(keyInfo.endDate ?? 0); DateTime.fromMillisecondsSinceEpoch(keyInfo.endDate ?? 0);
final DateTime now = DateTime.now(); final DateTime now = DateTime.now();
@ -161,7 +166,8 @@ class LockListLogic extends BaseGetXController {
final bool isKeyStatus = keyStatus.contains(keyInfo.keyStatus); final bool isKeyStatus = keyStatus.contains(keyInfo.keyStatus);
final Duration difference = endDate.difference(now); final Duration difference = endDate.difference(now);
final bool isExpirationSoon = isKeyType && difference.inDays <= 15; final bool isExpirationSoon = isKeyType && difference.inDays <= 15;
final bool isShow = isKeyType && isKeyStatus || isExpirationSoon; final bool isShow =
isKeyType && isKeyStatus || isExpirationSoon || isLongFrozenStatus;
return isShow; return isShow;
} }

17
lib/main/lockMian/lockList/lockList_page.dart
View File

@ -110,6 +110,7 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
return; return;
} }
if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || if ((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
keyInfo.keyType == XSConstantMacro.keyTypeLong ||
keyInfo.keyType == XSConstantMacro.keyTypeLoop) && keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
(keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) { (keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) {
logic.showToast('您的钥匙已冻结'.tr); logic.showToast('您的钥匙已冻结'.tr);
@ -143,12 +144,16 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
? EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w, bottom: 20.w) ? EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w, bottom: 20.w)
: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w), : EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: ((keyInfo.keyType == XSConstantMacro.keyTypeTime || color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
keyInfo.keyType == XSConstantMacro.keyTypeLoop) && keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
(keyInfo.keyStatus == (keyInfo.keyStatus ==
XSConstantMacro.keyStatusWaitIneffective || XSConstantMacro.keyStatusWaitIneffective ||
keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen || keyInfo.keyStatus ==
keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) XSConstantMacro.keyStatusFrozen ||
keyInfo.keyStatus ==
XSConstantMacro.keyStatusExpired)) ||
(keyInfo.keyType == XSConstantMacro.keyTypeLong &&
keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen))
? AppColors.greyBackgroundColor ? AppColors.greyBackgroundColor
: Colors.white, : Colors.white,
borderRadius: BorderRadius.circular(20.w), borderRadius: BorderRadius.circular(20.w),

17
lib/main/lockMian/lockList/lockList_xhj_page.dart
View File

@ -208,6 +208,7 @@ class _LockListXHJPageState extends State<LockListXHJPage> with RouteAware {
return; return;
} }
if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || if ((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
keyInfo.keyType == XSConstantMacro.keyTypeLong ||
keyInfo.keyType == XSConstantMacro.keyTypeLoop) && keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
(keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) { (keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) {
logic.showToast('您的钥匙已冻结'.tr); logic.showToast('您的钥匙已冻结'.tr);
@ -254,12 +255,16 @@ class _LockListXHJPageState extends State<LockListXHJPage> with RouteAware {
onTap: action, onTap: action,
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: ((keyInfo.keyType == XSConstantMacro.keyTypeTime || color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
keyInfo.keyType == XSConstantMacro.keyTypeLoop) && keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
(keyInfo.keyStatus == (keyInfo.keyStatus ==
XSConstantMacro.keyStatusWaitIneffective || XSConstantMacro.keyStatusWaitIneffective ||
keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen || keyInfo.keyStatus ==
keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) XSConstantMacro.keyStatusFrozen ||
keyInfo.keyStatus ==
XSConstantMacro.keyStatusExpired)) ||
(keyInfo.keyType == XSConstantMacro.keyTypeLong &&
keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen))
? AppColors.greyBackgroundColor ? AppColors.greyBackgroundColor
: Colors.white.withOpacity(0.8), : Colors.white.withOpacity(0.8),
borderRadius: BorderRadius.circular(20.w), borderRadius: BorderRadius.circular(20.w),