From efb4e11796d07736aacd4cee548071ca51373eee Mon Sep 17 00:00:00 2001
From: panwenbo <panwenbo@wingtech.com>
Date: Tue, 9 Jan 2024 17:27:45 +0800
Subject: [PATCH] =?UTF-8?q?One.Toolbox=20=E6=96=B0=E5=A2=9E=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E7=B3=BB=E7=BB=9F=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84IP=EF=BC=9B=20=E5=85=B6=E4=BB=96=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96=EF=BC=9B=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 One.Core/Helpers/NetHelpers/NetHelper.cs      |  22 +-
 One.Toolbox/One.Toolbox.csproj                |   4 +-
 .../ViewModels/BingImage/BingImageVM.cs       |  12 +-
 .../ViewModels/Dashboard/DashboardVM.cs       |  14 ++
 .../Views/Dashboard/DashboardPage.xaml        | 176 +++++++------
 One.Toolbox/Views/Pages/WinUSBPage.xaml       | 111 ---------
 One.Toolbox/Views/Pages/WinUSBPage.xaml.cs    | 232 ------------------
 7 files changed, 129 insertions(+), 442 deletions(-)
 delete mode 100644 One.Toolbox/Views/Pages/WinUSBPage.xaml
 delete mode 100644 One.Toolbox/Views/Pages/WinUSBPage.xaml.cs

diff --git a/One.Core/Helpers/NetHelpers/NetHelper.cs b/One.Core/Helpers/NetHelpers/NetHelper.cs
index 440a836..9a1f98e 100644
--- a/One.Core/Helpers/NetHelpers/NetHelper.cs
+++ b/One.Core/Helpers/NetHelpers/NetHelper.cs
@@ -11,22 +11,20 @@ namespace One.Core.Helpers.NetHelpers
     public class NetHelper
     {
         /// <summary> 获取本机所有IPv4地址 </summary>
-        public static List<IPAddress> GetIPv4AdList()
+        /// <returns> </returns>
+        public static List<IPAddress> GetIPv4AddressList()
         {
-            string hostName = Dns.GetHostName();//本机名
+            string hostName = Dns.GetHostName();
             IPAddress[] addressList = Dns.GetHostAddresses(hostName);//会返回所有地址，包括IPv4和IPv6
-            List<IPAddress> address4List = new List<IPAddress>();
-            foreach (IPAddress ipa in addressList)
+            List<IPAddress> ipv4AddressList = new List<IPAddress>();
+            foreach (IPAddress ipAddress in addressList)
             {
-                if (ipa.AddressFamily == AddressFamily.InterNetwork)
+                if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
                 {
-                    //LocalIP = ipa;
-                    //return ipa.ToString();
-                    address4List.Add(ipa);
-                    //return ipa;
+                    ipv4AddressList.Add(ipAddress);
                 }
             }
-            return address4List;
+            return ipv4AddressList;
         }
 
         /// <summary> 获取本机所有IPv6地址 </summary>
@@ -48,7 +46,7 @@ public static List<IPAddress> GetIPv6AdList()
             return address4List;
         }
 
-        /// <summary> 获取当前使用的IP,Ping baidu </summary>
+        /// <summary> 通过Ping baidu 获取当前使用的IP </summary>
         /// <returns> </returns>
         public static string GetLocalIP()
         {
@@ -272,6 +270,8 @@ public IPAddress BroadcastPoint
             get { return GetBroadcastPoint(); }
         }
 
