From e17cf9ebf68de5c1486c9b9f44706af5b8081519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E9=A3=8E=E8=BF=87=E5=AE=A2?= <3529987066@qq.com> Date: Mon, 27 May 2024 18:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=EF=BC=9A?= =?UTF-8?q?=201=20=E8=A7=A3=E5=86=B3FTP=E8=B7=AF=E5=BE=84=E9=80=89?= =?UTF-8?q?=E5=8F=96=E5=92=8C=E8=B7=AF=E5=BE=84=E7=A1=AE=E8=AE=A4=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= =?UTF-8?q?=202=20=E7=A0=94=E7=A9=B6=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E8=8E=B7=E5=8F=96=E5=88=B0FTP=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E4=BB=B6=E5=92=8C=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=203=20=E6=B5=8B=E8=AF=95FTP=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.vs/JiangsuEarthquake/v17/.futdcache.v2 | Bin 540 -> 540 bytes .../.vs/JiangsuEarthquake/v17/.suo | Bin 306688 -> 315392 bytes .../JiangsuEarthquake/v17/DocumentLayout.json | 62 +++++++----------- .../jiangsuearthquake.metadata.v7.bin | Bin 222430 -> 222443 bytes .../jiangsuearthquake.projects.v7.bin | Bin 7701540 -> 7826406 bytes .../Common/DateTimeConverter.cs | 2 +- .../Models/FTP/FTPConnectModel.cs | 32 +++++++-- .../Views/UserControls/FTPSettingView.xaml | 26 ++++---- .../Views/UserControls/FTPSettingView.xaml.cs | 16 +---- .../net6.0-windows/JiangsuEarthquake.dll | Bin 5091840 -> 5092864 bytes .../net6.0-windows/JiangsuEarthquake.exe | Bin 240640 -> 240640 bytes .../net6.0-windows/JiangsuEarthquake.pdb | Bin 307436 -> 307568 bytes .../JiangsuEarthquake.AssemblyInfo.cs | 2 +- ...JiangsuEarthquake.AssemblyInfoInputs.cache | 2 +- .../net6.0-windows/JiangsuEarthquake.dll | Bin 5091840 -> 5092864 bytes .../JiangsuEarthquake.g.resources | Bin 4664345 -> 4664676 bytes .../net6.0-windows/JiangsuEarthquake.pdb | Bin 307436 -> 307568 bytes .../obj/Debug/net6.0-windows/apphost.exe | Bin 240640 -> 240640 bytes .../net6.0-windows/ref/JiangsuEarthquake.dll | Bin 172544 -> 172544 bytes .../refint/JiangsuEarthquake.dll | Bin 172544 -> 172544 bytes 20 files changed, 65 insertions(+), 77 deletions(-) diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 index 7d557e0b3cae37d7e30607cd4dbfe0ffcac6eae4..e06e4b47eeeed11c233f4f9edfa4e95e1389146e 100644 GIT binary patch delta 26 icmbQkGKXbD1tV+T{4?7oOs-{|&QUV+|F#L$cQ^o)rVH-? delta 26 icmbQkGKXbD1tY7erj04{jwFlV% diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo index 24b9c22a7f8a16920f666c3355c6abba7d325a85..a33a6ffcff7344c351c14881611b8ef2c3dd4a5a 100644 GIT binary patch delta 18439 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 JVy(F+{XhO6G}Hh9 diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json index e5084ce..0bd745c 100644 --- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json +++ b/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}", - "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\\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\\views\\usercontrols\\ftpconnectsstview.xaml.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}" + "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\\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", - "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\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", - "EditorCaption": "" + "WhenOpened": "2024-05-21T01:25:38.05Z" }, { "$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", diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin index eae96f34deaf624637df14bd57654a9c179e79e5..86376f311d614c6d188e61eee051291966b502e4 100644 GIT binary patch delta 91 zcmcb2lK1sVUM>bneg-fwp3bPtsMcuEYQVVFfa&rJJ_(=%hnu0ZrK6#do62NIammRa n)VQ~6ykuIGFQn2^3f9F8Bqe@+Xl}2b{??IMYdc#c^9^nQMei9$ delta 62 zcmaETlK0+8UN!~^eg+1H=?fg0JsSO5{TR3UF>QUZUEn3t@qB@#ImJLZ1_ovzUg!PR Qb^6)>W}WTAk<2%^0gY}H4gdfE diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin index 4762706f6d872bb57e645a11d0d090cca40f113c..de9479876236ff6ed9ca016cc0652a82675bf3ec 100644 GIT binary patch delta 280 zcmV~$%T|m5007`K{+Kc`iZW%Uq$!e=Orl(BqWcB8-x4Nt(Jv2i1%ToGW(eJ8j1`N9HhMR5~GAwPxZFh_s zGj779Dbr@mnse7Z_sx6Yp+_Ej;;Cnzd*P*57QD9Tjkn&(Sn}QnA1zz4YRxC>vOfDF pC%^MGY5V6!JX89Y$nFN=STyv%9E+C9=~N{Atx(LB3dQ`^pM7H3Y{mcp delta 245 zcmV~$LskU<006*OKihUc+qP}ncI{itqJwmV&Qhzkouiq*pWnde$9Ldeh)@Ax!bOM_ zC0dMFapEONlq6Y-RB6&>$dn~pj$C>26)04sScy_WWy)2kRHa&tT6O9*Xw;-xi&kyg zb?DTkTaR9S`VAN~WY~yNW5!LGG-cY1S##zsShQr>idAdYZP>JB+m2m(_8mBM(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec))\s*(?[0-9]*)\s*(?([0-9]|:)*)\s*(?.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + public static Regex FtpListDirectoryDetailsRegexYear = new Regex(@"\b\d{4}\b", RegexOptions.Compiled | RegexOptions.IgnoreCase); + /// /// 获取当前目录一级字目录和文件信息 /// @@ -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 fmsgTime = Convert.ToDateTime(DateTime.Now.ToString("yy") + month + day).ToString("yyyy-MM-dd"); - Console.WriteLine(line); + string year = ""; + foreach (Match ma in matchYear) + { + 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 diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml index 0891bca..e20b220 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml @@ -176,12 +176,10 @@ - - - - +