新增功能:

1 完成主备地震仪电源控制功能的编写;
2 完成电源开关、功能启停状态On/Off提示,并根据用户操作情况实时更改的功能;
This commit is contained in:
春风过客 2024-05-18 11:32:00 +08:00
parent c4840dff0c
commit 968020e5f7
25 changed files with 545 additions and 330 deletions

View File

@ -3,64 +3,64 @@
"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\\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\\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\\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\\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\\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\\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\\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\\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\\common\\server.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\server.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\\seismographmodel.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\\seismographmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\seismographmodel.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\\alarmrecordviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\alarmrecordviewmodel.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\\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\\models\\earthquakeparasetmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\earthquakeparasetmodel.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\\base\\command.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\base\\command.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\\viewmodels\\seismometerstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\seismometerstatedataviewmodel.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\\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\\views\\systemcontrolview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemcontrolview.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\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\volcurcollectormodel.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\\seismometerstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\seismometerstatedataviewmodel.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\\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\\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\\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.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemcontrolview.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\\boosterstationstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
@ -74,18 +74,6 @@
"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\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\volcurcollectormodel.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\\alarmrecordviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\alarmrecordviewmodel.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\\earthquakeparasetmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\earthquakeparasetmodel.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\\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}"
@ -102,7 +90,7 @@
"DocumentGroups": [
{
"DockedWidth": 169,
"SelectedChildIndex": 20,
"SelectedChildIndex": 18,
"Children": [
{
"$type": "Document",
@ -119,71 +107,43 @@
},
{
"$type": "Document",
"DocumentIndex": 5,
"DocumentIndex": 11,
"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": "AQIAAAAAAAAAAAAAAAAAAGMBAAA5AAAA",
"ViewState": "AQIAAPsAAAAAAAAAAAAgwPEAAAApAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-17T02:27:46.939Z",
"WhenOpened": "2024-05-17T02:27:46.939Z"
},
{
"$type": "Document",
"DocumentIndex": 4,
"Title": "SeismographModel.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\SeismographModel.cs",
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs",
"RelativeToolTip": "JiangsuEarthquake\\Models\\SeismographModel.cs",
"ViewState": "AQIAAFgCAAAAAAAAAAAAAIgCAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-14T07:44:15.338Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"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": "AQIAAHkAAAAAAAAAAAAQwJAAAAAgAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-17T01:54:39.276Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 6,
"Title": "Server.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\Server.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\Server.cs",
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\Server.cs",
"RelativeToolTip": "JiangsuEarthquake\\Common\\Server.cs",
"ViewState": "AQIAAOUAAAAAAAAAAAAzwAkBAAAqAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-16T07:49:02.5Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 10,
"Title": "Command.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Base\\Command.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Base\\Command.cs",
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Base\\Command.cs",
"RelativeToolTip": "JiangsuEarthquake\\Base\\Command.cs",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAsAAAAjAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-16T07:48:58.182Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 12,
"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-05-14T08:02:27.552Z",
"EditorCaption": ""
"WhenOpened": "2024-05-14T08:02:27.552Z"
},
{
"$type": "Document",
"DocumentIndex": 14,
"DocumentIndex": 7,
"Title": "SeismometerStateDataViewModel.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SeismometerStateDataViewModel.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\SeismometerStateDataViewModel.cs",
@ -191,12 +151,11 @@
"RelativeToolTip": "JiangsuEarthquake\\ViewModels\\SeismometerStateDataViewModel.cs",
"ViewState": "AQIAAM0AAAAAAAAAAAAwwAABAAAIAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-14T07:31:53.747Z",
"EditorCaption": ""
"WhenOpened": "2024-05-14T07:31:53.747Z"
},
{
"$type": "Document",
"DocumentIndex": 13,
"DocumentIndex": 14,
"Title": "SystemControlView.xaml.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml.cs",
@ -204,12 +163,11 @@
"RelativeToolTip": "JiangsuEarthquake\\Views\\SystemControlView.xaml.cs",
"ViewState": "AQIAAC8AAAAAAAAAAAAAAEYAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-14T01:31:43.485Z",
"EditorCaption": ""
"WhenOpened": "2024-05-14T01:31:43.485Z"
},
{
"$type": "Document",
"DocumentIndex": 1,
"DocumentIndex": 12,
"Title": "BoosterStationStateDataViewModel.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
@ -217,8 +175,7 @@
"RelativeToolTip": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
"ViewState": "AQIAAH8AAAAAAAAAAAAAAEUBAAAwAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-14T00:25:10.523Z",
"EditorCaption": ""
"WhenOpened": "2024-05-14T00:25:10.523Z"
},
{
"$type": "Document",
@ -229,8 +186,7 @@
"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": ""
"WhenOpened": "2024-05-13T07:36:41.444Z"
},
{
"$type": "Document",
@ -242,36 +198,34 @@
"RelativeToolTip": "JiangsuEarthquake\\Common\\CSVDownload.cs",
"ViewState": "AQIAAPoAAAAAAAAAAAA0wPoAAAA8AAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-13T06:22:56.037Z",
"EditorCaption": ""
"WhenOpened": "2024-05-13T06:22:56.037Z"
},
{
"$type": "Document",
"DocumentIndex": 9,
"DocumentIndex": 13,
"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-05-11T08:13:03.306Z",
"EditorCaption": ""
"WhenOpened": "2024-05-11T08:13:03.306Z"
},
{
"$type": "Document",
"DocumentIndex": 19,
"DocumentIndex": 5,
"Title": "AlarmRecordViewModel.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\AlarmRecordViewModel.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\AlarmRecordViewModel.cs",
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\AlarmRecordViewModel.cs",
"RelativeToolTip": "JiangsuEarthquake\\ViewModels\\AlarmRecordViewModel.cs",
"ViewState": "AQIAAF8AAAAAAAAAAAAUwMIAAAArAAAA",
"ViewState": "AQIAAE0AAAAAAAAAAAAIwMIAAAArAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-09T08:08:20.353Z"
},
{
"$type": "Document",
"DocumentIndex": 20,
"DocumentIndex": 6,
"Title": "EarthQuakeParaSetModel.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\EarthQuakeParaSetModel.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\EarthQuakeParaSetModel.cs",
@ -283,7 +237,7 @@
},
{
"$type": "Document",
"DocumentIndex": 22,
"DocumentIndex": 19,
"Title": "DBHelper.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\DataAccess\\DBHelper.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\DataAccess\\DBHelper.cs",
@ -295,32 +249,31 @@
},
{
"$type": "Document",
"DocumentIndex": 18,
"DocumentIndex": 9,
"Title": "VolCurCollectorModel.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
"RelativeToolTip": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
"ViewState": "AQIAAG8AAAAAAAAAAAAAAIUAAAAVAAAA",
"ViewState": "AQIAAG4AAAAAAAAAAAAAAIUAAAAVAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-04-25T08:11:58.297Z"
},
{
"$type": "Document",
"DocumentIndex": 11,
"DocumentIndex": 10,
"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": "AQIAAAAAAAAAAAAAAAAAAGIAAAAAAAAA",
"ViewState": "AQIAAMgAAAAAAAAAAAAzwP4AAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-13T00:26:48.284Z",
"EditorCaption": ""
"WhenOpened": "2024-05-13T00:26:48.284Z"
},
{
"$type": "Document",
"DocumentIndex": 21,
"DocumentIndex": 18,
"Title": "Tools.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\Tools.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\Tools.cs",
@ -332,20 +285,20 @@
},
{
"$type": "Document",
"DocumentIndex": 4,
"DocumentIndex": 2,
"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": "AQIAAAgAAAAAAAAAAAAIwBwAAAAKAAAA",
"ViewState": "AQIAAAAAAAAAAAAAAAAuwBIAAAAXAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-04-22T06:58:22.442Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"DocumentIndex": 3,
"Title": "SystemControlView.xaml",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml",
@ -363,27 +316,14 @@
"RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
"RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
"ViewState": "AQIAAIMKAAAAAAAAAAAgwKcKAABHAAAA",
"ViewState": "AQIAAKoMAAAAAAAAAAAgwLkMAAAyAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-03-12T06:03:03.53Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 7,
"Title": "SeismographModel.cs",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\SeismographModel.cs",
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs",
"RelativeToolTip": "JiangsuEarthquake\\Models\\SeismographModel.cs",
"ViewState": "AQIAAEICAAAAAAAAAAAkwCsDAABVAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-14T07:44:15.338Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 8,
"DocumentIndex": 1,
"Title": "RealTimeDataView.xaml",
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml",
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml",

View File

@ -6,6 +6,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
namespace JiangsuEarthquake.Models
{
@ -66,8 +68,8 @@ namespace JiangsuEarthquake.Models
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
}
catch
{
catch
{
}
@ -80,7 +82,6 @@ namespace JiangsuEarthquake.Models
switch (functionCode)
{
case 0x02:
//浮标端发送数据给服务器
SensorType = byteList[6];
switch (SensorType)
@ -88,7 +89,7 @@ namespace JiangsuEarthquake.Models
case 0x30:
//接驳盒端其他传感器集合
byteLength = BitConverter.ToInt16(new byte[] { byteList[3], byteList[2] }, 0);
if(byteLength!=106) //长度校验失败
if (byteLength != 106) //长度校验失败
{
try
{
@ -143,7 +144,7 @@ namespace JiangsuEarthquake.Models
{
}
}
catch (Exception ex)
{
@ -183,139 +184,223 @@ namespace JiangsuEarthquake.Models
break;
case 0x03:
//读取状态
byteLength = BitConverter.ToInt16(new byte[] { byteList[3], byteList[2] }, 0);
if (byteLength != 45) //长度校验失败
byte operFunc = byteList[6]; //操作功能
switch (operFunc)
{
try
{
//发送失败信息
if (id == 1)
case 0x01:
//读取长度
byteLength = BitConverter.ToInt16(new byte[] { byteList[3], byteList[2] }, 0);
if (byteLength != 13) //长度校验失败
{
if (MainWindow.mainViewModel.serverModel1 != null && MainWindow.mainViewModel.serverModel1.IsOpened)
MainWindow.mainViewModel.serverModel1.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
else if (id == 2)
{
if (MainWindow.mainViewModel.serverModel2 != null && MainWindow.mainViewModel.serverModel2.IsOpened)
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
}
catch
{
try
{
//发送失败信息
if (id == 1)
{
if (MainWindow.mainViewModel.serverModel1 != null && MainWindow.mainViewModel.serverModel1.IsOpened)
MainWindow.mainViewModel.serverModel1.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
else if (id == 2)
{
if (MainWindow.mainViewModel.serverModel2 != null && MainWindow.mainViewModel.serverModel2.IsOpened)
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
}
catch
{
}
}
break;
}
byte sensorId = byteList[8]; //传感器ID
byte ActionKind = byteList[9]; //动作类型ACT,0-关闭1-开启2-失败)
byte ActionType = byteList[10]; //动作种类0x00-电源0x01-数据回传2-失败)
switch (sensorId)
{
case 0x06:
if (ActionType == 0x00)
{
if (ActionKind == 0x00) //关闭
{
MainWindow.mainViewModel.ImageSourceBaseStation = (ImageSource)Application.Current.FindResource("DeviceOff");
}
else if (ActionKind == 0x01) //开启
{
MainWindow.mainViewModel.ImageSourceBaseStation = (ImageSource)Application.Current.FindResource("DeviceOn");
}
}
break;
case 0x08: //8-接驳盒-地震仪1
if (ActionType == 0x00)
{
if (ActionKind == 0x00) //关闭
{
MainWindow.mainViewModel.ImageSourceMainSeis = (ImageSource)Application.Current.FindResource("DeviceOff");
}
else if (ActionKind == 0x01) //开启
{
MainWindow.mainViewModel.ImageSourceMainSeis = (ImageSource)Application.Current.FindResource("DeviceOn");
}
}
break;
case 0x09: //9-接驳盒-地震仪2
if (ActionType == 0x00)
{
if (ActionKind == 0x00) //关闭
{
MainWindow.mainViewModel.ImageSourceBackupSeis = (ImageSource)Application.Current.FindResource("DeviceOff");
}
else if (ActionKind == 0x01) //开启
{
MainWindow.mainViewModel.ImageSourceBackupSeis = (ImageSource)Application.Current.FindResource("DeviceOn");
}
}
break;
}
break;
case 0x00:
//读取长度
byteLength = BitConverter.ToInt16(new byte[] { byteList[3], byteList[2] }, 0);
if (byteLength != 45) //长度校验失败
{
try
{
//发送失败信息
if (id == 1)
{
if (MainWindow.mainViewModel.serverModel1 != null && MainWindow.mainViewModel.serverModel1.IsOpened)
MainWindow.mainViewModel.serverModel1.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
else if (id == 2)
{
if (MainWindow.mainViewModel.serverModel2 != null && MainWindow.mainViewModel.serverModel2.IsOpened)
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
}
catch
{
}
break;
}
try
{
byte bhb_dlzb = 0; //接驳盒-保护板电力载波-状态反馈
byte bhb_gdjhj = 0; //接驳盒-保护板-光电交换机-状态反馈
byte bhb_dzy1 = 0; //接驳盒-保护板-地震仪1-状态反馈
byte bhb_dzy2 = 0; //接驳盒-保护板-地震仪2-状态反馈
byte bhb_hlj = 0; //接驳盒-保护板-海流计-状态反馈
byte dzy_fkdy = 0; //地震仪-反馈电源状态
byte dzy_fkgd = 0; //地震仪-反馈供电方式
byte jbh_dlzb = 0; //接驳盒-电力载波
byte jbh_gdjhj = 0; //接驳盒-光电交换机
byte jbh_dzy1 = 0; //接驳盒-地震仪1
byte jbh_dzy2 = 0; //接驳盒-地震仪2
byte jbh_hlj = 0; //接驳盒-海流计
byte[] state1 = new byte[] { byteList[7], byteList[8], byteList[9], byteList[10] };
if (Tools.IsBitSet(state1, 32))
bhb_dlzb = 1;
if (Tools.IsBitSet(state1, 31))
bhb_gdjhj = 1;
if (Tools.IsBitSet(state1, 30))
bhb_dzy1 = 1;
if (Tools.IsBitSet(state1, 29))
bhb_dzy2 = 1;
if (Tools.IsBitSet(state1, 28))
bhb_hlj = 1;
if (Tools.IsBitSet(state1, 27))
dzy_fkdy = 1;
if (Tools.IsBitSet(state1, 26))
dzy_fkgd = 1;
if (Tools.IsBitSet(state1, 25))
jbh_dlzb = 1;
if (Tools.IsBitSet(state1, 24))
jbh_gdjhj = 1;
if (Tools.IsBitSet(state1, 23))
jbh_dzy1 = 1;
if (Tools.IsBitSet(state1, 22))
jbh_dzy2 = 1;
if (Tools.IsBitSet(state1, 21))
jbh_hlj = 1;
byte leakage = 0;
byte state = 0;
byte[] state2 = new byte[] { byteList[11], byteList[12], byteList[13], byteList[14] };
if (Tools.IsBitSet(state2, 32))
leakage = 1;
if (Tools.IsBitSet(state2, 31))
state = 1;
float voltage; //24V输出电压4-蓄电池电压
float current_dzy1; //地震仪1电流
float current_dzy2; //地震仪2电流
float current_hlj; //海流计-电流
float current_dlzb; //电力载波-电流
float voltage121; //12V输出电压1-预留
float voltage122; //12V输出电压2-预留
voltage = BitConverter.ToSingle(new byte[] { byteList[18], byteList[17], byteList[16], byteList[15] }, 0);
current_dzy1 = BitConverter.ToSingle(new byte[] { byteList[22], byteList[21], byteList[20], byteList[19] }, 0);
current_dzy2 = BitConverter.ToSingle(new byte[] { byteList[26], byteList[25], byteList[24], byteList[23] }, 0);
current_hlj = BitConverter.ToSingle(new byte[] { byteList[30], byteList[29], byteList[28], byteList[27] }, 0);
current_dlzb = BitConverter.ToSingle(new byte[] { byteList[34], byteList[33], byteList[32], byteList[31] }, 0);
voltage121 = BitConverter.ToSingle(new byte[] { byteList[38], byteList[37], byteList[36], byteList[35] }, 0);
voltage122 = BitConverter.ToSingle(new byte[] { byteList[42], byteList[41], byteList[40], byteList[39] }, 0);
try
{
//发送成功信息
if (id == 1)
{
if (MainWindow.mainViewModel.serverModel1 != null && MainWindow.mainViewModel.serverModel1.IsOpened)
MainWindow.mainViewModel.serverModel1.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x01).ToArray());
}
else if (id == 2)
{
if (MainWindow.mainViewModel.serverModel2 != null && MainWindow.mainViewModel.serverModel2.IsOpened)
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x01).ToArray());
}
}
catch
{
}
}
catch (Exception ex)
{
try
{
//发送失败信息
if (id == 1)
{
if (MainWindow.mainViewModel.serverModel1 != null && MainWindow.mainViewModel.serverModel1.IsOpened)
MainWindow.mainViewModel.serverModel1.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
else if (id == 2)
{
if (MainWindow.mainViewModel.serverModel2 != null && MainWindow.mainViewModel.serverModel2.IsOpened)
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
}
catch
{
}
}
//数据存储
break;
}
try
{
byte bhb_dlzb = 0; //接驳盒-保护板电力载波-状态反馈
byte bhb_gdjhj = 0; //接驳盒-保护板-光电交换机-状态反馈
byte bhb_dzy1 = 0; //接驳盒-保护板-地震仪1-状态反馈
byte bhb_dzy2 = 0; //接驳盒-保护板-地震仪2-状态反馈
byte bhb_hlj = 0; //接驳盒-保护板-海流计-状态反馈
byte dzy_fkdy = 0; //地震仪-反馈电源状态
byte dzy_fkgd = 0; //地震仪-反馈供电方式
byte jbh_dlzb = 0; //接驳盒-电力载波
byte jbh_gdjhj = 0; //接驳盒-光电交换机
byte jbh_dzy1 = 0; //接驳盒-地震仪1
byte jbh_dzy2 = 0; //接驳盒-地震仪2
byte jbh_hlj = 0; //接驳盒-海流计
byte[] state1 = new byte[] { byteList[7], byteList[8], byteList[9], byteList[10] };
if (Tools.IsBitSet(state1, 32))
bhb_dlzb = 1;
if (Tools.IsBitSet(state1, 31))
bhb_gdjhj = 1;
if (Tools.IsBitSet(state1, 30))
bhb_dzy1 = 1;
if (Tools.IsBitSet(state1, 29))
bhb_dzy2 = 1;
if (Tools.IsBitSet(state1, 28))
bhb_hlj = 1;
if (Tools.IsBitSet(state1, 27))
dzy_fkdy = 1;
if (Tools.IsBitSet(state1, 26))
dzy_fkgd = 1;
if (Tools.IsBitSet(state1, 25))
jbh_dlzb = 1;
if (Tools.IsBitSet(state1, 24))
jbh_gdjhj = 1;
if (Tools.IsBitSet(state1, 23))
jbh_dzy1 = 1;
if (Tools.IsBitSet(state1, 22))
jbh_dzy2 = 1;
if (Tools.IsBitSet(state1, 21))
jbh_hlj = 1;
byte leakage = 0;
byte state = 0;
byte[] state2 = new byte[] { byteList[11], byteList[12], byteList[13], byteList[14] };
if (Tools.IsBitSet(state2, 32))
leakage = 1;
if (Tools.IsBitSet(state2, 31))
state = 1;
float voltage; //24V输出电压4-蓄电池电压
float current_dzy1; //地震仪1电流
float current_dzy2; //地震仪2电流
float current_hlj; //海流计-电流
float current_dlzb; //电力载波-电流
float voltage121; //12V输出电压1-预留
float voltage122; //12V输出电压2-预留
voltage = BitConverter.ToSingle(new byte[] { byteList[18], byteList[17], byteList[16], byteList[15] }, 0);
current_dzy1 = BitConverter.ToSingle(new byte[] { byteList[22], byteList[21], byteList[20], byteList[19] }, 0);
current_dzy2 = BitConverter.ToSingle(new byte[] { byteList[26], byteList[25], byteList[24], byteList[23] }, 0);
current_hlj = BitConverter.ToSingle(new byte[] { byteList[30], byteList[29], byteList[28], byteList[27] }, 0);
current_dlzb = BitConverter.ToSingle(new byte[] { byteList[18], byteList[17], byteList[16], byteList[15] }, 0);
voltage121 = BitConverter.ToSingle(new byte[] { byteList[18], byteList[17], byteList[16], byteList[15] }, 0);
voltage122 = BitConverter.ToSingle(new byte[] { byteList[18], byteList[17], byteList[16], byteList[15] }, 0);
try
{
//发送成功信息
if (id == 1)
{
if (MainWindow.mainViewModel.serverModel1 != null && MainWindow.mainViewModel.serverModel1.IsOpened)
MainWindow.mainViewModel.serverModel1.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x01).ToArray());
}
else if (id == 2)
{
if (MainWindow.mainViewModel.serverModel2 != null && MainWindow.mainViewModel.serverModel2.IsOpened)
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x01).ToArray());
}
}
catch
{
}
}
catch(Exception ex)
{
try
{
//发送失败信息
if (id == 1)
{
if (MainWindow.mainViewModel.serverModel1 != null && MainWindow.mainViewModel.serverModel1.IsOpened)
MainWindow.mainViewModel.serverModel1.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
else if (id == 2)
{
if (MainWindow.mainViewModel.serverModel2 != null && MainWindow.mainViewModel.serverModel2.IsOpened)
MainWindow.mainViewModel.serverModel2.SendMessage(ServerReplyData(byteList[5], byteList[6], 0x00).ToArray());
}
}
catch
{
}
}
//数据存储
break;
case 0x07:

View File

@ -645,6 +645,9 @@ namespace JiangsuEarthquake.Models
MainWindow.mainViewModel.ImageSourceSetZero = (ImageSource)Application.Current.FindResource("DeviceOn");
MainWindow.mainViewModel.SeisZeroSetStartButtonIsEnabled = true;
MainWindow.mainViewModel.SeisZeroSetStopButtonIsEnabled = true;
//存储状态
}
else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x51 })) //停止地震计调零
{
@ -662,6 +665,9 @@ namespace JiangsuEarthquake.Models
MainWindow.mainViewModel.ImageSourceSetZero = (ImageSource)Application.Current.FindResource("DeviceOff");
MainWindow.mainViewModel.SeisZeroSetStopButtonIsEnabled = true;
MainWindow.mainViewModel.SeisZeroSetStartButtonIsEnabled = true;
//存储状态
}
else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x66 })) //运行状态信息
{
@ -793,6 +799,9 @@ namespace JiangsuEarthquake.Models
MainWindow.mainViewModel.ImageSourceSetLevel = (ImageSource)Application.Current.FindResource("DeviceOn");
MainWindow.mainViewModel.SeisLevelSetStartButtonIsEnabled = true;
MainWindow.mainViewModel.SeisLevelSetStopButtonIsEnabled = true;
//存储状态
}
else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x91 })) //停止地震计调平
{
@ -810,6 +819,9 @@ namespace JiangsuEarthquake.Models
MainWindow.mainViewModel.ImageSourceSetLevel = (ImageSource)Application.Current.FindResource("DeviceOff");
MainWindow.mainViewModel.SeisLevelSetStopButtonIsEnabled = true;
MainWindow.mainViewModel.SeisLevelSetStartButtonIsEnabled = true;
//存储状态
}
}
}

