Commit 0388efc7 by 鲁志-悦动

NDIViewModel部分订阅消息方法优化 And 没有获取到流的IP在发送命令时会有提示

parent 387918a7

//------------------------------------------------------------------------------
// <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);
}
}
}
......@@ -10,11 +10,11 @@ none
false
21870986562
2-725104376
31364711570
17-1683084370
3947974750
17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
True
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\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
......
......@@ -782,7 +782,11 @@ namespace VIZ.FGOUT.Module
ApplicationDomain.MessageManager.Send(replayModel);
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
var managerAlgorithm = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (managerAlgorithm == null) return;
......@@ -812,7 +816,11 @@ namespace VIZ.FGOUT.Module
EndTime = 0;
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
var managerAlgorithm = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (managerAlgorithm == null) return;
......@@ -863,7 +871,11 @@ namespace VIZ.FGOUT.Module
}
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
var managerAlgorithm = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (managerAlgorithm == null) return;
......@@ -882,7 +894,11 @@ namespace VIZ.FGOUT.Module
private void ReplayStop()
{
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
var replayPackage = new ReplayPackage()
{
......@@ -1116,7 +1132,11 @@ namespace VIZ.FGOUT.Module
//// 发送UDP命令给算法
//UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
manager.SendJson(package);
}
......
......@@ -212,11 +212,15 @@ namespace VIZ.FGOUT.Module
private void ReplayOutPort(ReplayOutPointModel replayOutPointModel)
{
if (this.ViewKey != NDIViewKeys.CAM_3)
return;
EndTime = ReplayTimeStamp;
}
private void ReplayInPort(ReplayInPortModel replayInPortModel)
{
if (this.ViewKey != NDIViewKeys.CAM_3)
return;
StartTime = ReplayTimeStamp;
}
......@@ -232,7 +236,11 @@ namespace VIZ.FGOUT.Module
var srcHeight = nDIView.video.ActualHeight;
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
var managerAlgorithm = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if (managerAlgorithm == null) return;
......@@ -289,12 +297,16 @@ namespace VIZ.FGOUT.Module
private void ReconfirmAbandon(ReconfirmAbandonModel reconfirmAbandonModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
ReconfirmSendParamsCommon(ReconfirmStatus.Abandon);
_autoSend_Timer.Stop();
}
private void ReconfirmSend(ReconfirmSendModel reconfirmSendModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
ReconfirmSendParamsCommon(ReconfirmStatus.Send);
//_autoSend_Timer.Stop();
//_autoSend_Timer.Start();
......@@ -302,13 +314,19 @@ namespace VIZ.FGOUT.Module
private void ReconfirmAutoSendIntervalTime(ReconfirmAutoSendIntervalTimeModel reconfirmAutoSendIntervalTimeModel)
{
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
_autoSend_Timer.Interval = reconfirmAutoSendIntervalTimeModel.IntervalTime * 1000;
}
private void ReconfirmSendParamsCommon(ReconfirmStatus reconfirmStatus)
{
var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
try
{
......@@ -375,6 +393,8 @@ namespace VIZ.FGOUT.Module
{
if (this.ViewKey == NDIViewKeys.CAM_2)
return;
//if (this.ViewKey != NDIViewKeys.CAM_1)
// return;
IsReplayStarted = replayModel.IsReplayStarted;
IsStartValue = replayModel.IsStartValue;
IsEndValue = replayModel.IsEndValue;
......
using System;
using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Domain;
using VIZ.Framework.Common;
using VIZ.Framework.Connection;
using VIZ.Framework.Core;
......@@ -29,7 +30,11 @@ namespace VIZ.FGOUT.Module
private void ReplayVideo()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = ClipPackageSignal.REPLAY;
......@@ -53,7 +58,11 @@ namespace VIZ.FGOUT.Module
private void CleanVideo()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = ClipPackageSignal.REPLAY;
......@@ -84,7 +93,11 @@ namespace VIZ.FGOUT.Module
private void StopVideo()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
if (manager == null)
{
MessageBoxEx.ShowDialog("未获取到流的IP地址。");
return;
}
ReplayPackage replayPackage = new ReplayPackage();
VideoData data = new VideoData();
......

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;;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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