From 137cdf4ab8429fdf60f11ac829011ab755e644b4 Mon Sep 17 00:00:00 2001
From: "sky.min" <bingb511@126.com>
Date: Thu, 15 Jan 2026 17:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=81=E8=BF=AB=E5=8D=A1=E5=9C=A8=E8=93=9D?=
 =?UTF-8?q?=E7=89=99=E5=BC=80=E9=94=81=E5=90=8E=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockDetail/lockDetail_logic.dart          | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
index 7e67c9b9..6a86dd21 100755
--- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
+++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
@@ -26,6 +26,7 @@ import 'package:star_lock/talk/starChart/constant/talk_status.dart';
 import 'package:star_lock/talk/starChart/handle/other/packet_loss_statistics.dart';
 import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart';
 import 'package:star_lock/talk/starChart/star_chart_manage.dart';
+import 'package:star_lock/talk/starChart/views/native/talk_view_native_decode_logic.dart';
 import 'package:star_lock/tools/bugly/bugly_tool.dart';
 import 'package:star_lock/tools/throttler.dart';
 import 'package:star_lock/widget/permission/permission_dialog.dart';
@@ -955,6 +956,8 @@ class LockDetailLogic extends BaseGetXController {
         showToast('设备未配网'.tr);
         return;
       }
+      // 记录开始时间
+      TalkViewNativeDecodeLogic.setMonitorStartTime(DateTime.now());
       // 重置丢包率监控
       // PacketLossStatistics().reset();
       // 发送监控id - 监控模式不设置等待接听状态
@@ -1132,8 +1135,14 @@ class LockDetailLogic extends BaseGetXController {
     final int status = reply.data[2];
     switch (status) {
       case 0x00:
+        //成功
+        cancelBlueConnetctToastTimer();
+
         final int dataLength = reply.data[8];
-        state.uploadPasswordDataList.addAll(reply.data.sublist(9, reply.data.length));
+        // 使用同步方式添加数据到列表，避免竞态条件
+        final newData = reply.data.sublist(9, reply.data.length);
+        state.uploadPasswordDataList.addAll(newData);
+        
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadPasswordPage = state.uploadPasswordPage + 1;
@@ -1158,13 +1167,13 @@ class LockDetailLogic extends BaseGetXController {
             }
           });
         } else {
-          state.indexCount.value = state.indexCount.value + 1;
-          // 保存到服务器
-          _lockDataUpload(
-            uploadType: 2,
-            recordType: 2,
-            records: state.uploadPasswordDataList,
-          );
+          // 添加延迟以确保数据完全写入列表，避免竞态条件
+          await Future.delayed(Duration(milliseconds: 50));
+          // 在调用上传方法前确保数据已正确添加
+          if (state.uploadPasswordDataList.isNotEmpty) {
+            state.indexCount.value = state.indexCount.value + 1;
+            _lockDataUpload(uploadType: 2, recordType: 2, records: List.from(state.uploadPasswordDataList));
+          }
         }
         break;
       case 0x06:
@@ -1235,7 +1244,10 @@ class LockDetailLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadCardDataList.addAll(reply.data.sublist(9, reply.data.length));
+        // 使用同步方式添加数据到列表，避免竞态条件
+        final newData = reply.data.sublist(9, reply.data.length);
+        state.uploadCardDataList.addAll(newData);
+        
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadCardPage = state.uploadCardPage + 1;
@@ -1264,8 +1276,12 @@ class LockDetailLogic extends BaseGetXController {
           });
         } else {
           state.indexCount.value = state.indexCount.value + 1;
-          print('到达上传锁卡,${state.uploadCardDataList}');
-          _lockDataUpload(uploadType: 2, recordType: 3, records: state.uploadCardDataList);
+          // 添加延迟以确保数据完全写入列表，避免竞态条件
+          await Future.delayed(Duration(milliseconds: 50));
+          // 在调用上传方法前确保数据已正确添加
+          if (state.uploadCardDataList.isNotEmpty) {
+            _lockDataUpload(uploadType: 2, recordType: 3, records: List.from(state.uploadCardDataList));
+          }
         }
         break;
       case 0x06:
@@ -1338,7 +1354,9 @@ class LockDetailLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
-        state.uploadFingerprintDataList.addAll(reply.data.sublist(9, reply.data.length));
+        // 使用同步方式添加数据到列表，避免竞态条件
+        final newData = reply.data.sublist(9, reply.data.length);
+        state.uploadFingerprintDataList.addAll(newData);
         if (dataLength == 10) {
           // 当数据是10的时候继续请求
           state.uploadFingerprintPage = state.uploadFingerprintPage + 1;
@@ -1367,7 +1385,12 @@ class LockDetailLogic extends BaseGetXController {
           });
         } else {
           state.indexCount.value = state.indexCount.value + 1;
-          _lockDataUpload(uploadType: 2, recordType: 4, records: state.uploadFingerprintDataList);
+          // 添加延迟以确保数据完全写入列表，避免竞态条件
+          await Future.delayed(Duration(milliseconds: 50));
+          // 在调用上传方法前确保数据已正确添加
+          if (state.uploadFingerprintDataList.isNotEmpty) {
+            _lockDataUpload(uploadType: 2, recordType: 4, records: List.from(state.uploadFingerprintDataList));
+          }
         }
         break;
       case 0x06: