Skip to content

F
FGOUT
Commit d2cafa6e by 鲁志-悦动
Options

主页面Title由时间切片系统改为FigureOUT加上体育项目英文名的形式

parent 0f309791
Showing with 98 additions and 47 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
Foreground="White" Foreground="White"
Text="时间切片系统" /> Text="{Binding Title}" />
<StackPanel <StackPanel
Grid.Column="2" Grid.Column="2"
HorizontalAlignment="Right" HorizontalAlignment="Right"
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
</b:EventTrigger> </b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</TextBox> </TextBox>
<TextBox <!--<TextBox
Width="30" Width="30"
Background="Yellow" Background="Yellow"
BorderBrush="Red" BorderBrush="Red"
...@@ -811,7 +811,19 @@ ...@@ -811,7 +811,19 @@
Foreground="Black" Foreground="Black"
IsEnabled="False" IsEnabled="False"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount}" /> Text="{Binding AutoSendCount}" />-->
<TextBlock
Width="30"
Height="30"
Padding="0,6,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Yellow"
FontSize="14"
Foreground="Black"
IsEnabled="False"
Text="{Binding AutoSendCount}"
TextAlignment="Center" />
</StackPanel> </StackPanel>
</Border> </Border>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
using Gma.System.MouseKeyHook; using Gma.System.MouseKeyHook;
using log4net; using log4net;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Interop; using System.Windows.Interop;
using Newtonsoft.Json;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send; using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
...@@ -61,9 +60,52 @@ namespace VIZ.FGOUT.Module ...@@ -61,9 +60,52 @@ namespace VIZ.FGOUT.Module
//初始化算法数据 //初始化算法数据
//InitAlgorithmData(); //InitAlgorithmData();
/// <summary> //初始化音视频流缓存时间
/// 音视频流缓存时间 InitStreamCachedTime();
/// </summary>
//初始化体育项目名称
InitSportName();
}
Dictionary<string, string> dics = new Dictionary<string, string>
{
{ "LJ", "Long Jump" }, { "TJ", "Triple Jump" }, { "VT", "Vault" }, { "JT", "Javelin Throw" }, { "FX", "Floor Exercise" }, { "HB", "Horizontal Bar" }, { "UB", "Uneven Bars" }
, { "DS", "Diving Springboard" } , { "DT", "Diving Tower" } , { "SS", "Synchronized Diving Springboard" } , { "ST", "Synchronized Diving Tower" } , { "SP", "Speed" }
};
private string _title = "FigureOUT";
public string Title
{
get => _title;
set
{
_title = value;
this.RaisePropertyChanged(nameof(Title));
}
}
private void InitSportName()
{
try
{
var number = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1)
.GameName;
if (!string.IsNullOrEmpty(number))
Title = "FigureOUT(" + dics[number] + ")";
}
catch (Exception ex)
{
log.Error(ex.Message);
}
}
/// <summary>
/// 音视频流缓存时间
/// </summary>
private void InitStreamCachedTime()
{
int STREAM_CACHEED_TIME = ApplicationDomain.IniStorage.GetValue<StreamConfig, int>(p => p.STREAM_CACHEED_TIME); int STREAM_CACHEED_TIME = ApplicationDomain.IniStorage.GetValue<StreamConfig, int>(p => p.STREAM_CACHEED_TIME);
SliderMaxValue = STREAM_CACHEED_TIME * 50; SliderMaxValue = STREAM_CACHEED_TIME * 50;
} }
...@@ -155,6 +197,25 @@ namespace VIZ.FGOUT.Module ...@@ -155,6 +197,25 @@ namespace VIZ.FGOUT.Module
//ApplicationDomain.MessageManager.Register<ReplayEndValueModel>(this, this.ReplayEndValueFromNDIViewModel); //ApplicationDomain.MessageManager.Register<ReplayEndValueModel>(this, this.ReplayEndValueFromNDIViewModel);
ApplicationDomain.MessageManager.Register<AutoSendModel>(this, this.AutoSendIntervalTimeChanged); ApplicationDomain.MessageManager.Register<AutoSendModel>(this, this.AutoSendIntervalTimeChanged);
// 算法落盘开始、结束时间戳消息
ApplicationDomain.MessageManager.Register<AlgorithmMessage__start_end>(this, this.OnAlgorithmMessage__start_end);
}
/// <summary>
/// 算法二次确认自动发送时间
/// </summary>
protected int ALGORITHM_ReconfirmAutoSend_TIME = ApplicationDomain.IniStorage.GetValue<AlgorithmConfig, int>(p => p.ALGORITHM_ReconfirmAutoSend_TIME);
/// <summary>
/// 算法落盘开始、结束时间戳消息
/// </summary>
/// <param name="msg"></param>
private void OnAlgorithmMessage__start_end(AlgorithmMessage__start_end msg)
{
_tempAutoSendCount = AutoSendCount = (ALGORITHM_ReconfirmAutoSend_TIME / 1000) + 1;
_autoSend_Timer.Stop();
_autoSend_Timer.Start();
} }
#region 自动发送倒计时器 #region 自动发送倒计时器
...@@ -164,7 +225,7 @@ namespace VIZ.FGOUT.Module ...@@ -164,7 +225,7 @@ namespace VIZ.FGOUT.Module
private int _tempAutoSendCount = 4; private int _tempAutoSendCount = 4;
private void AutoSendIntervalTimeChanged(AutoSendModel model) private void AutoSendIntervalTimeChanged(AutoSendModel model)
{ {
_tempAutoSendCount = AutoSendCount = model.Interval / 1000 + 1; _tempAutoSendCount = AutoSendCount = (model.Interval / 1000) + 1;
_autoSend_Timer.Stop(); _autoSend_Timer.Stop();
_autoSend_Timer.Start(); _autoSend_Timer.Start();
} }
...@@ -709,6 +770,8 @@ namespace VIZ.FGOUT.Module ...@@ -709,6 +770,8 @@ namespace VIZ.FGOUT.Module
//ApplicationDomain.MessageManager.Send(refreshPositionModel); //ApplicationDomain.MessageManager.Send(refreshPositionModel);
HidePlace(); HidePlace();
ShowPlace(); ShowPlace();
//点恢复的时候刷新一下体育项目名
InitSportName();
} }
#endregion #endregion
...@@ -787,7 +850,7 @@ namespace VIZ.FGOUT.Module ...@@ -787,7 +850,7 @@ namespace VIZ.FGOUT.Module
public VCommand<RoutedEventArgs> AutoSendIntervalTimeChangedCommand { get; set; } public VCommand<RoutedEventArgs> AutoSendIntervalTimeChangedCommand { get; set; }
private void AutoSendIntervalTimeChanged(RoutedEventArgs e) private void AutoSendIntervalTimeChanged(RoutedEventArgs e)
{ {
if (e.OriginalSource is TextBox tb) if (e.OriginalSource is System.Windows.Controls.TextBox tb)
{ {
var text = tb.Text; var text = tb.Text;
if (int.TryParse(text, out var value) && value > 0) if (int.TryParse(text, out var value) && value > 0)
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
...@@ -152,7 +152,10 @@ namespace VIZ.FGOUT.Module ...@@ -152,7 +152,10 @@ namespace VIZ.FGOUT.Module
info.TimeCode = msg.timecode; info.TimeCode = msg.timecode;
infos.Add(info); infos.Add(info);
if (!view.vm.IsReplay) if (!view.vm.IsReplay)
{
_trackingBoxInfoBuffer.AddInfo(info); _trackingBoxInfoBuffer.AddInfo(info);
_trackingBBoxInfoBuffer.AddInfo(info);
}
} }
} }
...@@ -175,10 +178,7 @@ namespace VIZ.FGOUT.Module ...@@ -175,10 +178,7 @@ namespace VIZ.FGOUT.Module
info.TimeCode = msg.timecode; info.TimeCode = msg.timecode;
infos.Add(info); infos.Add(info);
if (!view.vm.IsReplay) if (!view.vm.IsReplay)
{
_trackingBoxInfoBuffer.AddInfo(info); _trackingBoxInfoBuffer.AddInfo(info);
_trackingBBoxInfoBuffer.AddInfo(info);
}
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/AboutPanelView.xaml.cs
using System; using System.Windows.Controls;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BF2B615BB0F0CB14CC9FFFCBA7C280946754091792A1EA6C47FC789E2765BA67" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9CB04D08D8547EFF26DD2E9EA28C48C8E4D8A6BC58D64B84670B83011A002669"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1234 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1246 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1363 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1375 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1378 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1390 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BF2B615BB0F0CB14CC9FFFCBA7C280946754091792A1EA6C47FC789E2765BA67" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9CB04D08D8547EFF26DD2E9EA28C48C8E4D8A6BC58D64B84670B83011A002669"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1234 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1246 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1363 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1375 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1378 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1390 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
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
2024-03-29 16:50:49,392 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"type":"REPLAY","start_time":0,"end_time":0,"status":1} 2024-04-01 14:48:11,560 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"signal":"auto_Place","start":[],"end":[],"ignore":[],"timecode":0}
2024-03-29 16:51:33,066 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-29 16:51:34,294 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-29 16:51:35,532 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-29 16:51:36,177 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-29 16:51:36,825 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
2024-03-29 16:51:38,055 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"auto","signal":"detect","timecode":0}
2024-03-29 16:51:39,843 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"mode":"manual","signal":"detect","timecode":0}
VIZ.Framework/VIZ.Framework.Core/Core/Timer/ITimerManager.cs
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Core namespace VIZ.Framework.Core
{ {
......
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