From 65f0dcaaf9a7c66e9d30e95b9a7b8e9875ea92fa Mon Sep 17 00:00:00 2001
From: Forgot-Dream <56014859+Forgot-Dream@users.noreply.github.com>
Date: Tue, 27 Feb 2024 09:51:40 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=20=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BC=B9=E7=AA=97=E6=B2=A1=E6=9C=89=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SduNetCheckTool.GUI/Views/Dialogs/InfoDialog.xaml | 10 +++++++---
 SduNetCheckTool.Mvvm/Utils/FileUtil.cs            |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/SduNetCheckTool.GUI/Views/Dialogs/InfoDialog.xaml b/SduNetCheckTool.GUI/Views/Dialogs/InfoDialog.xaml
index 5e4c9df..757e277 100644
--- a/SduNetCheckTool.GUI/Views/Dialogs/InfoDialog.xaml
+++ b/SduNetCheckTool.GUI/Views/Dialogs/InfoDialog.xaml
@@ -8,8 +8,8 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    DefaultButton="Close"
     CloseButtonText="我知道了"
+    DefaultButton="Close"
     mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
@@ -18,9 +18,13 @@
         </Grid.RowDefinitions>
         <TextBlock
             FontSize="20"
-            Text="提示"
             FontWeight="Bold"
+            Text="提示"
             TextAlignment="Left" />
-        <TextBlock Grid.Row="1" Margin="4,8" x:Name="Description" />
+        <TextBlock
+            x:Name="Description"
+            Grid.Row="1"
+            Margin="4,8"
+            TextWrapping="Wrap" />
     </Grid>
 </ui:ContentDialog>
diff --git a/SduNetCheckTool.Mvvm/Utils/FileUtil.cs b/SduNetCheckTool.Mvvm/Utils/FileUtil.cs
index a328c82..9b89f6d 100644
--- a/SduNetCheckTool.Mvvm/Utils/FileUtil.cs
+++ b/SduNetCheckTool.Mvvm/Utils/FileUtil.cs
@@ -9,10 +9,10 @@ namespace SduNetCheckTool.Mvvm.Utils
 {
     public static class FileUtil
     {
-        public static string ExportPath = Directory.GetCurrentDirectory() + "\\报告";
+        public static string ExportPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
         public static string ExportReport(ObservableCollection<DetectionTask> tasks)
         {
-            var exportFilePath = ExportPath + "\\" + System.DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss") + ".txt";
+            var exportFilePath = ExportPath + "\\报告-" + DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss") + ".txt";
 
             if (tasks.Any(i => i.TaskStatusEnum == TaskStatusEnum.Waiting))
                 return null;
@@ -28,7 +28,7 @@ public static string ExportReport(ObservableCollection<DetectionTask> tasks)
             return exportFilePath;
         }
 
-        public static string ReadFile(string filePath)
+        /*public static string ReadFile(string filePath)
         {
             if (!File.Exists(filePath)) return "FileNotExists";
 
@@ -49,6 +49,6 @@ public static string ReadFile(string filePath)
                 //
             }
             return "-1";
-        }
+        }*/
     }
 }