Merge branch 'develop_sync_record' into 'develop'

fix: “上传数据成功后，指纹列表没显示出来，必须下拉刷新才显示”问题修复完成

See merge request StarlockTeam/app-starlock!28

lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart

@@ -405,6 +405,7 @@ class FingerprintListLogic extends BaseGetXController {
     _teamEvent = eventBus
         .on<OtherTypeRefreshListEvent>()
         .listen((OtherTypeRefreshListEvent event) async {
+      // 立即刷新数据
       await getFingerprintsListData(isRefresh: true);
     });
   }
@@ -459,8 +460,10 @@ class FingerprintListLogic extends BaseGetXController {
     final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
     if (isDemoMode == false) {
       _initReplySubscription();
+      _initRefreshAction();
 
-      // _initRefreshAction();
+      // 初始加载数据
+      await getFingerprintsListData(isRefresh: true);
     }
   }
 

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

@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
@@ -7,6 +6,8 @@ import 'package:star_lock/blue/io_protocol/io_updataLockRemoteControlList.dart';
 import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/commonDataManage.dart';
+import 'package:star_lock/tools/eventBusEventManage.dart';
+import 'package:star_lock/tools/storage.dart';
 
 import '../../../../app_settings/app_settings.dart';
 import '../../../../blue/blue_manage.dart';
@@ -21,48 +22,56 @@ import '../../../../blue/io_tool/io_tool.dart';
 import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
