Skip to content

F
FGOUT
Commit 65e3f0c0 by 鲁志-悦动
Options

Replay点中向音视频发送预开始指令

parent 13cebb1e
Showing with 93 additions and 24 deletions
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.lref
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Enum/ClipPackageSignal.cs 0 → 100644
namespace VIZ.FGOUT.Connection
{
public class ClipPackageSignal
{
/// <summary>
/// Replay
/// </summary>
public const string REPLAY = "REPLAY";
/// <summary>
/// 落盘
/// </summary>
public const string LOADMASK = "LOADMASK";
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/ReplayPackage.cs
namespace VIZ.FGOUT.Connection using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Connection
{ {
public class ReplayPackage public class ReplayPackage
{ {
...@@ -21,11 +23,22 @@ ...@@ -21,11 +23,22 @@
/// 是否开始或者停止或者重新开始 /// 是否开始或者停止或者重新开始
/// 结束0 开始1 重新开始2 /// 结束0 开始1 重新开始2
/// </summary> /// </summary>
public int status { get; set; } public ReplayStatus status { get; set; }
/// <summary> /// <summary>
/// 数据 /// 数据
/// </summary> /// </summary>
public VideoData data { get; set; } public VideoData data { get; set; }
} }
/// <summary>
/// Replay状态
/// </summary>
//public enum ReplayStatus
//{
// Stop,
// PreStart,
// Start,
// ReStart
//}
} }
VIZ.FGOUT/VIZ.FGOUT.Connection/VIZ.FGOUT.Connection.csproj
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
<Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage__MatCmd.cs" /> <Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage__MatCmd.cs" />
<Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage__no_mode.cs" /> <Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage__no_mode.cs" />
<Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage__stop.cs" /> <Compile Include="UDP\Algorithm\Signal\Send\AlgorithmPackage__stop.cs" />
<Compile Include="UDP\Clip\Enum\ClipPackageSignal.cs" />
<Compile Include="UDP\Clip\Sender\ClipSender.cs" /> <Compile Include="UDP\Clip\Sender\ClipSender.cs" />
<Compile Include="UDP\Clip\Signal\Send\ClipPackage__crop_roi.cs" /> <Compile Include="UDP\Clip\Signal\Send\ClipPackage__crop_roi.cs" />
<Compile Include="UDP\Clip\Signal\Send\ReplayPackage.cs" /> <Compile Include="UDP\Clip\Signal\Send\ReplayPackage.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Connection/obj/x64/Debug/VIZ.FGOUT.Connection.csproj.CoreCompileInputs.cache
6b5fc1ed04f1a72b04463bf148afef51d446d299 3bb9cd2aaa5a0488c7efeea774306b0de58e97bc
VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/ReplayStatus.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
/// <summary>
/// Replay状态
/// </summary>
public enum ReplayStatus
{
/// <summary>
/// 停止
/// </summary>
Stop,
/// <summary>
/// 预开始
/// </summary>
PreStart,
/// <summary>
/// 开始
/// </summary>
Start,
/// <summary>
/// 重开
/// </summary>
ReStart
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<Compile Include="ApplicationDomainEx.cs" /> <Compile Include="ApplicationDomainEx.cs" />
<Compile Include="Enum\NDIViewKeys.cs" /> <Compile Include="Enum\NDIViewKeys.cs" />
<Compile Include="Enum\NDIViewStatus.cs" /> <Compile Include="Enum\NDIViewStatus.cs" />
<Compile Include="Enum\ReplayStatus.cs" />
<Compile Include="Enum\ServiceKeys.cs" /> <Compile Include="Enum\ServiceKeys.cs" />
<Compile Include="Enum\SystemPermissions.cs" /> <Compile Include="Enum\SystemPermissions.cs" />
<Compile Include="Info\AlgorithmInfo_borderline.cs" /> <Compile Include="Info\AlgorithmInfo_borderline.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
abce2ed6bd8860697bdf35cc469c93114b39453a 9e62ad6b71bec937a3610a93e2b7bceffd49164e
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -608,6 +608,16 @@ namespace VIZ.FGOUT.Module ...@@ -608,6 +608,16 @@ namespace VIZ.FGOUT.Module
SliderValue = SliderMaxValue; SliderValue = SliderMaxValue;
ReplayModel replayModel = new ReplayModel() { IsReplay = true }; ReplayModel replayModel = new ReplayModel() { IsReplay = true };
ApplicationDomain.MessageManager.Send(replayModel); ApplicationDomain.MessageManager.Send(replayModel);
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
var replayPackage = new ReplayPackage()
{
type = ClipPackageSignal.REPLAY,
status = ReplayStatus.PreStart
};
manager.SendJson(replayPackage);
} }
private void ReplayUnchecked() private void ReplayUnchecked()
...@@ -662,10 +672,10 @@ namespace VIZ.FGOUT.Module ...@@ -662,10 +672,10 @@ namespace VIZ.FGOUT.Module
if (manager == null) return; if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY"; replayPackage.type = ClipPackageSignal.REPLAY;
replayPackage.start_time = StartTime; replayPackage.start_time = StartTime;
replayPackage.end_time = EndTime; replayPackage.end_time = EndTime;
replayPackage.status = 2; replayPackage.status = ReplayStatus.ReStart;
manager.SendJson(replayPackage); manager.SendJson(replayPackage);
MessageBoxEx.ShowDialog("Replay Restart OK."); MessageBoxEx.ShowDialog("Replay Restart OK.");
} }
...@@ -675,8 +685,8 @@ namespace VIZ.FGOUT.Module ...@@ -675,8 +685,8 @@ namespace VIZ.FGOUT.Module
if (manager == null) return; if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY"; replayPackage.type = ClipPackageSignal.REPLAY;
replayPackage.status = 0; replayPackage.status = ReplayStatus.Stop;
manager.SendJson(replayPackage); manager.SendJson(replayPackage);
MessageBoxEx.ShowDialog("Replay Stop OK."); MessageBoxEx.ShowDialog("Replay Stop OK.");
ReplayIsChecked = false; ReplayIsChecked = false;
...@@ -704,7 +714,7 @@ namespace VIZ.FGOUT.Module ...@@ -704,7 +714,7 @@ namespace VIZ.FGOUT.Module
if (manager == null) return; if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY"; replayPackage.type = ClipPackageSignal.REPLAY;
//VideoData data = new VideoData(); //VideoData data = new VideoData();
////data.backTimes = Convert.ToInt32(ReplaySecond); ////data.backTimes = Convert.ToInt32(ReplaySecond);
////timecode时间戳 ////timecode时间戳
...@@ -713,7 +723,7 @@ namespace VIZ.FGOUT.Module ...@@ -713,7 +723,7 @@ namespace VIZ.FGOUT.Module
//replayPackage.data = data; //replayPackage.data = data;
replayPackage.start_time = StartTime; replayPackage.start_time = StartTime;
replayPackage.end_time = EndTime; replayPackage.end_time = EndTime;
replayPackage.status = 1; replayPackage.status = ReplayStatus.Start;
manager.SendJson(replayPackage); manager.SendJson(replayPackage);
MessageBoxEx.ShowDialog("Replay Start OK."); MessageBoxEx.ShowDialog("Replay Start OK.");
} }
...@@ -878,7 +888,7 @@ namespace VIZ.FGOUT.Module ...@@ -878,7 +888,7 @@ namespace VIZ.FGOUT.Module
return; return;
SaveMatImagePackage package = new SaveMatImagePackage(); SaveMatImagePackage package = new SaveMatImagePackage();
package.type = "LOADMASK"; package.type = ClipPackageSignal.LOADMASK;
package.start_time = config.start; package.start_time = config.start;
package.end_time = config.end; package.end_time = config.end;
// 发送UDP命令给音视频 // 发送UDP命令给音视频
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/RePlayPanelViewModel.cs
...@@ -32,7 +32,7 @@ namespace VIZ.FGOUT.Module ...@@ -32,7 +32,7 @@ namespace VIZ.FGOUT.Module
if (manager == null) return; if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY"; replayPackage.type = ClipPackageSignal.REPLAY;
VideoData data = new VideoData(); VideoData data = new VideoData();
data.backTimes = Convert.ToInt32(ReplaySecond); data.backTimes = Convert.ToInt32(ReplaySecond);
//timecode //timecode
...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module ...@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module
if (manager == null) return; if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY"; replayPackage.type = ClipPackageSignal.REPLAY;
VideoData data = new VideoData(); VideoData data = new VideoData();
data.backTimes = Convert.ToInt32(ReplaySecond); data.backTimes = Convert.ToInt32(ReplaySecond);
//timecode //timecode
...@@ -88,7 +88,7 @@ namespace VIZ.FGOUT.Module ...@@ -88,7 +88,7 @@ namespace VIZ.FGOUT.Module
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
VideoData data = new VideoData(); VideoData data = new VideoData();
replayPackage.type = "REPLAY"; replayPackage.type = ClipPackageSignal.REPLAY;
data.backTimes = Convert.ToInt32(ReplaySecond); data.backTimes = Convert.ToInt32(ReplaySecond);
//timecode //timecode
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
This source diff could not be displayed because it is too large. You can view the blob instead.
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
2023-12-08 14:22:10,927 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"UE_Presets":{"StartSets":{"EventCode":"LJ","DualMode":0,"EnableStats":{"bEnableSpline":false,"bShowHeight":true,"bShowSpeed":true,"bEnableZoom":true},"SplineSets":{"bLineBehind":false},"ZoomSets":{"ZoomEase":"SinusoidalInOut","MoveEase":"SinusoidalInOut","Scale":50.0,"SafeScale":0.9,"ZoomIn":3.0,"ZoomOut":3.0,"Move":3.0,"delay_zoomin_move":1.0,"delay_move_zoomout":1.0,"bMovementOnlyX":false,"MovementOnlyXPosition":0,"bMovementOnlyY":false,"MovementOnlyYPosition":0},"Datas":{"bIsManualMode":false,"Positions":[{"name":"height","x":230,"y":485},{"name":"speed","x":1035,"y":1890}]}}}} 2023-12-11 10:35:08,765 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-12-08 14:23:24,003 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-12-11 10:35:09,003 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl +
2023-12-08 14:23:41,829 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键： 2023-12-11 10:35:09,148 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + A
2023-12-08 14:23:42,317 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + 2023-12-11 11:56:25,671 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-12-08 14:33:29,013 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"matt_start","timecode":0} 2023-12-11 11:56:25,990 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl +
2023-12-08 14:33:41,169 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"matt_start","timecode":0} 2023-12-11 11:56:26,111 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：Ctrl + A
2023-12-08 14:33:42,378 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"matt_end","timecode":0} 2023-12-11 14:12:13,481 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-12-08 18:09:33,114 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0} 2023-12-11 14:12:13,506 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-12-08 18:09:49,989 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0} 2023-12-11 14:12:13,667 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
2023-12-11 14:12:13,693 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键：
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment