新增功能：

1 解决FTP路径选取和路径确认无法成功的问题；
2 研究正则表达式，解决无法正确获取到FTP目录中文件和文件夹的修改日期的问题；
3 测试FTP上传下载功能；

JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json

@@ -7,24 +7,20 @@
       "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
+      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
       "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|"
     },
-    {
-      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\systemstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
-      "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
-    },
     {
       "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\viewmodels\\systemstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\systemstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\models\\ftp\\ftpconnectmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\systemstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
-      "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\ftp\\ftpconnectmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\usercontrols\\ftpconnectsstview.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\models\\ftp\\ftpconnectmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\ftpconnectsstview.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\ftp\\ftpconnectmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\usercontrols\\ftpconnectsstview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
@@ -70,11 +66,11 @@
       "DocumentGroups": [
         {
           "DockedWidth": 169,
-          "SelectedChildIndex": 5,
+          "SelectedChildIndex": 4,
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 8,
+              "DocumentIndex": 7,
               "Title": "App.config",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.config",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\App.config",
@@ -93,14 +89,14 @@
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\FTP\\FTPConnectModel.cs",
               "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\FTP\\FTPConnectModel.cs",
               "RelativeToolTip": "JiangsuEarthquake\\Models\\FTP\\FTPConnectModel.cs",
-              "ViewState": "AQIAAFwAAAAAAAAAAIAzwHIAAAAMAAAA",
+              "ViewState": "AQIAAPoAAAAAAAAAAAAUwBkBAAAwAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-05-23T08:23:47.997Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 6,
+              "DocumentIndex": 5,
               "Title": "FTPConnectSstView.xaml",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml",
@@ -110,19 +106,6 @@
               "WhenOpened": "2024-05-22T08:03:41.293Z",
               "EditorCaption": ""
             },
-            {
-              "$type": "Document",
-              "DocumentIndex": 5,
-              "Title": "FTPConnectSstView.xaml.cs",
-              "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml.cs",
-              "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml.cs",
-              "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml.cs",
-              "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml.cs",
-              "ViewState": "AQIAAAYAAAAAAAAAAAAAACsAAAAMAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-05-23T00:42:56.622Z",
-              "EditorCaption": ""
-            },
             {
               "$type": "Document",
               "DocumentIndex": 1,
@@ -131,7 +114,7 @@
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs",
               "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs",
               "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs",
-              "ViewState": "AQIAADQAAAAAAAAAAAASwEMAAABLAAAA",
+              "ViewState": "AQIAAPYAAAAAAAAAAIAzwA0BAAAMAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-05-21T02:25:53.875Z",
               "EditorCaption": ""
@@ -142,15 +125,15 @@
               "Title": "FTPSettingView.xaml",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml",
-              "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml",
+              "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml*",
-              "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml",
+              "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml*",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
               "WhenOpened": "2024-05-24T01:29:26.923Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 3,
               "Title": "SystemStateDataView.xaml",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemStateDataView.xaml",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemStateDataView.xaml",
@@ -162,7 +145,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 2,
               "Title": "SystemStateDataViewModel.cs",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs",
@@ -175,7 +158,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 7,
+              "DocumentIndex": 6,
               "Title": "FTPLIST.cs",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\FTP\\FTPLIST.cs",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\FTP\\FTPLIST.cs",
@@ -183,12 +166,11 @@
               "RelativeToolTip": "JiangsuEarthquake\\Models\\FTP\\FTPLIST.cs",
               "ViewState": "AQIAABAAAAAAAAAAAAA5wCYAAAAKAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-05-21T01:25:38.05Z",
+              "WhenOpened": "2024-05-21T01:25:38.05Z"
-              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 10,
+              "DocumentIndex": 9,
               "Title": "MainWindow.xaml",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\MainWindow.xaml",
@@ -199,7 +181,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 11,
+              "DocumentIndex": 10,
               "Title": "Tools.cs",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\Tools.cs",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\Tools.cs",
@@ -211,7 +193,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 14,
+              "DocumentIndex": 13,
               "Title": "ClientModel.cs",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ClientModel.cs",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\ClientModel.cs",
@@ -223,7 +205,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 9,
+              "DocumentIndex": 8,
               "Title": "SystemControlView.xaml",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml",
@@ -234,7 +216,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 12,
+              "DocumentIndex": 11,
               "Title": "MainViewModel.cs",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
@@ -246,7 +228,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 13,
+              "DocumentIndex": 12,
               "Title": "RealTimeDataView.xaml",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml",

JiangsuEarthquake/JiangsuEarthquake/Common/DateTimeConverter.cs

@@ -15,7 +15,7 @@ namespace JiangsuEarthquake.Common
             if (value is DateTime dateTime)
             {
                 // 使用自定义的时间格式，例如："yyyy-MM-dd HH:mm:ss"
-                return dateTime.ToString("yyyy/MM/dd HH:mm:ss");
+                return dateTime.ToString("yyyy/MM/dd");
             }
             return value;
         }

JiangsuEarthquake/JiangsuEarthquake/Models/FTP/FTPConnectModel.cs

@@ -1,7 +1,10 @@
-using HandyControl.Data;
+using Google.Protobuf;
+using HandyControl.Data;
 using JiangsuEarthquake.Common;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -230,6 +233,8 @@ namespace JiangsuEarthquake.Models.FTP
         #region 获取当前目录的一级子目录和文件信息
         public static Regex FtpListDirectoryDetailsRegex = new Regex(@".*(?<month>(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec))\s*(?<day>[0-9]*)\s*(?<yearTime>([0-9]|:)*)\s*(?<fileName>.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
+        public static Regex FtpListDirectoryDetailsRegexYear = new Regex(@"\b\d{4}\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
         /// <summary>
         /// 获取当前目录一级字目录和文件信息
         /// </summary>
@@ -246,19 +251,34 @@ namespace JiangsuEarthquake.Models.FTP
                     string line = null;
                     while ((line = sr.ReadLine()) != null)
                     {
+                        MatchCollection matchYear = FtpListDirectoryDetailsRegexYear.Matches(line);
                         Match match = FtpListDirectoryDetailsRegex.Match(line);
+
                         //string[] a = line.Split(' ');
                         string month = match.Groups["month"].Value;
 
                         string day = match.Groups["day"].Value;
-                        string yearTime = match.Groups["yearTime"].Value;
+                        //string yearTime = match.Groups["yearTime"].Value;
                         string fileName = match.Groups["fileName"].Value;
-                        //string fmsgTime = Convert.ToDateTime(DateTime.Now.ToString("yy") + month + day).ToString("yyyy-MM-dd") + " " + yearTime;
+                        string year = "";
-                        string fmsgTime = Convert.ToDateTime(DateTime.Now.ToString("yy") + month + day).ToString("yyyy-MM-dd");
+                        foreach (Match ma in matchYear)
-                        Console.WriteLine(line);
+                        {
+                            if (int.Parse(ma.Value) >= 2000 && int.Parse(ma.Value) <= 2050)
+                                year = ma.Value;
+                        }
+
+                        if (year == "")
+                            year = DateTime.Now.Year.ToString();
+
+                        string fmsgTime = Convert.ToDateTime(year + month + day).ToString("yyyy/MM/dd");
+
+                        DateTimeFormatInfo dtFormat = new System.Globalization.DateTimeFormatInfo();
+                        dtFormat.ShortDatePattern = "yyyy/MM/dd";
+
                         var model = new FTPModel()
                         {
-                            CreateTime = Convert.ToDateTime(fmsgTime),
+                            //CreateTime = Convert.ToDateTime(fmsgTime),
+                            CreateTime = Convert.ToDateTime(fmsgTime, dtFormat),
                             FileName = fileName,
                             FilePath = ftpRemotePath + "/" + fileName,
                             IsDirectory = true

JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml

@@ -176,12 +176,10 @@
                     <TextBlock Text="路径：" FontSize="17" Foreground="White" Margin="10,0,0,0" 
                                VerticalAlignment="Center"/>
 
-                    <TextBox Name="PathTxtBox" Text="{Binding ftpcon.ftpURI}" Foreground="Black" 
+                    <TextBox Name="PathTxtBox" Text="{Binding ftpList.datagrid1Path}" Foreground="Black" 
-                             FontSize="16" Width="200" Height="30"
+                             FontSize="16" Width="200" Height="30" ToolTipService.ToolTip="{Binding ftpList.datagrid1Path}"
                              TextAlignment="Left" VerticalContentAlignment="Center">
-                        <TextBox.ToolTip>
+                        
-                            <ToolTip Content="{Binding ElementName=PathTxtBox, Path=Text}"/>
-                        </TextBox.ToolTip>
                     </TextBox>
 
                     <Button Name="SelectFTPPathBtn" Style="{StaticResource ButtonStyle}" Margin="15,0,0,0"
@@ -193,7 +191,7 @@
                             </Style>
                         </Button.Resources>
                         <Button.ToolTip>
-                            <ToolTip Content="选择文件夹路径" VerticalAlignment="Center" HorizontalAlignment="Center"
+                            <ToolTip Content="默认文件夹路径" VerticalAlignment="Center" HorizontalAlignment="Center"
                                      BorderThickness="0"/>
                         </Button.ToolTip>
                         <Button.Content>
@@ -302,7 +300,7 @@
                             <DataGridTemplateColumn Header="修改日期" Width="1.6*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding CreateTime,StringFormat='yyyy/MM/dd HH:mm:ss'}" ToolTipService.ToolTip="{Binding CreateTime, Converter={StaticResource ResourceKey=DateTimeConverter}}">
+                                        <TextBlock Text="{Binding CreateTime,StringFormat='yyyy/MM/dd'}" HorizontalAlignment="Center" ToolTipService.ToolTip="{Binding CreateTime, Converter={StaticResource ResourceKey=DateTimeConverter}}">
                                             <TextBlock.Resources>
                                                 <Style TargetType="TextBlock">
                                                     <Setter Property="FontSize" Value="14"/>
@@ -315,7 +313,7 @@
                             <DataGridTemplateColumn Header="类型" Width="0.9*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding FileType}" ToolTipService.ToolTip="{Binding FileType}">
+                                        <TextBlock Text="{Binding FileType}" HorizontalAlignment="Center" ToolTipService.ToolTip="{Binding FileType}">
                                             <TextBlock.Resources>
                                                 <Style TargetType="TextBlock">
                                                     <Setter Property="FontSize" Value="14"/>
@@ -328,7 +326,7 @@
                             <DataGridTemplateColumn Header="大小" Width="*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding FileSize}" ToolTipService.ToolTip="{Binding FileSize}">
+                                        <TextBlock Text="{Binding FileSize}" HorizontalAlignment="Center" ToolTipService.ToolTip="{Binding FileSize}">
                                             <TextBlock.Resources>
                                                 <Style TargetType="TextBlock">
                                                     <Setter Property="FontSize" Value="14"/>
@@ -469,7 +467,7 @@
                              Foreground="Black" FontSize="16" Width="200" Height="30"
                              TextAlignment="Left" VerticalContentAlignment="Center">
                         <TextBox.ToolTip>
-                            <ToolTip Content="{Binding ElementName=PathTxtLocalBox, Path=Text}"/>
+                            <ToolTip Content="{Binding ElementName=PathTxtLocalBox, Path=Text}" BorderThickness="0" FontSize="14"/>
                         </TextBox.ToolTip>
                     </TextBox>
 
@@ -575,7 +573,7 @@
                             <DataGridTemplateColumn Header="文件名称" Width="1.6*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding FileName}" ToolTipService.ToolTip="{Binding FileName}">
+                                        <TextBlock Text="{Binding FileName}" HorizontalAlignment="Left" ToolTipService.ToolTip="{Binding FileName}">
                                             <TextBlock.Resources>
                                                 <Style TargetType="TextBlock">
                                                     <Setter Property="FontSize" Value="14"/>
@@ -588,7 +586,7 @@
                             <DataGridTemplateColumn Header="修改日期" Width="1.6*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding CreateTime,StringFormat='yyyy/MM/dd HH:mm:ss'}" ToolTipService.ToolTip="{Binding CreateTime, Converter={StaticResource ResourceKey=DateTimeConverter}}">
+                                        <TextBlock Text="{Binding CreateTime,StringFormat='yyyy/MM/dd'}" HorizontalAlignment="Center" ToolTipService.ToolTip="{Binding CreateTime, Converter={StaticResource ResourceKey=DateTimeConverter}}">
                                             <TextBlock.Resources>
                                                 <Style TargetType="TextBlock">
                                                     <Setter Property="FontSize" Value="14"/>
@@ -601,7 +599,7 @@
                             <DataGridTemplateColumn Header="类型" Width="0.9*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding FileType}" ToolTipService.ToolTip="{Binding FileType}">
+                                        <TextBlock Text="{Binding FileType}" HorizontalAlignment="Center" ToolTipService.ToolTip="{Binding FileType}">
                                             <TextBlock.Resources>
                                                 <Style TargetType="TextBlock">
                                                     <Setter Property="FontSize" Value="14"/>
@@ -614,7 +612,7 @@
                             <DataGridTemplateColumn Header="大小" Width="*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding FileSize}" ToolTipService.ToolTip="{Binding FileSize}">
+                                        <TextBlock Text="{Binding FileSize}" HorizontalAlignment="Center" ToolTipService.ToolTip="{Binding FileSize}">
                                             <TextBlock.Resources>
                                                 <Style TargetType="TextBlock">
                                                     <Setter Property="FontSize" Value="14"/>

JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml.cs

@@ -378,20 +378,8 @@ namespace JiangsuEarthquake.Views.UserControls
         /// <param name="e"></param>
         private void SelectFTPPathBtn_Click(object sender, RoutedEventArgs e)
         {
-            using (FolderBrowserDialog dialog = new FolderBrowserDialog())
+            ftpList.datagrid1Path = "FTP_Test";
-            {
+            //ftpcon.ftpURI = ftpList.datagrid1Path;
-                dialog.Description = "请选择文件夹";
-                DialogResult result = dialog.ShowDialog();
-
-                if (result == System.Windows.Forms.DialogResult.OK)
-                {
-                    string folderPath = dialog.SelectedPath;
-                    ftpList.datagrid1Path = folderPath;
-
-                    // 使用获取到的文件夹路径
-                    MessageBox.Show("选择的文件夹路径是：" + folderPath);
-                }
-            }
         }
 
 

JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("JiangsuEarthquake")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+efea32747fff84299d62351fa0688190393cb169")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8b14c2956338822ebbd261b58cdcae9eab0833d3")]
 [assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
 [assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache

@@ -1 +1 @@
-d2f7e7659b5f998b07f03241df9c2ccb0ec2bc05086d7aabaca2f3254b639d5d
+37122add7d9acdd97eaf069fce7065d071801cb20b7f3161f2274bf617399b7a