框架调整

VIZ.Framework.Common.Resource/Style/GridSplitter/GridSplitter_None.xaml

+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="GridSplitter_None" TargetType="GridSplitter">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border Background="Transparent"></Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file

VIZ.Framework.Common.Resource/VIZ.Framework.Common.Resource.csproj

@@ -90,6 +90,10 @@
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
     </Page>
     </Page>
+    <Page Include="Style\GridSplitter\GridSplitter_None.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Style\ListBox\ListBox_None.xaml">
     <Page Include="Style\ListBox\ListBox_None.xaml">
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>

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

@@ -28,6 +28,11 @@ namespace VIZ.Framework.Common
         public string FullName { get; set; }
         public string FullName { get; set; }
 
 
         /// <summary>
         /// <summary>
+        /// 地址
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
         /// NDI流信息
         /// NDI流信息
         /// </summary>
         /// </summary>
         public NDIlib.source_t Source { get; set; }
         public NDIlib.source_t Source { get; set; }

VIZ.Framework.Common/VideoControl/Stream/NDI/Task/NDIStreamFindStreamTask.cs

@@ -70,12 +70,14 @@ namespace VIZ.Framework.Common
 
 
                 // NDI流名称
                 // NDI流名称
                 string ndiName = UTF.Utf8ToString(src.p_ndi_name);
                 string ndiName = UTF.Utf8ToString(src.p_ndi_name);
+                string address = UTF.Utf8ToString(src.p_url_address);
 
 
                 // 添加NDI流信息
                 // 添加NDI流信息
                 NDIStreamInfo info = new NDIStreamInfo();
                 NDIStreamInfo info = new NDIStreamInfo();
                 info.FullName = ndiName;
                 info.FullName = ndiName;
                 info.Machine = ndiName.Split(new char[] { ' ' }, 2)[0];
                 info.Machine = ndiName.Split(new char[] { ' ' }, 2)[0];
                 info.Name = ndiName.Substring(ndiName.IndexOf(' ') + 1);
                 info.Name = ndiName.Substring(ndiName.IndexOf(' ') + 1);
+                info.Address = address;
                 info.Source = src;
                 info.Source = src;
 
 
                 lock (this.Stream.StreamInfos)
                 lock (this.Stream.StreamInfos)

VIZ.Framework.Common/Widgets/NavigationControl/NavigationConfig.cs

@@ -41,28 +41,14 @@ namespace VIZ.Framework.Common
 
 
         #endregion
         #endregion
 
 
-        #region ViewModelType -- 视图模型类型
-
-        private Type viewModelType;
-        /// <summary>
-        /// 视图模型类型
-        /// </summary>
-        public Type ViewModelType
-        {
-            get { return viewModelType; }
-            set { viewModelType = value; this.RaisePropertyChanged(nameof(ViewModelType)); }
-        }
-
-        #endregion
-
         /// <summary>
         /// <summary>
         /// 视图
         /// 视图
         /// </summary>
         /// </summary>
         public WeakReference<object> View { get; set; }
         public WeakReference<object> View { get; set; }
 
 
         /// <summary>
         /// <summary>
-        /// 视图模型
+        /// 视图创建后触发 参数: 导航配置, 视图
         /// </summary>
         /// </summary>
-        public WeakReference<object> ViewModel { get; set; }
+        public Action<NavigationConfig, object> ViewCreated { get; set; }
     }
     }
 }
 }

VIZ.Framework.Common/Widgets/NavigationControl/NavigationControl.xaml

@@ -22,7 +22,6 @@
         <Setter Property="Background" Value="Transparent"></Setter>
         <Setter Property="Background" Value="Transparent"></Setter>
         <Setter Property="Visibility" Value="{Binding Path=IsSelected,RelativeSource={RelativeSource Mode=Self},Converter={StaticResource Bool2VisibilityConverter}}"></Setter>
         <Setter Property="Visibility" Value="{Binding Path=IsSelected,RelativeSource={RelativeSource Mode=Self},Converter={StaticResource Bool2VisibilityConverter}}"></Setter>
         <Setter Property="ViewType" Value="{Binding Path=ViewType,Mode=OneWay}"></Setter>
         <Setter Property="ViewType" Value="{Binding Path=ViewType,Mode=OneWay}"></Setter>