+        /// <summary> This function calculates and returns the broadcast point IP address based on the given IP address and IPv4 mask. </summary>
+        /// <returns> The broadcast point IP address as an instance of IPAddress, or null if either the IP or the IPv4 mask is null. </returns>
         private IPAddress GetBroadcastPoint()
         {
             if (IP != null && IPv4Mask != null)
diff --git a/One.Toolbox/One.Toolbox.csproj b/One.Toolbox/One.Toolbox.csproj
index a20e4d3..7eef8ad 100644
--- a/One.Toolbox/One.Toolbox.csproj
+++ b/One.Toolbox/One.Toolbox.csproj
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-	<Version>2.6.5</Version>
+	<Version>2.6.6</Version>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<SatelliteResourceLanguages>zh-Hans;en-us</SatelliteResourceLanguages>
 	<ApplicationIcon>Icon.ico</ApplicationIcon>
@@ -33,13 +33,11 @@
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     <PackageReference Include="HandyControl" Version="3.4.0" />
-    <PackageReference Include="LibUsbDotNet" Version="3.0.102-alpha" />
     <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.2" />
     <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
       <PrivateAssets>all</PrivateAssets>
- 
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.2.4" />
diff --git a/One.Toolbox/ViewModels/BingImage/BingImageVM.cs b/One.Toolbox/ViewModels/BingImage/BingImageVM.cs
index bb11c6c..ba6e498 100644
--- a/One.Toolbox/ViewModels/BingImage/BingImageVM.cs
+++ b/One.Toolbox/ViewModels/BingImage/BingImageVM.cs
@@ -25,7 +25,7 @@ public override void OnNavigatedEnter()
     [ObservableProperty]
     private ObservableCollection<UsefullImageInfoVM> obImageListInfo = new ObservableCollection<UsefullImageInfoVM>();
 
-    private List<UsefullImageInfoVM> ImageList = new List<UsefullImageInfoVM>();
+    private List<UsefullImageInfoVM> ImageList = [];
     //public ObservableCollection<UsefullImageInfoViewModel> ObImageListInfo { get; set; } = new ObservableCollection<UsefullImageInfoViewModel>();
 
     async void InitData()
@@ -143,7 +143,7 @@ private List<UsefullImageInfoVM> FilterImageInfoAndSave(BingImageOriginalModel b
         return listVM;
     }
 
-    private async Task DownloadImage(UsefullImageInfoVM usefullImageInfos)
+    private static async Task DownloadImage(UsefullImageInfoVM usefullImageInfos)
     {
         //查看图片是否已经下载，path为路径
         if (File.Exists(usefullImageInfos.LocalImagePath))
@@ -165,14 +165,12 @@ private async Task DownloadImage(UsefullImageInfoVM usefullImageInfos)
         {
             return;
         }
-        //创造图片
-        using (FileStream fileStream = new FileStream(usefullImageInfos.LocalImagePath, FileMode.Create))
+
+        using (var fileStream = new FileStream(usefullImageInfos.LocalImagePath, FileMode.Create))
+        using (var binaryWriter = new BinaryWriter(fileStream))
         {
-            BinaryWriter binaryWriter = new BinaryWriter(fileStream);
-            //写入图片信息
             binaryWriter.Write(timeline);
         }
-
         return;
     }
 }
\ No newline at end of file
diff --git a/One.Toolbox/ViewModels/Dashboard/DashboardVM.cs b/One.Toolbox/ViewModels/Dashboard/DashboardVM.cs
index 04db3a8..163d432 100644
--- a/One.Toolbox/ViewModels/Dashboard/DashboardVM.cs
+++ b/One.Toolbox/ViewModels/Dashboard/DashboardVM.cs
@@ -29,6 +29,8 @@ void InitData()
             Text = a.hitokoto;
             Author = "--" + a.from;
         });
+
+        _ = Task.Run(GetCurrentUseIP);
     }
 
     private void Register()
@@ -89,4 +91,16 @@ private static async Task<YiyanAPIM> GetEveryDayYiyan()
 
         return timeline;
     }
+
+    #region StatusBar
+
+    [ObservableProperty]
+    private string currentUseIP;
+
+    private void GetCurrentUseIP()
+    {
+        CurrentUseIP = One.Core.Helpers.NetHelpers.NetHelper.GetLocalIP();
+    }
+
+    #endregion StatusBar
 }
\ No newline at end of file
diff --git a/One.Toolbox/Views/Dashboard/DashboardPage.xaml b/One.Toolbox/Views/Dashboard/DashboardPage.xaml
index c73b3a9..9ad9bba 100644
--- a/One.Toolbox/Views/Dashboard/DashboardPage.xaml
+++ b/One.Toolbox/Views/Dashboard/DashboardPage.xaml
@@ -11,83 +11,103 @@
              d:Height="548"
              d:Width="733"
              mc:Ignorable="d">
