Merge branch 'master' of https://gitee.com/weishaoyang/star_lock

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart

@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
@@ -21,7 +20,8 @@ class AuthorizedAdminLogic extends BaseGetXController {
   // 监听设备返回的数据
   late StreamSubscription<Reply> _replySubscription;
   void _initReplySubscription() {
-    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((reply) async {
+    _replySubscription =
+        EventBusManager().eventBus!.on<Reply>().listen((reply) async {
       // 开门
       if (reply is TransferPermissionsReply) {
         var token = reply.data.sublist(2, 6);
@@ -42,7 +42,8 @@ class AuthorizedAdminLogic extends BaseGetXController {
             //无权限
             print("${reply.commandType!.typeValue} 需要鉴权");
             var privateKey = await Storage.getStringList(saveBluePrivateKey);
-            List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
+            List<int> getPrivateKeyList =
+                changeStringListToIntList(privateKey!);
 
             var publicKey = await Storage.getStringList(saveBluePublicKey);
             List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
@@ -57,8 +58,7 @@ class AuthorizedAdminLogic extends BaseGetXController {
                 needAuthor: 1,
                 publicKey: publicKeyDataList,
                 privateKey: getPrivateKeyList,
-                token: getTokenList
+                token: getTokenList);
-            );
             break;
           case 0x07:
             //无权限
@@ -82,7 +82,9 @@ class AuthorizedAdminLogic extends BaseGetXController {
 
   // 转移权限
   Future<void> transferPermissionsAction() async {
-    BlueManage().judgeReconnect(BlueManage().connectDeviceMacAddress, BlueManage().connectDeviceName, (DeviceConnectionState state) async {
+    BlueManage().judgeReconnect(
+        BlueManage().connectDeviceMacAddress, BlueManage().connectDeviceName,
+        (DeviceConnectionState state) async {
       if (state == DeviceConnectionState.connected) {
         var privateKey = await Storage.getStringList(saveBluePrivateKey);
         List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
@@ -103,8 +105,7 @@ class AuthorizedAdminLogic extends BaseGetXController {
             needAuthor: 1,
             publicKey: publicKeyDataList,
             privateKey: getPrivateKeyList,
-            token: getTokenList
+            token: getTokenList);
-        );
       }
     });
   }
@@ -121,7 +122,6 @@ class AuthorizedAdminLogic extends BaseGetXController {
   void onInit() {
     // TODO: implement onInit
     super.onInit();
-
   }
 
   @override
@@ -129,5 +129,4 @@ class AuthorizedAdminLogic extends BaseGetXController {
     // TODO: implement onClose
     _replySubscription.cancel();
   }
-
 }

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart

@@ -302,7 +302,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage> {
             btnName: '完成',
             onClick: () {
               _isSendSuccess = false;
-              setState(() {});
+              Navigator.pop(context, true);
             }),
         SizedBox(
           height: 10.h,

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart

@@ -69,6 +69,11 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
                             arguments: {
                               "lockMainEntity": lockMainEntity,
                               "keyInfo": keyInfo
+                            }).then((val) {
+                          if (val != null) {
+                            mockNetworkDataRequest();
+                            setState(() {});
+                          }
                         });
                       },
                     ),

star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart

@@ -81,7 +81,8 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
               isHaveDirection: true,
               action: () {
                 Navigator.pushNamed(
-                    context, Routers.electronicKeyDetailChangeDate);
+                    context, Routers.electronicKeyDetailChangeDate,
+                    arguments: {"itemData": itemData});
               }),
           Container(height: 10.h),
           CommonItem(
@@ -252,7 +253,7 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
   Future<void> modifyKeyNameRequest() async {
     KeyOperationRecordEntity entity = await ApiRepository.to
         .modifyKeyNameForAdmin(
-            itemData.keyId.toString(), _changeNameController.text, '0');
+            itemData.keyId.toString(), _changeNameController.text, '');
     if (entity.errorCode!.codeIsSuccessful) {
       print("修改要是名称成功啦啦啦啦啦");
       Toast.show(msg: "修改成功");
@@ -265,7 +266,7 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
   //删除电子钥匙名称请求
   Future<void> deleteKeyRequest() async {
     ElectronicKeyListEntity entity =
-        await ApiRepository.to.deleteElectronicKey('0');
+        await ApiRepository.to.deleteElectronicKey(itemData.keyId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       print("删除电子钥匙成功");
       Toast.show(msg: "删除成功");

star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_page.dart

@@ -1,11 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_cupertino_datetime_picker/flutter_cupertino_datetime_picker.dart';
+import 'package:flutter_pickers/pickers.dart';
+import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
+import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
+import 'package:star_lock/network/api_repository.dart';
+import 'package:star_lock/tools/baseGetXController.dart';
+import 'package:star_lock/tools/toast.dart';
 
 import '../../../../../app_settings/app_colors.dart';
 import '../../../../../tools/commonItem.dart';
-import '../../../../../tools/showSeletDateTime.dart';
 import '../../../../../tools/titleAppBar.dart';
 import '../../../../../translations/trans_lib.dart';
 
@@ -19,8 +24,23 @@ class ElectronicKeyDetailChangeDate extends StatefulWidget {
 
 class _ElectronicKeyDetailChangeDateState
     extends State<ElectronicKeyDetailChangeDate> {
+  ElectronicKeyListItem itemData = ElectronicKeyListItem();
+
+  String _selectEffectiveDate = ''; //生效时间
+  String _selectFailureDate = ''; //失效时间
+  late DateTime _effectiveDateTime;
+  late DateTime _failureDateTime;
+  late String endDay = '';
+  late String startDay = '';
+  late List weekDays = [];
+
   @override
   Widget build(BuildContext context) {
+    dynamic obj = ModalRoute.of(context)?.settings.arguments;
+    if (obj != null && (obj["itemData"] != null)) {
+      itemData = obj["itemData"];
+    }
+
     return Scaffold(
       backgroundColor: AppColors.mainBackgroundColor,
       appBar: TitleAppBar(
@@ -34,7 +54,9 @@ class _ElectronicKeyDetailChangeDateState
               TranslationLoader.lanKeys!.sure!.tr,
               style: TextStyle(color: Colors.white, fontSize: 24.sp),
             ),
-            onPressed: () {},
+            onPressed: () {
+              updateKeyDateRequest();
+            },
           ),
         ],
       ),
@@ -47,50 +69,58 @@ class _ElectronicKeyDetailChangeDateState
       children: [
         CommonItem(
             leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr,
-            rightTitle: "2020.06.20 11:49",
+            rightTitle: _selectEffectiveDate,
-            isHaveDirection: true,
             isHaveLine: true,
+            isHaveDirection: true,
             action: () {
-              ShowSeletDateTime().showDatePicker(
+              Pickers.showDatePicker(context, mode: DateMode.YMDHM,
-                  context,
+                  onConfirm: (p) {
-                  '2100-01-01 00:00',
+                setState(() {
-                  '1900-01-01 00:00',
+                  _selectEffectiveDate =
-                  getNowDate(),
+                      '${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}:${intToStr(p.minute!)}';
-                  'yyyy-MMMM-dd HH:mm',
+                  _effectiveDateTime = DateTime.parse(_selectEffectiveDate);
-                  (dateTime, List<int> index) {});
+                });
+              });
             }),
         CommonItem(
             leftTitel: TranslationLoader.lanKeys!.failureTime!.tr,
-            rightTitle: "2020.06.20 11:49",
+            rightTitle: _selectFailureDate,
             isHaveDirection: true,
             action: () {
-              ShowSeletDateTime().showDatePicker(context, '00:00', '00:00',
+              Pickers.showDatePicker(context, mode: DateMode.YMDHM,
-                  getNowDate(), 'HH:mm', (dateTime, List<int> index) {});
+                  onConfirm: (p) {
+                setState(() {
+                  _selectFailureDate =
+                      '${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}:${intToStr(p.minute!)}';
+                  _failureDateTime = DateTime.parse(_selectFailureDate);
+                });
+              });
             }),
       ],
     );
   }
 
-  String getNowDate() {
+  //修改钥匙名称请求
-    // 获取当前时间对象
+  Future<void> updateKeyDateRequest() async {
-    DateTime today = DateTime.now();
+    KeyOperationRecordEntity entity = await ApiRepository.to.updateKeyDate(
-    String dateSlug =
+        itemData.keyId.toString(),
-        "${today.hour.toString().padLeft(2, '0')}:${today.minute.toString().padLeft(2, '0')}";
+        itemData.lockId.toString(),
-
+        _failureDateTime.millisecondsSinceEpoch.toString(),
-    // //获取当前时间的年
+        endDay,
-    // int year = now.year;
+        '',
-    // //获取当前时间的月
+        _effectiveDateTime.millisecondsSinceEpoch.toString(),
-    // int month = now.month;
+        startDay,
-    // //获取当前时间的日
+        weekDays);
-    // int day = now.day;
+    if (entity.errorCode!.codeIsSuccessful) {
-    // //获取当前时间的时
+      print("修改要是名称成功啦啦啦啦啦");
-    // int hour = now.hour;
+      Toast.show(msg: "修改成功");
-    // //获取当前时间的分
+      setState(() {
-    // int minute = now.minute;
+        Navigator.pop(context);
-    // //获取当前时间的秒
+      });
-    // int millisecond = now.millisecond;
+    }
-
+  }
-    // print("组合 $year-$month-$day $hour:$minute:$millisecond");
+
-    return dateSlug;
+  String intToStr(int v) {
+    return (v < 10) ? "0$v" : "$v";
   }
 }

star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart

@@ -82,6 +82,11 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
                             arguments: {
                               "lockMainEntity": lockMainEntity,
                               "keyInfo": keyInfo
+                            }).then((val) {
+                          if (val != null) {
+                            mockNetworkDataRequest();
+                            setState(() {});
+                          }
                         });
                       },
                     ),

star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart

@@ -0,0 +1,163 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/utils.dart';
+import 'package:star_lock/app_settings/app_colors.dart';
+import 'package:star_lock/tools/ExpandedListView.dart';
+import 'package:star_lock/translations/trans_lib.dart';
+
+class MassSendLockGroupListPage extends StatefulWidget {
+  const MassSendLockGroupListPage({Key? key}) : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() {
+    return _MassSendLockGroupListPageState();
+  }
+}
+
+class _MassSendLockGroupListPageState extends State<MassSendLockGroupListPage> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(
+          backgroundColor: AppColors.mainColor,
+          title: Text(
+            TranslationLoader.lanKeys!.authorityManagement!.tr,
+            style: TextStyle(
+                color: Colors.white,
+                fontSize: 28.sp,
+                fontWeight: FontWeight.w600),
+          ),
+          elevation: 0,
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios, color: Colors.white),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+        ),
+        body: Column(
+          children: [
+            Text(
+              '请选择要发送的锁',
+              style: TextStyle(
+                  color: AppColors.darkGrayTextColor, fontSize: 22.sp),
+            ),
+            _keyGroupList()
+          ],
+        ));
+  }
+
+//设备列表
+  Widget _keyGroupList() {
+    return Column(
+      children: [
+        SizedBox(
+          height: 10.h,
+        ),
+        Expanded(
+            child: ListView.separated(
+                itemBuilder: (context, index) {
+                  if (index == 0) {
+                    return _buildLockExpandedList(context, index, "大门锁");
+                  } else if (index == 1) {
+                    return _buildLockExpandedList(context, index, "办公室锁");
+                  } else if (index == 2) {
+                    return _buildLockExpandedList(context, index, "会议室锁");
+                  } else {
+                    return _buildLockExpandedList(context, index, "宴会厅锁");
+                  }
+                },
+                separatorBuilder: (context, index) {
+                  return const Divider(
+                    height: 1,
+                    color: AppColors.greyLineColor,
+                  );
+                },
+                itemCount: 5)),
+      ],
+    );
+  }
+
+//设备多层级列表
+  Widget _buildLockExpandedList(context, index, deviceName) {
+    return ExpandedListTile(
+      onTap: () => print("onTap."),
+      title: deviceName,
+      imgName: 'images/icon_lock.png',
+      typeImgList: const [],
+      child: ListView.separated(
+        physics: const NeverScrollableScrollPhysics(),
+        shrinkWrap: true,
+        itemCount: 10,
+        itemBuilder: (_, index) {
+          if (index == 0) {
+            return _buildNameWidget(
+                context, index, 'images/icon_password.png', '张三');
+          } else if (index == 1) {
+            return _buildNameWidget(
+                context, index, 'images/icon_card.png', '李四');
+          } else if (index == 2) {
+            return _buildNameWidget(
+                context, index, 'images/icon_fingerprint.png', '王二');
+          } else if (index == 3) {
+            return _buildNameWidget(
+                context, index, 'images/icon_card.png', '麻子');
+          } else {
+            return null;
+          }
+        },
+        separatorBuilder: (BuildContext context, int index) {
+          return const Divider(
+            height: 1,
+            color: AppColors.greyLineColor,
+          );
+        },
+      ),
+    );
+  }
+
+  //单个姓名行
+  Widget _buildNameWidget(context, index, imageName, getName) {
+    return GestureDetector(
+      child: Container(
+        height: 60.h,
+        color: Colors.white,
+        width: ScreenUtil().screenWidth,
+        child: Row(
+          children: [
+            SizedBox(
+              width: 30.w,
+            ),
+            Image.asset(
+              'images/controls_user.png',
+              width: 36.w,
+              height: 36.w,
+            ),
+            SizedBox(
+              width: 10.w,
+            ),
+            Text(
+              getName,
+              style: TextStyle(
+                  fontSize: 20.sp, color: AppColors.darkGrayTextColor),
+            ),
+            SizedBox(
+              width: 30.w,
+            )
+          ],
+        ),
+      ),
+      onTap: () {
+        // selectNameIndex = index;
+        // setState(() {
+        //   if (selectNameIndex == index) {
+        //     isNameSelect = !isNameSelect;
+        //   }
+        // });
+      },
+    );
+  }
+}

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart

@@ -80,13 +80,14 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
   }
 
   Widget indexChangeWidget() {
+    if (_isSendSuccess) {
+      return sendElectronicKeySucceed();
+    } else {
       switch (int.parse(widget.type)) {
         case 0:
           {
             // 限时
-          return _isSendSuccess
+            return Column(
-              ? sendElectronicKeySucceed()
-              : Column(
               children: [
                 keyInfoWidget(),
                 keyTimeWidget(),
@@ -99,9 +100,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
         case 1:
           {
             // 永久
-          return _isSendSuccess
+            return Column(
-              ? sendElectronicKeySucceed()
-              : Column(
               children: [
                 keyInfoWidget(),
                 remoteUnlockingWidget(),
@@ -113,9 +112,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
         case 2:
           {
             // 单次
-          return _isSendSuccess
+            return Column(
-              ? sendElectronicKeySucceed()
-              : Column(
               children: [
                 keyInfoWidget(),
                 remoteUnlockingWidget(),
@@ -127,9 +124,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
         case 3:
           {
             // 循环
-          return _isSendSuccess
+            return Column(
-              ? sendElectronicKeySucceed()
-              : Column(
               children: [
                 keyInfoWidget(),
                 keyPeriodValidityWidget(),
@@ -143,6 +138,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
           return Container();
       }
     }
+  }
 
   // 顶部钥匙信息widget
   Widget keyInfoWidget() {
@@ -412,7 +408,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
             btnName: '完成',
             onClick: () {
               _isSendSuccess = false;
-              setState(() {});
+              Navigator.pop(context, true);
             }),
         SizedBox(
           height: 10.h,

star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:star_lock/network/api_repository.dart';
+import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../../appRouters.dart';
 import '../../../../../app_settings/app_colors.dart';
@@ -104,4 +106,37 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
           ],
         ));
   }
+
+/*
+  void getLockInfo() async {
+    var entity = await ApiRepository.to.getLockInfo(
+      lastUpdateDate: DateTime.now().millisecondsSinceEpoch.toString(),
+      pageNo: '1',
+    );
+    if (entity.errorCode!.codeIsSuccessful) {
+      // if (page == 0) {
+      //   refreshController.refreshCompleted();
+      // } else {
+      //   if (entity.data!.keyInfos!.isEmpty) {
+      //     refreshController.loadNoData();
+      //   } else {
+      //     refreshController.loadComplete();
+      //   }
+      // }
+      // page++;
+
+      if (entity.data!.keyInfos!.isEmpty) {
+        state.dataLength.value = 0;
+      } else if (entity.data!.keyInfos!.length == 1) {
+        state.dataLength.value = 1;
+      } else {
+        state.dataLength.value = 2;
+      }
+      state.lockMainEntity.value = entity;
+    } else {
+      // refreshController.loadFailed();
+    }
+    // refreshController.refreshCompleted();
+  }
+  */
 }

star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart';
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
@@ -58,7 +59,8 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
           //   ),
           // ],
         ),
-      body: Column(
+        body: SingleChildScrollView(
+          child: Column(
             children: [
               CommonItem(
                   leftTitel: TranslationLoader.lanKeys!.password!.tr,
@@ -88,10 +90,11 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
               CommonItem(
                   leftTitel: TranslationLoader.lanKeys!.sender!.tr,
                   rightTitle: itemData.senderUsername,
+                  isHaveLine: true,
                   action: () {}),
               CommonItem(
                   leftTitel: TranslationLoader.lanKeys!.senderTime!.tr,
-              rightTitle: itemData.sendDate.toString(),
+                  rightTitle: getSenderDate(itemData),
                   action: () {}),
               Container(height: 10.h),
               CommonItem(
@@ -114,12 +117,14 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
                         // backgroundColor: Colors.white,
                         side: BorderSide(width: 1, color: AppColors.mainColor)),
                     onPressed: () {
-                  Navigator.pushNamed(context, Routers.otherTypeKeyManagePage,
+                      Navigator.pushNamed(
+                          context, Routers.otherTypeKeyManagePage,
                           arguments: 0);
                     },
                     child: Text(
                       '设置卡',
-                  style: TextStyle(color: AppColors.mainColor, fontSize: 24.sp),
+                      style: TextStyle(
+                          color: AppColors.mainColor, fontSize: 24.sp),
                     )),
               ),
               SizedBox(
@@ -133,12 +138,14 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
                         // backgroundColor: Colors.white,
                         side: BorderSide(width: 1, color: AppColors.mainColor)),
                     onPressed: () {
-                  Navigator.pushNamed(context, Routers.otherTypeKeyManagePage,
+                      Navigator.pushNamed(
+                          context, Routers.otherTypeKeyManagePage,
                           arguments: 1);
                     },
                     child: Text(
                       '设置指纹',
-                  style: TextStyle(color: AppColors.mainColor, fontSize: 24.sp),
+                      style: TextStyle(
+                          color: AppColors.mainColor, fontSize: 24.sp),
                     )),
               ),
               SizedBox(
@@ -152,12 +159,14 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
                         // backgroundColor: Colors.white,
                         side: BorderSide(width: 1, color: AppColors.mainColor)),
                     onPressed: () {
-                  Navigator.pushNamed(context, Routers.otherTypeKeyManagePage,
+                      Navigator.pushNamed(
+                          context, Routers.otherTypeKeyManagePage,
                           arguments: 2);
                     },
                     child: Text(
                       '设置遥控',
-                  style: TextStyle(color: AppColors.mainColor, fontSize: 24.sp),
+                      style: TextStyle(
+                          color: AppColors.mainColor, fontSize: 24.sp),
                     )),
               ),
               SizedBox(
@@ -175,7 +184,16 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
                   }),
             ],
           ),
-    );
+        ));
+  }
+
+  //发送时间
+  String getSenderDate(PasswordKeyListItem indexEntity) {
+    String senderDate = '';
+    DateTime dateStr =
+        DateTime.fromMillisecondsSinceEpoch(indexEntity.sendDate!);
+    senderDate = dateStr.toLocal().toString().substring(0, 16);
+    return senderDate;
   }
 
   Widget commonItem(String leftTitle, String rightTitle,
@@ -241,10 +259,10 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
     );
   }
 
-  //删除密码请求
+  //删除密码请求 deleteType:1-蓝牙 2-网关
   Future<void> deletePwdRequest() async {
-    PasswordKeyEntity entity =
+    PasswordKeyEntity entity = await ApiRepository.to.deleteKeyboardPwd(
-        await ApiRepository.to.deleteKeyboardPwd('0', '1', '1');
+        itemData.lockId.toString(), itemData.keyboardPwdId.toString(), '1');
     if (entity.errorCode!.codeIsSuccessful) {
       print("删除密码成功");
       Toast.show(msg: "删除成功");

star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart

@@ -78,12 +78,17 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
                         btnName: TranslationLoader.lanKeys!.getPassword!.tr,
                         onClick: () {
                           Navigator.pushNamed(
-                            context, Routers.passwordKeyManagePage, arguments: {
+                              context, Routers.passwordKeyManagePage,
+                              arguments: {
                                 "lockMainEntity": lockMainEntity,
                                 "keyInfo": keyInfo
+                              }).then((val) {
+                            if (val != null) {
+                              mockNetworkDataRequest();
+                              setState(() {});
+                            }
                           });
-                      },
+                        }),
-                    ),
                     SizedBox(
                       height: 42.h,
                     )

star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart

@@ -14,11 +14,12 @@ import '../../../../tools/baseGetXController.dart';
 import '../../../../tools/storage.dart';
 
 class PasswordKeyPerpetualLogic extends BaseGetXController {
-
+  late DateTime getStartDateTime;
   // 监听设备返回的数据
   late StreamSubscription<Reply> _replySubscription;
   void _initReplySubscription() {
-    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((reply) async {
+    _replySubscription =
+        EventBusManager().eventBus!.on<Reply>().listen((reply) async {
       // 设置自定义密码
       if (reply is SenderCustomPasswordsReply) {
         var token = reply.data.sublist(2, 6);
@@ -39,11 +40,14 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
             //无权限
             print("${reply.commandType!.typeValue} 需要鉴权");
             var privateKey = await Storage.getStringList(saveBluePrivateKey);
-            List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
+            List<int> getPrivateKeyList =
+                changeStringListToIntList(privateKey!);
 
             var publicKey = await Storage.getStringList(saveBluePublicKey);
             List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
 
+            print('得到的开始时间时间戳$getStartDate');
+
             IoSenderManage.senderCustomPasswordsCommand(
                 keyID: "1",
                 userID: await Storage.getUid(),
@@ -55,8 +59,7 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
                 needAuthor: 1,
                 publicKey: publicKeyDataList,
                 privateKey: getPrivateKeyList,
-                token: token
+                token: token);
-            );
             break;
           case 0x07:
             //无权限
@@ -78,9 +81,15 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
     });
   }
 
+  void getStartDate(DateTime startDate) {
+    getStartDateTime = startDate;
+  }
+
   // 设置自定义密码
   Future<void> senderCustomPasswords() async {
-    BlueManage().judgeReconnect(BlueManage().connectDeviceMacAddress, BlueManage().connectDeviceName, (DeviceConnectionState state) async {
+    BlueManage().judgeReconnect(
+        BlueManage().connectDeviceMacAddress, BlueManage().connectDeviceName,
+        (DeviceConnectionState state) async {
       if (state == DeviceConnectionState.connected) {
         var publicKey = await Storage.getStringList(saveBluePublicKey);
         List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
@@ -103,8 +112,7 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
             needAuthor: 1,
             publicKey: publicKeyDataList,
             privateKey: getPrivateKeyList,
-            token: getTokenList
+            token: getTokenList);
-        );
       }
     });
   }
@@ -121,7 +129,6 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
   void onInit() {
     // TODO: implement onInit
     super.onInit();
-
   }
 
   @override
@@ -129,5 +136,4 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
     // TODO: implement onClose
     _replySubscription.cancel();
   }
-
 }

star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart

@@ -6,6 +6,7 @@ import 'package:flutter_pickers/style/default_style.dart';
 import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart';
 import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
@@ -33,7 +34,10 @@ class PasswordKeyPerpetualPage extends StatefulWidget {
 }
 
 class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
-  final TextEditingController _controller = TextEditingController();
+  final TextEditingController _nameController = TextEditingController();
+  final TextEditingController _pwdController = TextEditingController();
+  final logic = Get.put(PasswordKeyPerpetualLogic());
+
   late bool _isSendSuccess; //是否发送成功
   late bool _isPermanent; //是否永久
   late String _getPwdStr;
@@ -47,7 +51,9 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
 
   @override
   Widget build(BuildContext context) {
-    return indexChangeWidget();
+    return SingleChildScrollView(
+      child: indexChangeWidget(),
+    );
   }
 
   @override
@@ -85,7 +91,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                 perpetualKeyWidget(
                     TranslationLoader.lanKeys!.name!.tr,
                     TranslationLoader.lanKeys!.pleaseNameYourPassword!.tr,
-                    _controller),
+                    _nameController),
                 keyBottomWidget(TranslationLoader.lanKeys!.getPasswordTip1!.tr)
               ],
             );
@@ -99,7 +105,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                 perpetualKeyWidget(
                     TranslationLoader.lanKeys!.name!.tr,
                     TranslationLoader.lanKeys!.pleaseNameYourPassword!.tr,
-                    _controller),
+                    _nameController),
                 keyBottomWidget(TranslationLoader.lanKeys!.getPasswordTip2!.tr)
               ],
             );
@@ -112,7 +118,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                 perpetualKeyWidget(
                     TranslationLoader.lanKeys!.name!.tr,
                     TranslationLoader.lanKeys!.pleaseNameYourPassword!.tr,
-                    _controller),
+                    _nameController),
                 keyBottomWidget(TranslationLoader.lanKeys!.getPasswordTip3!.tr)
               ],
             );
@@ -127,9 +133,9 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                 perpetualKeyWidget(
                     TranslationLoader.lanKeys!.name!.tr,
                     TranslationLoader.lanKeys!.pleaseNameYourPassword!.tr,
-                    _controller),
+                    _nameController),
                 perpetualKeyWidget(TranslationLoader.lanKeys!.password!.tr,
-                    "请输入6-9位数字", _controller),
+                    "请输入6-9位数字", _pwdController),
                 keyBottomWidget(TranslationLoader.lanKeys!.getPasswordTip4!.tr)
               ],
             );
@@ -143,7 +149,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                 perpetualKeyWidget(
                     TranslationLoader.lanKeys!.name!.tr,
                     TranslationLoader.lanKeys!.pleaseNameYourPassword!.tr,
-                    _controller),
+                    _nameController),
                 keyBottomWidget(TranslationLoader.lanKeys!.getPasswordTip5!.tr)
               ],
             );
