Merge remote-tracking branch 'origin/develop_sky_liyi' into develop_sky_liyi

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<int> getPublicKeyList =
             changeStringListToIntList(publicKey!);
 
-        AppLog.log(
+        AppLog.log('发送同步锁记录命令:${BlueManage().connectDeviceName}');
-            '发送同步锁记录命令:${BlueManage().connectDeviceName}');
         IoSenderManage.senderReferEventRecordTimeCommand(
           keyID: BlueManage().connectDeviceName,
           userID: await Storage.getUid(),

lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart

@@ -798,8 +798,48 @@ class UploadDataLogic extends BaseGetXController {
         }
       }
     } else {
-      state.indexCount.value = 0;
+      if (uploadType == 1) {
-      state.sureBtnState.value = 0;
+        // 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();
     }
   }

lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart

@@ -68,8 +68,7 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage>
                 final bool? isDemoMode =
                     await Storage.getBool(ifIsDemoModeOrNot);
                 if (isDemoMode == false) {
-                  final bool isNetWork =
+                  final bool isNetWork = await logic.isConnected() ?? false;
-                      await LockMainLogic.to()?.judgeTheNetwork() ?? false;
                   if (!isNetWork) {
                     return;
                   }