Skip to content

F
FGOUT
Commit ffce85a8 by 鲁志-悦动
Options

二次确认自动发送功能

parent 69232190
Showing with 284 additions and 124 deletions
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs

//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
21870986562
2-725104376
31364711570
17-1683084370
3947974750
17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
True
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/ReconfirmAbandonModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class ReconfirmAbandonModel
{
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/ReconfirmAutoSendIntervalTimeModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class ReconfirmAutoSendIntervalTimeModel
{
public int IntervalTime { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/ReconfirmSendModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class ReconfirmSendModel
{
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
......@@ -85,6 +85,9 @@
<Compile Include="Message\Setting\InvalidPlaceModel.cs" />
<Compile Include="Message\Setting\MarkModel.cs" />
<Compile Include="Message\Setting\NewWindowModel.cs" />
<Compile Include="Message\Setting\ReconfirmAbandonModel.cs" />
<Compile Include="Message\Setting\ReconfirmAutoSendIntervalTimeModel.cs" />
<Compile Include="Message\Setting\ReconfirmSendModel.cs" />
<Compile Include="Message\Setting\RefreshPositionModel.cs" />
<Compile Include="Message\Setting\ReplayInPortModel.cs" />
<Compile Include="Message\Setting\ReplayModel.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
a3270f111813ab297576adff9320e17ce0986e88
8267e03e49dcbba58f17538229cc9b6e6e557449
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -670,7 +670,7 @@
<GroupBox
Grid.Row="2"
Grid.Column="2"
Grid.ColumnSpan="2"
Grid.ColumnSpan="4"
Foreground="White"
Header="二次确认">
<StackPanel Orientation="Horizontal">
......@@ -690,6 +690,26 @@
Content="发送"
Style="{StaticResource ButtonStyle}" />
<TextBlock
Margin="20,5,5,5"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="自动发送时间间隔" />
<TextBox
Width="100"
Margin="5"
Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendIntervalTime, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="TextChanged">
<b:InvokeCommandAction Command="{Binding AutoSendIntervalTimeChangedCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
<!--<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>-->
</TextBox>
</StackPanel>
</GroupBox>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -7,6 +7,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Web.WebSockets;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Interop;
using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
......@@ -119,6 +120,8 @@ namespace VIZ.FGOUT.Module
this.AbandonCommand = new VCommand(this.Abandon);
//二次确认发送
this.SendCommand = new VCommand(this.Send);
//二次确认自动发送时间间隔改变
this.AutoSendIntervalTimeChangedCommand = new VCommand<RoutedEventArgs>(this.AutoSendIntervalTimeChanged);
}
/// <summary>
......@@ -560,41 +563,71 @@ namespace VIZ.FGOUT.Module
#region 二次确认
public VCommand AbandonCommand { get; set; }
public ReconfirmAbandonModel _reconfirmAbandonModel = new ReconfirmAbandonModel();
/// <summary>
/// 抛弃
/// </summary>
private void Abandon()
{
ReconfirmSendParamsCommon(ReconfirmStatus.Abandon);
//ReconfirmSendParamsCommon(ReconfirmStatus.Abandon);
ApplicationDomain.MessageManager.Send(_reconfirmAbandonModel);
}
public VCommand SendCommand { get; set; }
public ReconfirmSendModel _reconfirmSendModel = new ReconfirmSendModel();
/// <summary>
/// 发送
/// </summary>
private void Send()
{
ReconfirmSendParamsCommon(ReconfirmStatus.Send);
//ReconfirmSendParamsCommon(ReconfirmStatus.Send);
ApplicationDomain.MessageManager.Send(_reconfirmSendModel);
}
private void ReconfirmSendParamsCommon(ReconfirmStatus reconfirmStatus)
private int _autoSendIntervalTime = 3;
public int AutoSendIntervalTime
{
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
var config = ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.FindAll().FirstOrDefault();
if (config == null)
return;
get => _autoSendIntervalTime;
set
{
_autoSendIntervalTime = value;
this.RaisePropertyChanged(nameof(AutoSendIntervalTime));
}
}
var reconfirm = new ReconfirmPackage()
public ReconfirmAutoSendIntervalTimeModel _reconfirmAutoSendIntervalTimeModel = new ReconfirmAutoSendIntervalTimeModel();
public VCommand<RoutedEventArgs> AutoSendIntervalTimeChangedCommand { get; set; }
private void AutoSendIntervalTimeChanged(RoutedEventArgs e)
{
if (e.OriginalSource is TextBox tb)
{
type = ClipPackageSignal.RECONFIRM,
start_time = config.start,
status = reconfirmStatus
};
manager.SendJson(reconfirm);
var text = tb.Text;
if (int.TryParse(text, out var value) && value > 0)
{
_reconfirmAutoSendIntervalTimeModel.IntervalTime = value;
ApplicationDomain.MessageManager.Send(_reconfirmAutoSendIntervalTimeModel);
}
}
}
//private void ReconfirmSendParamsCommon(ReconfirmStatus reconfirmStatus)
//{
// var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
// if (manager == null) return;
// var config = ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.FindAll().FirstOrDefault();
// if (config == null)
// return;
// var reconfirm = new ReconfirmPackage()
// {
// type = ClipPackageSignal.RECONFIRM,
// start_time = config.start,
// status = reconfirmStatus
// };
// manager.SendJson(reconfirm);
//}
#endregion
#region 算法GoOn And Holdon And MattStart And MattEnd
......@@ -608,7 +641,6 @@ namespace VIZ.FGOUT.Module
{
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
//manager.SendJson(new AlgorithmPackage_Figout_model(){signal = AlgorithmPackageSignal.EXIT});
manager.SendJson(new AlgorithmPackage_Figout_model() { signal = AlgorithmPackageSignal.GO_ON });
}
public VCommand HoldonCommand { get; set; }
......@@ -858,7 +890,6 @@ namespace VIZ.FGOUT.Module
public ReplayInPortModel replayInPortModel = new ReplayInPortModel();
private void InPoint()
{
//StartTime = NDIViewModel.ReplayTimeStamp;
ApplicationDomain.MessageManager.Send(replayInPortModel);
}
......@@ -866,7 +897,6 @@ namespace VIZ.FGOUT.Module
public ReplayOutPointModel replayOutPointModel = new ReplayOutPointModel();
private void OutPoint()
{
//EndTime = NDIViewModel.ReplayTimeStamp;
ApplicationDomain.MessageManager.Send(replayOutPointModel);
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
......@@ -28,12 +28,20 @@ namespace VIZ.FGOUT.Module
config.start = msg.start;
config.end = msg.end;
ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.Upsert(config);
_autoSend_Timer.Stop();
_autoSend_Timer.Start();
}
/// <summary>
/// 算法清除跟踪框时间
/// </summary>
protected readonly int ALGORITHM_ClearTrackingBox_TIME = ApplicationDomain.IniStorage.GetValue<AlgorithmConfig, int>(p => p.ALGORITHM_ClearTrackingBox_TIME);
/// <summary>
/// 算法二次确认自动发送时间
/// </summary>
protected readonly int ALGORITHM_ReconfirmAutoSend_TIME = ApplicationDomain.IniStorage.GetValue<AlgorithmConfig, int>(p => p.ALGORITHM_ReconfirmAutoSend_TIME);
//CleanPlaceModel cpModel = new CleanPlaceModel{ CleanPlace = true };
/// <summary>
......@@ -158,8 +166,8 @@ namespace VIZ.FGOUT.Module
private System.Timers.Timer time_1s = new System.Timers.Timer();
public void InitTimer()
{
time_1s.AutoReset = true;
time_1s.Enabled = true;
//time_1s.AutoReset = true;
//time_1s.Enabled = true;
time_1s.Interval = ALGORITHM_ClearTrackingBox_TIME;
time_1s.Elapsed += UpdateCountDownTimer_Tick;
time_1s.Start();
......@@ -167,6 +175,8 @@ namespace VIZ.FGOUT.Module
private void UpdateCountDownTimer_Tick(object sender, EventArgs e)
{
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
var nowDt = DateTime.Now;
var minus = (nowDt - cropDt).TotalMilliseconds;
try
......@@ -182,6 +192,33 @@ namespace VIZ.FGOUT.Module
#endregion
#region 二次确认自动发送定时器
private System.Timers.Timer _autoSend_Timer = new System.Timers.Timer();
public void InitAutoSendTimer()
{
//_autoSend_Timer.AutoReset = true;
//_autoSend_Timer.Enabled = true;
_autoSend_Timer.Interval = ALGORITHM_ReconfirmAutoSend_TIME;
_autoSend_Timer.Elapsed += UpdateAutoSendTimer_Tick;
}
private void UpdateAutoSendTimer_Tick(object sender, EventArgs e)
{
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
try
{
ReconfirmSendParamsCommon(ReconfirmStatus.Send);
}
catch (Exception ex)
{
log.Error(ex);
}
}
#endregion
/// <summary>
/// 处理算法裁剪消息
/// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -3,7 +3,6 @@ using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Windows.Media;
using System.Windows.Shapes;
using VIZ.FGOUT.Connection;
......@@ -74,6 +73,9 @@ namespace VIZ.FGOUT.Module
// 初始化定时器
InitTimer();
// 初始化二次确认自动发送定时器
InitAutoSendTimer();
}
/// <summary>
......@@ -192,6 +194,13 @@ namespace VIZ.FGOUT.Module
//刷新位置
//ApplicationDomain.MessageManager.Register<RefreshPositionModel>(this, this.RefreshPosition);
//二次确认抛弃
ApplicationDomain.MessageManager.Register<ReconfirmAbandonModel>(this, this.ReconfirmAbandon);
//二次确认发送
ApplicationDomain.MessageManager.Register<ReconfirmSendModel>(this, this.ReconfirmSend);
//二次确认自动发送间隔时间
ApplicationDomain.MessageManager.Register<ReconfirmAutoSendIntervalTimeModel>(this, this.ReconfirmAutoSendIntervalTime);
}
private void ReplayOutPort(ReplayOutPointModel replayOutPointModel)
......@@ -275,6 +284,48 @@ namespace VIZ.FGOUT.Module
newWindowView.Show();
}
private void ReconfirmAbandon(ReconfirmAbandonModel reconfirmAbandonModel)
{
ReconfirmSendParamsCommon(ReconfirmStatus.Abandon);
_autoSend_Timer.Stop();
}
private void ReconfirmSend(ReconfirmSendModel reconfirmSendModel)
{
ReconfirmSendParamsCommon(ReconfirmStatus.Send);
//_autoSend_Timer.Stop();
//_autoSend_Timer.Start();
}
private void ReconfirmAutoSendIntervalTime(ReconfirmAutoSendIntervalTimeModel reconfirmAutoSendIntervalTimeModel)
{
_autoSend_Timer.Interval = reconfirmAutoSendIntervalTimeModel.IntervalTime * 1000;
}
private void ReconfirmSendParamsCommon(ReconfirmStatus reconfirmStatus)
{
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
try
{
var config = ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.FindAll().FirstOrDefault();
if (config == null)
return;
var reconfirm = new ReconfirmPackage()
{
type = ClipPackageSignal.RECONFIRM,
start_time = config.start,
status = reconfirmStatus
};
manager.SendJson(reconfirm);
}
catch (Exception ex)
{
log.Error(ex);
}
}
private void RefreshPosition(RefreshPositionModel refreshPositionModel)
{
......@@ -310,13 +361,10 @@ namespace VIZ.FGOUT.Module
if (this.ViewKey == NDIViewKeys.CAM_2)
return;
IsReplay = replayModel.IsReplay;
if (IsReplay)
_autoSend_Timer.Stop();
IsSliderValueChanged = replayModel.IsSliderValueChanged;
SliderValue = replayModel.SliderValue;
//ReplayPanelView replayPanelView = new ReplayPanelView();
//RePlayPanelViewModel rePlayPanelViewModel = replayPanelView.DataContext as RePlayPanelViewModel;
//rePlayPanelViewModel.timecode = timecode;
//replayPanelView.Show();
}
public bool IsMark;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E9B8063454C3D3B54B8B849A6531686E27AF1DA24E8705E465032C1490EDAF73"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C90FE303D44366A3840C034023AD6A60CC1E9C5DC635831D9CB7335A937227AE"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1063 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1083 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1077 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1097 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1125 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1145 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
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}" "E9B8063454C3D3B54B8B849A6531686E27AF1DA24E8705E465032C1490EDAF73"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C90FE303D44366A3840C034023AD6A60CC1E9C5DC635831D9CB7335A937227AE"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1063 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1083 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1077 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1097 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1125 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1145 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/Init/Config/AlgorithmConfig.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Storage;
using VIZ.Framework.Storage;
namespace VIZ.FGOUT.Storage
{
......@@ -25,15 +20,21 @@ namespace VIZ.FGOUT.Storage
public string ALGORITHM_STOP_TIMEOUT { get; set; }
/// <summary>
/// ALGORITHM_TARGET_BOX_LOST_FRAME
/// 算法目标框连续丢失帧数（如果目标框连续丢失则改变指示灯状态）
/// </summary>
[Ini(Section = "Algorithm", DefaultValue = "25", Type = typeof(int))]
public string ALGORITHM_TARGET_BOX_LOST_FRAME { get; set; }
/// <summary>
/// ALGORITHM_TARGET_BOX_LOST_FRAME
/// 算法清除跟踪框时间
/// </summary>
[Ini(Section = "Algorithm", DefaultValue = "1000", Type = typeof(int))]
public string ALGORITHM_ClearTrackingBox_TIME { get; set; }
/// <summary>
/// 算法二次确认自动发送时间
/// </summary>
[Ini(Section = "Algorithm", DefaultValue = "3000", Type = typeof(int))]
public string ALGORITHM_ReconfirmAutoSend_TIME { get; set; }
}
}
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
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/config/config.ini
......@@ -96,6 +96,7 @@ ALGORITHM_IS_SHOW_TARGET_BOX=true
ALGORITHM_TARGET_BOX_LOST_FRAME=25
;算法清除跟踪框时间（单位：毫秒）
ALGORITHM_ClearTrackingBox_TIME=1000
;算法二次确认自动发送时间（单位：毫秒）
ALGORITHM_ReconfirmAutoSend_TIME=3000
VIZ.FGOUT/VIZ.FGOUT/config/config.ini
......@@ -96,6 +96,7 @@ ALGORITHM_IS_SHOW_TARGET_BOX=true
ALGORITHM_TARGET_BOX_LOST_FRAME=25
;算法清除跟踪框时间（单位：毫秒）
ALGORITHM_ClearTrackingBox_TIME=1000
;算法二次确认自动发送时间（单位：毫秒）
ALGORITHM_ReconfirmAutoSend_TIME=3000
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Release/VIZ.Framework.Common.Resource_MarkupCompile.cache
......@@ -10,10 +10,10 @@ none
false
TRACE
9-721875057
91711917753
3-630027162
19468308608
3-1719726047
19269851070
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/GeneratedInternalTypeHelper.g.cs
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}

VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
TRACE
15-721109437
15488264905
120150095399
44928538216
120494897808
44-1038958293
MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
True
False
VIZ.Framework/VIZ.Framework.Module/obj/x64/Release/VIZ.Framework.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
TRACE
1-731644535
11882902973
212002329545
25-1969161261
212023628146
25-1079249465
Themes\Generic.xaml;
True
False
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