新增功能：
1 完成升压站单路直流电压电流组合采集器报警设置功能指令、通信编写，并进行串口通信测试； 新增bug： 1 串口通信内部存在bug，导致两个串口内部有关联，从而导致两个串口无法同时通信；
This commit is contained in:
parent
57bc972a18
commit
0b9514a317
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -2,69 +2,77 @@
|
||||
"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\\views\\usercontrols\\alarmsettingview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\alarmsettingview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\usercontrols\\alarmsettingview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\alarmsettingview.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\\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\\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\\usercontrols\\textdialog.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\textdialog.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\\systemcontrolviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\systemcontrolviewmodel.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\\boosterstationstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\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\\usercontrols\\alarmsettingview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\alarmsettingview.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\\alarmsettingview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\alarmsettingview.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\\boosterstationstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\boosterstationstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\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\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\models\\commodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\commodel.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\\commodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\commodel.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\\dataaccess\\dbhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\dataaccess\\dbhelper.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\\commodel2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\commodel2.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\\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\\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\\volcurcollectormodel2.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\\connectconvert2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\connectconvert2.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.cs||{8B382828-6202-11D1-8870-0000F87579D2}|",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\mainwindow.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\\volcurcollectormodel2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\volcurcollectormodel2.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\\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\\common\\tools.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\tools.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\usercontrols\\textdialog.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\textdialog.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\\dataaccess\\dbhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\dataaccess\\dbhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
}
|
||||
],
|
||||
"DocumentGroupContainers": [
|
||||
@ -74,11 +82,63 @@
|
||||
"DocumentGroups": [
|
||||
{
|
||||
"DockedWidth": 196,
|
||||
"SelectedChildIndex": 1,
|
||||
"SelectedChildIndex": 14,
|
||||
"Children": [
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 5,
|
||||
"DocumentIndex": 10,
|
||||
"Title": "ComModel2.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ComModel2.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\ComModel2.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ComModel2.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Models\\ComModel2.cs",
|
||||
"ViewState": "AQIAAAMAAAAAAAAAAAAAADQAAAAAAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-18T06:56:29.71Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 13,
|
||||
"Title": "MainWindow.xaml.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\MainWindow.xaml.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\MainWindow.xaml.cs",
|
||||
"ViewState": "AQIAAAEAAAAAAAAAAAAAAC0AAAAIAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-18T06:41:01.564Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 12,
|
||||
"Title": "ConnectConvert2.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ConnectConvert2.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\ConnectConvert2.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ConnectConvert2.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Common\\ConnectConvert2.cs",
|
||||
"ViewState": "AQIAAAAAAAAAAAAAAAAAABIAAAAQAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-18T06:29:04.315Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 11,
|
||||
"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": "AQIAACcAAAAAAAAAAIAzwDIAAAAyAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-18T06:28:41.516Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 16,
|
||||
"Title": "TextDialog.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\TextDialog.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\TextDialog.xaml",
|
||||
@ -90,7 +150,7 @@
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 0,
|
||||
"DocumentIndex": 4,
|
||||
"Title": "AlarmSettingView.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\AlarmSettingView.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\AlarmSettingView.xaml",
|
||||
@ -102,72 +162,72 @@
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 1,
|
||||
"DocumentIndex": 3,
|
||||
"Title": "AlarmSettingView.xaml.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\AlarmSettingView.xaml.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\AlarmSettingView.xaml.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\AlarmSettingView.xaml.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\AlarmSettingView.xaml.cs",
|
||||
"ViewState": "AQIAADcAAAAAAAAAAAAiwF8AAAAmAAAA",
|
||||
"ViewState": "AQIAABgAAAAAAAAAAAAzwCsAAAANAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-17T07:52:06.944Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 11,
|
||||
"DocumentIndex": 17,
|
||||
"Title": "DBHelper.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\DataAccess\\DBHelper.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\DataAccess\\DBHelper.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\DataAccess\\DBHelper.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\DataAccess\\DBHelper.cs",
|
||||
"ViewState": "AQIAAAMAAAAAAAAAAAAAABQAAAAPAAAA",
|
||||
"ViewState": "AQIAAAAAAAAAAAAAAABOwBQAAAAPAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-17T01:04:50.395Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 12,
|
||||
"DocumentIndex": 15,
|
||||
"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": "AQIAAF4AAAAAAAAAAAAkwG0AAAAoAAAA",
|
||||
"ViewState": "AQIAAAYAAAAAAAAAAAAAABMAAABGAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-17T00:28:01.438Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 13,
|
||||
"DocumentIndex": 14,
|
||||
"Title": "VolCurCollectorModel2.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel2.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\VolCurCollectorModel2.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel2.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Models\\VolCurCollectorModel2.cs",
|
||||
"ViewState": "AQIAADIAAAAAAAAAAAAiwGoAAAANAAAA",
|
||||
"ViewState": "AQIAADIAAAAAAAAAAAA4wGoAAAANAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-17T06:28:24.849Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 10,
|
||||
"DocumentIndex": 7,
|
||||
"Title": "ComModel.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ComModel.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\ComModel.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\ComModel.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Models\\ComModel.cs",
|
||||
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAAABAAAA",
|
||||
"ViewState": "AQIAAA4AAAAAAAAAAAAUwCMAAAAMAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-16T08:15:26.979Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 9,
|
||||
"DocumentIndex": 8,
|
||||
"Title": "SystemControlView.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml",
|
||||
@ -179,72 +239,46 @@
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 8,
|
||||
"DocumentIndex": 2,
|
||||
"Title": "SystemControlView.xaml.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Views\\SystemControlView.xaml.cs",
|
||||
"ViewState": "AQIAAAkAAAAAAAAAAAAAAC8AAAAIAAAA",
|
||||
"ViewState": "AQIAAAwAAAAAAAAAAAAAABEAAAAhAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-16T07:45:39.593Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 6,
|
||||
"DocumentIndex": 1,
|
||||
"Title": "SystemControlViewModel.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemControlViewModel.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\SystemControlViewModel.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\SystemControlViewModel.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\ViewModels\\SystemControlViewModel.cs",
|
||||
"ViewState": "AQIAABUAAAAAAAAAAAAzwEgAAAAqAAAA",
|
||||
"ViewState": "AQIAAAAAAAAAAAAAAAAAAA8AAAAnAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-16T07:54:58.266Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$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": "AQIAANUAAAAAAAAAAAAAADkDAAAMAAAA",
|
||||
"ViewState": "AQIAABQCAAAAAAAAAAAiwPkFAAAAAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-03-12T06:03:03.53Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 14,
|
||||
"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": "AQIAAAAAAAAAAAAAAAAAAB8AAAAbAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
|
||||
"WhenOpened": "2024-04-09T07:40:07.536Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 15,
|
||||
"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": "AQIAAPYAAAAAAAAAAABBwA4BAAAJAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-10T11:03:39.252Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 4,
|
||||
"DocumentIndex": 9,
|
||||
"Title": "MainWindow.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\MainWindow.xaml",
|
||||
@ -256,7 +290,7 @@
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 7,
|
||||
"DocumentIndex": 5,
|
||||
"Title": "BoosterStationStateDataView.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\BoosterStationStateDataView.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\BoosterStationStateDataView.xaml",
|
||||
@ -268,13 +302,13 @@
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 3,
|
||||
"DocumentIndex": 6,
|
||||
"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": "AQIAAKwAAAAAAAAAAAAkwLsAAAA9AAAA",
|
||||
"ViewState": "AQIAAA8AAAAAAAAAAAAAABIAAAAmAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-04-17T08:04:49.029Z",
|
||||
"EditorCaption": ""
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -20,11 +20,11 @@
|
||||
<!--下位机作为服务器的端口号2-->
|
||||
|
||||
<!--升压站串口信息1-->
|
||||
<add key="PortName1" value="COM4"/>
|
||||
<add key="PortName1" value="COM11"/>
|
||||
<add key="BaudRate1" value="9600"/>
|
||||
|
||||
<!--升压站串口信息2-->
|
||||
<add key="PortName2" value="COM4"/>
|
||||
<add key="PortName2" value="COM1"/>
|
||||
<add key="BaudRate2" value="9600"/>
|
||||
|
||||
<!--升压站量程信息-->
|
||||
|
||||
@ -16,9 +16,10 @@
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />
|
||||
<!--<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.LightBlue.xaml" />-->
|
||||
|
||||
<!--<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDark.xaml"/>-->
|
||||
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDark.xaml"/>
|
||||
<!--<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/BaseDark.xaml"/>-->
|
||||
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
|
||||
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
|
||||
<!--<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>-->
|
||||
|
||||
<ResourceDictionary Source="/JiangsuEarthquake;component/ImageDictionary.xaml"/>
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
@ -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 ConnectConvert2 : 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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -11,12 +11,9 @@ namespace JiangsuEarthquake.Models
|
||||
{
|
||||
public class ComModel : NotifyBase
|
||||
{
|
||||
RTU rtuInstance = null;
|
||||
|
||||
SerialInfo serialInfo = new SerialInfo();
|
||||
private RTU rtuInstance = null;
|
||||
|
||||
private VolCurCollectorModel volCurCollectorModel { get; set; } = new VolCurCollectorModel();
|
||||
private VolCurCollectorModel2 volCurCollectorModel2 { get; set; } = new VolCurCollectorModel2();
|
||||
|
||||
private bool isConnected;
|
||||
|
||||
@ -34,13 +31,10 @@ namespace JiangsuEarthquake.Models
|
||||
/// 建立连接
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool DoConnect(SerialInfo serialInfo, int stationId)
|
||||
public bool DoConnect(SerialInfo serialInfo)
|
||||
{
|
||||
rtuInstance = RTU.GetInstance(serialInfo);
|
||||
if (stationId == 1)
|
||||
rtuInstance.ResponseData = new Action<List<byte>>(volCurCollectorModel.ParsingData);
|
||||
else
|
||||
rtuInstance.ResponseData = new Action<List<byte>>(volCurCollectorModel2.ParsingData);
|
||||
rtuInstance.ResponseData = new Action<List<byte>>(volCurCollectorModel.ParsingData);
|
||||
IsConnected = rtuInstance.Connection();
|
||||
return IsConnected;
|
||||
}
|
||||
|
||||
78
JiangsuEarthquake/JiangsuEarthquake/Models/ComModel2.cs
Normal file
78
JiangsuEarthquake/JiangsuEarthquake/Models/ComModel2.cs
Normal file
@ -0,0 +1,78 @@
|
||||
using Communication.Modbus;
|
||||
using Communication;
|
||||
using JiangsuEarthquake.Common;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace JiangsuEarthquake.Models
|
||||
{
|
||||
public class ComModel2 : NotifyBase
|
||||
{
|
||||
private RTU rtuInstance2 = null;
|
||||
|
||||
private VolCurCollectorModel2 volCurCollectorModel2 { get; set; } = new VolCurCollectorModel2();
|
||||
|
||||
private bool isConnected;
|
||||
|
||||
/// <summary>
|
||||
/// 是否连接
|
||||
/// </summary>
|
||||
public bool IsConnected
|
||||
{
|
||||
get { return isConnected; }
|
||||
set { isConnected = value; this.DoNotify(); }
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 建立连接
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool DoConnect(SerialInfo serialInfo)
|
||||
{
|
||||
rtuInstance2 = RTU.GetInstance(serialInfo);
|
||||
rtuInstance2.ResponseData = new Action<List<byte>>(volCurCollectorModel2.ParsingData);
|
||||
IsConnected = rtuInstance2.Connection();
|
||||
return IsConnected;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 断开连接
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool DisConnect()
|
||||
{
|
||||
rtuInstance2.Dispose();
|
||||
IsConnected = false;
|
||||
return IsConnected;
|
||||
}
|
||||
|
||||
|
||||
public bool SendMessage(byte[] _send)
|
||||
{
|
||||
if (_send.Length == 0)
|
||||
return false;
|
||||
try
|
||||
{
|
||||
if (IsConnected)
|
||||
{
|
||||
rtuInstance2.Send(_send);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -119,7 +119,27 @@ namespace JiangsuEarthquake.Models
|
||||
return;
|
||||
|
||||
//需要判断发送内容和接收内容是否相同，相同则设置成功
|
||||
//根据寄存器地址判断接收的到信息是对什么进行设置的
|
||||
if (byteList[2] ==0x01 && byteList[3]==0x2C) //继电器报警参数
|
||||
{
|
||||
|
||||
}
|
||||
else if(byteList[2] == 0x01 && byteList[3] == 0x2D) //继电器报警阀值 1
|
||||
{
|
||||
|
||||
}
|
||||
else if(byteList[2] == 0x01 && byteList[3] == 0x2E) //继电器报警阀值 2
|
||||
{
|
||||
|
||||
}
|
||||
else if(byteList[2] == 0x01 && byteList[3] == 0x2F) //继电器报警功能
|
||||
{
|
||||
|
||||
}
|
||||
else if (byteList[2] == 0x01 && byteList[3] == 0x30) //继电器输出
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -24,6 +24,9 @@ namespace JiangsuEarthquake.ViewModels
|
||||
|
||||
public BoosterStationStateDataView boosterStationStateDataView { get; set; } = new BoosterStationStateDataView();
|
||||
|
||||
|
||||
#region SearchData
|
||||
|
||||
private DateTime _startDateTime;
|
||||
|
||||
public DateTime StartDateTime
|
||||
@ -65,7 +68,10 @@ namespace JiangsuEarthquake.ViewModels
|
||||
get { return boosterStationStateMsg; }
|
||||
set { boosterStationStateMsg = value; this.DoNotify(); }
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Coordinate Axis
|
||||
public SeriesCollection seriesCollection;
|
||||
|
||||
public SeriesCollection SeriesCollection
|
||||
@ -113,6 +119,8 @@ namespace JiangsuEarthquake.ViewModels
|
||||
this.DoNotify();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
private ObservableCollection<BoosterStationStateDataModel> boosterStationStateDataList = new ObservableCollection<BoosterStationStateDataModel>();
|
||||
|
||||
@ -134,12 +142,10 @@ namespace JiangsuEarthquake.ViewModels
|
||||
|
||||
public CommandBase NextBoosterStationStateCommand { get; set; } //读取日志信息
|
||||
|
||||
public CommandBase AlarmSettingCommand { get; set; }
|
||||
|
||||
int station_id = 1;
|
||||
|
||||
|
||||
|
||||
#region Data Filtering
|
||||
public static DialogViewModel vm;
|
||||
|
||||
private bool _isChecked;
|
||||
@ -258,6 +264,7 @@ namespace JiangsuEarthquake.ViewModels
|
||||
YFormatter2 = val => val.ToString("F2") + " A";
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
public BoosterStationStateDataViewModel(int id)
|
||||
@ -281,12 +288,10 @@ namespace JiangsuEarthquake.ViewModels
|
||||
this.NextBoosterStationStateCommand = new CommandBase();
|
||||
this.NextBoosterStationStateCommand.DoExcute = new Action<object>(NextBoosterStationState);
|
||||
this.NextBoosterStationStateCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
this.AlarmSettingCommand = new CommandBase();
|
||||
this.AlarmSettingCommand.DoExcute = new Action<object>(AlarmSetting);
|
||||
this.AlarmSettingCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
}
|
||||
|
||||
|
||||
#region Page Switching
|
||||
public void ForwordBoosterStationState(object o)
|
||||
{
|
||||
if (PageIndex == 1)
|
||||
@ -314,10 +319,7 @@ namespace JiangsuEarthquake.ViewModels
|
||||
}
|
||||
BoosterStationStateMsg = string.Format("共计{0}页，当前第{1}页", TotalPage, PageIndex);
|
||||
}
|
||||
#endregion
|
||||
|
||||
public void AlarmSetting(object o)
|
||||
{
|
||||
HandyControl.Controls.Dialog.Show(new AlarmSettingView());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,6 +18,10 @@ using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Threading;
|
||||
using Communication;
|
||||
using System.IO.Ports;
|
||||
using JiangsuEarthquake.Views.UserControls;
|
||||
using HandyControl.Tools.Extension;
|
||||
|
||||
namespace JiangsuEarthquake.ViewModels
|
||||
{
|
||||
@ -201,14 +205,107 @@ namespace JiangsuEarthquake.ViewModels
|
||||
};
|
||||
|
||||
|
||||
#region Communication
|
||||
public CommandBase Com1DoConnectCommand { get; set; } //串口连接/断开操作
|
||||
public CommandBase Com2DoConnectCommand { get; set; } //串口连接/断开操作
|
||||
|
||||
public CommandBase Socket1DoConnectCommand { get; set; } //客户端连接/断开操作
|
||||
public CommandBase Socket2DoConnectCommand { get; set; } //客户端连接/断开操作
|
||||
|
||||
public ClientModel clientModel1 { get; set; } = new ClientModel();
|
||||
public ClientModel clientModel2 { get; set; } = new ClientModel();
|
||||
|
||||
public ComModel comModel1 { get; set; } = new ComModel();
|
||||
|
||||
public ComModel2 comModel2 { get; set; } = new ComModel2();
|
||||
#endregion
|
||||
|
||||
|
||||
#region VolCurCollectorModel
|
||||
private byte fromDeviceAddress { get; set; } //从设备地址
|
||||
|
||||
private byte functionCode { get; set; } //功能码
|
||||
|
||||
private byte[] startingRegisterAddress { get; set; } //起始寄存器地址
|
||||
|
||||
private byte[] registerNumber { get; set; } //寄存器个数
|
||||
|
||||
private byte[] registerAddress { get; set; } //寄存器地址
|
||||
|
||||
private byte[] checkCodeCRC { get; set; } //校验码
|
||||
|
||||
private List<byte> checkByte { get; set; } = new List<byte>(); //校验码Byte
|
||||
|
||||
private byte[] writeData { get; set; } //数据
|
||||
|
||||
private List<byte> sendBytes { get; set; } = new List<byte>(); //发送数据
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region AlarmSet
|
||||
public CommandBase AlarmSettingCommand { get; set; } //显示报警设置窗体
|
||||
|
||||
public CommandBase AlarmSetButtonCommand { get; set; } //发送报警设置信息
|
||||
|
||||
public CommandBase AskDataCommand { get; set; } //获取数据
|
||||
|
||||
public string alarmParaComSelectedItem;
|
||||
|
||||
public string AlarmParaComSelectedItem
|
||||
{
|
||||
get { return alarmParaComSelectedItem; }
|
||||
set
|
||||
{
|
||||
alarmParaComSelectedItem = value;
|
||||
this.DoNotify();
|
||||
}
|
||||
}
|
||||
|
||||
public string alarmFuncComSelectedItem;
|
||||
|
||||
public string AlarmFuncComSelectedItem
|
||||
{
|
||||
get { return alarmFuncComSelectedItem; }
|
||||
set
|
||||
{
|
||||
alarmFuncComSelectedItem = value;
|
||||
this.DoNotify();
|
||||
}
|
||||
}
|
||||
|
||||
public string alarmUpTBText;
|
||||
|
||||
public string AlarmUpTBText
|
||||
{
|
||||
get { return alarmUpTBText; }
|
||||
set
|
||||
{
|
||||
alarmUpTBText = value;
|
||||
this.DoNotify();
|
||||
}
|
||||
}
|
||||
|
||||
public string alarmDownTBText;
|
||||
|
||||
public string AlarmDownTBText
|
||||
{
|
||||
get { return alarmDownTBText; }
|
||||
set
|
||||
{
|
||||
alarmDownTBText = value;
|
||||
this.DoNotify();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
public MainViewModel()
|
||||
{
|
||||
this.NavChangedCommand = new CommandBase();
|
||||
this.NavChangedCommand.DoExcute = new Action<object>(DoNavChanged);
|
||||
this.NavChangedCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
|
||||
|
||||
this.Switch = new CommandBase();
|
||||
this.Switch.DoExcute = new Action<object>(Btn_Switch);
|
||||
this.Switch.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
@ -217,6 +314,34 @@ namespace JiangsuEarthquake.ViewModels
|
||||
this.ParaSetSwitch.DoExcute = new Action<object>(Btn_ParaSet);
|
||||
this.ParaSetSwitch.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
this.Socket1DoConnectCommand = new CommandBase();
|
||||
this.Socket1DoConnectCommand.DoExcute = new Action<object>(DoSocket1Connect);
|
||||
this.Socket1DoConnectCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
this.Socket2DoConnectCommand = new CommandBase();
|
||||
this.Socket2DoConnectCommand.DoExcute = new Action<object>(DoSocket2Connect);
|
||||
this.Socket2DoConnectCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
this.Com1DoConnectCommand = new CommandBase();
|
||||
this.Com1DoConnectCommand.DoExcute = new Action<object>(Com1DoConnect);
|
||||
this.Com1DoConnectCommand.DoCanExcute = new Func<object, bool>((o) => { return true; });
|
||||
|
||||
this.Com2DoConnectCommand = new CommandBase();
|
||||
this.Com2DoConnectCommand.DoExcute = new Action<object>(Com2DoConnect);
|
||||
this.Com2DoConnectCommand.DoCanExcute = new Func<object, bool>((o) => { return true; });
|
||||
|
||||
this.AlarmSettingCommand = new CommandBase();
|
||||
this.AlarmSettingCommand.DoExcute = new Action<object>(AlarmSetting);
|
||||
this.AlarmSettingCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
this.AlarmSetButtonCommand = new CommandBase();
|
||||
this.AlarmSetButtonCommand.DoExcute = new Action<object>(AlarmSetButton);
|
||||
this.AlarmSetButtonCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
this.AskDataCommand = new CommandBase();
|
||||
this.AskDataCommand.DoExcute = new Action<object>(AskData);
|
||||
this.AskDataCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
|
||||
#region 日志页面初始化
|
||||
string sql = String.Format("select * from logrecordhis where StationID = {0} ORDER by id desc limit 100", 1);
|
||||
@ -1044,6 +1169,368 @@ namespace JiangsuEarthquake.ViewModels
|
||||
}
|
||||
|
||||
|
||||
#region Communication Command
|
||||
/// <summary>
|
||||
/// Socket1连接
|
||||
/// </summary>
|
||||
/// <param name="o"></param>
|
||||
public void DoSocket1Connect(object o)
|
||||
{
|
||||
if (clientModel1.IsConnected)
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
clientModel1.DisConnect();
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(150);
|
||||
|
||||
//if (clientModel1.DoConnect(SocketInfo1))
|
||||
//{
|
||||
// EM.Socket1ConMessage = string.Format("IP：{0} \r\n端口号：{1}", SocketInfo1.IP, SocketInfo1.Port.ToString());
|
||||
// //更新下App.config中的配置信息
|
||||
// Tools.UpdateAppSettings("PLC_IP1", SocketInfo1.IP);
|
||||
// Tools.UpdateAppSettings("PLC_Service_Port1", SocketInfo1.Port.ToString());
|
||||
//}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Socket2连接
|
||||
/// </summary>
|
||||
/// <param name="o"></param>
|
||||
public void DoSocket2Connect(object o)
|
||||
{
|
||||
if (clientModel2.IsConnected)
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
clientModel2.DisConnect();
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(200);
|
||||
|
||||
//if (clientModel2.DoConnect(SocketInfo2))
|
||||
//{
|
||||
// EM.Socket2ConMessage = string.Format("IP：{0} \r\n端口号：{1}", SocketInfo2.IP, SocketInfo2.Port.ToString());
|
||||
// //更新下App.config中的配置信息
|
||||
// Tools.UpdateAppSettings("PLC_IP2", SocketInfo2.IP);
|
||||
// Tools.UpdateAppSettings("PLC_Service_Port2", SocketInfo2.Port.ToString());
|
||||
//}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
public static SerialInfo SerialInfo1 { get; set; } = new SerialInfo() //初始化串口连接信息
|
||||
{
|
||||
PortName = Tools.GetAppSetting("PortName1"),
|
||||
BaudRate = Convert.ToInt32(Tools.GetAppSetting("BaudRate1")),
|
||||
DataBit = 8,
|
||||
Parity = Parity.None,
|
||||
StopBits = StopBits.One
|
||||
};
|
||||
|
||||
public void Com1DoConnect(object o)
|
||||
{
|
||||
if (comModel1.IsConnected)
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
comModel1.DisConnect();
|
||||
}));
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
|
||||
if (comModel1.DoConnect(SerialInfo1))
|
||||
{
|
||||
//EM.ComConMessage = string.Format("串口号：{0} \r\n波特率：{1}", SerialInfo.PortName, SerialInfo.BaudRate.ToString());
|
||||
//更新下App.config中的配置信息
|
||||
//Tools.UpdateAppSettings("PortName", SerialInfo1.PortName);
|
||||
//Tools.UpdateAppSettings("BaudRate", SerialInfo1.BaudRate.ToString());
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
public static SerialInfo SerialInfo2 { get; set; } = new SerialInfo() //初始化串口连接信息
|
||||
{
|
||||
PortName = Tools.GetAppSetting("PortName2"),
|
||||
BaudRate = Convert.ToInt32(Tools.GetAppSetting("BaudRate2")),
|
||||
DataBit = 8,
|
||||
Parity = Parity.None,
|
||||
StopBits = StopBits.One
|
||||
};
|
||||
|
||||
public void Com2DoConnect(object o)
|
||||
{
|
||||
if (comModel2.IsConnected)
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
comModel2.DisConnect();
|
||||
}));
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
|
||||
if (comModel2.DoConnect(SerialInfo2))
|
||||
{
|
||||
//EM.ComConMessage = string.Format("串口号：{0} \r\n波特率：{1}", SerialInfo.PortName, SerialInfo.BaudRate.ToString());
|
||||
//更新下App.config中的配置信息
|
||||
//Tools.UpdateAppSettings("PortName", SerialInfo2.PortName);
|
||||
//Tools.UpdateAppSettings("BaudRate", SerialInfo2.BaudRate.ToString());
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region AlarmSetCommand
|
||||
public void AlarmSetting(object o)
|
||||
{
|
||||
HandyControl.Controls.Dialog.Show(new AlarmSettingView());
|
||||
}
|
||||
|
||||
|
||||
public void AlarmSetButton(object o)
|
||||
{
|
||||
//对从设备单个寄存器置数
|
||||
fromDeviceAddress = 0x01; //从设备地址
|
||||
|
||||
//先设置报警参数(300 寄存器)即对应哪个参数报警
|
||||
functionCode = 0x06; //功能码
|
||||
registerAddress = new byte[] { 0x01, 0x2C };
|
||||
|
||||
if (AlarmParaComSelectedItem == "电压")
|
||||
writeData = new byte[] { 0x00, 0x07 };
|
||||
else if (AlarmParaComSelectedItem == "电流")
|
||||
writeData = new byte[] { 0x00, 0x08 };
|
||||
|
||||
//校验码计算
|
||||
checkByte.Clear();
|
||||
checkByte.Add(fromDeviceAddress);
|
||||
checkByte.Add(functionCode);
|
||||
checkByte.AddRange(registerAddress);
|
||||
checkByte.AddRange(writeData);
|
||||
checkCodeCRC = Tools.CRCCalc(checkByte.ToArray());
|
||||
//发送指令
|
||||
sendBytes.Clear();
|
||||
sendBytes.Add(fromDeviceAddress);
|
||||
sendBytes.Add(functionCode);
|
||||
sendBytes.AddRange(registerAddress);
|
||||
sendBytes.AddRange(writeData);
|
||||
sendBytes.AddRange(checkCodeCRC);
|
||||
if (station_id == 1)
|
||||
{
|
||||
if (comModel1.IsConnected)
|
||||
comModel1.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
else if (station_id == 2)
|
||||
{
|
||||
if (comModel2.IsConnected)
|
||||
comModel2.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
|
||||
//再设置报警功能(303 寄存器)即需要上 / 下限等报警功能
|
||||
functionCode = 0x06; //功能码
|
||||
registerAddress = new byte[] { 0x01, 0x2F };
|
||||
|
||||
if (AlarmFuncComSelectedItem == "下限报警")
|
||||
writeData = new byte[] { 0x00, 0x01 };
|
||||
else if (AlarmFuncComSelectedItem == "上限报警")
|
||||
writeData = new byte[] { 0x00, 0x02 };
|
||||
else if (AlarmFuncComSelectedItem == "上下限报警")
|
||||
writeData = new byte[] { 0x00, 0x03 };
|
||||
else if (AlarmFuncComSelectedItem == "区间内报警")
|
||||
writeData = new byte[] { 0x00, 0x04 };
|
||||
|
||||
//校验码计算
|
||||
checkByte.Clear();
|
||||
checkByte.Add(fromDeviceAddress);
|
||||
checkByte.Add(functionCode);
|
||||
checkByte.AddRange(registerAddress);
|
||||
checkByte.AddRange(writeData);
|
||||
checkCodeCRC = Tools.CRCCalc(checkByte.ToArray());
|
||||
//发送指令
|
||||
sendBytes.Clear();
|
||||
sendBytes.Add(fromDeviceAddress);
|
||||
sendBytes.Add(functionCode);
|
||||
sendBytes.AddRange(registerAddress);
|
||||
sendBytes.AddRange(writeData);
|
||||
sendBytes.AddRange(checkCodeCRC);
|
||||
if (station_id == 1)
|
||||
{
|
||||
if (comModel1.IsConnected)
|
||||
comModel1.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
else if (station_id == 2)
|
||||
{
|
||||
if (comModel2.IsConnected)
|
||||
comModel2.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
|
||||
//再设置报警阀值(301 与 302 寄存器),根据报警功能设置对应的下/ 下限报警值(报警阀值设置为量程的百分比方式)
|
||||
if (AlarmFuncComSelectedItem == "下限报警"|| AlarmFuncComSelectedItem == "上限报警")
|
||||
{
|
||||
functionCode = 0x06; //功能码
|
||||
|
||||
if (AlarmFuncComSelectedItem == "下限报警")
|
||||
{
|
||||
registerAddress = new byte[] { 0x01, 0x2D };
|
||||
ushort down = ushort.Parse(AlarmDownTBText);
|
||||
if (AlarmParaComSelectedItem == "电流")
|
||||
down = (ushort)(ushort.Parse(AlarmDownTBText) * 5);
|
||||
writeData = new byte[2];
|
||||
writeData[0] = (byte)((down & 0xFF00) >> 8);
|
||||
writeData[1] = (byte)(down & 0x00FF);
|
||||
}
|
||||
else if (AlarmParaComSelectedItem == "上限报警")
|
||||
{
|
||||
registerAddress = new byte[] { 0x01, 0x2D };
|
||||
ushort up = ushort.Parse(AlarmUpTBText);
|
||||
if (AlarmParaComSelectedItem == "电流")
|
||||
up = (ushort)(ushort.Parse(AlarmDownTBText) * 5);
|
||||
writeData = new byte[2];
|
||||
writeData[0] = (byte)((up & 0xFF00) >> 8);
|
||||
writeData[1] = (byte)(up & 0x00FF);
|
||||
}
|
||||
|
||||
//校验码计算
|
||||
checkByte.Clear();
|
||||
checkByte.Add(fromDeviceAddress);
|
||||
checkByte.Add(functionCode);
|
||||
checkByte.AddRange(registerAddress);
|
||||
checkByte.AddRange(writeData);
|
||||
checkCodeCRC = Tools.CRCCalc(checkByte.ToArray());
|
||||
//发送指令
|
||||
sendBytes.Clear();
|
||||
sendBytes.Add(fromDeviceAddress);
|
||||
sendBytes.Add(functionCode);
|
||||
sendBytes.AddRange(registerAddress);
|
||||
sendBytes.AddRange(writeData);
|
||||
sendBytes.AddRange(checkCodeCRC);
|
||||
if (station_id == 1)
|
||||
{
|
||||
if (comModel1.IsConnected)
|
||||
comModel1.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
else if (station_id == 2)
|
||||
{
|
||||
if (comModel2.IsConnected)
|
||||
comModel2.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
}
|
||||
else if(AlarmFuncComSelectedItem == "上下限报警"|| AlarmFuncComSelectedItem == "区间内报警")
|
||||
{
|
||||
functionCode = 0x10; //功能码
|
||||
startingRegisterAddress = new byte[2] { 0x01, 0x2D }; //起始寄存器地址
|
||||
registerNumber = new byte[2] { 0x00, 0x02 }; //寄存器个数
|
||||
byte dataNumber = 0x04;
|
||||
ushort down = ushort.Parse(AlarmDownTBText);
|
||||
ushort up = ushort.Parse(AlarmUpTBText);
|
||||
if (AlarmParaComSelectedItem == "电流")
|
||||
{
|
||||
down = (ushort)(ushort.Parse(AlarmDownTBText) * 5);
|
||||
up = (ushort)(ushort.Parse(AlarmDownTBText) * 5);
|
||||
}
|
||||
writeData = new byte[4];
|
||||
writeData[0] = (byte)((down & 0xFF00) >> 8);
|
||||
writeData[1] = (byte)(down & 0x00FF);
|
||||
writeData[2] = (byte)((up & 0xFF00) >> 8);
|
||||
writeData[3] = (byte)(up & 0x00FF);
|
||||
|
||||
//校验码计算
|
||||
checkByte.Clear();
|
||||
checkByte.Add(fromDeviceAddress);
|
||||
checkByte.Add(functionCode);
|
||||
checkByte.AddRange(startingRegisterAddress);
|
||||
checkByte.AddRange(registerNumber);
|
||||
checkByte.Add(dataNumber);
|
||||
checkByte.AddRange(writeData);
|
||||
checkCodeCRC = Tools.CRCCalc(checkByte.ToArray());
|
||||
//发送指令
|
||||
sendBytes.Clear();
|
||||
sendBytes.Add(fromDeviceAddress);
|
||||
sendBytes.Add(functionCode);
|
||||
sendBytes.AddRange(startingRegisterAddress);
|
||||
sendBytes.AddRange(registerNumber);
|
||||
sendBytes.Add(dataNumber);
|
||||
sendBytes.AddRange(writeData);
|
||||
sendBytes.AddRange(checkCodeCRC);
|
||||
|
||||
if (station_id == 1)
|
||||
{
|
||||
if (comModel1.IsConnected)
|
||||
comModel1.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
else if (station_id == 2)
|
||||
{
|
||||
if (comModel2.IsConnected)
|
||||
comModel2.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void AskData(object o)
|
||||
{
|
||||
//查询从设备寄存器内容
|
||||
fromDeviceAddress = 0x01; //从设备地址
|
||||
functionCode = 0x03; //功能码
|
||||
startingRegisterAddress = new byte[2] { 0x00, 0x00 }; //起始寄存器地址
|
||||
registerNumber = new byte[2] { 0x00, 0x10 }; //寄存器个数
|
||||
//校验码计算
|
||||
checkByte.Clear();
|
||||
checkByte.Add(fromDeviceAddress);
|
||||
checkByte.Add(functionCode);
|
||||
checkByte.AddRange(startingRegisterAddress);
|
||||
checkByte.AddRange(registerNumber);
|
||||
checkCodeCRC = Tools.CRCCalc(checkByte.ToArray());
|
||||
//发送指令
|
||||
sendBytes.Clear();
|
||||
sendBytes.Add(fromDeviceAddress);
|
||||
sendBytes.Add(functionCode);
|
||||
sendBytes.AddRange(startingRegisterAddress);
|
||||
sendBytes.AddRange(registerNumber);
|
||||
sendBytes.AddRange(checkCodeCRC);
|
||||
|
||||
if (station_id == 1)
|
||||
{
|
||||
if (comModel1.IsConnected)
|
||||
comModel1.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
else if (station_id == 2)
|
||||
{
|
||||
if (comModel2.IsConnected)
|
||||
comModel2.SendMessage(sendBytes.ToArray());
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
//各个开关
|
||||
public async void Btn_Switch(object o)
|
||||
{
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
using JiangsuEarthquake.Common;
|
||||
using Communication;
|
||||
using JiangsuEarthquake.Common;
|
||||
using JiangsuEarthquake.Models;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO.Ports;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
@ -10,85 +12,10 @@ namespace JiangsuEarthquake.ViewModels
|
||||
{
|
||||
public class SystemControlViewModel
|
||||
{
|
||||
public CommandBase Com1DoConnectCommand { get; set; } //串口连接/断开操作
|
||||
public CommandBase Com2DoConnectCommand { get; set; } //串口连接/断开操作
|
||||
|
||||
public CommandBase Socket1DoConnectCommand { get; set; } //客户端连接/断开操作
|
||||
public CommandBase Socket2DoConnectCommand { get; set; } //客户端连接/断开操作
|
||||
|
||||
public ClientModel clientModel1 { get; set; } = new ClientModel();
|
||||
public ClientModel clientModel2 { get; set; } = new ClientModel();
|
||||
|
||||
public SystemControlViewModel()
|
||||
{
|
||||
this.Socket1DoConnectCommand = new CommandBase();
|
||||
this.Socket1DoConnectCommand.DoExcute = new Action<object>(DoSocket1Connect);
|
||||
this.Socket1DoConnectCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
|
||||
this.Socket2DoConnectCommand = new CommandBase();
|
||||
this.Socket2DoConnectCommand.DoExcute = new Action<object>(DoSocket2Connect);
|
||||
this.Socket2DoConnectCommand.DoCanExcute = new Func<object, bool>((o) => true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Socket1连接
|
||||
/// </summary>
|
||||
/// <param name="o"></param>
|
||||
public void DoSocket1Connect(object o)
|
||||
{
|
||||
if (clientModel1.IsConnected)
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
clientModel1.DisConnect();
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(150);
|
||||
|
||||
//if (clientModel1.DoConnect(SocketInfo1))
|
||||
//{
|
||||
// EM.Socket1ConMessage = string.Format("IP：{0} \r\n端口号：{1}", SocketInfo1.IP, SocketInfo1.Port.ToString());
|
||||
// //更新下App.config中的配置信息
|
||||
// Tools.UpdateAppSettings("PLC_IP1", SocketInfo1.IP);
|
||||
// Tools.UpdateAppSettings("PLC_Service_Port1", SocketInfo1.Port.ToString());
|
||||
//}
|
||||
}));
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Socket2连接
|
||||
/// </summary>
|
||||
/// <param name="o"></param>
|
||||
public void DoSocket2Connect(object o)
|
||||
{
|
||||
if (clientModel2.IsConnected)
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(100);
|
||||
clientModel2.DisConnect();
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(new Action(async () =>
|
||||
{
|
||||
await Task.Delay(200);
|
||||
|
||||
//if (clientModel2.DoConnect(SocketInfo2))
|
||||
//{
|
||||
// EM.Socket2ConMessage = string.Format("IP：{0} \r\n端口号：{1}", SocketInfo2.IP, SocketInfo2.Port.ToString());
|
||||
// //更新下App.config中的配置信息
|
||||
// Tools.UpdateAppSettings("PLC_IP2", SocketInfo2.IP);
|
||||
// Tools.UpdateAppSettings("PLC_Service_Port2", SocketInfo2.Port.ToString());
|
||||
//}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -207,9 +207,11 @@
|
||||
HorizontalAlignment="Right" Margin="0,0,10,0">
|
||||
<TextBlock VerticalAlignment="Center" FontSize="17" Foreground="White"
|
||||
Margin="0,0,20,0" Text="{Binding AlarmMsg}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordAlarmCommand}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordAlarmCommand}"
|
||||
Background="Transparent" BorderBrush="White"/>
|
||||
<Button Content="下一页" FontSize="16" Margin="20,0,20,0"
|
||||
Command="{Binding NextAlarmCommand}"/>
|
||||
Command="{Binding NextAlarmCommand}"
|
||||
Background="Transparent" BorderBrush="White"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</hc:TransitioningContentControl>
|
||||
|
||||
@ -234,9 +234,11 @@
|
||||
HorizontalAlignment="Right" Margin="0,0,10,0">
|
||||
<TextBlock VerticalAlignment="Center" FontSize="17" Foreground="White"
|
||||
Margin="0,0,20,0" Text="{Binding BoosterStationStateMsg}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordBoosterStationStateCommand}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordBoosterStationStateCommand}"
|
||||
Background="Transparent" BorderBrush="White"/>
|
||||
<Button Content="下一页" FontSize="16" Margin="20,0,20,0"
|
||||
Command="{Binding NextBoosterStationStateCommand}"/>
|
||||
Command="{Binding NextBoosterStationStateCommand}"
|
||||
Background="Transparent" BorderBrush="White"/>
|
||||
</StackPanel>
|
||||
|
||||
</Grid>
|
||||
@ -382,7 +384,8 @@
|
||||
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
|
||||
<Button Name="AskDataBtn" Foreground="White" Background="Transparent" BorderBrush="White"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Center" BorderThickness="1" Width="150"
|
||||
Height="45" Click="AskDataBtn_Click" Style="{StaticResource ButtonStyle}">
|
||||
Height="45" Click="AskDataBtn_Click" Style="{StaticResource ButtonStyle}"
|
||||
Command="{Binding AskDataCommand}">
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Assets/Images/AskData.png" Width="18"/>
|
||||
|
||||
@ -23,6 +23,9 @@ namespace JiangsuEarthquake.Views
|
||||
public BoosterStationStateDataView()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
AskDataBtn.DataContext = MainWindow.mainViewModel;
|
||||
AlarmSettingBtn.DataContext = MainWindow.mainViewModel;
|
||||
}
|
||||
|
||||
private void AskDataBtn_Click(object sender, RoutedEventArgs e)
|
||||
|
||||
@ -200,9 +200,11 @@
|
||||
HorizontalAlignment="Right" Margin="0,0,10,0">
|
||||
<TextBlock VerticalAlignment="Center" FontSize="17" Foreground="White"
|
||||
Margin="0,0,20,0" Text="{Binding LogMsg}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordLogCommand}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordLogCommand}"
|
||||
Background="Transparent" BorderBrush="White"/>
|
||||
<Button Content="下一页" FontSize="16" Margin="20,0,20,0"
|
||||
Command="{Binding NextLogCommand}"/>
|
||||
Command="{Binding NextLogCommand}"
|
||||
Background="Transparent" BorderBrush="White"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</hc:TransitioningContentControl>
|
||||
|
||||
@ -7,13 +7,15 @@
|
||||
xmlns:converters="clr-namespace:JiangsuEarthquake.Common"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
mc:Ignorable="d"
|
||||
xmlns:hc="https://handyorg.github.io/handycontrol"
|
||||
FontFamily="{StaticResource DigitalDisplay}"
|
||||
Name="SystemControlPage"
|
||||
d:DesignHeight="850" d:DesignWidth="1550">
|
||||
<UserControl.Resources>
|
||||
<converters:NegateConverter x:Key="NegateConverter"/>
|
||||
<converters:BtnConvert x:Key="BtnConvert" />
|
||||
|
||||
<converters:ConnectConvert2 x:Key="ConnectConvert2" />
|
||||
|
||||
<Style TargetType="GroupBox">
|
||||
<Setter Property="Margin" Value="10,5"/>
|
||||
<Setter Property="Template">
|
||||
@ -111,14 +113,97 @@
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="TextBox" >
|
||||
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="0" SnapsToDevicePixels="True">
|
||||
<ScrollViewer x:Name="PART_ContentHost" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
|
||||
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
Background="{TemplateBinding Background}" CornerRadius="0" SnapsToDevicePixels="True">
|
||||
<ScrollViewer x:Name="PART_ContentHost" Focusable="False"
|
||||
HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!--<Style TargetType="ComboBox">
|
||||
<Setter Property="Background" Value="Black"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBox">
|
||||
<Grid>
|
||||
<ToggleButton x:Name="ToggleButton" Grid.Column="2" Margin="30,0,0,0" Background="Transparent"
|
||||
IsChecked="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ClickMode="Press" Foreground="White" BorderBrush="Transparent">
|
||||
</ToggleButton>
|
||||
<ContentPresenter x:Name="ContentSite" IsHitTestVisible="False"
|
||||
Content="{TemplateBinding SelectionBoxItem}"
|
||||
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
|
||||
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
|
||||
Margin="3,3,23,3"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center">
|
||||
</ContentPresenter>
|
||||
<TextBox x:Name="PART_EditableTextBox"
|
||||
IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Margin="3,3,23,3"
|
||||
Focusable="True"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Background="Transparent"
|
||||
Visibility="Hidden"
|
||||
IsEnabled="{TemplateBinding IsEnabled}">
|
||||
<TextBox.Template>
|
||||
<ControlTemplate TargetType="TextBox">
|
||||
<Border x:Name="Border"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}">
|
||||
<ScrollViewer x:Name="PART_ContentHost"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0"/>
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</TextBox.Template>
|
||||
</TextBox>
|
||||
<Popup x:Name="Popup"
|
||||
Placement="Bottom"
|
||||
IsOpen="{TemplateBinding IsDropDownOpen}"
|
||||
AllowsTransparency="True"
|
||||
Focusable="False"
|
||||
PopupAnimation="Slide">
|
||||
<Grid x:Name="DropDown"
|
||||
SnapsToDevicePixels="True"
|
||||
MinWidth="{TemplateBinding ActualWidth}"
|
||||
MaxHeight="{TemplateBinding MaxDropDownHeight}">
|
||||
<Border x:Name="DropDownBorder"
|
||||
Background="#FF14273A"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}">
|
||||
<ScrollViewer x:Name="DropDownScrollViewer">
|
||||
<ItemsPresenter x:Name="ItemsPresenter"
|
||||
KeyboardNavigation.DirectionalNavigation="Contained"
|
||||
SnapsToDevicePixels="True"/>
|
||||
</ScrollViewer>
|
||||
</Border>
|
||||
</Grid>
|
||||
</Popup>
|
||||
</Grid>
|
||||
-->
|
||||
<!--<ControlTemplate.Triggers>
|
||||
<Trigger SourceName="ToggleButton"
|
||||
Property="IsChecked"
|
||||
Value="True">
|
||||
<Setter Property="IsDropDownOpen" TargetName="Popup" Value="True"/>
|
||||
<Setter Property="NoFocusRectangle" TargetName="ToggleButton" Value="True"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>-->
|
||||
<!--
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>-->
|
||||
|
||||
<sys:Boolean x:Key="BoolTrue">True</sys:Boolean>
|
||||
<sys:Boolean x:Key="BoolFalse">False</sys:Boolean>
|
||||
</UserControl.Resources>
|
||||
@ -167,7 +252,7 @@
|
||||
<TextBlock Width="16"/>
|
||||
<TextBox Name="MUIP1" Width="120" VerticalAlignment="Center" Background="Transparent"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.IP"
|
||||
@ -185,7 +270,7 @@
|
||||
Foreground="White" Text="Port："/>
|
||||
<TextBox Name="Port1" Width="120" VerticalAlignment="Center" FontSize="16"
|
||||
Foreground="White" Background="Transparent" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.Port"
|
||||
@ -211,7 +296,7 @@
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Assets/Images/ConnectState.png" Stretch="Fill" Width="20" Height="20"/>
|
||||
<TextBlock Text=""
|
||||
<TextBlock Text="{Binding clientModel1.IsConnected, Converter={StaticResource ResourceKey=ConnectConvert2}}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Margin="10,0,0,0" FontSize="16" Foreground="White"/>
|
||||
</StackPanel>
|
||||
@ -242,7 +327,7 @@
|
||||
<TextBlock Width="16"/>
|
||||
<TextBox Name="MUIP2" Width="120" VerticalAlignment="Center" Background="Transparent"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.IP"
|
||||
@ -260,7 +345,7 @@
|
||||
Foreground="White" Text="Port："/>
|
||||
<TextBox Name="Port2" Width="120" VerticalAlignment="Center" FontSize="16"
|
||||
Foreground="White" Background="Transparent" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.Port"
|
||||
@ -286,7 +371,7 @@
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Assets/Images/ConnectState.png" Stretch="Fill" Width="20" Height="20"/>
|
||||
<TextBlock Text=""
|
||||
<TextBlock Text="{Binding clientModel2.IsConnected, Converter={StaticResource ResourceKey=ConnectConvert2}}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Margin="10,0,0,0" FontSize="16" Foreground="White"/>
|
||||
</StackPanel>
|
||||
@ -294,7 +379,7 @@
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
|
||||
<!--地震仪通信-->
|
||||
<Grid Grid.Column="2">
|
||||
<Grid.RowDefinitions>
|
||||
@ -317,7 +402,7 @@
|
||||
<TextBlock Width="16"/>
|
||||
<TextBox Name="DZIP" Width="120" VerticalAlignment="Center" Background="Transparent"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.IP"
|
||||
@ -335,7 +420,7 @@
|
||||
Foreground="White" Text="Port："/>
|
||||
<TextBox Name="DZPort" Width="120" VerticalAlignment="Center" FontSize="16"
|
||||
Foreground="White" Background="Transparent" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.Port"
|
||||
@ -392,7 +477,7 @@
|
||||
<TextBlock Width="16"/>
|
||||
<TextBox Name="DZIP2" Width="120" VerticalAlignment="Center" Background="Transparent"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.IP"
|
||||
@ -410,7 +495,7 @@
|
||||
Foreground="White" Text="Port："/>
|
||||
<TextBox Name="DZPort2" Width="120" VerticalAlignment="Center" FontSize="16"
|
||||
Foreground="White" Background="Transparent" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
BorderThickness="0,0,0,1.2" BorderBrush="#FF424242" HorizontalContentAlignment="Center"
|
||||
IsEnabled="{Binding clientModel1.IsConnected, Converter={StaticResource NegateConverter}}">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True" Path="SocketInfo1.Port"
|
||||
@ -466,10 +551,14 @@
|
||||
Foreground="White" Text="SerialPort："/>
|
||||
<TextBlock Width="16"/>
|
||||
<ComboBox Name="SYZCHK1" Width="120" VerticalAlignment="Center"
|
||||
Background="Transparent" BorderThickness="0"
|
||||
Background="Transparent" BorderThickness="0,0,0,1"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White"
|
||||
IsEnabled="{Binding comModel1.IsConnected, Converter={StaticResource NegateConverter}}"
|
||||
Text="{Binding SerialInfo1.PortName}"/>
|
||||
Text="{Binding SerialInfo1.PortName}"
|
||||
HorizontalContentAlignment="Center" >
|
||||
</ComboBox>
|
||||
|
||||
|
||||
<!--<TextBox Name="SYZIP1" Width="120" VerticalAlignment="Center" Background="Transparent"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
@ -490,9 +579,10 @@
|
||||
Foreground="White" Text="BaudRate："/>
|
||||
<ComboBox Name="SYZBTL1" Width="120" FontSize="16" VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderThickness="0"
|
||||
Background="Transparent" BorderThickness="0,0,0,1"
|
||||
IsEnabled="{Binding comModel1.IsConnected, Converter={StaticResource NegateConverter}}"
|
||||
Text="{Binding SerialInfo1.BaudRate}"/>
|
||||
Text="{Binding SerialInfo1.BaudRate}"
|
||||
HorizontalContentAlignment="Center"/>
|
||||
<!--<TextBox Name="SYZPort1" Width="120" VerticalAlignment="Center" FontSize="16"
|
||||
Foreground="White" Background="Transparent" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
@ -511,7 +601,7 @@
|
||||
Orientation="Horizontal">
|
||||
<Button Width="100" Height="30" Margin="10,0" HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center" Click="FTPButton2_Click"
|
||||
Command="" BorderBrush="White"
|
||||
Command="{Binding Com1DoConnectCommand}" BorderBrush="White"
|
||||
Background="Transparent" Style="{StaticResource ButtonStyle}">
|
||||
<Button.Resources>
|
||||
<Style TargetType="{x:Type Border}">
|
||||
@ -521,7 +611,7 @@
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Assets/Images/ConnectState.png" Stretch="Fill" Width="20" Height="20"/>
|
||||
<TextBlock Text=""
|
||||
<TextBlock Text="{Binding comModel1.IsConnected, Converter={StaticResource ResourceKey=ConnectConvert2}}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Margin="10,0,0,0" FontSize="16" Foreground="White"/>
|
||||
</StackPanel>
|
||||
@ -551,10 +641,11 @@
|
||||
Foreground="White" Text="SerialPort："/>
|
||||
<TextBlock Width="16"/>
|
||||
<ComboBox Name="SYZCHK2" Width="120" VerticalAlignment="Center"
|
||||
Background="Transparent" BorderThickness="0"
|
||||
Background="Transparent" BorderThickness="0,0,0,1"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White"
|
||||
IsEnabled="{Binding comModel2.IsConnected, Converter={StaticResource NegateConverter}}"
|
||||
Text="{Binding SerialInfo2.PortName}"/>
|
||||
Text="{Binding SerialInfo2.PortName}"
|
||||
HorizontalContentAlignment="Center"/>
|
||||
<!--<TextBox Name="SYZIP2" Width="120" VerticalAlignment="Center" Background="Transparent"
|
||||
HorizontalAlignment="Center" FontSize="16" Foreground="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
@ -575,9 +666,10 @@
|
||||
Foreground="White" Text="BaudRate："/>
|
||||
<ComboBox Name="SYZBTL2" Width="120" FontSize="16" VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderThickness="0"
|
||||
Background="Transparent" BorderThickness="0,0,0,1"
|
||||
IsEnabled="{Binding comModel2.IsConnected, Converter={StaticResource NegateConverter}}"
|
||||
Text="{Binding SerialInfo2.BaudRate}"/>
|
||||
Text="{Binding SerialInfo2.BaudRate}"
|
||||
HorizontalContentAlignment="Center"/>
|
||||
<!--<TextBox Name="SYZPort2" Width="120" VerticalAlignment="Center" FontSize="16"
|
||||
Foreground="White" Background="Transparent" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" BorderBrush="White" HorizontalContentAlignment="Center"
|
||||
@ -596,7 +688,7 @@
|
||||
Orientation="Horizontal">
|
||||
<Button Width="100" Height="30" Margin="10,0" HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center" Click="FTPButton2_Click"
|
||||
Command="" BorderBrush="White"
|
||||
Command="{Binding Com2DoConnectCommand}" BorderBrush="White"
|
||||
Background="Transparent" Style="{StaticResource ButtonStyle}">
|
||||
<Button.Resources>
|
||||
<Style TargetType="{x:Type Border}">
|
||||
@ -606,7 +698,7 @@
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Assets/Images/ConnectState.png" Stretch="Fill" Width="20" Height="20"/>
|
||||
<TextBlock Text=""
|
||||
<TextBlock Text="{Binding comModel2.IsConnected, Converter={StaticResource ResourceKey=ConnectConvert2}}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Margin="10,0,0,0" FontSize="16" Foreground="White"/>
|
||||
</StackPanel>
|
||||
@ -617,7 +709,7 @@
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
|
||||
|
||||
<!--远程控制-->
|
||||
<Grid Grid.Row="1">
|
||||
<GroupBox Header="远程控制">
|
||||
@ -1016,7 +1108,7 @@
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
|
||||
|
||||
<!--地震仪参数设置-->
|
||||
<Grid Grid.Row="2">
|
||||
<GroupBox Header="地震仪参数设置">
|
||||
@ -1048,7 +1140,7 @@
|
||||
<TextBox Name="StationNo" Grid.Column="1" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White"
|
||||
Background="Transparent" BorderBrush="#FF424242"
|
||||
BorderThickness="0,0,0,1" CaretBrush="White">
|
||||
<TextBox.Text>
|
||||
<Binding NotifyOnValidationError="True"
|
||||
@ -1073,7 +1165,7 @@
|
||||
<TextBox Name="StationName" Grid.Column="1" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White" CaretBrush="White"
|
||||
Background="Transparent" BorderBrush="#FF424242" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.StationName}"/>
|
||||
</Grid>
|
||||
|
||||
@ -1088,7 +1180,7 @@
|
||||
<TextBox Name="StationAbbreviation" Grid.Column="1" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White" CaretBrush="White"
|
||||
Background="Transparent" BorderBrush="#FF424242" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.StationShortName}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
@ -1112,8 +1204,8 @@
|
||||
<TextBox Name="TotalSeismometers" Grid.Column="1" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.EarthQuakeCount}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.EarthQuakeCount}"/>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="2">
|
||||
@ -1127,8 +1219,8 @@
|
||||
<TextBox Grid.Column="1" Name="TotalNumberOfChannels" Width="110"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White" CaretBrush="White"
|
||||
Background="Transparent" BorderBrush="White" Margin="10,0,0,0"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.ChannelsNo}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" Margin="10,0,0,0"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.ChannelsNo}"/>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="3">
|
||||
@ -1142,8 +1234,8 @@
|
||||
<TextBox Grid.Column="1" Name="Latitude" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.WD}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.WD}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@ -1166,8 +1258,8 @@
|
||||
<TextBox Name="Longitude" Grid.Column="1" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.EarthQuakeCount}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.EarthQuakeCount}"/>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="2">
|
||||
@ -1181,8 +1273,8 @@
|
||||
<TextBox Grid.Column="1" Name="Altitude" Width="110"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White" CaretBrush="White"
|
||||
Background="Transparent" BorderBrush="White" Margin="10,0,0,0"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.GaoCheng}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" Margin="10,0,0,0"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.GaoCheng}"/>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="3">
|
||||
@ -1196,8 +1288,8 @@
|
||||
<TextBox Grid.Column="1" Name="StartDate" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.StartTime}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.StartTime}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@ -1220,8 +1312,8 @@
|
||||
<TextBox Name="NetworkMarking" Grid.Column="1" Width="110" Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White"
|
||||
Background="Transparent" BorderBrush="White" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.Station_Id}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" CaretBrush="White"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.Station_Id}"/>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="2">
|
||||
@ -1235,8 +1327,8 @@
|
||||
<TextBox Grid.Column="1" Name="SoftwareVersion" Width="110"
|
||||
HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"
|
||||
HorizontalContentAlignment="Center" Foreground="White" CaretBrush="White"
|
||||
Background="Transparent" BorderBrush="White" Margin="10,0,0,0"
|
||||
BorderThickness="0,0,0,1" Text="{Binding EQPS.Software_Version}"/>
|
||||
Background="Transparent" BorderBrush="#FF424242" Margin="10,0,0,0"
|
||||
BorderThickness="0,0,0,1.2" Text="{Binding EQPS.Software_Version}"/>
|
||||
</Grid>
|
||||
|
||||
</Grid>
|
||||
@ -1324,10 +1416,10 @@
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
|
||||
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
|
||||
|
||||
<!--地震仪状态数据-->
|
||||
<Grid Grid.Row="3">
|
||||
<GroupBox Header="地震仪状态数据">
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using JiangsuEarthquake.Common;
|
||||
using JiangsuEarthquake.ViewModels;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@ -21,9 +22,11 @@ namespace JiangsuEarthquake.Views
|
||||
/// </summary>
|
||||
public partial class SystemControlView : UserControl
|
||||
{
|
||||
|
||||
public SystemControlView()
|
||||
{
|
||||
InitializeComponent();
|
||||
this.DataContext = MainWindow.mainViewModel;
|
||||
|
||||
//串口号赋值
|
||||
for (int i = 0; i < Tools.GetSerialPort().Length; i++)
|
||||
@ -39,15 +42,9 @@ namespace JiangsuEarthquake.Views
|
||||
this.SYZBTL1.Items.Add(btl[i]);
|
||||
this.SYZBTL2.Items.Add(btl[i]);
|
||||
}
|
||||
|
||||
this.SYZBTL1.SelectedItem = "9600";
|
||||
this.SYZBTL2.SelectedItem = "9600";
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private void Button_MouseEnter(object sender, MouseEventArgs e)
|
||||
{
|
||||
Button button = (Button)sender;
|
||||
|
||||
@ -247,9 +247,10 @@
|
||||
HorizontalAlignment="Right" Margin="0,0,10,0">
|
||||
<TextBlock VerticalAlignment="Center" FontSize="17" Foreground="White"
|
||||
Margin="0,0,20,0" Text="{Binding SystemStateMsg}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordSystemStateCommand}"/>
|
||||
<Button Content="下一页" FontSize="16" Margin="20,0,20,0"
|
||||
Command="{Binding NextSystemStateCommand}"/>
|
||||
<Button Content="上一页" FontSize="16" Command="{Binding ForwordSystemStateCommand}"
|
||||
Background="Transparent" BorderBrush="White"/>
|
||||
<Button Content="下一页" FontSize="16" Margin="20,0,20,0" Background="Transparent"
|
||||
Command="{Binding NextSystemStateCommand}" BorderBrush="White"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</hc:TransitioningContentControl>
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
xmlns:hc="https://handyorg.github.io/handycontrol"
|
||||
Background="{DynamicResource RegionBrush}"
|
||||
FontFamily="{StaticResource DigitalDisplay}"
|
||||
Height="250" Width="400">
|
||||
Height="280" Width="400">
|
||||
<UserControl.Resources>
|
||||
<Style TargetType="TextBox">
|
||||
<Setter Property="Template">
|
||||
@ -34,14 +34,17 @@
|
||||
<RowDefinition Height="4*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Text="报 警 设 置" FontSize="18" Foreground="Black" Background="Transparent"
|
||||
<TextBlock Text="报 警 设 置" FontSize="18" Foreground="White" Background="Transparent"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<hc:Divider VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,4"
|
||||
Width="400"/>
|
||||
<Button Height="30" Width="30" Margin="0,0,5,1" Style="{StaticResource ButtonPrimary}"
|
||||
<!--<Button Height="30" Width="30" Margin="0,0,5,1" Style="{StaticResource ButtonPrimary}"
|
||||
hc:IconElement.Geometry="{StaticResource CloseGeometry}" hc:BorderElement.CornerRadius="24"
|
||||
Background="#E614273A" Foreground="{DynamicResource TextIconBrush}"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Center" Command="hc:ControlCommands.Close"/>
|
||||
HorizontalAlignment="Right" VerticalAlignment="Center" Command="hc:ControlCommands.Close"/>-->
|
||||
<Button Width="24" Height="24" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryBrush}"
|
||||
hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center" Margin="0,0,5,2" Command="hc:ControlCommands.Close"/>
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition/>
|
||||
@ -53,51 +56,65 @@
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<TextBlock Text="报警参数：" FontSize="16" Foreground="Black" Background="Transparent"
|
||||
<TextBlock Text="报警参数：" FontSize="16" Foreground="White" Background="Transparent"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<ComboBox Name="AlarmParaCom" Width="140" FontSize="16" VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" Foreground="Black" Background="Transparent"
|
||||
Margin="20,0,0,0" HorizontalContentAlignment="Center"/>
|
||||
HorizontalAlignment="Center" Foreground="White" Background="Transparent"
|
||||
Margin="20,0,0,0" HorizontalContentAlignment="Center"
|
||||
SelectedItem="{Binding AlarmParaComSelectedItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock Text="报警功能：" FontSize="16" Foreground="Black" Background="Transparent"
|
||||
<TextBlock Text="报警功能：" FontSize="16" Foreground="White" Background="Transparent"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<ComboBox Name="AlarmFuncCom" Width="140" FontSize="16" VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" Foreground="Black" Background="Transparent"
|
||||
Margin="20,0,0,0" HorizontalContentAlignment="Center"/>
|
||||
HorizontalAlignment="Center" Foreground="White" Background="Transparent"
|
||||
Margin="20,0,0,0" HorizontalContentAlignment="Center" BorderBrush="#50A0A0A0"
|
||||
SelectedItem="{Binding AlarmFuncComSelectedItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock Text="阈值上限：" FontSize="16" Foreground="Black" Background="Transparent"
|
||||
<TextBlock Text="阈值上限：" FontSize="16" Foreground="White" Background="Transparent"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<TextBox Name="AlarmUpTB" Width="140" FontSize="16" VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" Foreground="Black" Background="Transparent"
|
||||
HorizontalAlignment="Center" Foreground="White" Background="Transparent"
|
||||
Margin="20,0,0,0" HorizontalContentAlignment="Center" BorderThickness="0,0,0,1"
|
||||
BorderBrush="#50A0A0A0" PreviewTextInput="AlarmUpTB_PreviewTextInput"
|
||||
InputMethod.IsInputMethodEnabled="False"/>
|
||||
InputMethod.IsInputMethodEnabled="False" CaretBrush="White"
|
||||
Text="{Binding AlarmUpTBText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="2" Background="Transparent" Foreground="White" HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center" Text="A / V" FontSize="12" Margin="0,0,45,0"/>
|
||||
|
||||
<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock Text="阈值下限：" FontSize="16" Foreground="Black" Background="Transparent"
|
||||
<TextBlock Text="阈值下限：" FontSize="16" Foreground="White" Background="Transparent"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<TextBox Name="AlarmDownTB" Width="140" FontSize="16" VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" Foreground="Black" Background="Transparent"
|
||||
HorizontalAlignment="Center" Foreground="White" Background="Transparent"
|
||||
Margin="20,0,0,0" HorizontalContentAlignment="Center" BorderThickness="0,0,0,1"
|
||||
BorderBrush="#50A0A0A0" PreviewTextInput="AlarmDownTB_PreviewTextInput"
|
||||
InputMethod.IsInputMethodEnabled="False"/>
|
||||
InputMethod.IsInputMethodEnabled="False" CaretBrush="White"
|
||||
Text="{Binding AlarmDownTBText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="3" Background="Transparent" Foreground="White" HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center" Text="A / V" FontSize="12" Margin="0,0,45,0"/>
|
||||
|
||||
<Button Name="AlarmSetButton" Grid.Row="4" Width="140" Height="35" Background="#E614273A" Foreground="White"
|
||||
<Button Name="AlarmSetButton" Grid.Row="4" Width="140" Height="35" Background="#2614273A" Foreground="White"
|
||||
Content="设 置" FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Bottom"
|
||||
Command="" Click="AlarmSetButton_Click"/>
|
||||
<TextBlock Name="AlarmSetMsg" Grid.Row="4" Foreground="#E614273A" Background="Transparent"
|
||||
Command="{Binding AlarmSetButtonCommand}" Click="AlarmSetButton_Click"/>
|
||||
<TextBlock Name="AlarmSetMsg" Grid.Row="4" Foreground="Red" Background="Transparent"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,5,5"
|
||||
FontSize="13"/>
|
||||
|
||||
<StackPanel Orientation="Vertical" Grid.Row="4" Margin="10,0,0,0" VerticalAlignment="Bottom">
|
||||
<TextBlock Background="Transparent" Foreground="White" HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center" Text="电流：0-20A" FontSize="12" Margin="0,0,0,5"/>
|
||||
<TextBlock Background="Transparent" Foreground="White" HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center" Text="电压：0-100V" FontSize="12" />
|
||||
</StackPanel>
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
@ -40,7 +40,7 @@ namespace JiangsuEarthquake.Views.UserControls
|
||||
string textAfter = AlarmUpTB.Text.Substring(caretIndex);
|
||||
string newText = textBefore + e.Text + textAfter;
|
||||
|
||||
if (IsIntegerInRange(newText, 1, 120))
|
||||
if (IsIntegerInRange(newText, 1, 100))
|
||||
{
|
||||
// 输入是有效的，允许输入
|
||||
e.Handled = false;
|
||||
@ -68,7 +68,7 @@ namespace JiangsuEarthquake.Views.UserControls
|
||||
string textAfter = AlarmDownTB.Text.Substring(caretIndex);
|
||||
string newText = textBefore + e.Text + textAfter;
|
||||
|
||||
if (IsIntegerInRange(newText, 1, 120))
|
||||
if (IsIntegerInRange(newText, 1, 100))
|
||||
{
|
||||
// 输入是有效的，允许输入
|
||||
e.Handled = false;
|
||||
@ -94,6 +94,18 @@ namespace JiangsuEarthquake.Views.UserControls
|
||||
AlarmSetMsg.Text = "请输入阈值上限和下限！";
|
||||
else
|
||||
AlarmSetMsg.Text = "";
|
||||
|
||||
if (int.Parse(AlarmUpTB.Text) <= int.Parse(AlarmDownTB.Text))
|
||||
AlarmSetMsg.Text = "阈值上限应该大于阈值下限！";
|
||||
else
|
||||
AlarmSetMsg.Text = "";
|
||||
|
||||
if (AlarmParaCom.SelectedItem == "电流" && int.Parse(AlarmUpTB.Text) > 20)
|
||||
AlarmSetMsg.Text = "电流的阈值上限不超过20A！";
|
||||
else if (AlarmParaCom.SelectedItem == "电压" && int.Parse(AlarmUpTB.Text) > 100)
|
||||
AlarmSetMsg.Text = "电压的阈值上限不超过100V！";
|
||||
else
|
||||
AlarmSetMsg.Text = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,14 +12,15 @@
|
||||
Width="400">
|
||||
<hc:SimplePanel>
|
||||
<TextBlock Name="textBlock" Style="{StaticResource TextBlockLargeBold}"
|
||||
Text="Please Wait..." TextWrapping="Wrap" Margin="0,0,0,20"/>
|
||||
Text="Please Wait..." TextWrapping="Wrap" Margin="0,0,0,20"
|
||||
Foreground="White"/>
|
||||
<!-- BtnClose.Command = ControlCommands.Close; -->
|
||||
<!--<Button Width="24" Height="24" Style="{StaticResource ButtonIcon}"
|
||||
Foreground="{DynamicResource PrimaryBrush}"
|
||||
hc:IconElement.Geometry="{StaticResource ErrorGeometry}"
|
||||
Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="4"
|
||||
Command="hc:ControlCommands.Close"/>-->
|
||||
<Button Width="100" Height="40" Background="#E614273A" Foreground="White"
|
||||
<Button Width="100" Height="40" Background="#2614273A" Foreground="White"
|
||||
Content="OK" HorizontalAlignment="Center" VerticalAlignment="Bottom"
|
||||
Margin="0,0,0,20" Command="hc:ControlCommands.Close"/>
|
||||
</hc:SimplePanel>
|
||||
|
||||
Binary file not shown.
@ -20,11 +20,11 @@
|
||||
<!--下位机作为服务器的端口号2-->
|
||||
|
||||
<!--升压站串口信息1-->
|
||||
<add key="PortName1" value="COM4"/>
|
||||
<add key="PortName1" value="COM11"/>
|
||||
<add key="BaudRate1" value="9600"/>
|
||||
|
||||
<!--升压站串口信息2-->
|
||||
<add key="PortName2" value="COM4"/>
|
||||
<add key="PortName2" value="COM1"/>
|
||||
<add key="BaudRate2" value="9600"/>
|
||||
|
||||
<!--升压站量程信息-->
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4FDFE756D0788DA4B097756EB253654B65025272"
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "310DE17A00D139CD5C1C31A194621C0AE11D98B7"
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4FDFE756D0788DA4B097756EB253654B65025272"
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "310DE17A00D139CD5C1C31A194621C0AE11D98B7"
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
|
||||
@ -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+c0b0edd7c39f76a5866073525fb1f245c21585ba")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@ -1 +1 @@
|
||||
b0bab45588d2fa622a7e892c0ab5cc158fd1ee14a305e0980ac1b0cbff679a52
|
||||
dccb7eb1a00df0cbf16318d2ae5ed201dd3cef21490e29167fc8696b032bc857
|
||||
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
b45ed9a2c72e50329a36ecd773e4eb9ad21344bef6cd9c12a5c3d48c23d585c0
|
||||
b2638bfbe595fc625ef395b798049bb4a3a29933e886ea783f22cc00d9378dea
|
||||
|
||||
@ -27,6 +27,7 @@ F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\MySql.Data.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\System.Diagnostics.DiagnosticSource.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\System.IO.Pipelines.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\System.IO.Ports.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\System.Text.Encodings.Web.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\System.Text.Json.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\ZstdSharp.dll
|
||||
@ -43,7 +44,15 @@ F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\win-x64\native\k5sprt64.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\win-x64\native\krb5_64.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\win-x64\native\krbcc64.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\linux-arm\native\libSystem.IO.Ports.Native.so
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\linux-arm64\native\libSystem.IO.Ports.Native.so
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\linux-x64\native\libSystem.IO.Ports.Native.so
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\osx-arm64\native\libSystem.IO.Ports.Native.dylib
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\osx-x64\native\libSystem.IO.Ports.Native.dylib
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\unix\lib\net6.0\System.IO.Ports.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.IO.Ports.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\browser\lib\net6.0\System.Text.Encodings.Web.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\Communication.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\Models.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\Models.pdb
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\JiangsuEarthquake.csproj.AssemblyReference.cache
|
||||
@ -56,6 +65,7 @@ F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\RealTimeDataView.g.cs
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\SystemControlView.g.cs
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\SystemStateDataView.g.cs
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\AlarmSettingView.g.cs
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\BaseStationModel.g.cs
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\InitialView.g.cs
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\InitialView1.g.cs
|
||||
@ -73,6 +83,7 @@ F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\RealTimeDataView.baml
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\SystemControlView.baml
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\SystemStateDataView.baml
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\AlarmSettingView.baml
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\BaseStationModel.baml
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\InitialView.baml
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\InitialView1.baml
|
||||
@ -88,14 +99,3 @@ F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\JiangsuEarthquake.pdb
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\JiangsuEarthquake.genruntimeconfig.cache
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\ref\JiangsuEarthquake.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\System.IO.Ports.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\linux-arm\native\libSystem.IO.Ports.Native.so
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\linux-arm64\native\libSystem.IO.Ports.Native.so
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\linux-x64\native\libSystem.IO.Ports.Native.so
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\osx-arm64\native\libSystem.IO.Ports.Native.dylib
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\osx-x64\native\libSystem.IO.Ports.Native.dylib
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\unix\lib\net6.0\System.IO.Ports.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.IO.Ports.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\bin\Debug\net6.0-windows\Communication.dll
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\AlarmSettingView.g.cs
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\Views\UserControls\AlarmSettingView.baml
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
b0bab45588d2fa622a7e892c0ab5cc158fd1ee14a305e0980ac1b0cbff679a52
|
||||
@ -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+c0b0edd7c39f76a5866073525fb1f245c21585ba")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
@ -0,0 +1 @@
|
||||
dccb7eb1a00df0cbf16318d2ae5ed201dd3cef21490e29167fc8696b032bc857
|
||||
@ -7,7 +7,7 @@ build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = JiangsuEarthquake_3b34buwn_wpftmp
|
||||
build_property.RootNamespace = JiangsuEarthquake_0iedoq0c_wpftmp
|
||||
build_property.ProjectDir = F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
Binary file not shown.
@ -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+5c0318fa538d52bc1b682b627f40e50089e190cc")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
@ -0,0 +1 @@
|
||||
dccb7eb1a00df0cbf16318d2ae5ed201dd3cef21490e29167fc8696b032bc857
|
||||
@ -7,7 +7,7 @@ build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = JiangsuEarthquake_04gvvuhd_wpftmp
|
||||
build_property.RootNamespace = JiangsuEarthquake_0seobx10_wpftmp
|
||||
build_property.ProjectDir = F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
Binary file not shown.
@ -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+5c0318fa538d52bc1b682b627f40e50089e190cc")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
@ -0,0 +1 @@
|
||||
dccb7eb1a00df0cbf16318d2ae5ed201dd3cef21490e29167fc8696b032bc857
|
||||
@ -7,7 +7,7 @@ build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = JiangsuEarthquake_3taqpghc_wpftmp
|
||||
build_property.RootNamespace = JiangsuEarthquake_115fyxrq_wpftmp
|
||||
build_property.ProjectDir = F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
Binary file not shown.
@ -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+c0b0edd7c39f76a5866073525fb1f245c21585ba")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
@ -0,0 +1 @@
|
||||
dccb7eb1a00df0cbf16318d2ae5ed201dd3cef21490e29167fc8696b032bc857
|
||||
@ -7,7 +7,7 @@ build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = JiangsuEarthquake_1olg41ce_wpftmp
|
||||
build_property.RootNamespace = JiangsuEarthquake_1dojfjjs_wpftmp
|
||||
build_property.ProjectDir = F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
61bc7ebe445e48033e2eda845d61e2a9dd1e0dc341649f5ac2bd28271c5404e3
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
61bc7ebe445e48033e2eda845d61e2a9dd1e0dc341649f5ac2bd28271c5404e3
|
||||
Binary file not shown.
@ -0,0 +1,25 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
// 运行时版本:4.0.30319.42000
|
||||
//
|
||||
// 对此文件的更改可能会导致不正确的行为，并且如果
|
||||
// 重新生成代码，这些更改将会丢失。
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
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+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
|
||||
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
|
||||
|
||||
// 由 MSBuild WriteCodeFragment 类生成。
|
||||
|
||||
@ -0,0 +1 @@
|
||||
dccb7eb1a00df0cbf16318d2ae5ed201dd3cef21490e29167fc8696b032bc857
|
||||
@ -0,0 +1,13 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net6.0-windows
|
||||
build_property.TargetPlatformMinVersion = 7.0
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = JiangsuEarthquake_3hnzcdk2_wpftmp
|
||||
build_property.ProjectDir = F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
b0bab45588d2fa622a7e892c0ab5cc158fd1ee14a305e0980ac1b0cbff679a52
|
||||
@ -1,25 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
// 运行时版本:4.0.30319.42000
|
||||
//
|
||||
// 对此文件的更改可能会导致不正确的行为，并且如果
|
||||
// 重新生成代码，这些更改将会丢失。
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
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+c0b0edd7c39f76a5866073525fb1f245c21585ba")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
|
||||
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
|
||||
|
||||
// 由 MSBuild WriteCodeFragment 类生成。
|
||||
|
||||
@ -1 +0,0 @@
|
||||
b0bab45588d2fa622a7e892c0ab5cc158fd1ee14a305e0980ac1b0cbff679a52
|
||||
@ -1,13 +0,0 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net6.0-windows
|
||||
build_property.TargetPlatformMinVersion = 7.0
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = JiangsuEarthquake_5l55dy5e_wpftmp
|
||||
build_property.ProjectDir = F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
@ -12,7 +12,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml
|
||||
14-1765943587
|
||||
11052456543
|
||||
58-1573670892
|
||||
60747043576
|
||||
2171548964508
|
||||
Assets\Styles\DefaultStyle.xaml;ImageDictionary.xaml;MainWindow.xaml;Views\AlarmRecordView.xaml;Views\BoosterStationStateDataView.xaml;Views\LogRecordView.xaml;Views\RealTimeDataView.xaml;Views\SystemControlView.xaml;Views\SystemStateDataView.xaml;Views\UserControls\AlarmSettingView.xaml;Views\UserControls\BaseStationModel.xaml;Views\UserControls\InitialView.xaml;Views\UserControls\InitialView1.xaml;Views\UserControls\TextDialog.xaml;
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml
|
||||
14-1765943587
|
||||
11052456543
|
||||
60-444467715
|
||||
621876246753
|
||||
2171548964508
|
||||
Assets\Styles\DefaultStyle.xaml;ImageDictionary.xaml;MainWindow.xaml;Views\AlarmRecordView.xaml;Views\BoosterStationStateDataView.xaml;Views\LogRecordView.xaml;Views\RealTimeDataView.xaml;Views\SystemControlView.xaml;Views\SystemStateDataView.xaml;Views\UserControls\AlarmSettingView.xaml;Views\UserControls\BaseStationModel.xaml;Views\UserControls\InitialView.xaml;Views\UserControls\InitialView1.xaml;Views\UserControls\TextDialog.xaml;
|
||||
|
||||
|
||||
@ -1,5 +1,15 @@
|
||||
|
||||
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.i.cs
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\MainWindow.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\AlarmRecordView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\BoosterStationStateDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\LogRecordView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\RealTimeDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemControlView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemStateDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\AlarmSettingView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\BaseStationModel.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\InitialView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\InitialView1.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\TextDialog.xaml;;
|
||||
|
||||
|
||||
@ -7,9 +7,9 @@ FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\Lo
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\RealTimeDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemControlView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemStateDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\AlarmSettingView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\BaseStationModel.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\InitialView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\InitialView1.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\TextDialog.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\AlarmSettingView.xaml;;
|
||||
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
// 运行时版本:4.0.30319.42000
|
||||
//
|
||||
// 对此文件的更改可能会导致不正确的行为，并且如果
|
||||
// 重新生成代码，这些更改将会丢失。
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
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+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
|
||||
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
|
||||
|
||||
// 由 MSBuild WriteCodeFragment 类生成。
|
||||
|
||||
@ -0,0 +1 @@
|
||||
dccb7eb1a00df0cbf16318d2ae5ed201dd3cef21490e29167fc8696b032bc857
|
||||
@ -0,0 +1,13 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net6.0-windows
|
||||
build_property.TargetPlatformMinVersion = 7.0
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = JiangsuEarthquake_ai3euotg_wpftmp
|
||||
build_property.ProjectDir = F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
Binary file not shown.
@ -0,0 +1,25 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
// 运行时版本:4.0.30319.42000
|
||||
//
|
||||
// 对此文件的更改可能会导致不正确的行为，并且如果
|
||||
// 重新生成代码，这些更改将会丢失。
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
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+57bc972a187bf0be5ac46ccd9a7c7af3b859ee5a")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
|
||||
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
|
||||
|
||||
// 由 MSBuild WriteCodeFragment 类生成。
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user