-    <ScrollViewer>
-        <Grid Margin="20">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Border Grid.Row="0" Height="150" CornerRadius="8">
-                <Border.Background>
-                    <ImageBrush ImageSource="pack://application:,,,/Resources/pexels-johannes-plenio-1103970.jpg" RenderOptions.BitmapScalingMode="HighQuality" Stretch="UniformToFill" />
-                </Border.Background>
-                <Border CornerRadius="8">
-                    <Border.Background>
-                        <RadialGradientBrush>
-                            <GradientStop Offset="0" Color="#1F000000" />
-                            <GradientStop Offset="1" Color="#4F000000" />
-                        </RadialGradientBrush>
-                    </Border.Background>
-                    <Grid>
-                        <StackPanel Margin="48,0" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent">
-                            <!--<TextBlock FontSize="18" Foreground="#B7FFFFFF" Text="Windows Presentation Foundation" />-->
-                            <TextBlock FontSize="28" FontWeight="Bold" Foreground="#FFFFFF" Text="One.Toolbox" />
-                            <!--<TextBlock FontSize="18" Foreground="#B7FFFFFF" Text="Build Fluent experiences on Windows using WPF UI." />-->
-                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
-                                <TextBlock FontSize="14" Foreground="#B7FFFFFF" Text="{Binding Text}" />
-                                <!--<TextBlock VerticalAlignment="Center" FontSize="12" Text=" " />-->
-
-                                <TextBlock VerticalAlignment="Center" FontSize="12" Foreground="#B7FFFFFF" Text="{Binding Author}" />
-                            </StackPanel>
-                        </StackPanel>
-                        <TextBlock Margin="12" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10"
-                                   Foreground="#57FFFFFF" Text="Created by pwb" />
-                        <Button HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="Transparent" BorderThickness="0"
-                                Command="{Binding TestCommand}"
-                                Visibility="Visible" />
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+           
+        </Grid.RowDefinitions>
+        <Border Style="{StaticResource BorderRegion}">
+            <ScrollViewer>
+                <Grid Margin="20">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+
+                    </Grid.RowDefinitions>
+
+                    <Border Grid.Row="0" Height="150" CornerRadius="8">
+                        <Border.Background>
+                            <ImageBrush ImageSource="pack://application:,,,/Resources/pexels-johannes-plenio-1103970.jpg" RenderOptions.BitmapScalingMode="HighQuality" Stretch="UniformToFill" />
+                        </Border.Background>
+                        <Border CornerRadius="8">
+                            <Border.Background>
+                                <RadialGradientBrush>
+                                    <GradientStop Offset="0" Color="#1F000000" />
+                                    <GradientStop Offset="1" Color="#4F000000" />
+                                </RadialGradientBrush>
+                            </Border.Background>
+                            <Grid>
+                                <StackPanel Margin="48,0" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent">
+                                    <!--<TextBlock FontSize="18" Foreground="#B7FFFFFF" Text="Windows Presentation Foundation" />-->
+                                    <TextBlock FontSize="28" FontWeight="Bold" Foreground="#FFFFFF" Text="One.Toolbox" />
+                                    <!--<TextBlock FontSize="18" Foreground="#B7FFFFFF" Text="Build Fluent experiences on Windows using WPF UI." />-->
+                                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                                        <TextBlock FontSize="14" Foreground="#B7FFFFFF" Text="{Binding Text}" />
+                                        <!--<TextBlock VerticalAlignment="Center" FontSize="12" Text=" " />-->
+
+                                        <TextBlock VerticalAlignment="Center" FontSize="12" Foreground="#B7FFFFFF" Text="{Binding Author}" />
+                                    </StackPanel>
+                                </StackPanel>
+                                <TextBlock Margin="12" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10"
+                         Foreground="#57FFFFFF" Text="Created by pwb" />
+                                <Button HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="Transparent" BorderThickness="0"
+                      Command="{Binding TestCommand}"
+                      Visibility="Visible" />
+                            </Grid>
+                        </Border>
+                    </Border>
+
+                    <Grid Grid.Row="1" Margin="0,24,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
                     </Grid>
