1，锁用户管理—即将到期列表—密码模块新增循环显示

2，锁用户管理—即将到期列表—修改已过期显示逻辑
3，锁用户管理—即将到期列表--删除指纹的文字提示要对应为确定删除指纹吗

star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireFingerprint/expireFingerprint_page.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
@@ -45,13 +44,17 @@ class _ExpireFingerprintPageState extends State<ExpireFingerprintPage> {
         onLoad: () {
           getHttpData();
         },
-        child: Obx(() => _buildMainUI())
+        child: Obx(() => _buildMainUI()));
-    );
   }
 
   Widget _buildMainUI() {
     return state.dataList.isEmpty
-        ? NoData(noDataHeight: 1.sh - ScreenUtil().statusBarHeight - ScreenUtil().bottomBarHeight - 190.h - 64.h)
+        ? NoData(
+            noDataHeight: 1.sh -
+                ScreenUtil().statusBarHeight -
+                ScreenUtil().bottomBarHeight -
+                190.h -
+                64.h)
         : SlidableAutoCloseBehavior(
             child: ListView.separated(
               itemCount: state.dataList.length,
@@ -65,8 +68,10 @@ class _ExpireFingerprintPageState extends State<ExpireFingerprintPage> {
                     children: [
                       SlidableAction(
                         onPressed: (BuildContext context) {
-                    ShowTipView().showIosTipWithContentDialog("确定删除卡吗？", (){
+                          ShowTipView().showIosTipWithContentDialog("确定删除指纹吗？",
-                      state.deletExpireFingerprintItemEntity = indexEntity;
+                              () {
+                            state.deletExpireFingerprintItemEntity =
+                                indexEntity;
                             logic.senderAddFingerprint();
                           });
                         },
@@ -216,8 +221,7 @@ class _ExpireFingerprintPageState extends State<ExpireFingerprintPage> {
         ),
         child: Text(
           '余${itemData.expireDate.toString()}天',
-          style: TextStyle(
+          style: TextStyle(color: Colors.white, fontSize: 13.sp),
-              color: Colors.white, fontSize: 13.sp),
         ),
       );
     } else {
@@ -229,12 +233,10 @@ class _ExpireFingerprintPageState extends State<ExpireFingerprintPage> {
         ),
         child: Text(
           '已过期',
-          style: TextStyle(
+          style: TextStyle(color: Colors.white, fontSize: 13.sp),
-              color: Colors.white, fontSize: 13.sp),
         ),
       );
     }
     // }
   }
-
 }

star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expirePassword/expirePassword_logic.dart

@@ -1,4 +1,3 @@
-
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/dateTool.dart';
 
@@ -13,7 +12,8 @@ class ExpirePasswordLogic extends BaseGetXController {
 
   //请求即将到期列表
   Future<ExpirePasswordEntity> expirePasswordListRequest() async {
-    ExpirePasswordEntity entity = await ApiRepository.to.expirePasswordList(pageNo.toString(), pageSize.toString());
+    ExpirePasswordEntity entity = await ApiRepository.to
+        .expirePasswordList(pageNo.toString(), pageSize.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       if (pageNo == 1) {
         state.dataList.value = entity.data!.list!;
@@ -29,7 +29,8 @@ class ExpirePasswordLogic extends BaseGetXController {
   }
 
   //删除密码请求 deleteType:1-蓝牙 2-网关
-  Future<void> deletePwdRequest(ExpirePasswordItemData expirePasswordItemData) async {
+  Future<void> deletePwdRequest(
+      ExpirePasswordItemData expirePasswordItemData) async {
     PasswordKeyEntity entity = await ApiRepository.to.deleteKeyboardPwd(
         lockId: expirePasswordItemData.lockId.toString(),
         keyboardPwdId: expirePasswordItemData.pwdId.toString(),
@@ -46,12 +47,13 @@ class ExpirePasswordLogic extends BaseGetXController {
   //使用期限
   String getExpireDateStr(ExpirePasswordItemData itemData) {
     String useDateStr = '';
-    if(itemData.keyboardPwdType == 4){
+    //* getKeyType 单次1 永久2 限期3 删除4 周未循环5 每日循环6 工作日循环7 周一循环8 周二循环9 周三循环10 周四循环11 周五循环12 周六循环13 周天循环14
+    if (itemData.keyboardPwdType! > 4) {
       useDateStr = '循环';
     } else {
-      useDateStr = '${DateTool().dateToYMDString(itemData.startDate.toString())}-${DateTool().dateToYMDString(itemData.endDate.toString())}';
+      useDateStr =
+          '${DateTool().dateToYMDString(itemData.startDate.toString())}-${DateTool().dateToYMDString(itemData.endDate.toString())}';
     }
     return useDateStr;
   }
-
 }

star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expirePassword/expirePassword_page.dart

@@ -1,10 +1,10 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/app_settings/app_colors.dart';
+import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart';
 import 'package:star_lock/tools/EasyRefreshTool.dart';
 import 'package:star_lock/tools/noData.dart';
 
@@ -46,13 +46,17 @@ class _ExpirePasswordPageState extends State<ExpirePasswordPage> {
         onLoad: () {
           getHttpData();
         },
-        child: Obx(() => _buildMainUI())
+        child: Obx(() => _buildMainUI()));
-    );
   }
 
   Widget _buildMainUI() {
     return state.dataList.isEmpty
-        ? NoData(noDataHeight: 1.sh - ScreenUtil().statusBarHeight - ScreenUtil().bottomBarHeight - 190.h - 64.h)
+        ? NoData(
+            noDataHeight: 1.sh -
+                ScreenUtil().statusBarHeight -
+                ScreenUtil().bottomBarHeight -
+                190.h -
+                64.h)
         : SlidableAutoCloseBehavior(
             child: ListView.separated(
               itemCount: state.dataList.length,
@@ -66,7 +70,8 @@ class _ExpirePasswordPageState extends State<ExpirePasswordPage> {
                     children: [
                       SlidableAction(
                         onPressed: (BuildContext context) {
-                    ShowTipView().showIosTipWithContentDialog("确定删除该密码吗？", (){
+                          ShowTipView().showIosTipWithContentDialog("确定删除该密码吗？",
+                              () {
                             logic.deletePwdRequest(indexEntity);
                           });
                         },
@@ -93,11 +98,12 @@ class _ExpirePasswordPageState extends State<ExpirePasswordPage> {
   Widget _electronicKeyItem(ExpirePasswordItemData itemData) {
     return GestureDetector(
       onTap: () async {
-        // if(itemData.keyboardPwdType! == 4){
+        // if (itemData.keyboardPwdType! > 4) {
         //   // 循环
-        //   var data = await Get.toNamed(Routers.electronicKeyPeriodValidityPage, arguments: {
+        //   var data = await Get.toNamed(Routers.electronicKeyPeriodValidityPage,
+        //       arguments: {
         //         "pushType": 0,
-        //     "expireLockItem": itemData,
+        //         "expirePasswordItem": itemData,
         //       });
         //   if (data != null) {
         //     // setState(() {
@@ -111,18 +117,19 @@ class _ExpirePasswordPageState extends State<ExpirePasswordPage> {
         //     getHttpData();
         //   }
         // } else {
-        //   var data = await Get.toNamed(Routers.electronicKeyDetailChangeDate, arguments: {
+        //   var backData = await Get.toNamed(
-        //     "pushType": 0,
+        //       Routers.passwordKeyDetailChangeDatePage,
-        //     "expireLockItem": itemData,
+        //       arguments: {
-        //   });
+        //         'itemData': itemData,
-        //   if(data != null) {
+
-        //     setState(() {
-        //       // state.starDate.value = data["beginTimeTimestamp"].toString();
-        //       // state.endDate.value = data["endTimeTimestamp"].toString();
-        //       // state.keyType.value = 2;
-        //       logic.pageNo = 1;
-        //       getHttpData();
         //       });
+        //   if (backData != null) {
+        //     itemData.startDate =
+        //         int.parse(backData["beginTimeTimestamp"]) * 1000;
+        //     itemData.endDate = int.parse(backData["endTimeTimestamp"]) * 1000;
+        //     // 改了日期之后，永久只能改限时的
+        //     itemData.keyboardPwdType = 3;
+        //     setState(() {});
         //   }
         // }
       },
@@ -193,22 +200,12 @@ class _ExpirePasswordPageState extends State<ExpirePasswordPage> {
   }
 
   Widget getStatus(ExpirePasswordItemData itemData) {
-    // if (itemData.keyboardPwdStatus! == 1) {
+    //keyboardPwdStatus 1：正常 2：已过期
-    //   return Container(
+    return Row(
-    //     padding: EdgeInsets.only(left: 5.w, right: 5.w),
+      children: [
-    //     decoration: BoxDecoration(
+        Visibility(
-    //       color: Colors.red,
+            visible: itemData.expireDate! > 0 ? true : false,
-    //       borderRadius: BorderRadius.circular(2.0),
+            child: Container(
-    //     ),
-    //     child: Text(
-    //       '未生效',
-    //       style: TextStyle(
-    //           color: Colors.white, fontSize: 13.sp),
-    //     ),
-    //   );
-    // } else {
-      if (itemData.expireDate! > 0) {
-        return Container(
               padding: EdgeInsets.only(left: 5.w, right: 5.w),
               decoration: BoxDecoration(
                 color: AppColors.expireTextBgColor,
@@ -216,25 +213,23 @@ class _ExpirePasswordPageState extends State<ExpirePasswordPage> {
               ),
               child: Text(
                 '余${itemData.expireDate.toString()}天',
-            style: TextStyle(
+                style: TextStyle(color: Colors.white, fontSize: 13.sp),
-                color: Colors.white, fontSize: 13.sp),
               ),
-        );
+            )),
-      } else {
+        Visibility(
-        return Container(
+            visible: itemData.keyboardPwdStatus! == 2 ? true : false,
+            child: Container(
               padding: EdgeInsets.only(left: 5.w, right: 5.w),
               decoration: BoxDecoration(
                 color: Colors.red,
                 borderRadius: BorderRadius.circular(2.0),
               ),
               child: Text(
-            '已过期',
+                '已过期'.tr,
-            style: TextStyle(
+                style: TextStyle(color: Colors.white, fontSize: 13.sp),
-                color: Colors.white, fontSize: 13.sp),
               ),
+            ))
+      ],
     );
   }
-    // }
-  }
-
 }