View File

@ -40,8 +40,8 @@ namespace JiangsuEarthquake.ViewModels
public static SeismometerStateDataViewModel seismometerStateDataViewModel2 = new SeismometerStateDataViewModel(2);
public static LogRecordViewModel logRecordViewModel1 = new LogRecordViewModel(1);
public static LogRecordViewModel logRecordViewModel2 = new LogRecordViewModel(2);
public static SystemControlViewModel systemControlViewModel1 = new SystemControlViewModel();
public static SystemControlViewModel systemControlViewModel2 = new SystemControlViewModel();
//public static SystemControlViewModel systemControlViewModel1 = new SystemControlViewModel();
//public static SystemControlViewModel systemControlViewModel2 = new SystemControlViewModel();
public static SystemStateDataViewModel systemStateDataViewModel1 = new SystemStateDataViewModel(1);
public static SystemStateDataViewModel systemStateDataViewModel2 = new SystemStateDataViewModel(2);
public static BaseStationModelViewModel baseStationModelViewModel1 = new BaseStationModelViewModel();
@ -2110,13 +2110,13 @@ namespace JiangsuEarthquake.ViewModels
(sender as DispatcherTimer).Stop();
}
private Brush baseStationPowerBackground = new SolidColorBrush(Colors.Red);
//private Brush baseStationPowerBackground = new SolidColorBrush(Colors.Red);
public Brush BaseStationPowerBackground
{
get { return baseStationPowerBackground; }
set { baseStationPowerBackground = value; this.DoNotify(); }
}
//public Brush BaseStationPowerBackground
//{
// get { return baseStationPowerBackground; }
// set { baseStationPowerBackground = value; this.DoNotify(); }
//}
private ImageSource imageSourceBaseStation = (ImageSource)Application.Current.FindResource("DeviceOff");
@ -2150,13 +2150,13 @@ namespace JiangsuEarthquake.ViewModels
set { baseStationMsgVisibility = value; this.DoNotify(); }
}
private Brush mainSeisPowerBackground = new SolidColorBrush(Colors.Red);
//private Brush mainSeisPowerBackground = new SolidColorBrush(Colors.Red);
public Brush MainSeisPowerBackground
{
get { return mainSeisPowerBackground; }
set { mainSeisPowerBackground = value; this.DoNotify(); }
}
//public Brush MainSeisPowerBackground
//{
// get { return mainSeisPowerBackground; }
// set { mainSeisPowerBackground = value; this.DoNotify(); }
//}
private ImageSource imageSourceMainSeis = (ImageSource)Application.Current.FindResource("DeviceOff");
@ -2190,13 +2190,13 @@ namespace JiangsuEarthquake.ViewModels
set { mainSeisMsgVisibility = value; this.DoNotify(); }
}
private Brush backupSeisPowerBackground = new SolidColorBrush(Colors.Red);
//private Brush backupSeisPowerBackground = new SolidColorBrush(Colors.Red);
public Brush BackupSeisPowerBackground
{
get { return backupSeisPowerBackground; }
set { backupSeisPowerBackground = value; this.DoNotify(); }
}
//public Brush BackupSeisPowerBackground
//{
// get { return backupSeisPowerBackground; }
// set { backupSeisPowerBackground = value; this.DoNotify(); }
//}
private ImageSource imageSourceBackupSeis = (ImageSource)Application.Current.FindResource("DeviceOff");
@ -2709,7 +2709,7 @@ namespace JiangsuEarthquake.ViewModels
MainSeisPowerCloseBtnIsEnabled = false;
MainSeisPowerOnIsReceived = false;
List<byte> sendDataPower = RemoteControl(0x30, 0x06, 0x01, 0x08);
List<byte> sendDataPower = RemoteControl(0x30, 0x08, 0x01, 0x00);
bool result = false;
if (station_id == 1)
@ -2720,12 +2720,12 @@ namespace JiangsuEarthquake.ViewModels
}
else
{
BaseStationMsgVisibility = Visibility.Visible;
BaseStationMsg = "通信未连接!";
timerBaseStationMsgHidden.Start();
BaseStationMsgForeground = new SolidColorBrush(Colors.Red);
BaseStationPowerOpenBtnIsEnabled = true;
BaseStationPowerCloseBtnIsEnabled = true;
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "通信未连接!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Red);
MainSeisPowerOpenBtnIsEnabled = false;
MainSeisPowerCloseBtnIsEnabled = false;
break;
}
}
@ -2737,47 +2737,221 @@ namespace JiangsuEarthquake.ViewModels
}
else
{
BaseStationMsgVisibility = Visibility.Visible;
BaseStationMsg = "通信未连接!";
timerBaseStationMsgHidden.Start();
BaseStationMsgForeground = new SolidColorBrush(Colors.Red);
BaseStationPowerOpenBtnIsEnabled = true;
BaseStationPowerCloseBtnIsEnabled = true;
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "通信未连接!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Red);
MainSeisPowerOpenBtnIsEnabled = false;
MainSeisPowerCloseBtnIsEnabled = false;
break;
}
}
if (result)
{
BaseStationMsgVisibility = Visibility.Visible;
BaseStationMsg = "打开海底基站电源发送成功!";
timerBaseStationMsgHidden.Start();
BaseStationMsgForeground = new SolidColorBrush(Colors.Green);
timerBaseStationPowerOn.Start();
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "打开主地震仪电源发送成功!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Green);
timerMainSeisPowerOn.Start();
}
else
{
BaseStationMsgVisibility = Visibility.Visible;
BaseStationMsg = "打开海底基站电源发送失败!";
timerBaseStationMsgHidden.Start();
BaseStationMsgForeground = new SolidColorBrush(Colors.Red);
BaseStationPowerOpenBtnIsEnabled = true;
BaseStationPowerCloseBtnIsEnabled = true;
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "打开主地震仪电源发送失败!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Red);
MainSeisPowerOpenBtnIsEnabled = false;
MainSeisPowerCloseBtnIsEnabled = false;
}
}
else
{
MainSeisPowerOpenBtnIsEnabled = false;
MainSeisPowerCloseBtnIsEnabled = false;
MainSeisPowerOffIsReceived = false;
List<byte> sendDataPower = RemoteControl(0x30, 0x08, 0x00, 0x00);
bool result = false;
if (station_id == 1)
{
if (serverModel1 != null && serverModel1.IsOpened)
{
result = serverModel1.SendMessage(sendDataPower.ToArray());
}
else
{
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "通信未连接!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Red);
MainSeisPowerOpenBtnIsEnabled = false;
MainSeisPowerCloseBtnIsEnabled = false;
break;
}
}
else
{
if (serverModel2 != null && serverModel2.IsOpened)
{
result = serverModel2.SendMessage(sendDataPower.ToArray());
}
else
{
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "通信未连接!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Red);
MainSeisPowerOpenBtnIsEnabled = false;
MainSeisPowerCloseBtnIsEnabled = false;
break;
}
}
if (result)
{
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "关闭主地震仪电源发送成功!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Green);
timerMainSeisPowerOff.Start();
}
else
{
MainSeisMsgVisibility = Visibility.Visible;
MainSeisMsg = "关闭主地震仪电源发送失败!";
timerMainSeisMsgHidden.Start();
MainSeisMsgForeground = new SolidColorBrush(Colors.Red);
MainSeisPowerOpenBtnIsEnabled = false;
MainSeisPowerCloseBtnIsEnabled = false;
}
}
break;
case "BackupSeisPowerPicker":
if (msg[1].Equals("True")) //打开
{
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
BackupSeisPowerOnIsReceived = false;
List<byte> sendDataPower = RemoteControl(0x30, 0x09, 0x01, 0x00);
bool result = false;
if (station_id == 1)
{
if (serverModel1 != null && serverModel1.IsOpened)
{
result = serverModel1.SendMessage(sendDataPower.ToArray());
}
else
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "通信未连接!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Red);
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
break;
}
}
else
{
if (serverModel2 != null && serverModel2.IsOpened)
{
result = serverModel2.SendMessage(sendDataPower.ToArray());
}
else
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "通信未连接!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Red);
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
break;
}
}
if (result)
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "打开备地震仪电源发送成功!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Green);
timerBackupSeisPowerOn.Start();
}
else
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "打开备地震仪电源发送失败!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Red);
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
}
}
else
{
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
BackupSeisPowerOffIsReceived = false;
List<byte> sendDataPower = RemoteControl(0x30, 0x09, 0x00, 0x00);
bool result = false;
if (station_id == 1)
{
if (serverModel1 != null && serverModel1.IsOpened)
{
result = serverModel1.SendMessage(sendDataPower.ToArray());
}
else
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "通信未连接!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Red);
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
break;
}
}
else
{
if (serverModel2 != null && serverModel2.IsOpened)
{
result = serverModel2.SendMessage(sendDataPower.ToArray());
}
else
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "通信未连接!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Red);
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
break;
}
}
if (result)
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "关闭备地震仪电源发送成功!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Green);
timerBackupSeisPowerOff.Start();
}
else
{
BackupSeisMsgVisibility = Visibility.Visible;
BackupSeisMsg = "关闭备地震仪电源发送失败!";
timerBackupSeisMsgHidden.Start();
BackupSeisMsgForeground = new SolidColorBrush(Colors.Red);
BackupSeisPowerOpenBtnIsEnabled = false;
BackupSeisPowerCloseBtnIsEnabled = false;
}
}
break;
case "SeisZeroSetStart": //凋零
@ -3092,10 +3266,10 @@ namespace JiangsuEarthquake.ViewModels
checkByteSeisLevel.Clear();
checkByteSeisLevel.AddRange(new byte[] { 0xA0, 0x90 }); //CMD
checkByteSeisLevel.AddRange(new byte[] { 0x00, 0x04 }); //LENGTH
checkByteSeisLevel.AddRange(numDZJ); //DATA
checkByteSeisLevel.AddRange(numDZJ); //DATA
checkCodeSeisLevel = Tools.CRCCalc(checkByteSeisLevel.ToArray()); //CHK_SUM
sendDataSeisLevel.AddRange(checkCodeSeisLevel);
bool result = false;
if (station_id == 1)
{
@ -3820,6 +3994,8 @@ namespace JiangsuEarthquake.ViewModels
case "SystemControlView":
MainSeisIsChecked = true;
BackupSeisIsChecked = false;
//从数据库中读取站点一海底基站、主备地震仪的电源开关和功能启停状态,并显示到页面
SS = switchStateModel1;
EQPS = earthQuakeParaSetModel1;
//EQSM = earthquakeSensorModel1;
@ -3852,6 +4028,8 @@ namespace JiangsuEarthquake.ViewModels
page.DataContext = seismometerStateDataViewModel2;
break;
case "SystemControlView":
//从数据库中读取站点二海底基站、主备地震仪的电源开关和功能启停状态,并显示到页面
MainSeisIsChecked = true;
BackupSeisIsChecked = false;
SS = switchStateModel2;

View File

@ -59,7 +59,7 @@ namespace JiangsuEarthquake {
#line default
#line hidden
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/app.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -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+d8b23992a255662315be71536d13fc723fccba10")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c4840dff0c4adad391bbdf08cd9746670ef3e54a")]
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
53f1b4f73a9f806908f9ab0ebc4c54889a25723ad844381c01e6696ee3bfa2dd
f3130775fda4ecfc73601a1840287a1d54a8e6e271e29ff7602aeeb6512f875d

