From af4075331988cf334fb52eadacb8fee897742d3e Mon Sep 17 00:00:00 2001
From: SI_Xiaolong <sixiaolong2018@outlook.com>
Date: Wed, 19 Apr 2023 08:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=9A=90=E8=97=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WinWoL/Package.appxmanifest |  2 +-
 WinWoL/WoL.xaml             | 33 ++++++++-----
 WinWoL/WoL.xaml.cs          | 99 +++++++++++++++++++++----------------
 3 files changed, 80 insertions(+), 54 deletions(-)

diff --git a/WinWoL/Package.appxmanifest b/WinWoL/Package.appxmanifest
index e1589f0..bb2da48 100644
--- a/WinWoL/Package.appxmanifest
+++ b/WinWoL/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="fe263fa7-295e-4f47-a1e3-87f6be98f05e"
     Publisher="CN=SI Xiaolong"
-    Version="1.0.5.0" />
+    Version="1.0.6.0" />
 
   <Properties>
     <DisplayName>网络唤醒 (Wake on LAN)</DisplayName>
diff --git a/WinWoL/WoL.xaml b/WinWoL/WoL.xaml
index ddec078..1373cc3 100644
--- a/WinWoL/WoL.xaml
+++ b/WinWoL/WoL.xaml
@@ -39,25 +39,36 @@
                               ItemsSource="{x:Bind ConfigSelector}" 
                               SelectionChanged="configNum_SelectionChanged" 
                               Header="配置编号："
-                              Width="132" 
-                              Margin="0,0,8,0">
+                              Width="268">
                         </ComboBox>
+                    </StackPanel>
 
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" 
+                                VerticalAlignment="Center" Margin="0,8,0,0">
+                            <Button 
+                            x:Name="HideConfig"
+                            Click="HideConfig_Click" 
+                            Content="隐藏地址"
+                            HorizontalAlignment="Center" 
+                            VerticalAlignment="Bottom" 
+                            Width="84" 
+                            Margin="0,0,8,0"
+                            />
                         <Button 
                             x:Name="ImportConfig"
                             Click="ImportConfig_Click" 
-                            Content="导入"
+                            Content="导入配置"
                             HorizontalAlignment="Center" 
                             VerticalAlignment="Bottom" 
-                            Width="60" 
+                            Width="84"
                             Margin="0,0,8,0"
                             />
                         <Button 
                             x:Name="ImportAndReplaceConfig"
-                            Content="覆盖"
+                            Content="覆盖配置"
                             HorizontalAlignment="Center" 
                             VerticalAlignment="Bottom" 
-                            Width="60" 
+                            Width="84"
                             Margin="0,0,8,0"
                             >
                             <Button.Flyout>
@@ -65,7 +76,7 @@
                                     <StackPanel>
                                         <TextBlock 
                                             Style="{ThemeResource BaseTextBlockStyle}" 
-                                            Text="您确定要删除此配置文件吗？" 
+                                            Text="您确定要覆盖此配置文件吗？" 
                                             Margin="0,0,0,12" />
                                         <Button 
                                             Click="ImportConfig_Click" 
@@ -77,10 +88,10 @@
                         <Button 
                             x:Name="ExportConfig" 
                             Click="ExportConfig_Click" 
-                            Content="导出"
+                            Content="导出配置"
                             HorizontalAlignment="Center" 
                             VerticalAlignment="Bottom" 
-                            Width="60" 
+                            Width="84"
                             />
                     </StackPanel>
 
@@ -99,13 +110,13 @@
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,8,0,0">
                         <Button 
                             x:Name="AddConfig" Click="AddConfigButton_Click" 
-                            Content="添加"
+                            Content="添加配置"
                             HorizontalAlignment="Center" VerticalAlignment="Bottom" 
                             Width="84" 
                             Margin="0,0,8,0"/>
                         <Button 
                             x:Name="DelConfig" 
-                            Content="删除"
+                            Content="删除配置"
                             HorizontalAlignment="Center" VerticalAlignment="Bottom" 
                             Width="84"
                             Margin="0,0,8,0">
diff --git a/WinWoL/WoL.xaml.cs b/WinWoL/WoL.xaml.cs
index c752b14..1b8225b 100644
--- a/WinWoL/WoL.xaml.cs
+++ b/WinWoL/WoL.xaml.cs
@@ -100,21 +100,23 @@ private void refresh(string ConfigIDNum)
             ImportConfig.Visibility = Visibility.Visible;
             ImportAndReplaceConfig.Visibility = Visibility.Collapsed;
 
