定义CAM_1__CLIP常量

VIZ.FGOUT/VIZ.FGOUT.Domain/Enum/NDIViewKeys.cs

@@ -30,10 +30,11 @@
         /// </summary>
         /// </summary>
         public const string MainView = "MainView";
         public const string MainView = "MainView";
 
 
+        
         /// <summary>
         /// <summary>
-        /// 预览 1
+        /// 预览1
         /// </summary>
         /// </summary>
-        //public const string Preview_1 = "Preview_1";
+        public const string Preview_1 = "Preview_1";
 
 
         ///// <summary>
         ///// <summary>
         ///// 预览 2
         ///// 预览 2
@@ -44,5 +45,10 @@
         ///// 预览 3
         ///// 预览 3
         ///// </summary>
         ///// </summary>
         //public const string Preview_3 = "Preview_3";
         //public const string Preview_3 = "Preview_3";
+
+        /// <summary>
+        /// CAM_1__CLIP
+        /// </summary>
+        public const string CAM_1__CLIP = "CAM_1__CLIP";
     }
     }
 }
 }

VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs

@@ -548,7 +548,7 @@ namespace VIZ.FGOUT.Module
 
 
         private void ReplaySend()
         private void ReplaySend()
         {
         {
-            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
+            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
             if (manager == null) return;
             if (manager == null) return;
 
 
             ReplayPackage replayPackage = new ReplayPackage();
             ReplayPackage replayPackage = new ReplayPackage();
@@ -576,6 +576,8 @@ namespace VIZ.FGOUT.Module
         /// </summary>
         /// </summary>
         private void Restart()
         private void Restart()
         {
         {
+            MessageBoxEx.ShowDialog("开发中...");
+            return;
             MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL);
             MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL);
             if (result == MessageBoxExResult.CANCEL)
             if (result == MessageBoxExResult.CANCEL)
                 return;
                 return;
@@ -631,6 +633,8 @@ namespace VIZ.FGOUT.Module
         /// </summary>
         /// </summary>
         private void Stop()
         private void Stop()
         {
         {
+            MessageBoxEx.ShowDialog("开发中...");
+            return;
             MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "是否关闭算法?", MessageBoxExButtons.YES_CANCEL);
             MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "是否关闭算法?", MessageBoxExButtons.YES_CANCEL);
             if (result == MessageBoxExResult.CANCEL)
             if (result == MessageBoxExResult.CANCEL)
                 return;
                 return;
@@ -689,7 +693,7 @@ namespace VIZ.FGOUT.Module
                 data.loadFlag = 0;
                 data.loadFlag = 0;
             replayPackage.data = data;
             replayPackage.data = data;
             // 发送UDP命令
             // 发送UDP命令
-            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
+            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
             if (manager == null) return;
             if (manager == null) return;
             manager.SendJson(replayPackage);
             manager.SendJson(replayPackage);
         }
         }

VIZ.FGOUT/VIZ.FGOUT.Module/NDIPreviewView/View/NDIPreviewView.xaml.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 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.FGOUT.Domain;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
-using VIZ.Framework.Storage;
-using VIZ.FGOUT.Module;
 
 
 namespace VIZ.FGOUT.Module
 namespace VIZ.FGOUT.Module
 {
 {

VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/RePlayPanelViewModel.cs

 using System;
 using System;
 using VIZ.FGOUT.Connection;
 using VIZ.FGOUT.Connection;
+using VIZ.FGOUT.Domain;
 using VIZ.Framework.Connection;
 using VIZ.Framework.Connection;
 using VIZ.Framework.Core;
 using VIZ.Framework.Core;
 
 
@@ -27,7 +28,7 @@ namespace VIZ.FGOUT.Module
         /// </summary>
         /// </summary>
         private void ReplayVideo()
         private void ReplayVideo()
         {
         {
-            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
+            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
             if (manager == null) return;
             if (manager == null) return;
 
 
             ReplayPackage replayPackage = new ReplayPackage();
             ReplayPackage replayPackage = new ReplayPackage();
@@ -51,7 +52,7 @@ namespace VIZ.FGOUT.Module
         /// </summary>
         /// </summary>
         private void CleanVideo()
         private void CleanVideo()
         {
         {
-            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
+            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
             if (manager == null) return;
             if (manager == null) return;
 
 
             ReplayPackage replayPackage = new ReplayPackage();
             ReplayPackage replayPackage = new ReplayPackage();
@@ -84,8 +85,7 @@ namespace VIZ.FGOUT.Module
 
 
         private void StopVideo()
         private void StopVideo()
         {
         {
-            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
-
+            UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
             if (manager == null) return;
             if (manager == null) return;
 
 
             ReplayPackage replayPackage = new ReplayPackage();
             ReplayPackage replayPackage = new ReplayPackage();

VIZ.Framework/VIZ.Framework.Common/MessageBox/MessageBoxExResult.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VIZ.Framework.Common
+namespace VIZ.Framework.Common
 {
 {
     /// <summary>
     /// <summary>
     /// 消息框返回
     /// 消息框返回

VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/NDI/NDIStream.cs

@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices;
-using static NewTek.NDIlib;
 
 
 namespace VIZ.Framework.Common
 namespace VIZ.Framework.Common
 {
 {

VIZ.Framework/VIZ.Framework.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.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.lref

-C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
+
 
 
 FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
 FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
 FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
 FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;

VIZ.Framework/VIZ.Framework.Connection/Listener/TCP/TcpConnectionListener.cs

-using System;
+using log4net;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics;
-using System.Linq;
 using System.Net;
 using System.Net;
 using System.Net.Sockets;
 using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using log4net;
 
 
 namespace VIZ.Framework.Connection
 namespace VIZ.Framework.Connection
 {
 {

VIZ.Framework/VIZ.Framework.Core/Expand/Monitor/System/Provider/SystemMonitorProvider_GPU.cs

-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 
 
 namespace VIZ.Framework.Core
 namespace VIZ.Framework.Core
 {
 {
@@ -24,7 +19,6 @@ namespace VIZ.Framework.Core
         public void Execute(MonitorInfolBase info)
         public void Execute(MonitorInfolBase info)
         {
         {
             SystemMonitorInfo system = info as SystemMonitorInfo;
             SystemMonitorInfo system = info as SystemMonitorInfo;
-
             try
             try
             {
             {
                 NvAPIWrapper.NVIDIA.Initialize();
                 NvAPIWrapper.NVIDIA.Initialize();