From 0520733080d357518c4ab50ba071dc551f82f1be Mon Sep 17 00:00:00 2001 From: liyi Date: Wed, 11 Jun 2025 09:17:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=A6=82=E6=9E=9C=E6=98=AF=E5=8D=95?= =?UTF-8?q?=E6=AC=A1=E9=92=A5=E5=8C=99=E5=BC=80=E9=94=81=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=B0=B1=E8=B0=83=E7=94=A8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockDetail/lockDetail/lockDetail_logic.dart | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 44e9259d..1155117f 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -126,6 +126,17 @@ class LockDetailLogic extends BaseGetXController { TalkStatus.answeredSuccessfully) { showToast('开锁成功'.tr); } + // 如果是单次钥匙，则开锁成功之后调用删除 + if (state.keyInfos.value.keyType == 3) { + final LockListInfoEntity entity = await ApiRepository.to + .deletOwnerKeyData( + lockId: state.keyInfos.value.lockId.toString(), + keyId: state.keyInfos.value!.keyId.toString(), + includeUnderlings: 0); + if (entity.errorCode!.codeIsSuccessful) { + AppLog.log("删除成功"); + } + } break; case 0x06: //无权限 @@ -532,8 +543,7 @@ class LockDetailLogic extends BaseGetXController { final List getPublicKeyList = changeStringListToIntList(publicKey!); - AppLog.log( - '发送同步锁记录命令:${BlueManage().connectDeviceName}'); + AppLog.log('发送同步锁记录命令:${BlueManage().connectDeviceName}'); IoSenderManage.senderReferEventRecordTimeCommand( keyID: BlueManage().connectDeviceName, userID: await Storage.getUid(), From 9d2c9535223bac507d4cc9c7baa4ad40b09a73d9 Mon Sep 17 00:00:00 2001 From: liyi Date: Wed, 11 Jun 2025 09:18:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E5=9B=9E=E5=A4=8D0=E6=97=B6=E4=B9=9F=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E8=AF=B7=E6=B1=82=E4=B8=8B=E4=B8=80=E4=BB=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockSet/uploadData/uploadData_logic.dart | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart b/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart index b032bb97..e1046768 100644 --- a/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart +++ b/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart @@ -798,8 +798,48 @@ class UploadDataLogic extends BaseGetXController { } } } else { - state.indexCount.value = 0; - state.sureBtnState.value = 0; + if (uploadType == 1) { + // 1设置 + // state.indexCount.value = 0; + // state.sureBtnState.value = 0; + // showToast('上传成功'.tr); + } else { + // 2开门方式 + switch (recordType) { + // case 1: + // // 电子钥匙 + // + // break; + case 2: + // 密码上传成功之后，获取卡列表 + getUpdataLockCardList(); + break; + case 3: + // IC卡上传成功，获取指纹列表 + getUpdataLockFingerprintList(); + break; + case 4: + // 指纹上传成功，获取人脸列表 + getUpdataLockFaceList(); + break; + case 5: + // 人脸上传成功，获取掌静脉列表 + getUpdataLockPalmVeinList(); + break; + case 6: + // 掌静脉上传成功，获取锁遥控 + getUpdataLockRemoteControlList(); + break; + case 7: + // 遥控上传成功，获取锁设置 + getUpdataLockSet(); + break; + default: + break; + } + } + // state.indexCount.value = 0; + // state.sureBtnState.value = 0; dismissEasyLoading(); } } From c76a7f0dadd76c5bcc6444e9f72577aef60b67ef Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 12 Jun 2025 09:38:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=EF=BC=88=E5=AF=86=E7=A0=81=EF=BC=89?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E5=90=8E?= =?UTF-8?q?=E4=B8=8D=E5=BC=B9=E7=AA=97=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passwordKey/passwordKeyList/passwordKeyList_page.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart index c9883358..37ae6d45 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart @@ -68,8 +68,7 @@ class _PasswordKeyListPageState extends State final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; }