分离tab为用户控件

FastGithub.UI/App.xaml.cs

@@ -89,7 +89,7 @@ namespace FastGithub.UI
             var startInfo = new ProcessStartInfo
             {
                 FileName = fileName,
-                Arguments = $"ParentProcessId={Process.GetCurrentProcess().Id} UdpLoggerPort={UdpLoggerPort.Value}",
+                Arguments = $"ParentProcessId={Process.GetCurrentProcess().Id} UdpLoggerPort={UdpLogger.Port}",
                 UseShellExecute = false,
                 CreateNoWindow = true
             };

FastGithub.UI/IssuesWebbrowser.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="FastGithub.UI.IssuesWebbrowser"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:FastGithub.UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <WebBrowser Name="webBrowser"  />
+    </Grid>
+</UserControl>

FastGithub.UI/IssuesWebbrowser.xaml.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace FastGithub.UI
+{
+    /// <summary>
+    /// IssuesWebbrowser.xaml 的交互逻辑
+    /// </summary>
+    public partial class IssuesWebbrowser : UserControl
+    {
+        public IssuesWebbrowser()
+        {
+            InitializeComponent();
+
+            this.NavigateIssueHtml();
+            this.webBrowser.AddHandler(KeyDownEvent, new RoutedEventHandler(WebBrowser_KeyDown), true);
+        }
+
+        /// <summary>
+        /// 拦截F5
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void WebBrowser_KeyDown(object sender, RoutedEventArgs e)
+        {
+            var @event = (KeyEventArgs)e;
+            if (@event.Key == Key.F5)
+            {
+                this.NavigateIssueHtml();
+            }
+        }
+
+        private void NavigateIssueHtml()
+        {
+            var resource = Application.GetResourceStream(new Uri("Resource/issue.html", UriKind.Relative));
+            this.webBrowser.NavigateToStream(resource.Stream);
+        }
+    }
+}

FastGithub.UI/MainWindow.xaml

@@ -158,7 +158,7 @@
 
             <TabItem Style="{StaticResource TabItemExWithUnderLineStyle}" Header="问题解答" Height="40" Width="100" Margin="5 0" FontSize="18">
                 <Grid Background="#f7f7f7">
-                    <WebBrowser Name="webBrowserIssue"  />
+                    <local:IssuesWebbrowser/>
                 </Grid>
             </TabItem>
 

FastGithub.UI/MainWindow.xaml.cs

@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Interop;
 
 namespace FastGithub.UI
@@ -49,27 +48,9 @@ namespace FastGithub.UI
             {
                 var version = FileVersionInfo.GetVersionInfo(fileName);
                 this.Title = $"{FAST_GITHUB} v{version.ProductVersion}";
-            }
+            } 
-
+        } 
-            this.webBrowserIssue.AddHandler(KeyDownEvent, new RoutedEventHandler(WebBrowser_KeyDown), true);
+        
-            var resource = Application.GetResourceStream(new Uri("Resource/issue.html", UriKind.Relative));
-            this.webBrowserIssue.NavigateToStream(resource.Stream);
-        }
-
-        /// <summary>
-        /// 拦截F5
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void WebBrowser_KeyDown(object sender, RoutedEventArgs e)
-        {
-            var @event = (KeyEventArgs)e;
-            if (@event.Key == Key.F5)
-            {
-                var resource = Application.GetResourceStream(new Uri("Resource/issue.html", UriKind.Relative));
-                this.webBrowserIssue.NavigateToStream(resource.Stream);
-            }
-        }
 
         /// <summary>
         /// 拦截最小化事件

FastGithub.UI/UdpLog.cs

@@ -1,4 +1,8 @@
 using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
 using System.Windows;
 
 namespace FastGithub.UI
@@ -15,10 +19,14 @@ namespace FastGithub.UI
 
         public string Color => this.Level <= LogLevel.Information ? "#333" : "IndianRed";
 
+        /// <summary>
+        /// 复制到剪贴板
+        /// </summary>
         public void SetToClipboard()
         {
             Clipboard.SetText($"{this.Timestamp:yyyy-MM-dd HH:mm:ss.fff}\r\n{this.Message}");
         }
+
     }
 
 }

FastGithub.UI/UdpLogListBox.xaml.cs

@@ -1,10 +1,4 @@
-using Newtonsoft.Json;
+using System.Collections.ObjectModel;
-using System;
-using System.Collections.ObjectModel;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 
 namespace FastGithub.UI
@@ -14,9 +8,6 @@ namespace FastGithub.UI
     /// </summary>
     public partial class UdpLogListBox : UserControl
     {
-        private readonly byte[] buffer = new byte[ushort.MaxValue];
-        private readonly Socket socket = new Socket(SocketType.Dgram, ProtocolType.Udp);
-
         public ObservableCollection<UdpLog> LogList { get; } = new ObservableCollection<UdpLog>();
 
         public UdpLogListBox()
@@ -28,36 +19,16 @@ namespace FastGithub.UI
         }
 
         private async void InitUdpLoggerAsync()