-            AddConfig.Content = "����";
+            AddConfig.Content = "��������";
             DelConfig.IsEnabled = false;
             RefConfig.IsEnabled = false;
             WoLConfig.IsEnabled = false;
             RDPConfig.IsEnabled = false;
             ExportConfig.IsEnabled = false;
+            HideConfig.IsEnabled = false;
 
             // ����ַ�����Ϊ��
             if (configInner != null)
             {
                 // �޸Ľ���UI�����Ժ�������ʾ
-                AddConfig.Content = "�޸�";
+                AddConfig.Content = "�޸�����";
                 DelConfig.IsEnabled = true;
                 WoLConfig.IsEnabled = true;
                 ExportConfig.IsEnabled = true;
+                HideConfig.IsEnabled = true;
 
                 // ���ص��� ��ʾ����
                 ImportConfig.Visibility = Visibility.Collapsed;
@@ -145,15 +147,34 @@ private void refresh(string ConfigIDNum)
                     ipAddressDisplay = "�� LAN ����㲥";
                 }
 
+                // ����������ص�ַ
+                string macAddressDisplay = macAddress;
+                string ipPortDisplay = ipPort;
+                string rdpIpAddressDisplay = rdpIpAddress;
+                string rdpPortDisplay = rdpPort;
+                if (localSettings.Values["HideConfig"] == null)
+                {
+                    localSettings.Values["HideConfig"] = "True";
+                }
+                if (localSettings.Values["HideConfig"].ToString() != "False")
+                {
+                    HideConfig.Content = "��ʾ��ַ";
+                    macAddressDisplay = "**:**:**:**:**:**";
+                    ipAddressDisplay = "***.***.***.***";
+                    ipPortDisplay = "***";
+                    rdpIpAddressDisplay = "***.***.***.***";
+                    rdpPortDisplay = "***";
+                }
+
                 // �������RDP
                 if (rdpIsOpen == "True")
                 {
                     ConfigName.Text = "������" + configName;
-                    MacAddress.Text = "���� Mac��" + macAddress;
+                    MacAddress.Text = "���� Mac��" + macAddressDisplay;
                     IpAddress.Text = "WoL ������ַ��" + ipAddressDisplay;
-                    IpPort.Text = "WoL �˿ڣ�" + ipPort;
-                    RDPIpAddress.Text = "RDP ������ַ��" + rdpIpAddress;
-                    RDPIpPort.Text = "RDP �˿ڣ�" + rdpPort;
+                    IpPort.Text = "WoL �˿ڣ�" + ipPortDisplay;
+                    RDPIpAddress.Text = "RDP ������ַ��" + rdpIpAddressDisplay;
+                    RDPIpPort.Text = "RDP �˿ڣ�" + rdpPortDisplay;
                     RDPPing.Text = "RDP �˿��ӳ٣�δ����";
 
                     RefConfig.IsEnabled = true;
@@ -163,9 +184,9 @@ private void refresh(string ConfigIDNum)
                 else
                 {
                     ConfigName.Text = "������" + configName;
-                    MacAddress.Text = "���� Mac��" + macAddress;
+                    MacAddress.Text = "���� Mac��" + macAddressDisplay;
                     IpAddress.Text = "WoL ������ַ��" + ipAddressDisplay;
-                    IpPort.Text = "WoL �˿ڣ�" + ipPort;
+                    IpPort.Text = "WoL �˿ڣ�" + ipPortDisplay;
                     RDPIpAddress.Text = "RDP ������ַ��δ����";
                     RDPIpPort.Text = "RDP �˿ڣ�δ����";
                     RDPPing.Text = "RDP �˿��ӳ٣�δ����";
@@ -454,68 +475,53 @@ private void RDPConfigButton_Click(object sender, RoutedEventArgs e)
             Thread childThread = new Thread(childref);
             childThread.Start();
         }
-
+        // �������ð�ť���
         private async void ImportConfig_Click(object sender, RoutedEventArgs e)
         {
             string ConfigIDNum = configNum.SelectedItem.ToString();
 
-            // Create a file picker
+            // ����һ��FileOpenPicker
             var openPicker = new Windows.Storage.Pickers.FileOpenPicker();
-
-            // ������ǰWinUI3���ڵĴ��ھ�� (HWND)
+            // ��ȡ��ǰ���ھ�� (HWND) 
             var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(App.m_window);
-
-            // Initialize the file picker with the window handle (HWND).
+            // ʹ�ô��ھ�� (HWND) ��ʼ��FileOpenPicker
             WinRT.Interop.InitializeWithWindow.Initialize(openPicker, hWnd);
 
-            // Set options for your file picker
+            // ΪFilePicker����ѡ��
             openPicker.ViewMode = PickerViewMode.Thumbnail;
-            openPicker.SuggestedStartLocation = PickerLocationId.PicturesLibrary;
+            // ������ ����
+            openPicker.SuggestedStartLocation = PickerLocationId.Desktop;
+            // �ļ����͹�����
             openPicker.FileTypeFilter.Add(".wolconfig");
 
-            // Open the picker for the user to pick a file
+            // ��ѡ�������û�ѡ���ļ�
             var file = await openPicker.PickSingleFileAsync();
             if (file != null)
             {
-                //PickAPhotoOutputTextBlock.Text = "Picked photo: " + file.Name;
                 var path = file.Path;
                 localSettings.Values["ConfigID" + ConfigIDNum] = File.ReadAllText(path, Encoding.UTF8);
                 // ˢ��UI
                 refresh(ConfigIDNum);
             }
-            else
-            {
-                // ����ȡ��
-            }
-
         }
-
+        // �������ð�ť���
         private async void ExportConfig_Click(object sender, RoutedEventArgs e)
         {
             string ConfigIDNum = configNum.SelectedItem.ToString();
             string configContent = localSettings.Values["ConfigID" + ConfigIDNum].ToString();
 
-            //// ���������ݱ����ڼ�����
-            //var package = new DataPackage();
-            //package.SetText(configContent);
-            //Clipboard.SetContent(package);
-
-            // ����һ��FilePicker
+            // ����һ��FileSavePicker
             FileSavePicker savePicker = new Windows.Storage.Pickers.FileSavePicker();
-
-            // ������ǰWinUI3���ڵĴ��ھ�� (HWND)
+            // ��ȡ��ǰ���ھ�� (HWND) 
             var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(App.m_window);
-
-            // ʹ�ô��ھ�� (HWND) ��ʼ���ļ�ѡȡ��
+            // ʹ�ô��ھ�� (HWND) ��ʼ��FileSavePicker
             WinRT.Interop.InitializeWithWindow.Initialize(savePicker, hWnd);
 
             // ΪFilePicker����ѡ��
             savePicker.SuggestedStartLocation = PickerLocationId.DocumentsLibrary;
             // �û����Խ��ļ�����Ϊ���ļ����������б�
             savePicker.FileTypeChoices.Add("Plain Text", new List<string>() { ".wolconfig" });
-            // Ĭ���ļ���������û�û�м����ѡ��Ҫ�滻���ļ�
-            var enteredFileName = ((sender as Button).Parent as StackPanel)
-            .FindName("FileNameTextBox") as TextBox;
+            // Ĭ���ļ���
             savePicker.SuggestedFileName = "WinUI_Wake_on_LAN_BackUp_" + DateTime.Now.ToString();
 
             // ��Picker���û�ѡ���ļ�
@@ -526,8 +532,6 @@ private async void ExportConfig_Click(object sender, RoutedEventArgs e)
                 CachedFileManager.DeferUpdates(file);
 
                 // д���ļ�
-                var textBox = ((sender as Button).Parent as StackPanel)
-                .FindName("FileContentTextBox") as TextBox;
                 using (var stream = await file.OpenStreamForWriteAsync())
                 {
                     using (var tw = new StreamWriter(stream))
@@ -537,7 +541,7 @@ private async void ExportConfig_Click(object sender, RoutedEventArgs e)
                 }
 
                 // ��Windows֪������������ļ����ģ��Ա�����Ӧ�ó�����Ը����ļ���Զ�̰汾��
-                // ��ɸ��¿�����Ҫ Windows �����û����롣
+                // ��ɸ��¿�����ҪWindows�����û����롣
                 FileUpdateStatus status = await CachedFileManager.CompleteUpdatesAsync(file);
                 if (status == FileUpdateStatus.Complete)
                 {
@@ -558,11 +562,22 @@ private async void ExportConfig_Click(object sender, RoutedEventArgs e)
                     SaveConfigTips.IsOpen = true;
                 }
             }
+        }
+        private void HideConfig_Click(object sender, RoutedEventArgs e)
+        {
+            string ConfigIDNum = configNum.SelectedItem.ToString();
+            if (localSettings.Values["HideConfig"].ToString() == "True")
+            {
+                localSettings.Values["HideConfig"] = "False";
+                HideConfig.Content = "���ص�ַ";
+            }
             else
             {
-                // ����ȡ��
+                localSettings.Values["HideConfig"] = "True";
+                HideConfig.Content = "��ʾ��ַ";
             }
-
+            // ˢ��UI
+            refresh(ConfigIDNum);
         }
     }
 }