From bfe66f89f3db849d15ad663b029d7136e86e0dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”> Date: Thu, 18 Jul 2024 17:05:45 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E5=BC=80=E9=94=81=E9=A1=B5-=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E9=92=A5=E5=8C=99-=E8=AF=A6=E6=83=85=E9=87=8C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AF=B9=E6=B0=B8=E4=B9=85=E7=9A=84=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E9=92=A5=E5=8C=99=E5=86=BB=E7=BB=93=E5=92=8C=E8=A7=A3?= =?UTF-8?q?=E5=86=BB=EF=BC=8C=E5=AE=9E=E9=99=85=E9=94=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E6=8E=88=E6=9D=83=E5=92=8C=E6=99=AE=E9=80=9A=E9=92=A5?= =?UTF-8?q?=E5=8C=99=E6=9C=AA=E6=94=B9=E5=8F=98=E7=8A=B6=E6=80=81=202?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=87=BA=E7=9A=84=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=AE=A1=E7=90=86=E5=91=98=E6=B0=B8=E4=B9=85=E6=97=B6?= =?UTF-8?q?=E9=99=90=E5=B9=B6=E5=9C=A8=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=AB=AF=E6=93=8D=E4=BD=9C=E5=86=BB=E7=BB=93=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockMian/lockList/lockList_logic.dart | 8 +++++++- lib/main/lockMian/lockList/lockList_page.dart | 17 +++++++++++------ .../lockMian/lockList/lockList_xhj_page.dart | 17 +++++++++++------ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/lib/main/lockMian/lockList/lockList_logic.dart b/lib/main/lockMian/lockList/lockList_logic.dart index 57247151..92daf947 100755 --- a/lib/main/lockMian/lockList/lockList_logic.dart +++ b/lib/main/lockMian/lockList/lockList_logic.dart @@ -131,6 +131,7 @@ class LockListLogic extends BaseGetXController { String getKeyEffective(LockListInfoItemEntity keyInfo) { // 当是限时、循环的时候 if (keyInfo.keyType == XSConstantMacro.keyTypeTime || + keyInfo.keyType == XSConstantMacro.keyTypeLong || keyInfo.keyType == XSConstantMacro.keyTypeLoop) { // 当是正常使用跟待接收状态的时候 if (keyInfo.keyStatus == XSConstantMacro.keyStatusNormalUse || @@ -154,6 +155,10 @@ class LockListLogic extends BaseGetXController { XSConstantMacro.keyStatusFrozen, XSConstantMacro.keyStatusExpired, ]; + + final bool isLongFrozenStatus = + keyInfo.keyType == XSConstantMacro.keyTypeLong && + keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen; final DateTime endDate = DateTime.fromMillisecondsSinceEpoch(keyInfo.endDate ?? 0); final DateTime now = DateTime.now(); @@ -161,7 +166,8 @@ class LockListLogic extends BaseGetXController { final bool isKeyStatus = keyStatus.contains(keyInfo.keyStatus); final Duration difference = endDate.difference(now); final bool isExpirationSoon = isKeyType && difference.inDays <= 15; - final bool isShow = isKeyType && isKeyStatus || isExpirationSoon; + final bool isShow = + isKeyType && isKeyStatus || isExpirationSoon || isLongFrozenStatus; return isShow; } diff --git a/lib/main/lockMian/lockList/lockList_page.dart b/lib/main/lockMian/lockList/lockList_page.dart index d97b3c0c..6871b95e 100755 --- a/lib/main/lockMian/lockList/lockList_page.dart +++ b/lib/main/lockMian/lockList/lockList_page.dart @@ -110,6 +110,7 @@ class _LockListPageState extends State with RouteAware { return; } if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || + keyInfo.keyType == XSConstantMacro.keyTypeLong || keyInfo.keyType == XSConstantMacro.keyTypeLoop) && (keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) { logic.showToast('您的钥匙已冻结'.tr); @@ -143,12 +144,16 @@ class _LockListPageState extends State 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), decoration: BoxDecoration( - color: ((keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && - (keyInfo.keyStatus == - XSConstantMacro.keyStatusWaitIneffective || - keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen || - keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) + color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime || + keyInfo.keyType == XSConstantMacro.keyTypeLoop) && + (keyInfo.keyStatus == + XSConstantMacro.keyStatusWaitIneffective || + keyInfo.keyStatus == + XSConstantMacro.keyStatusFrozen || + keyInfo.keyStatus == + XSConstantMacro.keyStatusExpired)) || + (keyInfo.keyType == XSConstantMacro.keyTypeLong && + keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) ? AppColors.greyBackgroundColor : Colors.white, borderRadius: BorderRadius.circular(20.w), diff --git a/lib/main/lockMian/lockList/lockList_xhj_page.dart b/lib/main/lockMian/lockList/lockList_xhj_page.dart index 47d6fce9..6c972bef 100755 --- a/lib/main/lockMian/lockList/lockList_xhj_page.dart +++ b/lib/main/lockMian/lockList/lockList_xhj_page.dart @@ -208,6 +208,7 @@ class _LockListXHJPageState extends State with RouteAware { return; } if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || + keyInfo.keyType == XSConstantMacro.keyTypeLong || keyInfo.keyType == XSConstantMacro.keyTypeLoop) && (keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) { logic.showToast('您的钥匙已冻结'.tr); @@ -254,12 +255,16 @@ class _LockListXHJPageState extends State with RouteAware { onTap: action, child: Container( decoration: BoxDecoration( - color: ((keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && - (keyInfo.keyStatus == - XSConstantMacro.keyStatusWaitIneffective || - keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen || - keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) + color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime || + keyInfo.keyType == XSConstantMacro.keyTypeLoop) && + (keyInfo.keyStatus == + XSConstantMacro.keyStatusWaitIneffective || + keyInfo.keyStatus == + XSConstantMacro.keyStatusFrozen || + keyInfo.keyStatus == + XSConstantMacro.keyStatusExpired)) || + (keyInfo.keyType == XSConstantMacro.keyTypeLong && + keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) ? AppColors.greyBackgroundColor : Colors.white.withOpacity(0.8), borderRadius: BorderRadius.circular(20.w),