-        <Setter Property="ViewModelType" Value="{Binding Path=ViewModelType,Mode=OneWay}"></Setter>
         <Setter Property="Template">
         <Setter Property="Template">
             <Setter.Value>
             <Setter.Value>
                 <ControlTemplate TargetType="local:NavigationItemControl">
                 <ControlTemplate TargetType="local:NavigationItemControl">

VIZ.Framework.Common/Widgets/NavigationControl/NavigationItemControl.cs

@@ -69,25 +69,6 @@ namespace VIZ.Framework.Common
 
 
         #endregion
         #endregion
 
 
-        #region ViewModelType -- 视图模型类型
-
-        /// <summary>
-        /// 视图模型类型
-        /// </summary>
-        public Type ViewModelType
-        {
-            get { return (Type)GetValue(ViewModelTypeProperty); }
-            set { SetValue(ViewModelTypeProperty, value); }
-        }
-
-        /// <summary>
-        /// Using a DependencyProperty as the backing store for ViewModelType.  This enables animation, styling, binding, etc...
-        /// </summary>
-        public static readonly DependencyProperty ViewModelTypeProperty =
-            DependencyProperty.Register("ViewModelType", typeof(Type), typeof(NavigationItemControl), new PropertyMetadata(null));
-
-        #endregion
-
         /// <summary>
         /// <summary>
         /// 可见性改变时触发
         /// 可见性改变时触发
         /// </summary>
         /// </summary>
@@ -104,28 +85,12 @@ namespace VIZ.Framework.Common
             if (this.ViewType != null)
             if (this.ViewType != null)
             {
             {
                 this.Content = this.ViewType.Assembly.CreateInstance(this.ViewType.FullName);
                 this.Content = this.ViewType.Assembly.CreateInstance(this.ViewType.FullName);
-                config.View = new WeakReference<object>(this.Content);
             }
             }
 
 
-            if (this.ViewModelType != null)
+            if (config != null)
             {
             {
-                FrameworkElement view = this.Content as FrameworkElement;
-                if (view != null)
-                {
-                    object obj = this.ViewModelType.Assembly.CreateInstance(this.ViewModelType.FullName);
-                    config.ViewModel = new WeakReference<object>(obj);
-
-                    ViewModelBase vm = obj as ViewModelBase;
-
-                    if (vm == null)
-                    {
-                        view.DataContext = obj;
-                    }
-                    else
-                    {
-                        WPFHelper.BindingViewModel(view, vm);
-                    }
-                }
+                config.View = new WeakReference<object>(this.Content);
+                config.ViewCreated?.Invoke(config, this.Content);
             }
             }
         }
         }
     }
     }

VIZ.Framework.Core/Core/Net/NetHelper.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Management;
 using System.Management;
 using System.Net;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.NetworkInformation;
+using System.Net.Sockets;
 using System.Runtime.CompilerServices;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
@@ -118,5 +119,25 @@ namespace VIZ.Framework.Core
 
 
             return 0;
             return 0;
         }
         }
+
+        /// <summary>
+        /// 获取本机第一个IPv4地址
+        /// </summary>
+        /// <returns>第一个IPv4地址</returns>
+        public static string GetLocalFirstIPv4Address()
+        {
+            if (!NetworkInterface.GetIsNetworkAvailable())
+            {
+                return string.Empty;
+            }
+
+            IPHostEntry host = Dns.GetHostEntry(Dns.GetHostName());
+
+            var ippaddress = host
+                .AddressList
+                .FirstOrDefault(ip => ip.AddressFamily == AddressFamily.InterNetwork);
+
+            return ippaddress.ToString();
+        }
     }
     }
 }
 }