新增 Mjpegplayer 用来播放 Web 流
This commit is contained in:
@@ -24,6 +24,9 @@ public class DeviceStatusHandler : BackgroundService
|
||||
// 状态存储:CameraId -> 状态载荷
|
||||
private readonly ConcurrentDictionary<string, StatusEventPayload> _stateStore = new();
|
||||
|
||||
// 记录上一次成功发送的状态快照,用于增量日志对比
|
||||
private readonly Dictionary<string, bool> _lastPublishedStates = new();
|
||||
|
||||
private volatile bool _isDirty = false;
|
||||
private long _lastSendTick = 0;
|
||||
|
||||
@@ -40,7 +43,7 @@ public class DeviceStatusHandler : BackgroundService
|
||||
// 1. 初始化本地状态缓存
|
||||
foreach (var dev in _manager.GetAllDevices())
|
||||
{
|
||||
UpdateLocalState(dev.Id, false, "Service Init");
|
||||
UpdateLocalState(dev.Id, dev.Config.IpAddress, false, "Service Init");
|
||||
}
|
||||
|
||||
// 2. 订阅 SDK 状态变更事件
|
||||
@@ -71,17 +74,18 @@ public class DeviceStatusHandler : BackgroundService
|
||||
/// <summary>
|
||||
/// SDK 状态变更回调
|
||||
/// </summary>
|
||||
private void OnSdkStatusChanged(long deviceId, bool isOnline, string reason)
|
||||
private void OnSdkStatusChanged(long deviceId, string ipAddress, bool isOnline, string reason)
|
||||
{
|
||||
UpdateLocalState(deviceId, isOnline, reason);
|
||||
UpdateLocalState(deviceId, ipAddress, isOnline, reason);
|
||||
_isDirty = true;
|
||||
}
|
||||
|
||||
private void UpdateLocalState(long deviceId, bool isOnline, string reason)
|
||||
private void UpdateLocalState(long deviceId, string ipAddress, bool isOnline, string reason)
|
||||
{
|
||||
var evt = new StatusEventPayload
|
||||
{
|
||||
CameraId = deviceId.ToString(),
|
||||
IpAddress = ipAddress,
|
||||
IsOnline = isOnline,
|
||||
Reason = reason,
|
||||
Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
|
||||
@@ -133,8 +137,7 @@ public class DeviceStatusHandler : BackgroundService
|
||||
// 这就是客户端尝试调用的真实路径:/包名.服务名/方法名
|
||||
var serviceName = client.GetType().DeclaringType?.Name ?? "Unknown";
|
||||
|
||||
_gRpcLog.Debug("[gRpc] 准备调用端点: {Url}", grpcUrl);
|
||||
_gRpcLog.Debug("[gRpc] 客户端契约服务名: {Service}", serviceName);
|
||||
_gRpcLog.Debug("[gRpc] 准备调用端点: {Url}, 客户端契约服务名: {Service}", grpcUrl, serviceName);
|
||||
|
||||
// 执行调用
|
||||
var response = await client.ReportStatusBatchAsync(request,
|
||||
@@ -142,8 +145,69 @@ public class DeviceStatusHandler : BackgroundService
|
||||
|
||||
if (response.Success)
|
||||
{
|
||||
_gRpcLog.Information("[gRpc] 设备状态上报成功, 共计: {Count} 个, Url: {Url}", request.Items.Count, grpcUrl);
|
||||
_gRpcLog.Debug("[gRpc] 设备状态上报成功: {Url} Items:{Items}", grpcUrl, request.Items);
|
||||
// 1. 处理变更日志 (Information)
|
||||
var diffList = new List<string>();
|
||||
foreach (var item in request.Items)
|
||||
{
|
||||
// 只有状态翻转时才记录变更
|
||||
if (!_lastPublishedStates.TryGetValue(item.CameraId, out bool lastStatus) || lastStatus != item.IsOnline)
|
||||
{
|
||||
// 从内存 Store 中抓取带有 IP 的原始对象
|
||||
_stateStore.TryGetValue(item.CameraId, out var payload);
|
||||
string ip = payload?.IpAddress ?? "Unknown IP";
|
||||
|
||||
string statusText = item.IsOnline ? "上线" : "离线";
|
||||
diffList.Add($"[{item.CameraId}({ip})] {statusText}");
|
||||
|
||||
// // Modified: 记录当前状态供下次对比
|
||||
_lastPublishedStates[item.CameraId] = item.IsOnline;
|
||||
}
|
||||
}
|
||||
|
||||
if (diffList.Any())
|
||||
{
|
||||
_gRpcLog.Information("[gRpc] 设备状态变更: {DiffDetails}, Url: {Url}",
|
||||
string.Join(", ", diffList), grpcUrl);
|
||||
}
|
||||
|
||||
// 2. 处理详细统计日志 (Debug)
|
||||
// Optimized: 通过映射获取 IP,不修改 StatusEventItem 契约
|
||||
var onlineDetails = request.Items
|
||||
.Where(x => x.IsOnline)
|
||||
.Select(x => {
|
||||
_stateStore.TryGetValue(x.CameraId, out var p);
|
||||
return $"{x.CameraId}({p?.IpAddress ?? "N/A"})";
|
||||
}).ToList();
|
||||
|
||||
var offlineDetails = request.Items
|
||||
.Where(x => !x.IsOnline)
|
||||
.Select(x => {
|
||||
_stateStore.TryGetValue(x.CameraId, out var p);
|
||||
return $"{x.CameraId}({p?.IpAddress ?? "N/A"})";
|
||||
}).ToList();
|
||||
|
||||
var detailParts = new List<string>();
|
||||
detailParts.Add($"其中在线 {onlineDetails.Count} 个");
|
||||
detailParts.Add($"离线 {offlineDetails.Count} 个");
|
||||
|
||||
if (offlineDetails.Any())
|
||||
{
|
||||
detailParts.Add($"离线设备【{string.Join(",", offlineDetails)}】");
|
||||
}
|
||||
|
||||
if (onlineDetails.Any())
|
||||
{
|
||||
detailParts.Add($"在线设备【{string.Join(",", onlineDetails)}】");
|
||||
}
|
||||
|
||||
string detailMsg = string.Join(",", detailParts);
|
||||
|
||||
// // Optimized: 最终输出格式化的详细日志
|
||||
_gRpcLog.Debug("[gRpc] 设备状态上报详细: {Url} 总数:{Count} {Detail}",
|
||||
grpcUrl,
|
||||
request.Items.Count,
|
||||
detailMsg);
|
||||
|
||||
_isDirty = false;
|
||||
_lastSendTick = Environment.TickCount64;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user