diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 index f2f3b70..a37d17f 100644 Binary files a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 and b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 differ diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 index fe8a6a5..31db9ed 100644 Binary files a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 and b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 differ diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo index 726653f..ec4998f 100644 Binary files a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo and b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo differ diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json index 4f4c213..218305a 100644 --- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json +++ b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json @@ -3,24 +3,44 @@ "WorkspaceRootPath": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\", "Documents": [ { - "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\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}" - }, - { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\boosterstationstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\boosterstationstatedataview.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\\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\\ftpsettingview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", "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\\common\\datetimeconverter.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\datetimeconverter.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.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\\views\\usercontrols\\ftpconnectsstview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\ftpconnectsstview.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\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}" + }, + { + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\models\\ftp\\ftplist.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\ftp\\ftplist.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\\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\\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\\systemcontrolview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemcontrolview.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\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", @@ -30,54 +50,14 @@ "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\common\\tools.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\tools.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\\systemcontrolview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemcontrolview.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\\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\\jiangsuearthquake.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\jiangsuearthquake.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" - }, - { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\app.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.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\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\mainviewmodel.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\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.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\\lowercomputermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\lowercomputermodel.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\\realtimedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\realtimedataview.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\\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\\models\\ftp\\ftplist.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\ftp\\ftplist.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\\ftpmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\ftp\\ftpmodel.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\\clientmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\clientmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -90,88 +70,76 @@ "DocumentGroups": [ { "DockedWidth": 169, - "SelectedChildIndex": 7, + "SelectedChildIndex": 4, "Children": [ { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 5, "Title": "App.config", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.config", "RelativeDocumentMoniker": "JiangsuEarthquake\\App.config", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.config", "RelativeToolTip": "JiangsuEarthquake\\App.config", - "ViewState": "AQIAAAMAAAAAAAAAAAAAABwAAAAYAAAA", + "ViewState": "AQIAAAMAAAAAAAAAAAAAABwAAAAuAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|", "WhenOpened": "2024-04-24T08:54:53.626Z", "IsPinned": true, "EditorCaption": "" }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "FTPConnectModel.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\FTP\\FTPConnectModel.cs", + "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": "AQIAAPEAAAAAAAAAAAAUwAYBAABGAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-05-23T08:23:47.997Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 4, - "Title": "DateTimeConverter.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\DateTimeConverter.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\DateTimeConverter.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\DateTimeConverter.cs", - "RelativeToolTip": "JiangsuEarthquake\\Common\\DateTimeConverter.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABQAAAAJAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-22T07:21:26.083Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 10, - "Title": "JiangsuEarthquake", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\JiangsuEarthquake.csproj", - "RelativeDocumentMoniker": "JiangsuEarthquake\\JiangsuEarthquake.csproj", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\JiangsuEarthquake.csproj", - "RelativeToolTip": "JiangsuEarthquake\\JiangsuEarthquake.csproj", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2024-05-22T06:12:42.635Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 11, - "Title": "App.xaml.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\App.xaml.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml.cs", - "RelativeToolTip": "JiangsuEarthquake\\App.xaml.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAAAqAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-22T06:03:18.235Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 9, - "Title": "SystemStateDataView.xaml", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemStateDataView.xaml", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemStateDataView.xaml", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemStateDataView.xaml", - "RelativeToolTip": "JiangsuEarthquake\\Views\\SystemStateDataView.xaml", + "Title": "FTPConnectSstView.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml", + "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPConnectSstView.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-05-21T01:40:06.564Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 8, - "Title": "SystemStateDataViewModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", - "ViewState": "AQIAAGkAAAAAAAAAAAAUwLYBAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-13T00:26:48.284Z", + "WhenOpened": "2024-05-22T08:03:41.293Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, + "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": 0, + "Title": "FTPSettingView.xaml.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs", + "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": "AQIAAPgAAAAAAAAAAIAzwPsAAAAVAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-05-21T02:25:53.875Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, "Title": "FTPSettingView.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml", @@ -183,20 +151,32 @@ }, { "$type": "Document", - "DocumentIndex": 0, - "Title": "FTPSettingView.xaml.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs", - "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": "AQIAAPAAAAAAAAAAAAAzwAsBAAArAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-21T02:25:53.875Z", + "DocumentIndex": 8, + "Title": "SystemStateDataView.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemStateDataView.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemStateDataView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemStateDataView.xaml", + "RelativeToolTip": "JiangsuEarthquake\\Views\\SystemStateDataView.xaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-05-21T01:40:06.564Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 7, + "Title": "SystemStateDataViewModel.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", + "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", + "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\SystemStateDataViewModel.cs", + "ViewState": "AQIAABsAAAAAAAAAAAAuwHAAAAA9AAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-05-13T00:26:48.284Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "FTPLIST.cs", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\FTP\\FTPLIST.cs", "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\FTP\\FTPLIST.cs", @@ -209,71 +189,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, - "Title": "FTPConnectModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\FTP\\FTPConnectModel.cs", - "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": "AQIAAA8AAAAAAAAAAAAQwMwAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-21T01:28:02.135Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 18, - "Title": "FTPModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\FTP\\FTPModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\FTP\\FTPModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\FTP\\FTPModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\Models\\FTP\\FTPModel.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAkAAAAZAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-21T01:21:33.508Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 14, - "Title": "LowerComputerModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "ViewState": "AQIAANAAAAAAAAAAAAAQwOsAAAA2AAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-17T02:27:46.939Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 13, - "Title": "BoosterStationStateDataViewModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "ViewState": "AQIAAB0BAAAAAAAAAAAQwDkBAAAxAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-05-14T00:25:10.523Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "BoosterStationStateDataView.xaml", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\BoosterStationStateDataView.xaml", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\BoosterStationStateDataView.xaml", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\BoosterStationStateDataView.xaml", - "RelativeToolTip": "JiangsuEarthquake\\Views\\BoosterStationStateDataView.xaml", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-05-13T07:36:41.444Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 10, "Title": "MainWindow.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\MainWindow.xaml", @@ -285,20 +201,20 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 11, "Title": "Tools.cs", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\Tools.cs", "RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\Tools.cs", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\Tools.cs", "RelativeToolTip": "JiangsuEarthquake\\Common\\Tools.cs", - "ViewState": "AQIAALMAAAAAAAAAAAAgwIoBAAAqAAAA", + "ViewState": "AQIAAJABAAAAAAAAAAAqwJwBAAAoAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-24T07:18:22.772Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 14, "Title": "ClientModel.cs", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ClientModel.cs", "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\ClientModel.cs", @@ -306,12 +222,11 @@ "RelativeToolTip": "JiangsuEarthquake\\Models\\ClientModel.cs", "ViewState": "AQIAAAAAAAAAAAAAAAAuwBIAAAAXAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-22T06:58:22.442Z", - "EditorCaption": "" + "WhenOpened": "2024-04-22T06:58:22.442Z" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 9, "Title": "SystemControlView.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml", @@ -329,22 +244,21 @@ "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", - "ViewState": "AQIAALoCAAAAAAAAAAAQwNMCAAAeAAAA", + "ViewState": "AQIAAMEFAAAAAAAAAAAIwDAAAABIAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-03-12T06:03:03.53Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 13, "Title": "RealTimeDataView.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml", "RelativeToolTip": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-05-16T03:27:31.661Z", - "EditorCaption": "" + "WhenOpened": "2024-05-16T03:27:31.661Z" } ] } diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin index c33e83f..f2b37be 100644 Binary files a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin and b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin differ diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin index b202396..9caabc3 100644 Binary files a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin and b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/App.config b/JiangsuEarthquake/JiangsuEarthquake/App.config index 97fde02..8eed671 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/App.config +++ b/JiangsuEarthquake/JiangsuEarthquake/App.config @@ -23,10 +23,10 @@ - + - - + + diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/CustomValidationRule.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/CustomValidationRule.cs index e70f727..3cba2d5 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Common/CustomValidationRule.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/CustomValidationRule.cs @@ -91,6 +91,34 @@ namespace JiangsuEarthquake.Common return new ValidationResult(false, "端口号不能为空!!!"); } } + else if(ValidateType == "UserName") + { + if (!string.IsNullOrEmpty(valueString)) + { + if(Regex.IsMatch(valueString, @"[\u4e00-\u9fff]")) + { + return new ValidationResult(false, "名称不能含中文!"); + } + } + else + { + return new ValidationResult(false, "名称不能为空!!!"); + } + } + else if (ValidateType == "Password") + { + if (!string.IsNullOrEmpty(valueString)) + { + if (Regex.IsMatch(valueString, @"[\u4e00-\u9fff]")) + { + return new ValidationResult(false, "密码不能含中文!"); + } + } + else + { + return new ValidationResult(false, "密码不能为空!!!"); + } + } else if (ValidateType == "BDCycle") //北斗周期 { if (!string.IsNullOrEmpty(valueString)) diff --git a/JiangsuEarthquake/JiangsuEarthquake/Models/FTP/FTPConnectModel.cs b/JiangsuEarthquake/JiangsuEarthquake/Models/FTP/FTPConnectModel.cs index a6248d3..331ce8e 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Models/FTP/FTPConnectModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Models/FTP/FTPConnectModel.cs @@ -253,7 +253,8 @@ namespace JiangsuEarthquake.Models.FTP string day = match.Groups["day"].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") + " " + yearTime; + string fmsgTime = Convert.ToDateTime(DateTime.Now.ToString("yy") + month + day).ToString("yyyy-MM-dd"); Console.WriteLine(line); var model = new FTPModel() { diff --git a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemStateDataViewModel.cs b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemStateDataViewModel.cs index 1ade23f..dded263 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemStateDataViewModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemStateDataViewModel.cs @@ -106,6 +106,12 @@ namespace JiangsuEarthquake.ViewModels public DispatcherTimer timerDownloadDataMsgHidden = new DispatcherTimer(); + public FTPSettingView fTPSettingView1 = new FTPSettingView(1); + + public FTPSettingView fTPSettingView2 = new FTPSettingView(2); + + public FTPLIST ftpList { get; set; } = new FTPLIST(); + #region Data Filtering string timeSearch = ""; @@ -441,9 +447,9 @@ namespace JiangsuEarthquake.ViewModels public void FTPSetting(object o) { if (station_id == 1) - HandyControl.Controls.Dialog.Show(new FTPSettingView(1)); + HandyControl.Controls.Dialog.Show(fTPSettingView1); else - HandyControl.Controls.Dialog.Show(new FTPSettingView(2)); + HandyControl.Controls.Dialog.Show(fTPSettingView2); } #endregion diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/SystemStateDataView.xaml b/JiangsuEarthquake/JiangsuEarthquake/Views/SystemStateDataView.xaml index e3f4dbe..5b00a01 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/SystemStateDataView.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/SystemStateDataView.xaml @@ -349,7 +349,7 @@ diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPConnectSstView.xaml.cs b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPConnectSstView.xaml.cs index 8341dcb..1f78007 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPConnectSstView.xaml.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPConnectSstView.xaml.cs @@ -1,4 +1,7 @@ -using System; +using HandyControl.Tools.Extension; +using JiangsuEarthquake.Common; +using JiangsuEarthquake.ViewModels; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -12,6 +15,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using UserControl = System.Windows.Controls.UserControl; namespace JiangsuEarthquake.Views.UserControls { @@ -20,9 +24,57 @@ namespace JiangsuEarthquake.Views.UserControls /// public partial class FTPConnectSstView : UserControl { - public FTPConnectSstView() + public FTPConnectSstView(int id) { InitializeComponent(); + + if (id == 1) + this.DataContext = MainViewModel.systemStateDataViewModel1.fTPSettingView1 ; + else + this.DataContext = MainViewModel.systemStateDataViewModel2.fTPSettingView2; + + stationId = id; + } + + int stationId = 1; + + + private void FTPConnectSetBtn_Click(object sender, RoutedEventArgs e) + { + if(string.IsNullOrEmpty(FTPIPText.Text)|| string.IsNullOrEmpty(FTPPortText.Text)|| string.IsNullOrEmpty(FTPUserNameText.Text)|| string.IsNullOrEmpty(FTPPasswordText.Text)) + { + if (stationId == 1) + { + MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.IP = Tools.GetAppSetting("FTPIP1"); + MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.Port = int.Parse(Tools.GetAppSetting("FTPPort1")); + MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.UserName = Tools.GetAppSetting("FTPUserName1"); + MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.PassWord = Tools.GetAppSetting("FTPPassword1"); + } + else + { + MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.IP = Tools.GetAppSetting("FTPIP2"); + MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.Port = int.Parse(Tools.GetAppSetting("FTPPort2")); + MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.UserName = Tools.GetAppSetting("FTPUserName2"); + MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.PassWord = Tools.GetAppSetting("FTPPassword2"); + } + } + else + { + if (stationId == 1) + { + Tools.UpdateAppSettings("FTPIP1", MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.IP); + Tools.UpdateAppSettings("FTPPort1", MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.Port.ToString()); + Tools.UpdateAppSettings("FTPUserName1", MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.UserName); + Tools.UpdateAppSettings("FTPPassword1", MainViewModel.systemStateDataViewModel1.fTPSettingView1.ftpcon.PassWord); + } + else + { + Tools.UpdateAppSettings("FTPIP2", MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.IP); + Tools.UpdateAppSettings("FTPPort2", MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.Port.ToString()); + Tools.UpdateAppSettings("FTPUserName2", MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.UserName); + Tools.UpdateAppSettings("FTPPassword2", MainViewModel.systemStateDataViewModel2.fTPSettingView2.ftpcon.PassWord); + } + } } } } diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml index 032c2c5..d68a21c 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml @@ -81,14 +81,14 @@