-                </Border>
-            </Border>
-
-            <Grid Grid.Row="1" Margin="0,24,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-            </Grid>
-
-            <StackPanel Grid.Row="2" Margin="0,24,0,0">
-
-                <TextBlock FontSize="18" FontWeight="DemiBold" Text="One.Core" />
-
-                <uc:Hyperlink Padding="4" Content="Documentation" NavigateUri="https://kleinpan.github.io/One/api/index.html" ToolTip="https://kleinpan.github.io/One/api/index.html" />
-                <uc:Hyperlink Padding="4" Content="GitHub" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
-
-                <uc:Hyperlink Padding="4" Content="NuGet" NavigateUri="https://www.nuget.org/packages/One.Core/" ToolTip="https://www.nuget.org/packages/One.Core/" />
-            </StackPanel>
-            <StackPanel Grid.Row="3" Margin="0,24,0,0">
-                <TextBlock FontSize="18" FontWeight="DemiBold" Text="One.Control" />
-
-                <uc:Hyperlink Content="Documentation" NavigateUri="https://kleinpan.github.io/One/api/index.html" ToolTip="https://kleinpan.github.io/One/api/index.html" />
-
-                <uc:Hyperlink Content="GitHub" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
-
-                <uc:Hyperlink Content="NuGet" NavigateUri="https://www.nuget.org/packages/One.Control/" ToolTip="https://www.nuget.org/packages/One.Control/" />
-            </StackPanel>
-
-            <StackPanel Grid.Row="4" Margin="0,24,0,0">
-                <TextBlock FontSize="18" FontWeight="DemiBold" Text="One.Toolbox" />
-                <uc:Hyperlink Content="Documentation" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
-                <uc:Hyperlink Content="GitHub" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
-            </StackPanel>
-        </Grid>
-    </ScrollViewer>
+
+                    <StackPanel Grid.Row="2" Margin="0,24,0,0">
+
+                        <TextBlock FontSize="18" FontWeight="DemiBold" Text="One.Core" />
+
+                        <uc:Hyperlink Padding="4" Content="Documentation" NavigateUri="https://kleinpan.github.io/One/api/index.html" ToolTip="https://kleinpan.github.io/One/api/index.html" />
+                        <uc:Hyperlink Padding="4" Content="GitHub" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
+
+                        <uc:Hyperlink Padding="4" Content="NuGet" NavigateUri="https://www.nuget.org/packages/One.Core/" ToolTip="https://www.nuget.org/packages/One.Core/" />
+                    </StackPanel>
+                    <StackPanel Grid.Row="3" Margin="0,24,0,0">
+                        <TextBlock FontSize="18" FontWeight="DemiBold" Text="One.Control" />
+
+                        <uc:Hyperlink Content="Documentation" NavigateUri="https://kleinpan.github.io/One/api/index.html" ToolTip="https://kleinpan.github.io/One/api/index.html" />
+
+                        <uc:Hyperlink Content="GitHub" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
+
+                        <uc:Hyperlink Content="NuGet" NavigateUri="https://www.nuget.org/packages/One.Control/" ToolTip="https://www.nuget.org/packages/One.Control/" />
+                    </StackPanel>
+
+                    <StackPanel Grid.Row="4" Margin="0,24,0,0">
+                        <TextBlock FontSize="18" FontWeight="DemiBold" Text="One.Toolbox" />
+                        <uc:Hyperlink Content="Documentation" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
+                        <uc:Hyperlink Content="GitHub" NavigateUri="https://github.com/KleinPan/One" ToolTip="https://github.com/KleinPan/One" />
+                    </StackPanel>
+
+                </Grid>
+            </ScrollViewer>
+        </Border>
+
+
+        <StatusBar Grid.Row="1">
+            <StatusBarItem>
+                <TextBlock Text="{Binding CurrentUseIP,StringFormat={}LocalIP: {0}}"></TextBlock>
+
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
+   
 </UserControl>
