fix:修复锁钥匙过期的动画和提示

star_lock/images/lan/lan_en.json

@@ -839,5 +839,6 @@
   "固件版本": "Firmware version",
   "手动升级": "Manual upgrade",
   "设备连接中...": "Device Connecting...",
-  "升级过程中无法开锁，请先开锁后再升级": "The lock cannot be unlocked during the upgrade, please unlock the lock before upgrading"
+  "升级过程中无法开锁，请先开锁后再升级": "The lock cannot be unlocked during the upgrade, please unlock the lock before upgrading",
+  "钥匙无效": "The key is invalid"
 }

star_lock/images/lan/lan_keys.json

@@ -867,5 +867,6 @@
   "固件版本": "固件版本",
   "手动升级": "手动升级",
   "设备连接中...": "设备连接中...",
-  "升级过程中无法开锁，请先开锁后再升级": "升级过程中无法开锁，请先开锁后再升级"
+  "升级过程中无法开锁，请先开锁后再升级": "升级过程中无法开锁，请先开锁后再升级",
+  "钥匙无效": "钥匙无效"
 }

star_lock/images/lan/lan_zh.json

@@ -837,5 +837,7 @@
   "固件版本": "固件版本",
   "手动升级": "手动升级",
   "设备连接中...": "设备连接中...",
-  "升级过程中无法开锁，请先开锁后再升级": "升级过程中无法开锁，请先开锁后再升级"
+  "升级过程中无法开锁，请先开锁后再升级": "升级过程中无法开锁，请先开锁后再升级",
+  "钥匙无效": "钥匙无效"
+
 }

