Ping功能完善。

SIXiaolong1117 · Mar 10, 2023 · 140a893 · 140a893
1 parent 1bb5bdc
commit 140a893
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 41 deletions.
diff --git a/WinWoL/Ping.xaml b/WinWoL/Ping.xaml
@@ -29,41 +29,41 @@
 
     <Grid>
         <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <GridView x:Name="MyGridView">
-                <GridView.ItemTemplate>
-                    <DataTemplate x:DataType="local:Item">
-                        <StackPanel Orientation="Vertical" Margin="8" MinWidth="252">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Bind HostName}"/>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Bind HostIP}"/>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Bind RTT}"/>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Bind PortIsOpen}"/>
-                            </StackPanel>
-                        </StackPanel>
-                    </DataTemplate>
-                </GridView.ItemTemplate>
-                <GridView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <WrapGrid Orientation="Horizontal"/>
-                    </ItemsPanelTemplate>
-                </GridView.ItemsPanel>
-            </GridView>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <TextBox x:Name="ipAddress" Header="IP 地址：" PlaceholderText="192.168.0.2" Width="268" Margin="0,8,0,0"/>
-                    <TextBlock Text="测试 IP 地址" Foreground="DarkGray" FontSize="12"/>
-                    <TextBox x:Name="ipPort" Header="端口：" PlaceholderText="80" Width="268" Margin="0,8,0,0"/>
-                    <TextBlock Text="测试 IP 端口" Foreground="DarkGray" FontSize="12"/>
-                    <Button x:Name="pingTestBut" Click="pingTestButton_Click" 
+
+                    <GridView x:Name="MyGridView">
+                        <GridView.ItemTemplate>
+                            <DataTemplate x:DataType="local:Item">
+                                <StackPanel Orientation="Vertical" Margin="8" Width="252">
+                                    <TextBlock Text="{x:Bind HostName}"/>
+                                    <TextBlock Text="{x:Bind HostIP}"/>
+                                    <TextBlock Text="{x:Bind RTT}"/>
+                                    <TextBlock Text="{x:Bind PortIsOpen}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </GridView.ItemTemplate>
+
+                        <GridView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapGrid Orientation="Horizontal"/>
+                            </ItemsPanelTemplate>
+                        </GridView.ItemsPanel>
+                    </GridView>
+
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBox x:Name="ipAddress" Header="IP 地址：" PlaceholderText="192.168.0.2" Width="268" Margin="0,8,0,0"/>
+                            <TextBlock Text="测试 IP 地址" Foreground="DarkGray" FontSize="12"/>
+                            <TextBox x:Name="ipPort" Header="端口：" PlaceholderText="80" Width="268" Margin="0,8,0,0"/>
+                            <TextBlock Text="测试 IP 端口" Foreground="DarkGray" FontSize="12"/>
+                            <Button x:Name="pingTestBut" Click="pingTestButton_Click" 
                             HorizontalAlignment="Center" VerticalAlignment="Bottom" 
                             Width="80" 
                             Margin="0,8,0,0">测试</Button>
+                        </StackPanel>
+                    </StackPanel>
+
                 </StackPanel>
             </StackPanel>
         </StackPanel>

diff --git a/WinWoL/Ping.xaml.cs b/WinWoL/Ping.xaml.cs
@@ -43,8 +43,6 @@ public sealed partial class Ping : Page
         public Ping()
         {
             this.InitializeComponent();
-
-
         }
         public void pingTest(string pingHostPort)
         {
@@ -132,12 +130,6 @@ public class Item
         public string RTT { get; set; }
         // 端口是否开放
         public string PortIsOpen { get; set; }
-        // 生存时间TTL
-        //public string TTL { get; set; }
-        // 缓冲区大小
-        //public string BufferLength { get; set; }
-        // 数据包是否分段
-        //public string DontFragment { get; set; }
 
 
         public Item(string hostName, string hostIP, string rTT, string portIsOpen)
@@ -146,9 +138,6 @@ public Item(string hostName, string hostIP, string rTT, string portIsOpen)
             HostIP = hostIP;
             RTT = rTT;
             PortIsOpen = portIsOpen;
-            //TTL = tTL;
-            //BufferLength = bufferLength;
-            //DontFragment = dontFragment;
         }
     }
 }