\ No newline at end of file
diff --git a/One.Toolbox/Views/Pages/WinUSBPage.xaml b/One.Toolbox/Views/Pages/WinUSBPage.xaml
deleted file mode 100644
index 07f39dd..0000000
--- a/One.Toolbox/Views/Pages/WinUSBPage.xaml
+++ /dev/null
@@ -1,111 +0,0 @@
-<Page
-    x:Class="One.Toolbox.Views.Pages.WinUSBPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:One.Toolbox.Views.Pages"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="WinUSBPage"
-    d:DesignHeight="480"
-    d:DesignWidth="400"
-    Loaded="Page_Loaded"
-    mc:Ignorable="d">
-
-    <Grid Name="MainGrid">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="35" />
-            <RowDefinition Height="35" />
-            <RowDefinition Height="35" />
-            <RowDefinition Height="30" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="30" />
-        </Grid.RowDefinitions>
-        <Grid Margin="0,5,0,0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="auto" />
-            </Grid.ColumnDefinitions>
-            <ComboBox Name="UsbListComboBox" IsEnabled="{Binding IsConnected, Converter={StaticResource boolNotConverter}}" />
-            <Button
-                x:Name="RefreshUsbButton"
-                Grid.Column="1"
-                Margin="5,0,0,0"
-                Click="RefreshUsbButton_Click"
-                Content="{DynamicResource RefreshDevices}"
-                IsEnabled="{Binding IsConnected, Converter={StaticResource boolNotConverter}}" />
-        </Grid>
-        <Grid Grid.Row="1" Margin="0,5,0,0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <TextBlock
-                Margin="5,0"
-                VerticalAlignment="Center"
-                Text="{DynamicResource ReadEndpoint}" />
-            <ComboBox
-                Name="UsbInComboBox"
-                Grid.Column="1"
-                IsEnabled="{Binding IsConnected, Converter={StaticResource boolNotConverter}}" />
-            <TextBlock
-                Grid.Column="2"
-                Margin="5,0"
-                VerticalAlignment="Center"
-                Text="{DynamicResource WriteEndpoint}" />
-            <ComboBox
-                Name="UsbOutComboBox"
-                Grid.Column="3"
-                IsEnabled="{Binding IsConnected, Converter={StaticResource boolNotConverter}}" />
-            <TextBlock
-                Grid.Column="4"
-                Margin="5,0"
-                VerticalAlignment="Center"
-                Text="Interface" />
-            <TextBox
-                Grid.Column="5"
-                IsEnabled="{Binding IsConnected, Converter={StaticResource boolNotConverter}}"
-                Text="{Binding InterfaceIndex}" />
-        </Grid>
-        <Button
-            x:Name="ConnectButton"
-            Grid.Row="2"
-            Margin="0,5,0,0"
-            Click="ConnectButton_Click"
-            Content="{DynamicResource ReadData}"
-            Visibility="{Binding IsConnected, Converter={StaticResource BoolToVisibilityConverterInverse}}" />
-        <TextBlock
-            Grid.Row="3"
-            Margin="2"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Text="{DynamicResource ToSendDataTextBlock}" />
-        <CheckBox
-            Grid.Row="3"
-            Margin="2"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Center"
-            Content="Hex"
-            IsChecked="{Binding HexMode}" />
-
-        <TextBox
-            Name="toSendDataTextBox"
-            Grid.Row="4"
-            Margin="2"
-            VerticalContentAlignment="Top"
-            AcceptsReturn="True"
-            FontFamily="Consolas"
-            TextWrapping="Wrap"
-            VerticalScrollBarVisibility="Auto" />
-        <Button
-            Name="SendDataButton"
-            Grid.Row="5"
-            Margin="2"
-            HorizontalAlignment="Right"
-            Click="SendDataButton_Click"
-            Content="{DynamicResource NetSendDataButton}" />
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/One.Toolbox/Views/Pages/WinUSBPage.xaml.cs b/One.Toolbox/Views/Pages/WinUSBPage.xaml.cs
deleted file mode 100644
index b4a4f76..0000000
--- a/One.Toolbox/Views/Pages/WinUSBPage.xaml.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-using LibUsbDotNet.Info;
-using LibUsbDotNet.LibUsb;
-using LibUsbDotNet.Main;
-
-using One.Core.Helpers.DataProcessHelpers;
-using One.Toolbox.Helpers;
-
-using System.Collections.ObjectModel;
-using System.Text;
-using System.Windows.Controls;
-
-namespace One.Toolbox.Views.Pages
-{
-    /// <summary> WinUSBPage.xaml 的交互逻辑 </summary>
-
-    public partial class WinUSBPage : Page
-    {
-        public WinUSBPage()
-        {
-            InitializeComponent();
-        }
-
-        public bool IsConnected { get; set; }
-        public bool HexMode { get; set; } = false;
-        public int InterfaceIndex { get; set; } = 0;
-
-        private static bool loaded = false;
-
-        private void ShowData(string title, byte[] data = null, bool send = false)
-        {
-            //Tools.Logger.ShowDataRaw(new Tools.DataShowRaw
-            //{
-            //    title = $"🔌 WinUSB: {title}",
-            //    data = data ?? new byte[0],
-            //    color = send ? Brushes.DarkRed : Brushes.DarkGreen,
-            //});
-        }
-
-        private List<DeviceInfo> GetUsbList()
-        {
-            var list = new List<DeviceInfo>();
-            StringBuilder sb = new StringBuilder();
-            using (UsbContext context = new UsbContext())
-            {
-                using var allDevices = context.List();
-                foreach (var usbRegistry in allDevices)
-                {
-                    if (usbRegistry.TryOpen())
-                    {
-                        try
-                        {
-                            var info = new DeviceInfo()
-                            {
-                                Vid = usbRegistry.VendorId,
-                                Pid = usbRegistry.ProductId,
-                                SerialNumber = usbRegistry.Info.SerialNumber,
-                            };
-                            sb.AppendLine(info.ToString());//信息加上
-                            //只取第0个吧，懒得写了，等大家贡献代码😍
-                            UsbConfigInfo configInfo = usbRegistry.Configs[0];
-
-                            ReadOnlyCollection<UsbInterfaceInfo> interfaceList = configInfo.Interfaces;
-                            for (int iInterface = 0; iInterface < interfaceList.Count; iInterface++)
-                            {
-                                UsbInterfaceInfo interfaceInfo = interfaceList[iInterface];
-                                if (string.IsNullOrEmpty(info.Name) && !string.IsNullOrEmpty(interfaceInfo.Interface))
-                                    info.Name = interfaceInfo.Interface;
-                                sb.AppendLine($"Interface[{iInterface}]: {interfaceInfo.Interface} =>");
-                                ReadOnlyCollection<UsbEndpointInfo> endpointList = interfaceInfo.Endpoints;
-                                for (int iEndpoint = 0; iEndpoint < endpointList.Count; iEndpoint++)
-                                {
-                                    sb.AppendLine($"\tEndpoint[{iEndpoint + 1}] =>");
-                                    sb.AppendLine($"\t\tMax packet size:{endpointList[iEndpoint].MaxPacketSize}");
-                                    sb.AppendLine($"\t\tEndpoint address:{endpointList[iEndpoint].EndpointAddress}");
-                                }
-                            }
-                            list.Add(info);
-                        }
-                        catch { }
-                        usbRegistry.Close();
-                        sb.AppendLine();
-                    }
-                }
-            }
-            ShowData($"device list\r\n{sb}");
-            return list;
-        }
-
-        private async Task RefreshUsbList()
-        {
-            List<DeviceInfo> r = null;
-            await Task.Run(() =>
-            {
-                try
-                {
-                    r = GetUsbList();
-                }
-                catch { }
-            });
-            UsbListComboBox.Items.Clear();
-            if (r != null)
-                foreach (var i in r)
-                    UsbListComboBox.Items.Add(i);
-            UsbListComboBox.SelectedIndex = 0;
-        }
-
-        private async void Page_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (loaded)
-                return;
-            loaded = true;
-
-            //绑定
-            MainGrid.DataContext = this;
-
-            //combox填满
-            for (int i = 1; i < 16; i++)
-            {
-                UsbInComboBox.Items.Add($"EP{i}");
-                UsbOutComboBox.Items.Add($"EP{i}");
-            }
-            UsbInComboBox.SelectedIndex = 0;
-            UsbOutComboBox.SelectedIndex = 1;
-            await RefreshUsbList();
-        }
-
-        private void SendReceive(DeviceInfo device, WriteEndpointID epw, ReadEndpointID epr, byte[] send = null)
-        {
-            using (UsbContext context = new UsbContext())
-            {
-                using var allDevices = context.List();
-                foreach (var usbRegistry in allDevices)
-                {
-                    if (usbRegistry.TryOpen())
-                    {
-                        if (usbRegistry.VendorId == device.Vid &&
-                            usbRegistry.ProductId == device.Pid &&
-                            usbRegistry.Info.SerialNumber == device.SerialNumber)
-                        {
-                            try
-                            {
-                                //Get the first config number of the interface
-                                usbRegistry.ClaimInterface(usbRegistry.Configs[0].Interfaces[InterfaceIndex].Number);
-                                //Open up the endpoints
-                                var w = usbRegistry.OpenEndpointWriter(epw);
-                                var r = usbRegistry.OpenEndpointReader(epr);
-                                if (w != null)
-                                {
-                                    w.Write(send, 5000, out var sentLen);
-                                    if (sentLen > 0)
-                                    {
-                                        ShowData($"sent {sentLen} bytes", send.Take(sentLen).ToArray(), true);
-                                    }
-                                }
-                                var buff = new byte[1024];
-                                r.Read(buff, 5000, out var recvLen);
-                                if (recvLen > 0)
-                                {
-                                    ShowData($"recv {recvLen} bytes", buff.Take(recvLen).ToArray());
-                                }
-                            }
-                            catch { }
-                            usbRegistry.Close();
-                            break;
-                        }
-                        else
-                        {
-                            usbRegistry.Close();
-                        }
-                    }
-                }
-            }
-        }
-
-        private async void RefreshUsbButton_Click(object sender, RoutedEventArgs e)
-        {
-            await RefreshUsbList();
-        }
-
-        private async void ConnectButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (UsbListComboBox.SelectedItem == null)
-                return;
-            var device = (DeviceInfo)UsbListComboBox.SelectedItem;
-            var epw = (WriteEndpointID)((int)WriteEndpointID.Ep01 + UsbOutComboBox.SelectedIndex);
-            var epr = (ReadEndpointID)((int)ReadEndpointID.Ep01 + UsbInComboBox.SelectedIndex);
-            await Task.Run(() =>
-            {
-                try
-                {
-                    SendReceive(device, epw, epr);
-                }
-                catch { }
-            });
-        }
-
-        private async void SendDataButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (UsbListComboBox.SelectedItem == null)
-                return;
-            var device = (DeviceInfo)UsbListComboBox.SelectedItem;
-            var epw = (WriteEndpointID)((int)WriteEndpointID.Ep01 + UsbOutComboBox.SelectedIndex);
-            var epr = (ReadEndpointID)((int)ReadEndpointID.Ep01 + UsbInComboBox.SelectedIndex);
-            byte[] buff = HexMode ? StringHelper.HexStringToBytes(toSendDataTextBox.Text) :
-                    System.Text.Encoding.UTF8.GetBytes(toSendDataTextBox.Text);
-            await Task.Run(() =>
-            {
-                try
-                {
-                    SendReceive(device, epw, epr, buff);
-                }
-                catch { }
-            });
-        }
-    }
-
-    internal class DeviceInfo
-    {
-        public string Name { get; set; } = null;
-        public ushort Pid { get; set; }
-        public ushort Vid { get; set; }
-        public string SerialNumber { get; set; }
-
-        public override unsafe string ToString()
-        {
-            if (Name == null)
-                return $"VID: 0x{Vid:X04}, PID: 0x{Pid:X04}, {SerialNumber}";
-            else
-                return $"{Name} (VID: 0x{Vid:X04}, PID: 0x{Pid:X04}, {SerialNumber})";
-        }
-    }
-}
\ No newline at end of file