diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 index ab8c4de..87e7cef 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 57f0e93..8aee588 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 6e4b7cf..0b53ed5 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 27a7911..ab2eaa0 100644 --- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json +++ b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json @@ -3,33 +3,41 @@ "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}|", - "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\\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\\views\\seismometerstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\seismometerstatedataview.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}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\mainwindow.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\\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\\viewmodels\\realtimedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\realtimedataviewmodel.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\\app.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\\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\\viewmodels\\systemenvirondataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\systemenvirondataviewmodel.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\\basestationenvirmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\basestationenvirmodel.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\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.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}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\mainwindow.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\\seismometerstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\seismometerstatedataview.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}" @@ -46,7 +54,7 @@ "Children": [ { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 9, "Title": "App.config", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.config", "RelativeDocumentMoniker": "JiangsuEarthquake\\App.config", @@ -55,57 +63,80 @@ "ViewState": "AQIAAGMAAAAAAAAAAAAAAGsAAAATAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|", "WhenOpened": "2024-04-24T08:54:53.626Z", - "IsPinned": true, - "EditorCaption": "" + "IsPinned": true }, { "$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": "AQIAAEMAAAAAAAAAAAAkwFYAAAAbAAAA", + "Title": "RealTimeDataViewModel.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\RealTimeDataViewModel.cs", + "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\RealTimeDataViewModel.cs", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\RealTimeDataViewModel.cs", + "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\RealTimeDataViewModel.cs", + "ViewState": "AQIAACAAAAAAAAAAAAAUwKoAAAASAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-07-02T08:28:45.445Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, - "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", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-07-02T08:27:40.833Z", + "WhenOpened": "2024-07-03T09:58:46.132Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 2, + "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": "AQIAABMDAAAAAAAAAAAuwCsDAABNAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-07-03T09:56:42.608Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "SystemEnvironDataViewModel.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemEnvironDataViewModel.cs", + "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\SystemEnvironDataViewModel.cs", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemEnvironDataViewModel.cs", + "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\SystemEnvironDataViewModel.cs", + "ViewState": "AQIAAAUAAAAAAAAAAAAiwPcAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-07-03T07:07:24.98Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "BaseStationEnvirModel.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\BaseStationEnvirModel.cs", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\BaseStationEnvirModel.cs", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\BaseStationEnvirModel.cs", + "RelativeToolTip": "JiangsuEarthquake\\Models\\BaseStationEnvirModel.cs", + "ViewState": "AQIAACEAAAAAAAAAAAAuwDAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-07-03T07:06:27.704Z" + }, + { + "$type": "Document", + "DocumentIndex": 8, "Title": "SeismometerStateDataView.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", "RelativeToolTip": "JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-07-02T08:18:15.039Z", - "EditorCaption": "" + "WhenOpened": "2024-07-02T08:18:15.039Z" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 7, "Title": "MainWindow.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\MainWindow.xaml", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml", "RelativeToolTip": "JiangsuEarthquake\\MainWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-07-02T06:09:17.045Z", - "EditorCaption": "" + "WhenOpened": "2024-07-02T06:09:17.045Z" }, { "$type": "Document", @@ -121,7 +152,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 3, "Title": "RealTimeDataView.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml", @@ -133,13 +164,13 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 1, "Title": "MainViewModel.cs", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", - "ViewState": "AQIAAF0BAAAAAAAAAAAwwAQCAAAAAAAA", + "ViewState": "AQIAAB4GAAAAAAAAAAAuwCYGAAANAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-06-26T09:47:38.344Z", "EditorCaption": "" diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin index 55bb6c2..f61e8ab 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 0d9491b..c7188be 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/Common/CSVDownload.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/CSVDownload.cs index 9c7046a..1f96987 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Common/CSVDownload.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/CSVDownload.cs @@ -118,13 +118,13 @@ namespace JiangsuEarthquake.Common strValue.Append(BaseStationList[i].AttitudeZ); strValue.Append(","); - if (BaseStationList[i].Hatch_State == (ImageSource)Application.Current.FindResource("CycleRed")) - strValue.Append("舱门异常"); - else if (BaseStationList[i].Hatch_State == (ImageSource)Application.Current.FindResource("CycleGreen")) - strValue.Append("舱门正常"); - else - strValue.Append("无数据"); - strValue.Append(","); + //if (BaseStationList[i].Hatch_State == (ImageSource)Application.Current.FindResource("CycleRed")) + // strValue.Append("舱门异常"); + //else if (BaseStationList[i].Hatch_State == (ImageSource)Application.Current.FindResource("CycleGreen")) + // strValue.Append("舱门正常"); + //else + // strValue.Append("无数据"); + //strValue.Append(","); if (BaseStationList[i].Leakage == (ImageSource)Application.Current.FindResource("CycleRed")) strValue.Append("漏水"); else if (BaseStationList[i].Leakage == (ImageSource)Application.Current.FindResource("CycleGreen")) diff --git a/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs b/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs index f1d6dfc..926b68c 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs @@ -808,12 +808,12 @@ namespace JiangsuEarthquake.Models else MainViewModel.realTimeDataViewModel1.LeakageImage = (ImageSource)Application.Current.FindResource("CycleGray"); - if (Hatch_State == 1) - MainViewModel.realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); - else if (Hatch_State == 0) - MainViewModel.realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); - else - MainViewModel.realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); + //if (Hatch_State == 1) + // MainViewModel.realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); + //else if (Hatch_State == 0) + // MainViewModel.realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); + //else + // MainViewModel.realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); }); } else @@ -909,12 +909,12 @@ namespace JiangsuEarthquake.Models else MainViewModel.realTimeDataViewModel2.LeakageImage = (ImageSource)Application.Current.FindResource("CycleGray"); - if (Hatch_State == 1) - MainViewModel.realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); - else if (Hatch_State == 0) - MainViewModel.realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); - else - MainViewModel.realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); + //if (Hatch_State == 1) + // MainViewModel.realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); + //else if (Hatch_State == 0) + // MainViewModel.realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); + //else + // MainViewModel.realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); }); } #endregion diff --git a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs index a87bbb4..d1f7e1f 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs @@ -647,24 +647,24 @@ namespace JiangsuEarthquake.ViewModels baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); } - int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); - if (hatchState == 1) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); - } - else if (hatchState == 0) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); - } - else - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); - } + //int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); + //if (hatchState == 1) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); + //} + //else if (hatchState == 0) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); + //} + //else + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //} } else { baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); } systemEnvironDataViewModel1.TotalSystemStateDataList.Add(baseStationEnvirModel); @@ -713,24 +713,24 @@ namespace JiangsuEarthquake.ViewModels baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); } - int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); - if (hatchState == 1) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); - } - else if (hatchState == 0) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); - } - else - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); - } + //int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); + //if (hatchState == 1) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); + //} + //else if (hatchState == 0) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); + //} + //else + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //} } else { baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); } systemEnvironDataViewModel2.TotalSystemStateDataList.Add(baseStationEnvirModel); @@ -1587,24 +1587,24 @@ namespace JiangsuEarthquake.ViewModels realTimeDataViewModel1.LeakageImage = (ImageSource)Application.Current.FindResource("CycleGray"); } - int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); - if (hatchState == 1) - { - realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); - } - else if (hatchState == 0) - { - realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); - } - else - { - realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); - } + //int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); + //if (hatchState == 1) + //{ + // realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); + //} + //else if (hatchState == 0) + //{ + // realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); + //} + //else + //{ + // realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); + //} } else { realTimeDataViewModel1.LeakageImage = (ImageSource)Application.Current.FindResource("CycleGray"); - realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); + //realTimeDataViewModel1.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); } //} dataReader.Dispose(); @@ -1688,24 +1688,24 @@ namespace JiangsuEarthquake.ViewModels realTimeDataViewModel2.LeakageImage = (ImageSource)Application.Current.FindResource("CycleGray"); } - int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); - if (hatchState == 1) - { - realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); - } - else if (hatchState == 0) - { - realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); - } - else - { - realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); - } + //int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); + //if (hatchState == 1) + //{ + // realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleRed"); + //} + //else if (hatchState == 0) + //{ + // realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGreen"); + //} + //else + //{ + // realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); + //} } else { realTimeDataViewModel2.LeakageImage = (ImageSource)Application.Current.FindResource("CycleGray"); - realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); + //realTimeDataViewModel2.HatchStateImage = (ImageSource)Application.Current.FindResource("CycleGray"); } //} dataReader.Dispose(); diff --git a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/RealTimeDataViewModel.cs b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/RealTimeDataViewModel.cs index c5d4147..c8418e9 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/RealTimeDataViewModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/RealTimeDataViewModel.cs @@ -293,13 +293,13 @@ namespace JiangsuEarthquake.ViewModels set { leakageImage = value; } } - private ImageSource hatchStateImage; + //private ImageSource hatchStateImage; - public ImageSource HatchStateImage - { - get { return hatchStateImage; } - set { hatchStateImage = value; } - } + //public ImageSource HatchStateImage + //{ + // get { return hatchStateImage; } + // set { hatchStateImage = value; } + //} /// /// 环境状态列表数据1 diff --git a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemEnvironDataViewModel.cs b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemEnvironDataViewModel.cs index 36fda4d..bc6bf45 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemEnvironDataViewModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/SystemEnvironDataViewModel.cs @@ -195,24 +195,24 @@ namespace JiangsuEarthquake.ViewModels baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); } - int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); - if (hatchState == 1) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); - } - else if (hatchState == 0) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); - } - else - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); - } + //int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); + //if (hatchState == 1) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); + //} + //else if (hatchState == 0) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); + //} + //else + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //} } else { baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); } TotalSystemStateDataList.Add(baseStationEnvirModel); } @@ -450,24 +450,24 @@ namespace JiangsuEarthquake.ViewModels baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); } - int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); - if (hatchState == 1) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); - } - else if (hatchState == 0) - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); - } - else - { - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); - } + //int hatchState = Convert.ToInt32(string.IsNullOrEmpty(dataReaderSub["Hatch_State"].ToString()) ? "2" : dataReaderSub["Hatch_State"]); + //if (hatchState == 1) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleRed"); + //} + //else if (hatchState == 0) + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGreen"); + //} + //else + //{ + // baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //} } else { baseStationEnvirModel.Leakage = (ImageSource)Application.Current.FindResource("CycleGray"); - baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); + //baseStationEnvirModel.Hatch_State = (ImageSource)Application.Current.FindResource("CycleGray"); } TotalSystemStateDataList.Add(baseStationEnvirModel); } diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/RealTimeDataView.xaml b/JiangsuEarthquake/JiangsuEarthquake/Views/RealTimeDataView.xaml index 00a4d83..96b58c1 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/RealTimeDataView.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/RealTimeDataView.xaml @@ -114,12 +114,12 @@ - - + --> diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll index 316f34b..c32c8e5 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe index a10c1a1..a841273 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb index ac521a6..9047fc7 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs index e896909..18265c2 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs +++ b/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+a63c18e22aa6a442f53b0452bfd8ff0a6d0c46d3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d405d4b3b6687fd683ef34aae76a87ebc5779d65")] [assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache index cfbbf8d..61f6b0f 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache @@ -1 +1 @@ -3fb8aeb6426e7d5762f43ce379d38917fc37fbba0d2c06c7236ec44f650e0d55 +a42d10776b7fac055165faca326245fe72f41fc0fb5bc7c1e4f4cbb8ce232d0c diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll index 316f34b..c32c8e5 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources index c6a13f2..215b369 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb index ac521a6..9047fc7 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache index c0f921e..fc614fd 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache @@ -16,5 +16,5 @@ F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml 227-921550327 Assets\Styles\DefaultStyle.xaml;ImageDictionary.xaml;MainWindow.xaml;Views\AlarmRecordView.xaml;Views\BoosterStationStateDataView.xaml;Views\LogRecordView.xaml;Views\RealTimeDataView.xaml;Views\SeismometerParameterView.xaml;Views\SeismometerStateDataView.xaml;Views\SystemControlView.xaml;Views\SystemEnvironDataView.xaml;Views\SystemMonitorDataView.xaml;Views\UserControls\AlarmSettingView.xaml;Views\UserControls\BaseStationModel.xaml;Views\UserControls\FTPConnectSstView.xaml;Views\UserControls\FTPSettingView.xaml;Views\UserControls\InitialView.xaml;Views\UserControls\InitialView1.xaml;Views\UserControls\OtherSettingView.xaml;Views\UserControls\TextDialog.xaml; -True +False diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.cs index 6ae3460..663a3fc 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\RealTimeDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "603D2602E8A5A0BDE0A09D71CB444B01F8143B44" +#pragma checksum "..\..\..\..\Views\RealTimeDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F907933CFC1EC6228BE5CDD11A194DE7DACE42CD" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.i.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.i.cs index 6ae3460..663a3fc 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.i.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/RealTimeDataView.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\RealTimeDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "603D2602E8A5A0BDE0A09D71CB444B01F8143B44" +#pragma checksum "..\..\..\..\Views\RealTimeDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F907933CFC1EC6228BE5CDD11A194DE7DACE42CD" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe index a10c1a1..a841273 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll index 37e4179..b053d51 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll index 37e4179..b053d51 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll differ