fix: 增加蓝牙开锁后同步密码、卡、指纹、人脸、遥控的钥匙信息

lib/main/lockDetail/lockDetail/lockDetail_state.dart

@@ -58,8 +58,26 @@ class LockDetailState {
   int logCountPage = 10; // 蓝牙记录一页多少个
   RxInt nextAuthTime = 0.obs; // 下次认证时间
 
-  // LockDetailState() {
+  int countReq = 10;// 每次请求的数量
-  //   Map map = Get.arguments;
+  RxInt indexCount = 0.obs;// 用来显示按钮的索引 0/5
-  //   lockCount = map["lockCount"];
+
-  // }
+  int uploadPasswordPage = 0;// 上传密码的页数
+  List<int> uploadPasswordDataList = <int>[];// 上传密码的数据
+
+  int uploadCardPage = 0;// 上传卡片的页数
+  List<int> uploadCardDataList = <int>[];// 上传卡片的数据
+
+  int uploadFingerprintPage = 0;// 上传指纹的页数
+  List<int> uploadFingerprintDataList = <int>[];// 上传指纹的数据
+
+  int uploadFacePage = 0;// 上传人脸的页数
+  List<int> uploadFaceDataList = <int>[];// 上传人脸的数据
+
+  int uploadPalmVeinPage = 0;// 上传掌静脉的页数
+  List<int> uploadPalmVeinDataList = <int>[];// 上传掌静脉的数据
+
+  int uploadRemoteControlPage = 0;// 上传遥控的页数
+  List<int> uploadRemoteControlDataList = <int>[];// 上传遥控的数据
+
+  List<int> uploadLockSetDataList = <int>[];// 上传锁设置数据
 }

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