@@ -156,7 +162,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                 perpetualKeyWidget(
                     TranslationLoader.lanKeys!.name!.tr,
                     TranslationLoader.lanKeys!.pleaseNameYourPassword!.tr,
-                    _controller),
+                    _nameController),
                 keyBottomWidget(TranslationLoader.lanKeys!.getPasswordTip6!.tr)
               ],
             );
@@ -179,7 +185,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
               leftTitel: titleStr,
               rightTitle: "",
               isHaveRightWidget: true,
-              rightWidget: getTFWidget(rightTitle)),
+              rightWidget: getTFWidget(rightTitle, controller)),
         ),
         SizedBox(height: 10.h),
       ],
@@ -346,6 +352,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
         SubmitBtn(
             btnName: TranslationLoader.lanKeys!.getPassword!.tr,
             onClick: () {
+              logic.getStartDate(_effectiveDateTime);
               getKeyboardPwdRequest();
             }),
       ],
@@ -393,7 +400,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
       //清空码
       getKeyType = '4';
     }
-    if (widget.type == '0') {
+    if (widget.type != '0' || widget.type != '2' || widget.type == '5') {
       getFailureDateTime =
           DateTime.parse(_selectFailureDate).millisecondsSinceEpoch.toString();
       getEffectiveDateTime = DateTime.parse(_selectEffectiveDate)
@@ -403,7 +410,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
     var entity = await ApiRepository.to.getPasswordKey(
         getFailureDateTime,
         '0',
-        _controller.text,
+        _nameController.text,
         getKeyType,
         '0',
         lockId,
@@ -466,7 +473,8 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
         SubmitBtn(
             btnName: '完成',
             onClick: () {
-              Navigator.pop(context);
+              _isSendSuccess = false;
+              Navigator.pop(context, true);
             }),
         SizedBox(
           height: 10.h,
@@ -489,7 +497,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
   }
 
   // 接受者信息输入框
-  Widget getTFWidget(String tfStr) {
+  Widget getTFWidget(String tfStr, TextEditingController editController) {
     return SizedBox(
       height: 50.h,
       width: 300.w,
@@ -499,7 +507,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
             child: TextField(
               //输入框一行
               maxLines: 1,
-              controller: _controller,
+              controller: editController,
               autofocus: false,
               textAlign: TextAlign.end,
               decoration: InputDecoration(

star_lock/lib/network/api.dart

@@ -23,10 +23,11 @@ abstract class Api {
   final String modifyKeyNameURL = '/key/modifyKeyName'; //修改锁名称
   final String modifyKeyNameForAdminURL =
       '/key/modifyKeyNameForAdmin'; //编辑电子钥匙名字
+  final String updateKeyDateURL = '/key/updateKeyDate'; //编辑电子钥匙的有效期、有效时间、有效日
   final String passwordKeyListURL = '/keyboardPwd/listSendRecords'; //密码钥匙列表
   final String passwordKeyResetURL = '/keyboardPwd/reset'; //密码钥匙重置
-  final String deleteElectronicKeyURL = '/keyboardPwd/reset'; //删除电子钥匙
+  final String deleteElectronicKeyURL = '/key/delete'; //删除电子钥匙
-  final String deleteKeyboardPwdURL = '/keyboardPwd/reset'; //删除密码
+  final String deleteKeyboardPwdURL = '/keyboardPwd/delete'; //删除密码
   final String getLockInfoURL = '/lock/syncDataPage'; // 获取锁信息
   final String deletLockURL = '/lock/delete'; // 删除锁
 
@@ -35,4 +36,6 @@ abstract class Api {
   final String addlockGroupURL = '/keyGroup/add'; //创建锁分组
   final String lockGroupListURL = '/authorizedAdmin/listGroup'; //锁分组列表
   final String updateSettingURL = '/room/updateSetting'; //标记房态
+  final String keyGroupListURL = '/keyGroup/list'; //分组列表
+  final String lockListByGroupURL = '/room/listByGroup'; //分组下的锁
 }

star_lock/lib/network/api_provider.dart

@@ -194,6 +194,28 @@ class ApiProvider extends BaseProvider {
             'operatorUid': operatorUid,
           }));
 
+  Future<Response> updateKeyDate(
+          String keyId,
+          String lockId,
+          String endDate,
+          String endDay,
+          String operatorUid,
+          String startDate,
+          String startDay,
+          List weekDays) =>
+      post(
+          updateKeyDateURL.toUrl,
+          jsonEncode({
+            'keyId': keyId,
+            'lockId': lockId,
+            'endDate': endDate,
+            'endDay': endDay,
+            'operatorUid': operatorUid,
+            'startDate': startDate,
+            'startDay': startDay,
+            'weekDays': weekDays,
+          }));
+
   Future<Response> resetElectronicKey(String lockId, String operatorUid) =>
       post(resetElectronicKeyURL.toUrl,
           jsonEncode({'lockId': lockId, 'operatorUid': operatorUid}));
@@ -332,11 +354,11 @@ class ApiProvider extends BaseProvider {
       post(deleteElectronicKeyURL.toUrl, jsonEncode({'keyId': keyId}));
 
   Future<Response> deleteKeyboardPwd(
-          String keyId, String keyboardPwdId, String deleteType) =>
+          String lockId, String keyboardPwdId, String deleteType) =>
       post(
           deleteKeyboardPwdURL.toUrl,
           jsonEncode({
-            'keyId': keyId,
+            'lockId': lockId,
             'keyboardPwdId': keyboardPwdId,
             'deleteType': deleteType
           }));
@@ -344,6 +366,13 @@ class ApiProvider extends BaseProvider {
   Future<Response> updateSetting(String lockId, String isOn, String type) =>
       post(updateSettingURL.toUrl,
           jsonEncode({'lockId': lockId, 'isOn': isOn, 'type': type}));
+
+  Future<Response> keyGroupList(String type) =>
+      post(keyGroupListURL.toUrl, jsonEncode({'type': type}));
+
+  Future<Response> lockListByGroup(String type, String keyGroupId) => post(
+      lockListByGroupURL.toUrl,
+      jsonEncode({'type': type, 'keyGroupId': keyGroupId}));
 }
 
 extension ExtensionString on String {

star_lock/lib/network/api_repository.dart

@@ -193,8 +193,16 @@ class ApiRepository {
       required Map bluetooth,
       required String deviceNo,
       required String lockUserNo}) async {
-    final res = await apiProvider.bindingBlueAdmin(bindingDate, hotelMode,
+    final res = await apiProvider.bindingBlueAdmin(
-        lockAlias, lockData, nbInitSuccess, position, bluetooth, deviceNo, lockUserNo);
+        bindingDate,
+        hotelMode,
+        lockAlias,
+        lockData,
+        nbInitSuccess,
+        position,
+        bluetooth,
+        deviceNo,
+        lockUserNo);
     return SaveLockEntity.fromJson(res.body);
   }
 
@@ -229,7 +237,22 @@ class ApiRepository {
     return KeyOperationRecordEntity.fromJson(res.body);
   }
 
-  //编辑电子钥匙名字
+  //编辑电子钥匙有效期
+  Future<KeyOperationRecordEntity> updateKeyDate(
+      String keyId,
+      String lockId,
+      String endDate,
+      String endDay,
+      String operatorUid,
+      String startDate,
+      String startDay,
+      List weekDays) async {
+    final res = await apiProvider.updateKeyDate(keyId, lockId, endDate, endDay,
+        operatorUid, startDate, startDay, weekDays);
+    return KeyOperationRecordEntity.fromJson(res.body);
+  }
+
+  //密码列表
   Future<PasswordKeyListEntity> passwordKeyList(
     String keyStatus,
     String lockId,
@@ -314,9 +337,9 @@ class ApiRepository {
 
   //删除密码
   Future<PasswordKeyEntity> deleteKeyboardPwd(
-      String keyId, String keyboardPwdId, String deleteType) async {
+      String lockId, String keyboardPwdId, String deleteType) async {
     final res =
-        await apiProvider.deleteKeyboardPwd(keyId, keyboardPwdId, deleteType);
+        await apiProvider.deleteKeyboardPwd(lockId, keyboardPwdId, deleteType);
     return PasswordKeyEntity.fromJson(res.body);
   }
 
@@ -326,4 +349,17 @@ class ApiRepository {
     final res = await apiProvider.deleteKeyboardPwd(lockId, isOn, type);
     return PasswordKeyEntity.fromJson(res.body);
   }
+
+  //分组列表
+  Future<PasswordKeyEntity> keyGroupList(String type) async {
+    final res = await apiProvider.keyGroupList(type);
+    return PasswordKeyEntity.fromJson(res.body);
+  }
+
+  //分组下的锁
+  Future<PasswordKeyEntity> lockListByGroup(
+      String type, String keyGroupId) async {
+    final res = await apiProvider.lockListByGroup(type, keyGroupId);
+    return PasswordKeyEntity.fromJson(res.body);
+  }
 }