diff --git a/lib/blue/io_sender.dart b/lib/blue/io_sender.dart index ae45e67e..5270d56d 100755 --- a/lib/blue/io_sender.dart +++ b/lib/blue/io_sender.dart @@ -34,12 +34,12 @@ abstract class SenderProtocol extends IOData { } void printLog(List data) { - // AppLog.log( - // "App -> 锁,指令类型:${commandType!.typeName} ${commandType!.typeValue == 0x3030 - // ? '子命令:${data[3]}' : ''} \n参数是:\n${toString()} \n加密之前数据是:\n$data 长度是:${data.length}"); + AppLog.log( + "App -> 锁,指令类型:${commandType!.typeName} ${commandType!.typeValue == 0x3030 + ? '子命令:${data[3]}' : ''} \n参数是:\n${toString()} \n加密之前数据是:\n$data 长度是:${data.length}"); } - //TODO:拼装数据Ï + //TODO:拼装数据 List packageData() { commandData = messageDetail(); List commandList = []; diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index aeae0a6a..2e35c767 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -33,7 +33,6 @@ import 'lockNetToken_entity.dart'; class LockDetailLogic extends BaseGetXController { final LockDetailState state = LockDetailState(); - // 监听设备返回的数据 void initReplySubscription() { state.replySubscription = @@ -59,9 +58,8 @@ class LockDetailLogic extends BaseGetXController { case 0x00: //成功 // _showFullScreenOverlay(Get.context!); - cancelBlueConnetctToastTimer(); - state.iSClosedUnlockSuccessfulPopup.value = true; + cancelBlueConnetctToastTimer(); state.closedUnlockSuccessfulTimer?.cancel(); // 如果没有点击关闭弹窗,3秒后自动关闭 state.closedUnlockSuccessfulTimer = @@ -82,9 +80,10 @@ class LockDetailLogic extends BaseGetXController { } // 更新电量 uploadElectricQuantityRequest(); - + //锁数据更新 getLockRecordLastUploadDataTime(); resetOpenDoorState(); + state.animationController!.stop(); break; case 0x06: //无权限 @@ -287,10 +286,11 @@ class LockDetailLogic extends BaseGetXController { } // 查询事件记录(时间查询) - Future senderReferEventRecordTime() async { + void senderReferEventRecordTime() { showBlueConnetctToastTimer( isShowBlueConnetctToast: false, action: () { + closeLuckStatus(); BlueManage().disconnect(); }); BlueManage().blueSendData(BlueManage().connectDeviceName, diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 8ad51780..97d42890 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -1324,7 +1324,6 @@ class _LockDetailPageState extends State return; } state.iSOpenLock.value = true; - state.iSClosedUnlockSuccessfulPopup.value = false; state.openLockBtnState.value = 1; state.animationController!.forward(); @@ -1347,7 +1346,6 @@ class _LockDetailPageState extends State return; } state.iSOpenLock.value = false; - state.iSClosedUnlockSuccessfulPopup.value = false; state.openLockBtnState.value = 1; state.animationController!.forward();