-        {
+        { 
-            this.socket.Bind(new IPEndPoint(IPAddress.Loopback, UdpLoggerPort.Value));
             while (this.Dispatcher.HasShutdownStarted == false)
             {
-                var log = await this.GetUdpLogAsync();
+                var log = await UdpLogger.GetUdpLogAsync();
                 if (log != null)
                 {
                     this.LogList.Add(log);
                 }
             }
-        }
+        } 
-
-        private async Task<UdpLog?> GetUdpLogAsync()
-        {
-            EndPoint remoteEP = new IPEndPoint(IPAddress.Any, 0);
-            var taskCompletionSource = new TaskCompletionSource<int>();
-            this.socket.BeginReceiveFrom(buffer, 0, buffer.Length, SocketFlags.None, ref remoteEP, this.EndReceiveFrom, taskCompletionSource);
-            var length = await taskCompletionSource.Task;
-
-            var json = Encoding.UTF8.GetString(buffer, 0, length);
-            return JsonConvert.DeserializeObject<UdpLog>(json);
-        }
-
-        private void EndReceiveFrom(IAsyncResult ar)
-        {
-            EndPoint remoteEP = new IPEndPoint(IPAddress.Any, 0);
-            var length = this.socket.EndReceiveFrom(ar, ref remoteEP);
-            var taskCompletionSource = (TaskCompletionSource<int>)ar.AsyncState;
-            taskCompletionSource.TrySetResult(length);
-        }
 
         private void MenuItem_Copy_Click(object sender, System.Windows.RoutedEventArgs e)
         {

FastGithub.UI/UdpLogger.cs

@@ -0,0 +1,77 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FastGithub.UI
+{
+    static class UdpLogger
+    {
+        private static readonly byte[] buffer = new byte[ushort.MaxValue];
+        private static readonly Socket socket = new Socket(SocketType.Dgram, ProtocolType.Udp);
+
+        /// <summary>
+        /// 获取日志端口
+        /// </summary>
+        public static int Port { get; } = GetAvailableUdpPort(38457);
+
+
+        static UdpLogger()
+        {
+            socket.Bind(new IPEndPoint(IPAddress.Loopback, Port));
+        }
+
+        /// <summary>
+        /// 获取可用的随机Udp端口
+        /// </summary>
+        /// <param name="minValue"></param>
+        /// <param name="addressFamily"></param>
+        /// <returns></returns>
+        private static int GetAvailableUdpPort(int minValue, AddressFamily addressFamily = AddressFamily.InterNetwork)
+        {
+            var hashSet = new HashSet<int>();
+            var tcpListeners = IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners();
+
+            foreach (var endpoint in tcpListeners)
+            {
+                if (endpoint.AddressFamily == addressFamily)
+                {
+                    hashSet.Add(endpoint.Port);
+                }
+            }
+
+            for (var port = minValue; port < IPEndPoint.MaxPort; port++)
+            {
+                if (hashSet.Contains(port) == false)
+                {
+                    return port;
+                }
+            }
+
+            throw new ArgumentException("当前无可用的端口");
+        }
+
+        public static async Task<UdpLog?> GetUdpLogAsync()
+        {
+            EndPoint remoteEP = new IPEndPoint(IPAddress.Any, 0);
+            var taskCompletionSource = new TaskCompletionSource<int>();
+            socket.BeginReceiveFrom(buffer, 0, buffer.Length, SocketFlags.None, ref remoteEP, EndReceiveFrom, taskCompletionSource);
+            var length = await taskCompletionSource.Task;
+
+            var json = Encoding.UTF8.GetString(buffer, 0, length);
+            return JsonConvert.DeserializeObject<UdpLog>(json);
+        }
+
+        private static void EndReceiveFrom(IAsyncResult ar)
+        {
+            EndPoint remoteEP = new IPEndPoint(IPAddress.Any, 0);
+            var length = socket.EndReceiveFrom(ar, ref remoteEP);
+            var taskCompletionSource = (TaskCompletionSource<int>)ar.AsyncState;
+            taskCompletionSource.TrySetResult(length);
+        }
+    }
+}

FastGithub.UI/UdpLoggerPort.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Net.Sockets;
-
-namespace FastGithub.UI
-{
-    /// <summary>
-    /// udp日志工具类
-    /// </summary>
-    static class UdpLoggerPort
-    {
-        /// <summary>
-        /// 获取日志端口
-        /// </summary>
-        public static int Value { get; } = GetAvailableUdpPort(38457);
-
-        /// <summary>
-        /// 获取可用的随机Udp端口
-        /// </summary>
-        /// <param name="minValue"></param>
-        /// <param name="addressFamily"></param>
-        /// <returns></returns>
-        private static int GetAvailableUdpPort(int minValue, AddressFamily addressFamily = AddressFamily.InterNetwork)
-        {
-            var hashSet = new HashSet<int>();
-            var tcpListeners = IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners();
-
-            foreach (var endpoint in tcpListeners)
-            {
-                if (endpoint.AddressFamily == addressFamily)
-                {
-                    hashSet.Add(endpoint.Port);
-                }
-            }
-
-            for (var port = minValue; port < IPEndPoint.MaxPort; port++)
-            {
-                if (hashSet.Contains(port) == false)
-                {
-                    return port;
-                }
-            }
-
-            throw new ArgumentException("当前无可用的端口");
-        }
-    }
-}