sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:调整组包逻辑

Browse Source
This commit is contained in:
liyi 2025-03-13 13:39:19 +08:00
parent fc23d8f851
commit 5e781a5f00
1 changed files with 84 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
lib/talk/starChart/handle/scp_message_base_handle.dart
View File

@ -43,7 +43,7 @@ class ScpMessageBaseHandle {
// 存储每个 messageId 对应的分包数据
static Map<String, List<List<int>>> _packetBuffer = {};
final Map<String, Timer> _packetTimers = {};
final Duration _timeoutDuration = Duration(seconds: 10); // 分包组包最大超时时间
final Duration _timeoutDuration = Duration(seconds: 3); // 分包组包最大超时时间
// 通话数据流的单例流数据处理类
final TalkDataRepository talkDataRepository = TalkDataRepository.instance;
@ -106,40 +106,104 @@ class ScpMessageBaseHandle {
required int payloadType,
}) {
// 初始化分包列表
String key = '$messageId-$payloadType';
if (!_packetBuffer.containsKey(key)) {
_packetBuffer[key] = List.filled(spTotal, []);
_startTimer(key);
}
// 使用更高效的key生成方式
final key = '${messageId}_$payloadType';
// 打印每个包的信息
// AppLog.log(
// '📦 收到分包 - MessageId: $messageId, 总包数: $spTotal, 当前包序号: $spIndex');
// 检查分包索引是否在合法范围内
if (spIndex < 1 || spIndex > spTotal) {
// print(
// 'Invalid spTotal: $spTotal spIndex: $spIndex for messageId: $messageId');
AppLog.log(
'❌ 分包序号异常 - MessageId: $messageId, 总包数: $spTotal, 无效包序号: $spIndex');
return null;
}
// 检查分包索引是否在合法范围内(提前检查可以避免后续无效操作)
if (spIndex < 1 || spIndex > spTotal) return null;
// 初始化分包列表(使用固定长度列表提高性能)
var packets = _packetBuffer[key];
if (packets == null) {
// 预分配固定大小的列表,避免动态扩容
packets = List<List<int>>.filled(spTotal, const [], growable: false);
_packetBuffer[key] = packets;
_startTimer(key);
// AppLog.log('📝 新建分包缓存 - MessageId: $messageId, 预期总包数: $spTotal');
}
// 存储当前分包
_packetBuffer[key]![spIndex - 1] = byte;
packets[spIndex - 1] = byte;
// 检查是否接收到所有分包
if (_packetBuffer[key]!.every((packet) => packet.isNotEmpty)) {
// 重组所有分包
Uint8List completePayload = Uint8List.fromList(
_packetBuffer[key]!.expand((packet) => packet).toList());
// 清除已重组和超时的分包数据
// 优化检查逻辑,使用循环替代every
var isComplete = true;
var totalLength = 0;
for (var i = 0; i < packets.length; i++) {
if (packets[i].isEmpty) {
isComplete = false;
} else {
totalLength += packets[i].length;
}
}
if (isComplete) {
// 预分配确切大小的buffer,避免扩容
final buffer = Uint8List(totalLength);
var offset = 0;
// 直接复制数据,避免使用expand
for (var packet in packets) {
buffer.setRange(offset, offset + packet.length, packet);
offset += packet.length;
}
// 清理资源
_clearPacketData(key);
// 使用重组的包构造成TalkData
// 构造TalkData
if (payloadType == PayloadTypeConstant.talkData) {
final talkData = TalkData();
talkData.mergeFromBuffer(completePayload);
talkData.mergeFromBuffer(buffer);
return talkData;
}
} else {
// 如果分包尚未接收完全，返回 null 或其他指示符
return null;
}
return null;
// if (!_packetBuffer.containsKey(key)) {
// _packetBuffer[key] = List.filled(spTotal, []);
// _startTimer(key);
// }
//
// // 检查分包索引是否在合法范围内
// if (spIndex < 1 || spIndex > spTotal) {
// // print(
// // 'Invalid spTotal: $spTotal spIndex: $spIndex for messageId: $messageId');
// return null;
// }
//
// // 存储当前分包
// _packetBuffer[key]![spIndex - 1] = byte;
//
// // 检查是否接收到所有分包
// if (_packetBuffer[key]!.every((packet) => packet.isNotEmpty)) {
// // 重组所有分包
// Uint8List completePayload = Uint8List.fromList(
// _packetBuffer[key]!.expand((packet) => packet).toList());
// // 清除已重组和超时的分包数据
// _clearPacketData(key);
//
// // 使用重组的包构造成TalkData
// if (payloadType == PayloadTypeConstant.talkData) {
// final talkData = TalkData();
// talkData.mergeFromBuffer(completePayload);
// return talkData;
// }
// } else {
// // 如果分包尚未接收完全，返回 null 或其他指示符
// return null;
// }
}
// 启动定时器