@@ -29,49 +29,41 @@ class UploadDataLogic extends BaseGetXController {
 
   // 监听蓝牙协议返回结果
   late StreamSubscription<Reply> _replySubscription;
+
   void _initReplySubscription() {
-    _replySubscription =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       // 上传数据获取锁密码列表
-      if (reply is UpdataLockPasswordListReply &&
+      if (reply is UpdataLockPasswordListReply && (state.ifCurrentScreen.value == true)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockPasswordListReply(reply);
       }
 
       // 上传数据获取锁卡列表
-      if (reply is UpdataLockCardListReply &&
+      if (reply is UpdataLockCardListReply && (state.ifCurrentScreen.value == true)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockCardListReply(reply);
       }
 
       // 上传数据获取锁指纹列表
-      if (reply is UpdataLockFingerprintListReply &&
+      if (reply is UpdataLockFingerprintListReply && (state.ifCurrentScreen.value == true)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockFingerprintListReply(reply);
       }
 
       // 上传数据获取锁人脸列表
-      if (reply is UpdataLockFaceListReply &&
+      if (reply is UpdataLockFaceListReply && (state.ifCurrentScreen.value == true)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockFaceListReply(reply);
       }
 
       // 上传数据获取锁掌静脉列表
-      if (reply is UpdataLockPalmVeinListReply &&
+      if (reply is UpdataLockPalmVeinListReply && (state.ifCurrentScreen.value == true)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockPalmVeinListReply(reply);
       }
 
       // 上传数据获取锁遥控
-      if (reply is UpdataLockRemoteControlListReply &&
+      if (reply is UpdataLockRemoteControlListReply && (state.ifCurrentScreen.value == true)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockRemoteControlListReply(reply);
       }
 
       // 上传数据获取锁设置
-      if (reply is UpdataLockSetReply &&
+      if (reply is UpdataLockSetReply && (state.ifCurrentScreen.value == true) && (state.ifSeletUpdataBtnState == true)) {
-          (state.ifCurrentScreen.value == true) &&
-          (state.ifSeletUpdataBtnState == true)) {
         _replyUpdataLockSetReply(reply);
       }
     });
@@ -86,8 +78,7 @@ class UploadDataLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadPasswordDataList
+        state.uploadPasswordDataList.addAll(reply.data.sublist(9, reply.data.length));
-            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadPasswordPage = state.uploadPasswordPage + 1;
@@ -105,10 +96,7 @@ class UploadDataLogic extends BaseGetXController {
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(
+          _lockDataUpload(uploadType: 2, recordType: 2, records: state.uploadPasswordDataList);
-              uploadType: 2,
-              recordType: 2,
-              records: state.uploadPasswordDataList);
           // }
         }
         break;
@@ -139,8 +127,7 @@ class UploadDataLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadCardDataList
+        state.uploadCardDataList.addAll(reply.data.sublist(9, reply.data.length));
-            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadCardPage = state.uploadCardPage + 1;
@@ -157,8 +144,7 @@ class UploadDataLogic extends BaseGetXController {
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(
+          _lockDataUpload(uploadType: 2, recordType: 3, records: state.uploadCardDataList);
-              uploadType: 2, recordType: 3, records: state.uploadCardDataList);
           // }
         }
         break;
@@ -188,8 +174,7 @@ class UploadDataLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadFingerprintDataList
+        state.uploadFingerprintDataList.addAll(reply.data.sublist(9, reply.data.length));
-            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadFingerprintPage = state.uploadFingerprintPage + 1;
@@ -206,10 +191,7 @@ class UploadDataLogic extends BaseGetXController {
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(
+          _lockDataUpload(uploadType: 2, recordType: 4, records: state.uploadFingerprintDataList);
-              uploadType: 2,
-              recordType: 4,
-              records: state.uploadFingerprintDataList);
           // }
         }
         break;
@@ -239,8 +221,7 @@ class UploadDataLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadFaceDataList
+        state.uploadFaceDataList.addAll(reply.data.sublist(9, reply.data.length));
-            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadFacePage = state.uploadFacePage + 1;
@@ -257,8 +238,7 @@ class UploadDataLogic extends BaseGetXController {
           // }else{
           // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(
+          _lockDataUpload(uploadType: 2, recordType: 5, records: state.uploadFaceDataList);
-              uploadType: 2, recordType: 5, records: state.uploadFaceDataList);
           // }
         }
         break;
@@ -288,8 +268,7 @@ class UploadDataLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadPalmVeinDataList
+        state.uploadPalmVeinDataList.addAll(reply.data.sublist(9, reply.data.length));
-            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadPalmVeinPage = state.uploadPalmVeinPage + 1;
@@ -306,10 +285,7 @@ class UploadDataLogic extends BaseGetXController {
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(
+          _lockDataUpload(uploadType: 2, recordType: 6, records: state.uploadPalmVeinDataList);
-              uploadType: 2,
-              recordType: 6,
-              records: state.uploadPalmVeinDataList);
           // }
         }
         break;
@@ -339,8 +315,7 @@ class UploadDataLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadRemoteControlDataList
+        state.uploadRemoteControlDataList.addAll(reply.data.sublist(9, reply.data.length));
-            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadRemoteControlPage = state.uploadRemoteControlPage + 1;
@@ -357,10 +332,7 @@ class UploadDataLogic extends BaseGetXController {
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(
+          _lockDataUpload(uploadType: 2, recordType: 7, records: state.uploadRemoteControlDataList);
-              uploadType: 2,
-              recordType: 7,
-              records: state.uploadRemoteControlDataList);
           // }
         }
         break;
@@ -390,10 +362,8 @@ class UploadDataLogic extends BaseGetXController {
         state.indexCount.value = state.indexCount.value + 1;
         cancelBlueConnetctToastTimer();
 
-        state.uploadLockSetDataList
+        state.uploadLockSetDataList.addAll(reply.data.sublist(7, reply.data.length));
-            .addAll(reply.data.sublist(7, reply.data.length));
+        _lockDataUpload(uploadType: 1, recordType: 0, records: state.uploadLockSetDataList);
-        _lockDataUpload(
-            uploadType: 1, recordType: 0, records: state.uploadLockSetDataList);
         break;
       case 0x06:
         //无权限
@@ -418,22 +388,18 @@ class UploadDataLogic extends BaseGetXController {
       return;
     }
     state.sureBtnState.value = 1;
-
     showEasyLoading();
     showBlueConnetctToastTimer(action: () {
       dismissEasyLoading();
-      AppLog.log('上传密码列表获取超时 关闭加载菊花');
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
 
         updataLockPasswordList(getTokenList, state.uploadPasswordPage);
       } else if (connectionState == BluetoothConnectionState.disconnected) {
-        AppLog.log('上传密码列表连接失败 关闭加载菊花');
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         state.sureBtnState.value = 0;
@@ -446,8 +412,7 @@ class UploadDataLogic extends BaseGetXController {
 
   // 公共的获取密码列表
   Future<void> updataLockPasswordList(List<int> token, int page) async {
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -472,8 +437,7 @@ class UploadDataLogic extends BaseGetXController {
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -493,8 +457,7 @@ class UploadDataLogic extends BaseGetXController {
 
   // 公共的获取Card列表
   Future<void> updataLockCardList(List<int> token, int page) async {
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -519,8 +482,7 @@ class UploadDataLogic extends BaseGetXController {
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -540,8 +502,7 @@ class UploadDataLogic extends BaseGetXController {
 
   // 公共的获取指纹列表
   Future<void> updataLockFingerprintList(List<int> token, int page) async {
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -566,8 +527,7 @@ class UploadDataLogic extends BaseGetXController {
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -587,8 +547,7 @@ class UploadDataLogic extends BaseGetXController {
 
   // 公共的获取人脸列表
   Future<void> updataLockFaceList(List<int> token, int page) async {
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -613,8 +572,7 @@ class UploadDataLogic extends BaseGetXController {
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -634,8 +592,7 @@ class UploadDataLogic extends BaseGetXController {
 
   // 公共的获取掌静脉列表
   Future<void> updataLockPalmVeinList(List<int> token, int page) async {
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -660,14 +617,12 @@ class UploadDataLogic extends BaseGetXController {
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
 
-        updataLockRemoteControlList(
+        updataLockRemoteControlList(getTokenList, state.uploadRemoteControlPage);
-            getTokenList, state.uploadRemoteControlPage);
       } else if (connectionState == BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
@@ -682,8 +637,7 @@ class UploadDataLogic extends BaseGetXController {
 
   // 公共的获取遥控列表
   Future<void> updataLockRemoteControlList(List<int> token, int page) async {
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -708,8 +662,7 @@ class UploadDataLogic extends BaseGetXController {
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -729,8 +682,7 @@ class UploadDataLogic extends BaseGetXController {
 
   // 公共的上传锁设置
   Future<void> updataLockSet(List<int> token) async {
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -746,16 +698,9 @@ class UploadDataLogic extends BaseGetXController {
   }
 
   // 锁数据上传服务器
-  Future<void> _lockDataUpload(
+  Future<void> _lockDataUpload({required int uploadType, required int recordType, required List records}) async {
-      {required int uploadType,
-      required int recordType,
-      required List records}) async {
     final LoginEntity entity = await ApiRepository.to.lockDataUpload(
-        lockId: CommonDataManage().currentKeyInfo.lockId!,
+        lockId: CommonDataManage().currentKeyInfo.lockId!, uploadType: uploadType, recordType: recordType, records: records, isUnShowLoading: false);
-        uploadType: uploadType,
-        recordType: recordType,
-        records: records,
-        isUnShowLoading: false);
     if (entity.errorCode!.codeIsSuccessful) {
       if (uploadType == 1) {
         // 1设置
@@ -806,32 +751,32 @@ class UploadDataLogic extends BaseGetXController {
       } else {
         // 2开门方式
         switch (recordType) {
-        // case 1:
+          // case 1:
-        //   // 电子钥匙
+          //   // 电子钥匙
-        //
+          //
-        //   break;
+          //   break;
           case 2:
-          // 密码上传成功之后，获取卡列表
+            // 密码上传成功之后，获取卡列表
             getUpdataLockCardList();
             break;
           case 3:
-          // IC卡上传成功，获取指纹列表
+            // IC卡上传成功，获取指纹列表
             getUpdataLockFingerprintList();
             break;
           case 4:
-          // 指纹上传成功，获取人脸列表
+            // 指纹上传成功，获取人脸列表
             getUpdataLockFaceList();
             break;
           case 5:
-          // 人脸上传成功，获取掌静脉列表
+            // 人脸上传成功，获取掌静脉列表
             getUpdataLockPalmVeinList();
             break;
           case 6:
-          // 掌静脉上传成功，获取锁遥控
+            // 掌静脉上传成功，获取锁遥控
             getUpdataLockRemoteControlList();
             break;
           case 7:
-          // 遥控上传成功，获取锁设置
+            // 遥控上传成功，获取锁设置
             getUpdataLockSet();
             break;
           default: