From 6d73934327ff8dbfc5f1a38df7b90fa01b2b73d2 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Thu, 19 Oct 2023 09:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BB=86=E8=8A=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sendElectronicKey_logic.dart | 14 ++++++-------- .../sendElectronicKey_page.dart | 16 +++++++++++----- .../sendElectronicKey_state.dart | 2 ++ .../authorizedAdministratorList_page.dart | 2 +- .../lockUserManage/lockUserManageList_page.dart | 8 ++++++-- 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart index 71b58301..d77924e2 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart @@ -13,22 +13,20 @@ class SendElectronicKeyLogic extends BaseGetXController { //发送钥匙请求 Future sendElectronicKeyRequest(BuildContext widgetContext) async { - String getFailureDateTime = '0'; - String getEffectiveDateTime = '0'; String lockID = state.keyInfo.value.lockId.toString(); String getKeyType = (int.parse(state.type.value) + 1).toString(); if (state.type.value == '0') { - getFailureDateTime = - state.failureDateTime.value.millisecondsSinceEpoch.toString(); - getEffectiveDateTime = - state.effectiveDateTime.value.millisecondsSinceEpoch.toString(); + state.failureTimestamp.value = + state.failureDateTime.value.millisecondsSinceEpoch; + state.effectiveTimestamp.value = + state.effectiveDateTime.value.millisecondsSinceEpoch; } var entity = await ApiRepository.to.sendElectronicKey( createUser: state.isCreateUser.value ? "1" : "0", countryCode: state.countryCode.value, usernameType: '1', - endDate: getFailureDateTime, + endDate: state.failureTimestamp.value.toString(), faceAuthentication: state.isAuthentication.value == true ? '1' : '2', isCameraEnable: '2', isRemoteUnlock: state.isRemoteUnlock.value == true ? '1' : '2', @@ -39,7 +37,7 @@ class SendElectronicKeyLogic extends BaseGetXController { operatorUid: '', receiverUsername: state.emailOrPhoneController.text, remarks: '', - startDate: getEffectiveDateTime, + startDate: state.effectiveTimestamp.value.toString(), weekDays: state.weekdaysList); if (entity.errorCode!.codeIsSuccessful) { print('发送电子钥匙成功'); diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart index a55d88e7..20804f7a 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart @@ -214,9 +214,13 @@ class _SendElectronicKeyPageState extends State { Widget keyPeriodValidityWidget() { return Column( children: [ - CommonItem( + Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr, - rightTitle: "", + rightTitle: state.weekdaysList.isEmpty + ? '' + : state.weekdaysList + .reduce((value, element) => value + ',' + element) + .toString(), isHaveDirection: true, action: () async { var result = await Navigator.pushNamed( @@ -224,10 +228,12 @@ class _SendElectronicKeyPageState extends State { if (result != null) { result as Map; state.weekdaysList.value = result['validityValue']; - state.effectiveDateTime.value = result['starDate']; - state.failureDateTime.value = result['endDate']; + state.effectiveTimestamp.value = + result['starDate'].millisecondsSinceEpoch; + state.failureTimestamp.value = + result['endDate'].millisecondsSinceEpoch; } - }), + })), SizedBox( height: 10.h, ) diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart index 7c721187..1b79bc58 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart @@ -18,6 +18,8 @@ class SendElectronicKeyState { DateTime dateTime = DateTime.now(); final effectiveDateTime = DateTime.now().obs; final failureDateTime = DateTime.now().obs; + final effectiveTimestamp = 0.obs; + final failureTimestamp = 0.obs; var selectEffectiveDate = '${DateTime.now().year}-${DateTime.now().month}-${DateTime.now().day} ${DateTime.now().hour}:${DateTime.now().minute}' diff --git a/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorList_page.dart b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorList_page.dart index a83233f1..cb258b47 100644 --- a/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorList_page.dart +++ b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorList_page.dart @@ -70,7 +70,7 @@ class _AuthorizedAdministratorListPageState return Column( children: [ - _searchWidget(), + // _searchWidget(), Expanded(child: _buildMainUI(itemList)), ], ); diff --git a/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList_page.dart b/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList_page.dart index 2c313057..8508211c 100644 --- a/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList_page.dart +++ b/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageList_page.dart @@ -20,6 +20,7 @@ class LockUserManageListPage extends StatefulWidget { class _LockUserManageListPageState extends State { List dataList = []; + final TextEditingController searchController = TextEditingController(); @override void initState() { @@ -94,8 +95,11 @@ class _LockUserManageListPageState extends State { child: TextField( //输入框一行 maxLines: 1, - // controller: _controller, + controller: searchController, autofocus: false, + onSubmitted: (value) { + lockUserListRequest(); + }, decoration: InputDecoration( //输入里面输入文字内边距设置 contentPadding: const EdgeInsets.only( @@ -140,7 +144,7 @@ class _LockUserManageListPageState extends State { //请求锁用户列表 Future> lockUserListRequest() async { LockUserListEntity entity = - await ApiRepository.to.lockUserList('1', '20', ''); + await ApiRepository.to.lockUserList('1', '20', searchController.text); if (entity.errorCode!.codeIsSuccessful) { setState(() { dataList = entity.data!;