From 205ddd34f86522532cd463fa504617e5feb076f3 Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 1 Apr 2025 16:22:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=94=81=E6=97=B6=E8=8E=B7=E5=8F=96wifi=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockDetail/lockDetail_logic.dart | 10 +++++----- lib/main/lockMian/lockList/lockList_logic.dart | 8 ++++---- lib/mine/addLock/nearbyLock/nearbyLock_logic.dart | 4 ++-- lib/mine/addLock/saveLock/saveLock_logic.dart | 2 +- lib/tools/storage.dart | 4 ++++ 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 9ee17ec3..ee7ba5f8 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -285,20 +285,20 @@ class LockDetailLogic extends BaseGetXController { final List publicKeyData = state.keyInfos.value.bluetooth!.publicKey!.cast(); final List saveStrList = changeIntListToStringList(publicKeyData); - Storage.setStringList(saveBluePublicKey, saveStrList); + await Storage.setStringList(saveBluePublicKey, saveStrList); // 私钥 final List privateKeyData = state.keyInfos.value.bluetooth!.privateKey!.cast(); final List savePrivateKeyList = changeIntListToStringList(privateKeyData); - Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); + await Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); // signKey final List signKeyData = state.keyInfos.value.bluetooth!.signKey!.cast(); final List saveSignKeyList = changeIntListToStringList(signKeyData); - Storage.setStringList(saveBlueSignKey, saveSignKeyList); + await Storage.setStringList(saveBlueSignKey, saveSignKeyList); final bool ifHaveKey = await Storage.ifHaveKey(saveBlueToken); if (!ifHaveKey) { @@ -741,7 +741,7 @@ class LockDetailLogic extends BaseGetXController { } /// 请求设备网络信息并设置 - void _requestDeviceNetworkInfo() async { + void requestDeviceNetworkInfo() async { final DeviceNetwork deviceNetworkInfo = await ApiRepository.to.getDeviceNetwork( deviceType: 2, @@ -787,7 +787,7 @@ class LockDetailLogic extends BaseGetXController { getServerDatetime(); await PermissionDialog.request(Permission.location); await PermissionDialog.requestBluetooth(); - _requestDeviceNetworkInfo(); + requestDeviceNetworkInfo(); } @override diff --git a/lib/main/lockMian/lockList/lockList_logic.dart b/lib/main/lockMian/lockList/lockList_logic.dart index f16dba13..dab00451 100755 --- a/lib/main/lockMian/lockList/lockList_logic.dart +++ b/lib/main/lockMian/lockList/lockList_logic.dart @@ -270,25 +270,25 @@ class LockListLogic extends BaseGetXController { state.lockListInfoItemEntity.bluetooth!.publicKey!.cast(); final List saveStrList = changeIntListToStringList(publicKeyData); - Storage.setStringList(saveBluePublicKey, saveStrList); + await Storage.setStringList(saveBluePublicKey, saveStrList); // 私钥 final List privateKeyData = state.lockListInfoItemEntity.bluetooth!.privateKey!.cast(); final List savePrivateKeyList = changeIntListToStringList(privateKeyData); - Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); + await Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); // signKey final List signKeyData = state.lockListInfoItemEntity.bluetooth!.signKey!.cast(); final List saveSignKeyList = changeIntListToStringList(signKeyData); - Storage.setStringList(saveBlueSignKey, saveSignKeyList); + await Storage.setStringList(saveBlueSignKey, saveSignKeyList); final List saveTokenList = changeIntListToStringList([0, 0, 0, 0]); - Storage.setStringList(saveBlueToken, saveTokenList); + await Storage.setStringList(saveBlueToken, saveTokenList); IoSenderManage.senderFactoryDataReset( lockID: BlueManage().connectDeviceName, diff --git a/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart b/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart index b607e6d1..77872c3c 100755 --- a/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart +++ b/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart @@ -136,12 +136,12 @@ class NearbyLockLogic extends BaseGetXController { final List privateKey = reply.data.sublist(0, 16); final List savePrivateKeyList = changeIntListToStringList(privateKey); - Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); + await Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); // signKey final List signKey = reply.data.sublist(16, 32); final List saveSignKeyList = changeIntListToStringList(signKey); - Storage.setStringList(saveBlueSignKey, saveSignKeyList); + await Storage.setStringList(saveBlueSignKey, saveSignKeyList); // 时间戳 final List timestamp = reply.data.sublist(32, 36); diff --git a/lib/mine/addLock/saveLock/saveLock_logic.dart b/lib/mine/addLock/saveLock/saveLock_logic.dart index f9e20f38..5b9c3ce3 100755 --- a/lib/mine/addLock/saveLock/saveLock_logic.dart +++ b/lib/mine/addLock/saveLock/saveLock_logic.dart @@ -486,7 +486,7 @@ class SaveLockLogic extends BaseGetXController { // } void backAction() async { - eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true)); + // eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true)); // BlueManage().disconnect(); // 查询锁设置信息 diff --git a/lib/tools/storage.dart b/lib/tools/storage.dart index 2ed936aa..12bd5a0b 100755 --- a/lib/tools/storage.dart +++ b/lib/tools/storage.dart @@ -287,6 +287,10 @@ class Storage { await Storage.setString(lockNetWorkInfo, json.encode(info)); } + static Future removeLockNetWorkInfoCache() async { + removeData(lockNetWorkInfo); + } + // 获取锁板的配网信息 static Future?> getLockNetWorkInfo() async { Map? info = null;