root/Ayay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在 AiVideo 中能看到图像

Browse Source 
增加了在线状态同步逻辑
This commit is contained in:
wilson
2026-01-09 12:30:36 +08:00
parent 3d47c8f009
commit 3351ae739e
31 changed files with 1090 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
SHH.CameraService/Core/NetSenders/DeviceStateMonitorWorker.cs Normal file
View File

@@ -0,0 +1,151 @@
using System.Collections.Concurrent;
using Microsoft.Extensions.Hosting;
using NetMQ;
using NetMQ.Sockets;
using MessagePack;
using SHH.CameraSdk;
using SHH.Contracts;
namespace SHH.CameraService
{
/// <summary>
/// [二合一] 设备状态聚合与上报服务
/// </summary>
public class DeviceStateMonitorWorker : BackgroundService
{
private readonly CameraManager _manager;
private readonly ServiceConfig _config;
// ★ 2. 注入拦截器管道
private readonly InterceptorPipeline _pipeline;
// 本地状态全集缓存
private readonly ConcurrentDictionary<string, StatusEventPayload> _stateStore = new();
// 标记是否有新变更
private volatile bool _isDirty = false;
private long _lastSendTick = 0;
// ★ 3. 构造函数增加 InterceptorPipeline 参数
public DeviceStateMonitorWorker(
CameraManager manager,
ServiceConfig config,
InterceptorPipeline pipeline) // <--- 注入点
{
_manager = manager;
_config = config;
_pipeline = pipeline;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
// 1. 初始化缓存 (默认离线)
foreach (var dev in _manager.GetAllDevices())
{
UpdateLocalState(dev.Id, false, "Init");
}
// 2. 挂载 SDK 事件
_manager.OnDeviceStatusChanged += OnSdkStatusChanged;
// 3. 建立连接
var cmdEndpoint = _config.CommandEndpoints.FirstOrDefault()?.Uri;
if (string.IsNullOrEmpty(cmdEndpoint))
{
Console.WriteLine("[StatusWorker] 警告: 未配置 Command 端点，状态上报无法启动。");
return;
}
Console.WriteLine($"[StatusWorker] 启动状态上报，直连服务端: {cmdEndpoint}");
using var socket = new DealerSocket();
socket.Options.SendHighWatermark = 1000;
// 设置 Identity 是个好习惯，虽然这里只发不收
// socket.Options.Identity = ...
socket.Connect(cmdEndpoint);
// 4. 定时循环 (1秒1次)
var timer = new PeriodicTimer(TimeSpan.FromSeconds(1));
try
{
while (await timer.WaitForNextTickAsync(stoppingToken))
{
// ★ 4. 关键修正：必须使用 await 调用新的异步方法
await CheckAndDirectSendAsync(socket);
}
}
finally
{
_manager.OnDeviceStatusChanged -= OnSdkStatusChanged;
socket.Dispose();
}
}
private void OnSdkStatusChanged(long deviceId, bool isOnline, string reason)
{
UpdateLocalState(deviceId, isOnline, reason);
_isDirty = true;
}
private void UpdateLocalState(long deviceId, bool isOnline, string reason)
{
var evt = new StatusEventPayload
{
CameraId = deviceId.ToString(),
IsOnline = isOnline,
Reason = reason,
Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
};
_stateStore[deviceId.ToString()] = evt;
}
/// <summary>
/// 检查并在当前线程直接发送 (已改为异步 Task)
/// </summary>
// ★ 5. 关键修正：void -> async Task
private async Task CheckAndDirectSendAsync(NetMQSocket socket)
{
long now = Environment.TickCount64;
// 策略: 有变更 或 超过5秒(心跳)
bool shouldSend = _isDirty || (now - _lastSendTick > 5000);
if (shouldSend)
{
try
{
// A. 组包 (全量)
var snapshot = _stateStore.Values.ToList();
var batch = new StatusBatchPayload
{
Items = snapshot,
Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
};
// B. 序列化
byte[] data = MessagePackSerializer.Serialize(batch);
// =========================================================
// ★ 6. 拦截器调用
// =========================================================
// 这里的 "STATUS_BATCH" 是协议头，你可以替换为 ProtocolHeaders.StatusBatch (如果定义了的话)
var ctx = await _pipeline.ExecuteSendAsync("STATUS_BATCH", data);
if (ctx != null) // 如果没被拦截
{
// C. 直接发送
socket.SendMoreFrame(ctx.Protocol)
.SendFrame(ctx.Data);
// D. 重置标记
_isDirty = false;
_lastSendTick = now;
}
}
catch (Exception ex)
{
Console.WriteLine($"[StatusWorker] 发送失败: {ex.Message}");
}
}
}
}
}

26
SHH.CameraService/Core/NetSenders/NetMQProtocolExtensions.cs
View File

@@ -1,4 +1,5 @@
using NetMQ;
using MessagePack;
using NetMQ;
using SHH.Contracts;
namespace SHH.CameraService
@@ -21,8 +22,16 @@ namespace SHH.CameraService
// Frame 0: 协议魔数
msg.Append(PROTOCOL_HEADER);
// Frame 1: 元数据 JSON
msg.Append(payload.GetMetadataJson());
////// Frame 1: 元数据 JSON
////msg.Append(payload.GetMetadataJson());
// ★★★ 修复点：在序列化之前，手动更新 Payload 的标志位 ★★★
payload.HasOriginalImage = (payload.OriginalImageBytes != null && payload.OriginalImageBytes.Length > 0);
payload.HasTargetImage = (payload.TargetImageBytes != null && payload.TargetImageBytes.Length > 0);
// Frame 1: Metadata (MessagePack)
byte[] metaBytes = MessagePackSerializer.Serialize(payload);
msg.Append(metaBytes);
// Frame 2: 原始图 (保持帧位对齐，无数据则发空帧)
if (payload.HasOriginalImage && payload.OriginalImageBytes != null)
@@ -49,9 +58,14 @@ namespace SHH.CameraService
// Frame 0 Check
if (msg[0].ConvertToString() != PROTOCOL_HEADER) return null;
// Frame 1: Metadata
string json = msg[1].ConvertToString();
var payload = VideoPayload.FromMetadataJson(json);
//// Frame 1: Metadata
//string json = msg[1].ConvertToString();
//var payload = VideoPayload.FromMetadataJson(json);
// [新代码] 直接从二进制还原
// ToByteArray() 虽然会产生一次拷贝，但对于 Metadata 这种小数据影响微乎其微
// 相比 JSON 解析 String 的开销，这已经非常快了
var payload = MessagePackSerializer.Deserialize<VideoPayload>(msg[1].ToByteArray());
if (payload == null) return null;
// Frame 2: Raw Image

3
SHH.CameraService/Core/NetSenders/NetworkStreamingWorker.cs
View File

@@ -92,6 +92,9 @@ public class NetworkStreamingWorker : BackgroundService
DispatchTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
};
// 添加订阅者
payload.SubscriberIds.AddRange(frame.SubscriberIds);
// 计算转码耗时(ms)
double processMs = (Stopwatch.GetTimestamp() - startTick) * 1000.0 / Stopwatch.Frequency;
payload.Diagnostics["encode_ms"] = Math.Round(processMs, 2);