From 61ab0351f9c108eff79a78da68e2d28ea1803b38 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, 8 Jul 2024 18:02:01 +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=E4=BF=AE=E6=94=B9=E5=8D=87=E5=8E=8B=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=8E=A7=E5=88=B6=E7=B3=BB=E7=BB=9F=E7=9A=84CRC?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=9A=84=E9=AB=98=E4=BD=8E=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=EF=BC=9B=202=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=9C=B0=E9=9C=87=E4=BB=AA=E8=BF=9E=E6=8E=A5=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=BD=AF=E4=BB=B6=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignTimeBuild/.dtbcache.v2 | Bin 148310 -> 148310 bytes .../.vs/JiangsuEarthquake/v17/.futdcache.v2 | Bin 540 -> 540 bytes .../.vs/JiangsuEarthquake/v17/.suo | Bin 337920 -> 342528 bytes .../JiangsuEarthquake/v17/DocumentLayout.json | 120 ++++++++++-------- .../jiangsuearthquake.metadata.v7.bin | Bin 224205 -> 224304 bytes .../jiangsuearthquake.projects.v7.bin | Bin 11523143 -> 11754031 bytes .../JiangsuEarthquake/App.config | 4 +- .../Common/ConnectConvert4.cs | 30 +++++ .../JiangsuEarthquake/Common/Tools.cs | 34 +++++ .../JiangsuEarthquake/DataAccess/DBHelper.cs | 8 +- .../JiangsuEarthquake/MainWindow.xaml | 15 ++- .../Models/SeismographModel.cs | 26 ++-- .../Models/VolCurCollectorModel.cs | 26 ++-- .../Models/VolCurCollectorModel2.cs | 8 +- .../BoosterStationStateDataViewModel.cs | 18 +-- .../ViewModels/MainViewModel.cs | 94 +++++++++----- .../SeismometerParameterViewModel.cs | 4 +- .../SeismometerStateDataViewModel.cs | 2 +- .../Views/BoosterStationStateDataView.xaml | 2 +- .../Views/LogRecordView.xaml | 4 - .../net6.0-windows/JiangsuEarthquake.dll | Bin 5199872 -> 5199360 bytes .../JiangsuEarthquake.dll.config | 10 +- .../net6.0-windows/JiangsuEarthquake.exe | Bin 240640 -> 240640 bytes .../net6.0-windows/JiangsuEarthquake.pdb | Bin 346600 -> 346996 bytes .../bin/Debug/net6.0-windows/Models.dll | Bin 48128 -> 48128 bytes .../bin/Debug/net6.0-windows/Models.pdb | Bin 24656 -> 24656 bytes .../JiangsuEarthquake.AssemblyInfo.cs | 2 +- ...JiangsuEarthquake.AssemblyInfoInputs.cache | 2 +- ...uEarthquake.csproj.AssemblyReference.cache | Bin 15953 -> 15953 bytes ...uEarthquake.csproj.CoreCompileInputs.cache | 2 +- .../net6.0-windows/JiangsuEarthquake.dll | Bin 5199872 -> 5199360 bytes .../JiangsuEarthquake.g.resources | Bin 4705704 -> 4705163 bytes .../net6.0-windows/JiangsuEarthquake.pdb | Bin 346600 -> 346996 bytes .../JiangsuEarthquake_MarkupCompile.cache | 2 +- .../JiangsuEarthquake_MarkupCompile.i.cache | 4 +- .../obj/Debug/net6.0-windows/MainWindow.g.cs | 16 +-- .../Debug/net6.0-windows/MainWindow.g.i.cs | 16 +-- .../Views/BoosterStationStateDataView.g.cs | 2 +- .../Views/BoosterStationStateDataView.g.i.cs | 2 +- .../net6.0-windows/Views/LogRecordView.g.cs | 21 +-- .../net6.0-windows/Views/LogRecordView.g.i.cs | 21 +-- .../Views/SystemControlView.g.cs | 69 +++------- .../Views/SystemControlView.g.i.cs | 74 ++++------- .../obj/Debug/net6.0-windows/apphost.exe | Bin 240640 -> 240640 bytes .../net6.0-windows/ref/JiangsuEarthquake.dll | Bin 178688 -> 179200 bytes .../refint/JiangsuEarthquake.dll | Bin 178688 -> 179200 bytes .../bin/Debug/net6.0-windows/Models.dll | Bin 48128 -> 48128 bytes .../bin/Debug/net6.0-windows/Models.pdb | Bin 24656 -> 24656 bytes .../net6.0-windows/Models.AssemblyInfo.cs | 2 +- .../Models.AssemblyInfoInputs.cache | 2 +- .../obj/Debug/net6.0-windows/Models.dll | Bin 48128 -> 48128 bytes .../obj/Debug/net6.0-windows/Models.pdb | Bin 24656 -> 24656 bytes .../obj/Debug/net6.0-windows/ref/Models.dll | Bin 7168 -> 7168 bytes .../Debug/net6.0-windows/refint/Models.dll | Bin 7168 -> 7168 bytes 54 files changed, 335 insertions(+), 307 deletions(-) create mode 100644 JiangsuEarthquake/JiangsuEarthquake/Common/ConnectConvert4.cs diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 index 9c857f92a444ba8677756fcd38cce7c4c95dbe70..93fa394a91540b4a8bbe2420f4cd2dfaeb50522c 100644 GIT binary patch delta 18802 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 A8UO$Q delta 23241 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 diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 index 9f0c4ea4b953f11ce5d9daf7a4927b1531fc9f33..cbb9a2ceda1cea445c4b1b578543b90f3607fe30 100644 GIT binary patch delta 39 ucmbQkGKXbD1tVLMqx_$vb0*g@c8RFi)F?C^*z$1aoI4z1=Zk^DcQ^n)9}(mL delta 39 ucmbQkGKXbD1tVMOQGtVQvnSUvc8Rzr8CG5O-F!N4)*X(m?cPA)I~)Ky7ZCXX diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo index 556314bd07d114763f1695e5f1d2eef22cd36d0d..b555a08d6077d9ac4fda57f6a6ff574e5a17a8ca 100644 GIT binary patch delta 27966 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 O*3eDhf9Ro6?0*0np83fD diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json index 820761e..9c47f48 100644 --- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json +++ b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json @@ -2,37 +2,40 @@ "Version": 1, "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\\models\\servermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\servermodel.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}" - }, { "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\\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\\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\\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\\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\\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:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\adm\\AppData\\Local\\Temp\\.vsdbgsrc\\793d914da17c09bdc8d37c92770294fd4f8e6e28e7f354949aefb80506ef516b\\DependencyObject.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\\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\\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\\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}" } ], "DocumentGroupContainers": [ @@ -42,76 +45,87 @@ "DocumentGroups": [ { "DockedWidth": 163, - "SelectedChildIndex": 2, + "SelectedChildIndex": 8, "Children": [ { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 6, "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": "AQIAADkAAAAAAAAAAAAAAGsAAAATAAAA", + "ViewState": "AQIAABIAAAAAAAAAAAAAAC4AAAAoAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|", "WhenOpened": "2024-04-24T08:54:53.626Z", "IsPinned": true, "EditorCaption": "" }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "DependencyObject.cs", + "DocumentMoniker": "C:\\Users\\adm\\AppData\\Local\\Temp\\.vsdbgsrc\\793d914da17c09bdc8d37c92770294fd4f8e6e28e7f354949aefb80506ef516b\\DependencyObject.cs", + "ToolTip": "C:\\Users\\adm\\AppData\\Local\\Temp\\.vsdbgsrc\\793d914da17c09bdc8d37c92770294fd4f8e6e28e7f354949aefb80506ef516b\\DependencyObject.cs [\u53EA\u8BFB]", + "ViewState": "AQIAAKoFAAAAAAAAAIAzwL8FAAACAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-07-08T08:35:05.858Z", + "EditorCaption": " [\u53EA\u8BFB]" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "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": "AQIAAAQDAAAAAAAAAAAuwBkDAAAwAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-07-08T08:20:55.119Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "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": "AQIAAFgBAAAAAAAAAAAUwAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-07-08T08:19:12.338Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 1, - "Title": "ClientModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ClientModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\ClientModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ClientModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\Models\\ClientModel.cs", - "ViewState": "AQIAALQAAAAAAAAAAAAkwDEAAAAXAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-07-05T07:41:03.947Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "ServerModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ServerModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\ServerModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ServerModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\Models\\ServerModel.cs", - "ViewState": "AQIAAGkAAAAAAAAAAAAuwIwAAAAQAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-07-05T07:39:49.265Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, "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": "AQIAAHAAAAAAAAAAAADgv4QAAAAAAAAA", + "ViewState": "AQIAAMkAAAAAAAAAAAAkwNQAAAAlAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-07-05T07:31:43.911Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 3, "Title": "SystemControlView.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml", - "RelativeToolTip": "JiangsuEarthquake\\Views\\SystemControlView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml*", + "RelativeToolTip": "JiangsuEarthquake\\Views\\SystemControlView.xaml*", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "WhenOpened": "2024-07-05T06:33:41.961Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 2, "Title": "MainWindow.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\MainWindow.xaml", @@ -123,7 +137,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 7, "Title": "App.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\App.xaml", @@ -135,13 +149,13 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 0, "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": "AQIAAF4NAAAAAAAAAAAkwAsIAAAIAAAA", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs*", + "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs*", + "ViewState": "AQIAAPoIAAAAAAAAAAAswB8JAAAbAAAA", "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 150581b8a7af0efb972e42cbfa4d60dba2e04b83..c5d9ce9661ae23b967cf07b908f961f641d89fd9 100644 GIT binary patch delta 189 zcmX?mop-|xUN#0Feg+1H>4F~29*usjevDiFn2g^idjJJF3|*X!49wk}Jb@eu=ltB< z{Ja?F{Jgx>a?eg-fwo^I&LY&<<7oLR8Zuhoxns~?l`dq$PXj^dJ&Kd5nU=lsBw zkuEeLaTQoK8<6ZtnHr@#d-^#KX07dO!p)H BAzJ_d diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin index 950cd563997951153b07218ce3bb14fc60b1aad9..4a00581e5d0c1373020eba79d8030a26f5fedcf8 100644 GIT binary patch delta 483 zcmXZRM{ErM0D$2<9a^Qesz&X-YS%19=|oGZReSGJd%f0Id#|UctyMZAX}qJ8I!Q zbk{?&o_gu6kG}fpZ-9XY8ElB5h8b>zky4B@+8ASvGu{NLCYofjDW;kx&2%%Qn`xHW zGR!eorYzZV&_ZjW*eAi>&!d+k$dzXJ|B6JS58k!n2KZk;`17iXS;ny`|QzJt88E0Ffvl0To zzGa;$XcjJLu86)7O8TBt9RB#O@=e757yk4+_%l9~_oX&A^fjq2Cj6r+u_i8@9@S7( l9uO`|E3Mld$PWFQR8kno`I~TlN=bEOAom}V - + - + diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ConnectConvert4.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ConnectConvert4.cs new file mode 100644 index 0000000..409b6da --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ConnectConvert4.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace JiangsuEarthquake.Common +{ + public class ConnectConvert4 : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value.ToString() == "True") + { + return "已连接"; + } + else + { + return "未连接"; + } + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/Tools.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/Tools.cs index 41f075d..89cd3fa 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Common/Tools.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/Tools.cs @@ -245,6 +245,7 @@ namespace JiangsuEarthquake.Common 0x44, 0x84, 0x85, 0x45, 0x87, 0x47, 0x46, 0x86, 0x82, 0x42, 0x43, 0x83, 0x41, 0x81, 0x80, 0x40 }; + public static byte[] Crc16(byte[] pucFrame, int usLen) { int i = 0; @@ -294,6 +295,39 @@ namespace JiangsuEarthquake.Common crc16[1] = (byte)(crc & 0xff); return crc16; } + + + /// + /// CRC校验，参数data为byte数组 + /// + /// 校验数据，字节数组 + /// 字节0是高8位，字节1是低8位 + public static byte[] CRCCalcRev(byte[] data) + { + //crc计算赋初始值 + int crc = 0xffff; + for (int i = 0; i < data.Length; i++) + { + crc = crc ^ data[i]; + for (int j = 0; j < 8; j++) + { + int temp; + temp = crc & 1; + crc = crc >> 1; + crc = crc & 0x7fff; + if (temp == 1) + { + crc = crc ^ 0xa001; + } + crc = crc & 0xffff; + } + } + //CRC寄存器的高低位进行互换 + byte[] crc16 = new byte[2]; + crc16[1] = (byte)((crc >> 8) & 0xff); + crc16[0] = (byte)(crc & 0xff); + return crc16; + } #endregion diff --git a/JiangsuEarthquake/JiangsuEarthquake/DataAccess/DBHelper.cs b/JiangsuEarthquake/JiangsuEarthquake/DataAccess/DBHelper.cs index bb22251..1ddaaa8 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/DataAccess/DBHelper.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/DataAccess/DBHelper.cs @@ -300,17 +300,17 @@ namespace JiangsuEarthquake.DataAccess //public static void InsertSwitchInfo(SwitchInfoModel switchInfo) //{ // //首先判断数据库中是否有这一条数据 - // string sql = string.Format("select id from switchinfo where SwitchName = '{0}';", switchInfo.SwitchName); + // string sql = string.Format("select id from switch_info where SwitchName = '{0}';", switchInfo.SwitchName); // if (ExecuteScalar(sql, 1) == null) //如果没有那就新增一条信息 // { - // sql = string.Format("insert into switchinfo(StationID,RecordTime,DataTime,SwitchName,SwitchState) VALUES({0},'{1}','{2}','{3}','{4}')", switchInfo.StationID, switchInfo.RecordTime, switchInfo.DataTime, switchInfo.SwitchName, switchInfo.SwitchState); + // sql = string.Format("insert into switch_info(StationID,RecordTime,DataTime,SwitchName,SwitchState) VALUES({0},'{1}','{2}','{3}','{4}')", switchInfo.StationID, switchInfo.RecordTime, switchInfo.DataTime, switchInfo.SwitchName, switchInfo.SwitchState); // } // else //如果有那就更新这条信息 // { - // sql = string.Format("update switchinfo set SwitchState='{0}',RecordTime='{1}',DataTime='{2}' where SwitchName = '{3}'", switchInfo.SwitchState, switchInfo.RecordTime, switchInfo.DataTime, switchInfo.SwitchName); + // sql = string.Format("update switch_info set SwitchState='{0}',RecordTime='{1}',DataTime='{2}' where SwitchName = '{3}'", switchInfo.SwitchState, switchInfo.RecordTime, switchInfo.DataTime, switchInfo.SwitchName); // } // ExecuteNonQuery(sql, 1); - // sql = string.Format("insert into switchinfohis(StationID,RecordTime,DataTime,SwitchName,SwitchState) VALUES({0},'{1}','{2}','{3}','{4}')", switchInfo.StationID, switchInfo.RecordTime, switchInfo.DataTime, switchInfo.SwitchName, switchInfo.SwitchState); + // sql = string.Format("insert into switch_info_his(StationID,RecordTime,DataTime,SwitchName,SwitchState) VALUES({0},'{1}','{2}','{3}','{4}')", switchInfo.StationID, switchInfo.RecordTime, switchInfo.DataTime, switchInfo.SwitchName, switchInfo.SwitchState); // ExecuteNonQuery(sql, 1); //} } diff --git a/JiangsuEarthquake/JiangsuEarthquake/MainWindow.xaml b/JiangsuEarthquake/JiangsuEarthquake/MainWindow.xaml index 81c82da..53b36e7 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/MainWindow.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/MainWindow.xaml @@ -96,6 +96,7 @@ + @@ -201,8 +202,18 @@ Foreground="{Binding serverModel2.IsOpened, Converter={StaticResource ResourceKey=ConnectConvert}}" Text="{Binding serverModel2.IsOpened, Converter={StaticResource ResourceKey=ConnectConvert1}}"/> - + + + + + +