star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -32,7 +32,8 @@ class LockDetailLogic extends BaseGetXController {
 
   // 监听设备返回的数据
   void initReplySubscription() {
-    state.replySubscription = EventBusManager().eventBus!.on<Reply>().listen((reply) async {
+    state.replySubscription =
+        EventBusManager().eventBus!.on<Reply>().listen((reply) async {
       // 开门
       if (reply is OpenDoorReply && state.ifCurrentScreen.value == true) {
         _replyOpenLock(reply);
@@ -132,8 +133,19 @@ class LockDetailLogic extends BaseGetXController {
           cancelBlueConnetctToastTimer();
         });
         break;
+      case 0x0d:
+        // 正在开锁中...
+        showToast('钥匙无效'.tr);
+        state.openLockBtnState.value = 0;
+        state.openDoorBtnisUneable.value = false;
+        state.animationController!.stop();
+        cancelBlueConnetctToastTimer();
+        break;
       default:
         //失败
+        state.openLockBtnState.value = 0;
+        state.openDoorBtnisUneable.value = false;
+        state.animationController!.stop();
         cancelBlueConnetctToastTimer();
         break;
     }
@@ -348,7 +360,9 @@ class LockDetailLogic extends BaseGetXController {
     var token = await Storage.getStringList(saveBlueToken);
     List<int> getTokenList = changeStringListToIntList(token!);
 
-    BlueManage().bludSendData(state.keyInfos.value.bluetooth!.bluetoothDeviceName!, (BluetoothConnectionState deviceConnectionState) async {
+    BlueManage()
+        .bludSendData(state.keyInfos.value.bluetooth!.bluetoothDeviceName!,
+            (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
         IoSenderManage.senderOpenLock(
           keyID: BlueManage().connectDeviceName,
@@ -374,13 +388,15 @@ class LockDetailLogic extends BaseGetXController {
     });
   }
 
-
   // 查询事件记录(时间查询)
   Future<void> senderReferEventRecordTime() async {
-    showBlueConnetctToastTimer(isShowBlueConnetctToast: false, action: () {
+    showBlueConnetctToastTimer(
+        isShowBlueConnetctToast: false,
+        action: () {
           BlueManage().disconnect();
         });
-    BlueManage().bludSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().bludSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         var privateKey = await Storage.getStringList(saveBluePrivateKey);
         List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
@@ -410,18 +426,21 @@ class LockDetailLogic extends BaseGetXController {
   void getServerDatetime() async {
     var entity = await ApiRepository.to.getServerDatetimeData();
     if (entity.errorCode!.codeIsSuccessful) {
-      state.differentialTime = entity.data!.date! ~/ 1000 - DateTime.now().millisecondsSinceEpoch ~/ 1000;
+      state.differentialTime = entity.data!.date! ~/ 1000 -
+          DateTime.now().millisecondsSinceEpoch ~/ 1000;
       // AppLog.log("entity.data!.date! ~/ 1000:${entity.data!.date! ~/ 1000} DateTime.now().millisecondsSinceEpoch ~/ 1000:${DateTime.now().millisecondsSinceEpoch ~/ 1000} 服务器时间差:${state.differentialTime}");
     }
   }
 
   int getUTCNetTime() {
-    return DateTime.now().millisecondsSinceEpoch ~/ 1000 + state.differentialTime;
+    return DateTime.now().millisecondsSinceEpoch ~/ 1000 +
+        state.differentialTime;
   }
 
   // 获取手机联网token，根据锁设置里面获取的开锁时是否联网来判断是否调用这个接口
   void getLockNetToken() async {
-    LockNetTokenEntity entity = await ApiRepository.to.getLockNetToken(lockId: state.keyInfos.value.lockId.toString());
+    LockNetTokenEntity entity = await ApiRepository.to
+        .getLockNetToken(lockId: state.keyInfos.value.lockId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockNetToken = entity.data!.token!.toString();
       AppLog.log("从服务器获取联网token:${state.lockNetToken}");
@@ -439,11 +458,12 @@ class LockDetailLogic extends BaseGetXController {
 
   //电量更新请求
   Future<void> uploadElectricQuantityRequest() async {
-    KeyOperationRecordEntity entity = await ApiRepository.to.uploadElectricQuantity(
+    KeyOperationRecordEntity entity = await ApiRepository.to
+        .uploadElectricQuantity(
             electricQuantity: state.electricQuantity.value.toString(),
-        electricQuantityStandby: state.electricQuantityStandby.value.toString(),
+            electricQuantityStandby:
-        lockId: state.keyInfos.value.lockId.toString()
+                state.electricQuantityStandby.value.toString(),
-    );
+            lockId: state.keyInfos.value.lockId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       SchedulerBinding.instance.addPostFrameCallback((_) {
         eventBus.fire(RefreshLockListInfoDataEvent());
@@ -488,7 +508,8 @@ class LockDetailLogic extends BaseGetXController {
             lockId: state.keyInfos.value.lockId.toString(), records: list);
     if (entity.errorCode!.codeIsSuccessful) {
       // mockNetworkDataRequest();
-      AppLog.log("state.keyInfos.value.keyType:${state.keyInfos.value.keyType}");
+      AppLog.log(
+          "state.keyInfos.value.keyType:${state.keyInfos.value.keyType}");
       if (state.keyInfos.value.keyType == XSConstantMacro.keyTypeOnce) {
         // 单次删除
         deletKeyData();
@@ -499,9 +520,7 @@ class LockDetailLogic extends BaseGetXController {
   // 普通用户或者授权管理员删除钥匙
   void deletKeyData() async {
     var entity = await ApiRepository.to.deleteElectronicKey(
-        keyId:state.keyInfos.value.keyId.toString(),
+        keyId: state.keyInfos.value.keyId.toString(), includeUnderlings: 0);
-        includeUnderlings: 0
-    );
     if (entity.errorCode!.codeIsSuccessful) {
       BlueManage().connectDeviceMacAddress = "";
       SchedulerBinding.instance.addPostFrameCallback((_) {
@@ -511,20 +530,23 @@ class LockDetailLogic extends BaseGetXController {
     }
   }
 
-
   /// 锁设置里面开启关闭考勤刷新锁详情
   void initLockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceAction() {
     // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus
     state.lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent =
-        eventBus.on<LockSetChangeSetRefreshLockDetailWithType>().listen((event) {
+        eventBus
+            .on<LockSetChangeSetRefreshLockDetailWithType>()
+            .listen((event) {
       if (event.type == 0) {
         // 0考勤
         state.isAttendance.value = int.parse(event.setResult);
-        state.keyInfos.value.lockSetting!.attendance = int.parse(event.setResult);
+        state.keyInfos.value.lockSetting!.attendance =
+            int.parse(event.setResult);
       } else if (event.type == 1) {
         // 1 开锁时是否需联网
         state.isOpenLockNeedOnline.value = int.parse(event.setResult);
-        state.keyInfos.value.lockSetting!.appUnlockOnline = int.parse(event.setResult);
+        state.keyInfos.value.lockSetting!.appUnlockOnline =
+            int.parse(event.setResult);
         state.lockNetToken = ""; // 改变开锁时是否联网状态的时候清空token
       } else if (event.type == 2) {
         // 2 常开模式
@@ -557,7 +579,8 @@ class LockDetailLogic extends BaseGetXController {
         state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusExpired ||
         state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusDeleted ||
         state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusReset) {
-      text = "${"你的钥匙".tr}${XSConstantMacro.getKeyStatusStr(state.keyInfos.value.keyStatus!)}";
+      text =
+          "${"你的钥匙".tr}${XSConstantMacro.getKeyStatusStr(state.keyInfos.value.keyStatus!)}";
     } else {
       text = state.isOpenPassageMode.value == 1
           ? "常开模式启动！长按闭锁".tr
@@ -582,5 +605,4 @@ class LockDetailLogic extends BaseGetXController {
     await PermissionDialog.request(Permission.location);
     await PermissionDialog.requestBluetooth();
   }
-
 }