View File

@ -77,7 +77,7 @@ namespace JiangsuEarthquake {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/mainwindow.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\MainWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -116,7 +116,7 @@ namespace JiangsuEarthquake.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/alarmrecordview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/alarmrecordview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\AlarmRecordView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -149,7 +149,7 @@ namespace JiangsuEarthquake.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/boosterstationstatedataview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/boosterstationstatedataview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\BoosterStationStateDataView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -130,7 +130,7 @@ namespace JiangsuEarthquake.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/logrecordview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/logrecordview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\LogRecordView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -89,7 +89,7 @@ namespace JiangsuEarthquake.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/realtimedataview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/realtimedataview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\RealTimeDataView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -442,7 +442,7 @@ namespace JiangsuEarthquake.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/systemcontrolview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/systemcontrolview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\SystemControlView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -124,7 +124,7 @@ namespace JiangsuEarthquake.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/systemstatedataview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/systemstatedataview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\SystemStateDataView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -121,7 +121,7 @@ namespace JiangsuEarthquake.Views.UserControls {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/usercontrols/alarmsettingview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/usercontrols/alarmsettingview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\..\Views\UserControls\AlarmSettingView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -134,7 +134,7 @@ namespace JiangsuEarthquake.Views.UserControls {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/usercontrols/basestationmodel.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/usercontrols/basestationmodel.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\..\Views\UserControls\BaseStationModel.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -149,7 +149,7 @@ namespace JiangsuEarthquake.Views.UserControls {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/usercontrols/initialview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/usercontrols/initialview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\..\Views\UserControls\InitialView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -125,7 +125,7 @@ namespace JiangsuEarthquake.Views.UserControls {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/usercontrols/initialview1.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/usercontrols/initialview1.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\..\Views\UserControls\InitialView1.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -89,7 +89,7 @@ namespace JiangsuEarthquake.Views.UserControls {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/usercontrols/othersettingview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/usercontrols/othersettingview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\..\Views\UserControls\OtherSettingView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

View File

@ -73,7 +73,7 @@ namespace JiangsuEarthquake.Views.UserControls {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;component/views/usercontrols/textdialog.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/JiangsuEarthquake;V1.0.0.0;component/views/usercontrols/textdialog.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\..\Views\UserControls\TextDialog.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);