-import '../../../../tools/storage.dart';
 import 'uploadData_state.dart';
 
 class UploadDataLogic extends BaseGetXController {
-  UploadDataState state = UploadDataState();
+  final UploadDataState state = UploadDataState();
 
   // 监听蓝牙协议返回结果
   late StreamSubscription<Reply> _replySubscription;
   void _initReplySubscription() {
-    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
+    _replySubscription =
+        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       // 上传数据获取锁密码列表
-      if (reply is UpdataLockPasswordListReply && (state.ifCurrentScreen.value == true)) {
+      if (reply is UpdataLockPasswordListReply &&
+          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockPasswordListReply(reply);
       }
 
       // 上传数据获取锁卡列表
-      if (reply is UpdataLockCardListReply && (state.ifCurrentScreen.value == true)) {
+      if (reply is UpdataLockCardListReply &&
+          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockCardListReply(reply);
       }
 
       // 上传数据获取锁指纹列表
-      if (reply is UpdataLockFingerprintListReply && (state.ifCurrentScreen.value == true)) {
+      if (reply is UpdataLockFingerprintListReply &&
+          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockFingerprintListReply(reply);
       }
 
       // 上传数据获取锁人脸列表
-      if (reply is UpdataLockFaceListReply && (state.ifCurrentScreen.value == true)) {
+      if (reply is UpdataLockFaceListReply &&
+          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockFaceListReply(reply);
       }
 
       // 上传数据获取锁掌静脉列表
-      if (reply is UpdataLockPalmVeinListReply && (state.ifCurrentScreen.value == true)) {
+      if (reply is UpdataLockPalmVeinListReply &&
+          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockPalmVeinListReply(reply);
       }
 
       // 上传数据获取锁遥控
-      if (reply is UpdataLockRemoteControlListReply && (state.ifCurrentScreen.value == true)) {
+      if (reply is UpdataLockRemoteControlListReply &&
+          (state.ifCurrentScreen.value == true)) {
         _replyUpdataLockRemoteControlListReply(reply);
       }
 
       // 上传数据获取锁设置
-      if (reply is UpdataLockSetReply && (state.ifCurrentScreen.value == true) && (state.ifSeletUpdataBtnState == true)) {
+      if (reply is UpdataLockSetReply &&
+          (state.ifCurrentScreen.value == true) &&
+          (state.ifSeletUpdataBtnState == true)) {
         _replyUpdataLockSetReply(reply);
       }
     });
@@ -77,7 +86,8 @@ class UploadDataLogic extends BaseGetXController{
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadPasswordDataList.addAll(reply.data.sublist(9, reply.data.length));
+        state.uploadPasswordDataList
+            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadPasswordPage = state.uploadPasswordPage + 1;
@@ -95,7 +105,10 @@ class UploadDataLogic extends BaseGetXController{
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-            _lockDataUpload(uploadType:2, recordType:2, records:state.uploadPasswordDataList);
+          _lockDataUpload(
+              uploadType: 2,
+              recordType: 2,
+              records: state.uploadPasswordDataList);
           // }
         }
         break;
@@ -126,7 +139,8 @@ class UploadDataLogic extends BaseGetXController{
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadCardDataList.addAll(reply.data.sublist(9, reply.data.length));
+        state.uploadCardDataList
+            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadCardPage = state.uploadCardPage + 1;
@@ -143,7 +157,8 @@ class UploadDataLogic extends BaseGetXController{
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-            _lockDataUpload(uploadType:2, recordType:3, records:state.uploadCardDataList);
+          _lockDataUpload(
+              uploadType: 2, recordType: 3, records: state.uploadCardDataList);
           // }
         }
         break;
@@ -173,7 +188,8 @@ class UploadDataLogic extends BaseGetXController{
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadFingerprintDataList.addAll(reply.data.sublist(9, reply.data.length));
+        state.uploadFingerprintDataList
+            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadFingerprintPage = state.uploadFingerprintPage + 1;
@@ -190,7 +206,10 @@ class UploadDataLogic extends BaseGetXController{
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-            _lockDataUpload(uploadType:2, recordType:4, records:state.uploadFingerprintDataList);
+          _lockDataUpload(
+              uploadType: 2,
+              recordType: 4,
+              records: state.uploadFingerprintDataList);
           // }
         }
         break;
@@ -220,7 +239,8 @@ class UploadDataLogic extends BaseGetXController{
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadFaceDataList.addAll(reply.data.sublist(9, reply.data.length));
+        state.uploadFaceDataList
+            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadFacePage = state.uploadFacePage + 1;
@@ -237,7 +257,8 @@ class UploadDataLogic extends BaseGetXController{
           // }else{
           // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-            _lockDataUpload(uploadType:2, recordType:5, records:state.uploadFaceDataList);
+          _lockDataUpload(
+              uploadType: 2, recordType: 5, records: state.uploadFaceDataList);
           // }
         }
         break;
@@ -267,7 +288,8 @@ class UploadDataLogic extends BaseGetXController{
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadPalmVeinDataList.addAll(reply.data.sublist(9, reply.data.length));
+        state.uploadPalmVeinDataList
+            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadPalmVeinPage = state.uploadPalmVeinPage + 1;
@@ -284,7 +306,10 @@ class UploadDataLogic extends BaseGetXController{
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-            _lockDataUpload(uploadType:2, recordType:6, records:state.uploadPalmVeinDataList);
+          _lockDataUpload(
+              uploadType: 2,
+              recordType: 6,
+              records: state.uploadPalmVeinDataList);
           // }
         }
         break;
@@ -314,7 +339,8 @@ class UploadDataLogic extends BaseGetXController{
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadRemoteControlDataList.addAll(reply.data.sublist(9, reply.data.length));
+        state.uploadRemoteControlDataList
+            .addAll(reply.data.sublist(9, reply.data.length));
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadRemoteControlPage = state.uploadRemoteControlPage + 1;
@@ -331,7 +357,10 @@ class UploadDataLogic extends BaseGetXController{
           // }else{
           //   // 如果不是空的解析数据上传
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(uploadType:2, recordType:7, records:state.uploadRemoteControlDataList);
+          _lockDataUpload(
+              uploadType: 2,
+              recordType: 7,
+              records: state.uploadRemoteControlDataList);
           // }
         }
         break;
@@ -361,8 +390,10 @@ class UploadDataLogic extends BaseGetXController{
         state.indexCount.value = state.indexCount.value + 1;
         cancelBlueConnetctToastTimer();
 
-        state.uploadLockSetDataList.addAll(reply.data.sublist(7, reply.data.length));
+        state.uploadLockSetDataList
-        _lockDataUpload(uploadType:1, recordType:0, records:state.uploadLockSetDataList);
+            .addAll(reply.data.sublist(7, reply.data.length));
+        _lockDataUpload(
+            uploadType: 1, recordType: 0, records: state.uploadLockSetDataList);
         break;
       case 0x06:
         //无权限
@@ -394,7 +425,8 @@ class UploadDataLogic extends BaseGetXController{
       AppLog.log('上传密码列表获取超时 关闭加载菊花');
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -414,7 +446,8 @@ class UploadDataLogic extends BaseGetXController{
 
   // 公共的获取密码列表
   Future<void> updataLockPasswordList(List<int> token, int page) async {
-    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -428,8 +461,7 @@ class UploadDataLogic extends BaseGetXController{
         token: token,
         needAuthor: 1,
         signKey: signKeyDataList,
-        privateKey: getPrivateKeyList
+        privateKey: getPrivateKeyList);
-    );
   }
 
   // 上传数据获取锁Card列表
@@ -440,7 +472,8 @@ class UploadDataLogic extends BaseGetXController{
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -460,7 +493,8 @@ class UploadDataLogic extends BaseGetXController{
 
   // 公共的获取Card列表
   Future<void> updataLockCardList(List<int> token, int page) async {
-    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -474,8 +508,7 @@ class UploadDataLogic extends BaseGetXController{
         token: token,
         needAuthor: 1,
         signKey: signKeyDataList,
-        privateKey: getPrivateKeyList
+        privateKey: getPrivateKeyList);
-    );
   }
 
   // 上传数据获取锁指纹列表
@@ -486,7 +519,8 @@ class UploadDataLogic extends BaseGetXController{
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -506,7 +540,8 @@ class UploadDataLogic extends BaseGetXController{
 
   // 公共的获取指纹列表
   Future<void> updataLockFingerprintList(List<int> token, int page) async {
-    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -520,8 +555,7 @@ class UploadDataLogic extends BaseGetXController{
         token: token,
         needAuthor: 1,
         signKey: signKeyDataList,
-        privateKey: getPrivateKeyList
+        privateKey: getPrivateKeyList);
-    );
   }
 
   // 上传数据获取锁人脸列表
@@ -532,7 +566,8 @@ class UploadDataLogic extends BaseGetXController{
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -552,7 +587,8 @@ class UploadDataLogic extends BaseGetXController{
 
   // 公共的获取人脸列表
   Future<void> updataLockFaceList(List<int> token, int page) async {
-    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -566,11 +602,9 @@ class UploadDataLogic extends BaseGetXController{
         token: token,
         needAuthor: 1,
         signKey: signKeyDataList,
-        privateKey: getPrivateKeyList
+        privateKey: getPrivateKeyList);
-    );
   }
 
-
   // 上传数据获取锁掌静脉列表
   Future<void> getUpdataLockPalmVeinList() async {
     showEasyLoading();
@@ -579,7 +613,8 @@ class UploadDataLogic extends BaseGetXController{
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -599,7 +634,8 @@ class UploadDataLogic extends BaseGetXController{
 
   // 公共的获取掌静脉列表
   Future<void> updataLockPalmVeinList(List<int> token, int page) async {
-    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -613,8 +649,7 @@ class UploadDataLogic extends BaseGetXController{
         token: token,
         needAuthor: 1,
         signKey: signKeyDataList,
-        privateKey: getPrivateKeyList
+        privateKey: getPrivateKeyList);
-    );
   }
 
   // 上传数据获取锁遥控列表
@@ -625,12 +660,14 @@ class UploadDataLogic extends BaseGetXController{
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
 
-        updataLockRemoteControlList(getTokenList, state.uploadRemoteControlPage);
+        updataLockRemoteControlList(
+            getTokenList, state.uploadRemoteControlPage);
       } else if (connectionState == BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
@@ -645,7 +682,8 @@ class UploadDataLogic extends BaseGetXController{
 
   // 公共的获取遥控列表
   Future<void> updataLockRemoteControlList(List<int> token, int page) async {
-    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -659,8 +697,7 @@ class UploadDataLogic extends BaseGetXController{
         token: token,
         needAuthor: 1,
         signKey: signKeyDataList,
-        privateKey: getPrivateKeyList
+        privateKey: getPrivateKeyList);
-    );
   }
 
   // 上传数据获取设置
@@ -671,7 +708,8 @@ class UploadDataLogic extends BaseGetXController{
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -691,7 +729,8 @@ class UploadDataLogic extends BaseGetXController{
 
   // 公共的上传锁设置
   Future<void> updataLockSet(List<int> token) async {
-    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
 
     final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
@@ -703,23 +742,20 @@ class UploadDataLogic extends BaseGetXController{
         token: token,
         needAuthor: 1,
         signKey: signKeyDataList,
-        privateKey: getPrivateKeyList
+        privateKey: getPrivateKeyList);
-    );
   }
 
   // 锁数据上传服务器
-  Future<void> _lockDataUpload({
+  Future<void> _lockDataUpload(
-    required int uploadType,
+      {required int uploadType,
       required int recordType,
-    required List records
+      required List records}) async {
-  }) async{
     final LoginEntity entity = await ApiRepository.to.lockDataUpload(
         lockId: CommonDataManage().currentKeyInfo.lockId!,
         uploadType: uploadType,
         recordType: recordType,
         records: records,
-        isUnShowLoading: false
+        isUnShowLoading: false);
-    );
     if (entity.errorCode!.codeIsSuccessful) {
       if (uploadType == 1) {
         // 1设置
@@ -768,6 +804,31 @@ class UploadDataLogic extends BaseGetXController{
     }
   }
 
+  // 上传数据成功后的回调
+  void onUploadSuccess() {
+    // 发送事件通知指纹列表刷新
+    eventBus.fire(OtherTypeRefreshListEvent());
+    // 返回上一页
+    Get.back();
+  }
+
+  // 在上传数据成功的地方调用
+  Future<void> uploadData() async {
+    try {
+      // ... existing upload code ...
+
+      // 假设这是上传成功的标志
+      bool uploadSuccess = true; // 这里需要根据实际的上传结果来设置
+
+      if (uploadSuccess) {
+        onUploadSuccess();
+      }
+    } catch (e) {
+      // 处理错误
+      print('Upload failed: $e');
+    }
+  }
+
   @override
   void onReady() {
     super.onReady();
@@ -783,5 +844,4 @@ class UploadDataLogic extends BaseGetXController{
 
     _replySubscription.cancel();
   }
-
 }