增加了通过网络主动上报图像的支持
增加了指令维护通道的支持
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using SHH.CameraDashboard.Services;
|
||||
using SHH.Contracts;
|
||||
using SHH.ProcessLaunchers;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Windows;
|
||||
@@ -31,6 +32,7 @@ namespace SHH.CameraDashboard
|
||||
// 启动指令服务 (Port 6001)
|
||||
CommandServer.Instance.Start(6001);
|
||||
|
||||
CommandServer.Instance.OnClientRegistered += SetupAutomaticConfiguration;
|
||||
|
||||
// 现在我们来配置启动
|
||||
|
||||
@@ -57,7 +59,9 @@ namespace SHH.CameraDashboard
|
||||
string serviceArgs = $"" +
|
||||
$"--pid {myPid} " +
|
||||
$"--appid \"CameraApp_01\" " +
|
||||
$"--uris \"127.0.0.1,6002&6001;\" " +
|
||||
$"--uris \"127.0.0.1,6002,video,调试PC;\" " +
|
||||
$"--uris \"127.0.0.1,6001,command,调试PC;\" " +
|
||||
$"--uris \"192.168.1.100,6002,video,大屏展示;\" " +
|
||||
$"--mode 1 " +
|
||||
$"--ports \"5000,100\"";
|
||||
|
||||
@@ -86,6 +90,78 @@ namespace SHH.CameraDashboard
|
||||
mainWin.Show();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 在程序启动时订阅事件
|
||||
/// </summary>
|
||||
/// <param name="obj"></param>
|
||||
private void SetupAutomaticConfiguration(ConnectedClient obj)
|
||||
{
|
||||
// 监听注册事件:每当有 Service (CommandClientWorker) 连上来注册成功
|
||||
CommandServer.Instance.OnClientRegistered += (client) =>
|
||||
{
|
||||
Console.WriteLine($"[自动化] 检测到新服务上线: {client.ServiceId} ({client.Ip})");
|
||||
|
||||
// 放到线程池去执行,避免阻塞 UI 或网络接收线程
|
||||
Task.Run(async () =>
|
||||
{
|
||||
// 1. 稍微延时一点点 (500ms),给 Service 一点喘息时间准备接收指令
|
||||
await Task.Delay(500);
|
||||
|
||||
// 2. 构造您指定的“206摄像头”配置
|
||||
var cameraConfig = new CameraConfigDto
|
||||
{
|
||||
Id = 17798,
|
||||
Name = "206摄像头",
|
||||
Location = "404办公室",
|
||||
IpAddress = "172.16.41.88",
|
||||
Username = "admin",
|
||||
Password = "abcd1234",
|
||||
Port = 8000,
|
||||
ChannelIndex = 1,
|
||||
StreamType = 0,
|
||||
Brand = DeviceBrand.HikVision.GetHashCode(), // 对应 DeviceBrand 枚举
|
||||
RenderHandle = 0, // 初始化为0
|
||||
MainboardIp = "", // 留空
|
||||
MainboardPort = 0,
|
||||
RtspPath = ""
|
||||
};
|
||||
|
||||
// ★ 新增:一并带上订阅要求 ★
|
||||
cameraConfig.AutoSubscriptions = new List<CameraConfigSubscribeDto>
|
||||
{
|
||||
// 第一条:显示帧,要求 8 帧
|
||||
new CameraConfigSubscribeDto {
|
||||
AppId = "UI_Display",
|
||||
Type = 0,
|
||||
TargetFps = 8,
|
||||
Memo = "显示帧"
|
||||
},
|
||||
// 第二条:分析帧,要求 1 帧
|
||||
new CameraConfigSubscribeDto {
|
||||
AppId = "AI_Analysis",
|
||||
Type = 0,
|
||||
Memo = "分析帧",
|
||||
TargetFps = 1
|
||||
}
|
||||
};
|
||||
|
||||
// 3. 封装协议包
|
||||
var commandPacket = new
|
||||
{
|
||||
Action = "SyncCamera", // 告诉 Service 执行什么动作
|
||||
Payload = cameraConfig, // 数据载荷
|
||||
Time = DateTime.Now
|
||||
};
|
||||
|
||||
// 4. 定向发送
|
||||
// client.ServiceId 就是那个 "CameraApp_01"
|
||||
CommandServer.Instance.SendCommand(client.ServiceId, commandPacket);
|
||||
|
||||
Console.WriteLine($"[自动化] 已向 {client.ServiceId} 下发配置: 206摄像头");
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 全局统一退出入口
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user