From f082212f929f14718a11eaebe0a23fcf1fbabbde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Fri, 27 Sep 2024 10:15:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=BC=80=E9=94=81?= =?UTF-8?q?=E9=A1=B5-=E5=BC=80=E9=94=81=E9=94=AE-=E8=93=9D=E7=89=99?= =?UTF-8?q?=E5=BC=80=E9=94=81=E6=88=90=E5=8A=9F=E5=90=8E=E6=9C=89=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=BC=B9=E6=A1=86=202=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=A1=E3=80=81=E6=8C=87=E7=BA=B9=E3=80=81=E4=BA=BA=E8=84=B8?= =?UTF-8?q?-=E8=AF=A6=E6=83=85=E3=80=81=E9=81=A5=E6=8E=A7=E3=80=81?= =?UTF-8?q?=E6=8E=8C=E9=9D=99=E8=84=89=E4=BF=AE=E6=94=B9=E5=A7=93=E5=90=8D?= =?UTF-8?q?=20=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=BC=B9=E6=A1=86=E9=BB=91?= =?UTF-8?q?=E6=97=A0=E5=86=85=E5=AE=B9=E9=97=AE=E9=A2=98=203=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/card/cardDetail/cardDetail_page.dart | 2 +- lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart | 8 +++++--- lib/main/lockDetail/face/faceDetail/faceDetail_page.dart | 2 +- .../fingerprintDetail/fingerprintDetail_page.dart | 2 +- lib/main/lockDetail/lockDetail/lockDetail_logic.dart | 3 +++ .../lockOperatingRecord/lockOperatingRecord_logic.dart | 6 +++++- .../lockSelectGrouping/lockSelectGrouping_page.dart | 5 ++++- .../remoteControlDetail/remoteControlDetail_page.dart | 2 +- 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart index 94b20c86..3ec4635b 100755 --- a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart +++ b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart @@ -50,7 +50,7 @@ class _CardDetailPageState extends State with RouteAware { ShowTipView().showTFViewAlertDialog( state.changeNameController, '请输入姓名'.tr, - '', () { + '请输入姓名'.tr, () { if (state.changeNameController.text.isEmpty) { logic.showToast('请输入姓名'.tr); return; diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart index a6528d18..a5780ab3 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart @@ -25,7 +25,6 @@ class DoorLockLogLogic extends BaseGetXController { // 获取解析后的数据 late StreamSubscription _replySubscription; - void _initReplySubscription() { _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) { @@ -77,8 +76,10 @@ class DoorLockLogLogic extends BaseGetXController { (0xff & indexList[5]) << 8 | (0xFF & indexList[6]); final operateDate = time * 1000; + final serverTime = state.currentDate; if (DateTime.fromMillisecondsSinceEpoch(operateDate).isAfter( - DateTime.fromMillisecondsSinceEpoch(state.currentDate))) { + DateTime.fromMillisecondsSinceEpoch(serverTime*1000))) { + // AppLog.log('operateDate:$operateDate state.currentDate:${state.currentDate}'); continue; } indexMap['date'] = '$operateDate'; @@ -213,6 +214,7 @@ class DoorLockLogLogic extends BaseGetXController { // 操作记录上传 Future lockRecordUploadData(List list) async { + AppLog.log('上传数据：$list'); // 无数据时不上传 if(list.isEmpty){ return; @@ -251,7 +253,7 @@ class DoorLockLogLogic extends BaseGetXController { if (isDemoMode == false) { // _initReplySubscription(); - mockNetworkDataRequest(isRefresh: true); + // mockNetworkDataRequest(isRefresh: true); _getDoorLockLogListRefreshUIAction(); } } diff --git a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart index 156955f6..b83b7863 100755 --- a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart +++ b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart @@ -50,7 +50,7 @@ class _FaceDetailPageState extends State with RouteAware { ShowTipView().showTFViewAlertDialog( state.changeNameController, '修改姓名'.tr, - '', () { + '修改姓名'.tr, () { if (state.changeNameController.text.isEmpty) { logic.showToast('请输入姓名'.tr); return; diff --git a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart index 735ac175..126bba47 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart @@ -50,7 +50,7 @@ class _FingerprintDetailPageState extends State ShowTipView().showTFViewAlertDialog( state.changeNameController, '修改姓名'.tr, - '', () { + '修改姓名'.tr, () { if (state.changeNameController.text.isEmpty) { logic.showToast('请输入姓名'.tr); return; diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index fb186a7f..c14580e5 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -489,6 +489,9 @@ class LockDetailLogic extends BaseGetXController { // 操作记录上传 Future lockRecordUploadData(List list) async { + if(list.isEmpty){ + return; + } final KeyOperationRecordEntity entity = await ApiRepository.to .lockRecordUploadData( lockId: state.keyInfos.value.lockId.toString(), records: list); diff --git a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart index 59a5d42e..41b51807 100755 --- a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart +++ b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart @@ -74,8 +74,9 @@ class LockOperatingRecordLogic extends BaseGetXController { (0xff & indexList[5]) << 8 | (0xFF & indexList[6]); final operateDate = time * 1000; + final serverTime = state.currentDate; if (DateTime.fromMillisecondsSinceEpoch(operateDate).isAfter( - DateTime.fromMillisecondsSinceEpoch(state.currentDate))) { + DateTime.fromMillisecondsSinceEpoch(serverTime*1000))) { continue; } indexMap['date'] = '$operateDate'; @@ -192,6 +193,9 @@ class LockOperatingRecordLogic extends BaseGetXController { // 操作记录上传 Future lockRecordUploadData(List list) async { + if(list.isEmpty){ + return; + } final KeyOperationRecordEntity entity = await ApiRepository.to .lockRecordUploadData( lockId: CommonDataManage().currentKeyInfo.lockId.toString(), diff --git a/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart b/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart index fc9a77cf..89abaf6f 100755 --- a/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart +++ b/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart @@ -46,7 +46,10 @@ class _LockSelectGroupingPageState extends State { padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: () { // showCupertinoAlertDialog(context); - ShowTipView().showTFViewAlertDialog(state.changeNameController, TranslationLoader.lanKeys!.createNewGroup!.tr, '请输入分组名称'.tr, (){ + ShowTipView().showTFViewAlertDialog( + state.changeNameController, + TranslationLoader.lanKeys!.createNewGroup!.tr, + '请输入分组名称'.tr, (){ logic.addLockGroupRequest(); Get.back(); }, isShowSuffixIcon:true, inputFormatters: [ diff --git a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart index 73ddc75c..6e837329 100755 --- a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart +++ b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart @@ -46,7 +46,7 @@ class _RemoteControlDetailPageState extends State with isHaveDirection: false, isHaveLine: true)), Obx(() => lockDataListItem('姓名'.tr, state.typeName.value, () { - ShowTipView().showTFViewAlertDialog(state.changeNameController, '修改姓名'.tr, '', () { + ShowTipView().showTFViewAlertDialog(state.changeNameController, '修改姓名'.tr, '修改姓名'.tr, () { if (state.changeNameController.text.isEmpty) { logic.showToast('请输入姓名'.tr); return;