From f2ad8bcd46a15f5a97f6258e24d48746fd559477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=A5=E9=A3=8E=E8=BF=87=E5=AE=A2?= <3529987066@qq.com>
Date: Wed, 8 May 2024 17:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=201=20=E7=BC=96=E5=86=99=E5=9C=B0=E9=9C=87=E4=BB=AA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=AF=BB=E5=8F=96=E5=92=8C=E8=AE=BE=E7=BD=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.vs/JiangsuEarthquake/v17/.suo            | Bin 272896 -> 272896 bytes
 .../JiangsuEarthquake/v17/DocumentLayout.json |  24 ++-
 .../ViewModels/MainViewModel.cs               | 189 +++++++++++++++---
 3 files changed, 173 insertions(+), 40 deletions(-)

diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo
index 989d13de77ac6c70aad670978803c9b17f2d7476..6c8378f39f6e046b8c2d0a447a6afc371626099e 100644
GIT binary patch
delta 822
zcmchSUr3W-6vjQz=QPRDAP3Qfrhzr#%l%PjyU2fwE-EsVAPH)1&Wm|tT@;nJY1WMk
zN%Y)Ewa|rBAc=cPLRP4#h5MW$W{4G37p7QYw7ThAhGgAz)q(eLUd}ns?>XLSop)N-
zTMNzY*Nd~OeRcRQX}m2dWuN-$lCI5>yD#=C<51QPL&s!7!iOWzTgyt7M*sY|TbDcy
z-DRbN(K(;eU-jnj9buDckjO1!duTGBBI22gwt#Z@rJIJST?A^#W8qYpQvX4WRk4v!
zCyj4k7uvZdbX^1<QFalX6{BA%mXe$h51sl03hPxmc@ZT(=!YC?gbY?5;s7gNB=U+M
zI-b7?BO3?sgx)jt;5g?p<luQEabOvlT-=P3jvfs2$u_(QHUPgX_W!jl)a^<V>hL(R
zb_@YlTCphVAL9z~gAVK#h9T_ROj=RijS*N%b1N!sCUc?9XuD`K6}Zgiy=J-EVs*)R
zCZ|hw7_C;h`n1F8aOOD+ozA>^`<lyNocSrVliu_5<akO8H>r7-`t0m$#$~a54`W*P
z-9S1w%wTGxr6%IKQFIE=JGeBVA=Lb5Uw0#m06*=*F;=2T=7~`h#m&rU^^Ke2=foo?
z>{n~OTG{#I00LqmQOYDfwM1sVUnOO6?H7!3AcXy_cC0+Ek<$6-0t$HPEw+kn%McX&
zrgBUcDi;|m=#{#pM2>vMnGKYnO37cR#I<I*#DKK6aICnkwk2C!NRqBrh{!73^an0@
HLYnviFl#K~

delta 815
zcmaKqTS(MF6vpSAzt>D%vJD|EGh5q-^-^ddk-7V)lFTxDDT<VCguW=HR%)wQK`1Da
zr?kAG%Ld*^?39qLfg~B`st{OV8Tg{1K4@(|)T|dY9~>As!_4`9-}xBxu*N*BX-h}f
zh|JN3)b<RVS6pp*Z-1U|&v3gx0#WUbZ`%`s2MSBRX4mAV<u{s)U4tV91083_j@O%v
zLHY{25R)f9lyZy#x&Q*%5eD`s=;OXi;EUixpRYg<+~m5ekhV8QJ-|PNs8n|pnT(wm
zukRFM*7vaXf6d@erF(=BDc?&?#uYA|GJtNwDqdC<oZbrWmN@Q<oJ_8J1-e+c!M(r1
z;py&QIh-rzPjWBf{yd0cFykOliWLnn3ekYnHiJiKv>1<4{4?yK&=S03$w4<7wPG+0
zn9+;&HRCaAZNecMD#H#-J|YB?lnLXR3M>W~qf{%_vV5xmhd#vjz<H0b30Oi}0KPb{
z&(Q0qm`Kf27)|;q?Bwn$Oi)+~T7aZX9k<k=)@4!AWus8-3te1NkGp{<EocP3U`18g
z;wgh!UOHK5<W^@FEUegNX*bE6rU~Qm+GUEI#V~qVgxyYkjY69qqaXEGV=O-z$7WZW
zX+u5hEAgP$y6Avqt_ZP(%X-&3=-Rs&NlDe1#cw9@0dV9v#`$PHJeDNP5w?J(T3wi*
z<opxtH;2jKY|EzB8X1*5Z&QT2HbRyW27%=dB7L03aL$=VyV9VzP{DK5YyY}0`wX>t
zONi6<Du`1wn&R}hx!mSBRGwa}<6CaZy<{p&fDkgL%MW{d4ksw_7y7TUVmYVu{{x+5
BF)siB

diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json
index 1301e0d..0d6a3fa 100644
--- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json
+++ b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json
@@ -6,6 +6,10 @@
       "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\\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\\earthquakeparasetmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\earthquakeparasetmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -14,10 +18,6 @@
       "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
-    {
-      "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\systemcontrolview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
-      "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemcontrolview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
-    },
     {
       "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\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}"
@@ -58,7 +58,7 @@
       "DocumentGroups": [
         {
           "DockedWidth": 196,
-          "SelectedChildIndex": 10,
+          "SelectedChildIndex": 11,
           "Children": [
             {
               "$type": "Document",
@@ -73,22 +73,26 @@
               "WhenOpened": "2024-04-24T08:54:53.626Z",
               "IsPinned": true
             },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 2,
               "Title": "EarthQuakeParaSetModel.cs",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\EarthQuakeParaSetModel.cs",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\EarthQuakeParaSetModel.cs",
               "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\EarthQuakeParaSetModel.cs",
               "RelativeToolTip": "JiangsuEarthquake\\Models\\EarthQuakeParaSetModel.cs",
-              "ViewState": "AQIAABwAAAAAAAAAAAAkwC8AAAAlAAAA",
+              "ViewState": "AQIAAGsAAAAAAAAAAAAUwIMAAAAnAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-05-07T06:16:48.633Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 3,
               "Title": "BoosterStationStateDataViewModel.cs",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
@@ -127,7 +131,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 1,
               "Title": "SystemControlView.xaml",
               "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml",
               "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemControlView.xaml",
@@ -197,7 +201,7 @@
               "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
               "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
               "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
-              "ViewState": "AQIAAAgIAAAAAAAAAIAwwBwIAAAAAAAA",
+              "ViewState": "AQIAAIIIAAAAAAAAAAAqwI0IAAAVAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-03-12T06:03:03.53Z",
               "EditorCaption": ""
diff --git a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs
index fb8c068..c21a246 100644
--- a/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs
+++ b/JiangsuEarthquake/JiangsuEarthquake/ViewModels/MainViewModel.cs
@@ -1477,10 +1477,11 @@ namespace JiangsuEarthquake.ViewModels
             if (!SeisZeroSetStartIsReceived)
             {
                 OpenSetMsgVisibility = Visibility.Visible;
-                OpenSetMsg = "请求数据发送成功，但未接收到数据！";
+                OpenSetMsg = "请求凋零开启发送成功，但未接收到数据！";
                 timerOpenSetMsgHidden.Start();
                 OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
                 SeisZeroSetStartButtonIsEnabled = true;
+                SeisZeroSetStopButtonIsEnabled = true;
             }
 
             // 停止定时器
@@ -1492,10 +1493,11 @@ namespace JiangsuEarthquake.ViewModels
             if (!SeisZeroSetStopIsReceived)
             {
                 CloseSetMsgVisibility = Visibility.Visible;
-                CloseSetMsg = "请求数据发送成功，但未接收到数据！";
+                CloseSetMsg = "请求调零停止发送成功，但未接收到数据！";
                 timerCloseSetMsgHidden.Start();
                 CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
-                SeisLevelSetStartButtonIsEnabled = true;
+                SeisZeroSetStartButtonIsEnabled = true;
+                SeisZeroSetStopButtonIsEnabled = true;
             }
 
             // 停止定时器
@@ -1507,10 +1509,11 @@ namespace JiangsuEarthquake.ViewModels
             if (!SeisLevelSetStartIsReceived)
             {
                 OpenSetMsgVisibility = Visibility.Visible;
-                OpenSetMsg = "请求数据发送成功，但未接收到数据！";
+                OpenSetMsg = "请求调平开始发送成功，但未接收到数据！";
                 timerOpenSetMsgHidden.Start();
                 OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
-                SeisZeroSetStopButtonIsEnabled = true;
+                SeisLevelSetStopButtonIsEnabled = true;
+                SeisLevelSetStartButtonIsEnabled = true;
             }
 
             // 停止定时器
@@ -1522,10 +1525,11 @@ namespace JiangsuEarthquake.ViewModels
             if (!SeisLevelSetStopIsReceived)
             {
                 CloseSetMsgVisibility = Visibility.Visible;
-                CloseSetMsg = "请求数据发送成功，但未接收到数据！";
+                CloseSetMsg = "请求调平停止发送成功，但未接收到数据！";
                 timerCloseSetMsgHidden.Start();
                 CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
                 SeisLevelSetStopButtonIsEnabled = true;
+                SeisLevelSetStartButtonIsEnabled = true;
             }
 
             // 停止定时器
@@ -1668,6 +1672,7 @@ namespace JiangsuEarthquake.ViewModels
                     if(msg[1].Equals("True"))   //打开
                     {
                         SeisZeroSetStartButtonIsEnabled = false;
+                        SeisZeroSetStopButtonIsEnabled = false;
                         SeisZeroSetStartIsReceived = false;
 
                         sendDataSeis.Clear();
@@ -1696,6 +1701,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerOpenSetMsgHidden.Start();
                                 OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisZeroSetStartButtonIsEnabled = true;
+                                SeisZeroSetStopButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1712,6 +1718,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerOpenSetMsgHidden.Start();
                                 OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisZeroSetStartButtonIsEnabled = true;
+                                SeisZeroSetStopButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1731,6 +1738,7 @@ namespace JiangsuEarthquake.ViewModels
                             timerOpenSetMsgHidden.Start();
                             OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
                             SeisZeroSetStartButtonIsEnabled = true;
+                            SeisZeroSetStopButtonIsEnabled = true;
                         }
                     }
                     break;
@@ -1738,6 +1746,7 @@ namespace JiangsuEarthquake.ViewModels
                     if(!msg[1].Equals("True"))  //关闭
                     {
                         SeisZeroSetStopButtonIsEnabled = false;
+                        SeisZeroSetStartButtonIsEnabled = false;
                         SeisZeroSetStopIsReceived = false;
 
                         sendDataSeis.Clear();
@@ -1766,6 +1775,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerCloseSetMsgHidden.Start();
                                 CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisZeroSetStopButtonIsEnabled = true;
+                                SeisZeroSetStartButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1782,6 +1792,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerCloseSetMsgHidden.Start();
                                 CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisZeroSetStopButtonIsEnabled = true;
+                                SeisZeroSetStartButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1801,6 +1812,7 @@ namespace JiangsuEarthquake.ViewModels
                             timerCloseSetMsgHidden.Start();
                             CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
                             SeisZeroSetStopButtonIsEnabled = true;
+                            SeisZeroSetStartButtonIsEnabled = true;
                         }
                     }
                     break;
@@ -1808,6 +1820,7 @@ namespace JiangsuEarthquake.ViewModels
                     if(msg[1].Equals("True"))   //开启
                     {
                         SeisLevelSetStartButtonIsEnabled = false;
+                        SeisLevelSetStopButtonIsEnabled = false;
                         SeisLevelSetStartIsReceived = false;
 
                         sendDataSeis.Clear();
@@ -1836,6 +1849,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerOpenSetMsgHidden.Start();
                                 OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisLevelSetStartButtonIsEnabled = true;
+                                SeisLevelSetStopButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1852,6 +1866,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerOpenSetMsgHidden.Start();
                                 OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisLevelSetStartButtonIsEnabled = true;
+                                SeisLevelSetStopButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1871,6 +1886,7 @@ namespace JiangsuEarthquake.ViewModels
                             timerOpenSetMsgHidden.Start();
                             OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
                             SeisLevelSetStartButtonIsEnabled = true;
+                            SeisLevelSetStopButtonIsEnabled = true;
                         }
                     }
                     break;
@@ -1878,6 +1894,7 @@ namespace JiangsuEarthquake.ViewModels
                     if(!msg[1].Equals("True"))  //关闭
                     {
                         SeisLevelSetStopButtonIsEnabled = false;
+                        SeisLevelSetStartButtonIsEnabled = false;
                         SeisLevelSetStopIsReceived = false;
 
                         sendDataSeis.Clear();
@@ -1906,6 +1923,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerCloseSetMsgHidden.Start();
                                 CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisLevelSetStopButtonIsEnabled = true;
+                                SeisLevelSetStartButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1922,6 +1940,7 @@ namespace JiangsuEarthquake.ViewModels
                                 timerCloseSetMsgHidden.Start();
                                 CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
                                 SeisLevelSetStopButtonIsEnabled = true;
+                                SeisLevelSetStartButtonIsEnabled = true;
                                 break;
                             }
                         }
@@ -1941,6 +1960,7 @@ namespace JiangsuEarthquake.ViewModels
                             timerCloseSetMsgHidden.Start();
                             CloseSetMsgForeground = new SolidColorBrush(Colors.Red);
                             SeisLevelSetStopButtonIsEnabled = true;
+                            SeisLevelSetStartButtonIsEnabled = true;
                         }
                     }
                     break;
@@ -1965,10 +1985,11 @@ namespace JiangsuEarthquake.ViewModels
             if (!EarthQuakeParaSetIsReceived)
             {
                 SeisParaMsgVisibility = Visibility.Visible;
-                SeisParaMsg = "请求数据发送成功，但未接收到数据！";
+                SeisParaMsg = "参数设置发送成功，但未接收到数据！";
                 timerSeisParaMsgHidden.Start();
                 SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
                 EarthQuakeParaSetBtnIsEnabled = true;
+                EarthQuakeParaReadBtnIsEnabled = true;
             }
 
             // 停止定时器
@@ -1980,10 +2001,11 @@ namespace JiangsuEarthquake.ViewModels
             if (!EarthQuakeParaReadIsReceived)
             {
                 SeisParaMsgVisibility = Visibility.Visible;
-                SeisParaMsg = "请求数据发送成功，但未接收到数据！";
+                SeisParaMsg = "参数读取发送成功，但未接收到数据！";
                 timerSeisParaMsgHidden.Start();
                 SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
                 EarthQuakeParaReadBtnIsEnabled = true;
+                EarthQuakeParaSetBtnIsEnabled = true;
             }
 
             // 停止定时器
@@ -2065,24 +2087,59 @@ namespace JiangsuEarthquake.ViewModels
                 //    break;
                 case "EarthQuakeParaSetBtn":
                     EarthQuakeParaSetBtnIsEnabled = false;
+                    EarthQuakeParaReadBtnIsEnabled = false;
                     earthQuakeParaSetIsReceived = false;
 
                     byte[] sationNo = Tools.IntToBytes(int.Parse(msg[1]));  //台号
                     byte[] stationName = Encoding.UTF8.GetBytes(msg[2]);    //台站名称
-                    stationName = Tools.PadArrayWithZeros(stationName, 36);
+                    stationName = Tools.PadArrayWithZeros(stationName, 32);
                     byte[] stationShortName = Encoding.UTF8.GetBytes(msg[3]);   //台站缩写
                     stationShortName = Tools.PadArrayWithZeros(stationShortName, 8);
-                    byte[] earthQuakeCount = BitConverter.GetBytes(short.Parse(msg[4]));
+                    byte[] earthQuakeCount = BitConverter.GetBytes(short.Parse(msg[4]));    //地震计总数
                     earthQuakeCount = Tools.PadArrayWithZeros(earthQuakeCount, 2);
+                    byte[] channelsNo = BitConverter.GetBytes(short.Parse(msg[5]));     //总通道数
+                    channelsNo = Tools.PadArrayWithZeros(channelsNo, 2);
+                    byte[] wd = Tools.IntToBytes(int.Parse(msg[6]));    //纬度
+                    byte[] jd = Tools.IntToBytes(int.Parse(msg[7]));    //经度
+                    byte[] gaoCheng = Tools.IntToBytes(int.Parse(msg[8]));  //高程
+                    byte[] startTime = BitConverter.GetBytes(short.Parse(msg[9]));  //起用日期
+                    startTime = Tools.PadArrayWithZeros(startTime, 32);
+                    byte[] stationid = BitConverter.GetBytes(short.Parse(msg[10]));  //台网标志
+                    stationid = Tools.PadArrayWithZeros(stationid, 4);
+                    byte[] software_version = BitConverter.GetBytes(short.Parse(msg[11]));  //软件版本
+                    software_version = Tools.PadArrayWithZeros(software_version, 32);
 
                     sendDataSeis.Clear();
                     sendDataSeis.AddRange(new byte[] { 0xBF, 0x13, 0x97, 0x74 });   //SYNC
                     sendDataSeis.AddRange(new byte[] { 0xA0, 0x00 });       //CMD
                     sendDataSeis.AddRange(new byte[] { 0x00, 0x82 });       //LENGTH
+                    sendDataSeis.AddRange(sationNo);
+                    sendDataSeis.AddRange(stationName);
+                    sendDataSeis.AddRange(stationShortName);
+                    sendDataSeis.AddRange(earthQuakeCount);
+                    sendDataSeis.AddRange(channelsNo);
+                    sendDataSeis.AddRange(wd);
+                    sendDataSeis.AddRange(jd);
+                    sendDataSeis.AddRange(gaoCheng);
+                    sendDataSeis.AddRange(startTime);
+                    sendDataSeis.AddRange(stationid);
+                    sendDataSeis.AddRange(software_version);
                     checkByte.Clear();
                     checkByte.AddRange(new byte[] { 0xA0, 0x00 });       //CMD
                     checkByte.AddRange(new byte[] { 0x00, 0x82 });       //LENGTH
+                    checkByte.AddRange(sationNo);
+                    checkByte.AddRange(stationName);
+                    checkByte.AddRange(stationShortName);
+                    checkByte.AddRange(earthQuakeCount);
+                    checkByte.AddRange(channelsNo);
+                    checkByte.AddRange(wd);
+                    checkByte.AddRange(jd);
+                    checkByte.AddRange(gaoCheng);
+                    checkByte.AddRange(startTime);
+                    checkByte.AddRange(stationid);
+                    checkByte.AddRange(software_version);
                     checkCode = Tools.CRCCalc(checkByte.ToArray());      //CHK_SUM
+
                     sendDataSeis.AddRange(checkCode);
 
                     bool result = false;
@@ -2094,11 +2151,12 @@ namespace JiangsuEarthquake.ViewModels
                         }
                         else
                         {
-                            OpenSetMsgVisibility = Visibility.Visible;
-                            OpenSetMsg = "通信未连接！";
-                            timerOpenSetMsgHidden.Start();
-                            OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
-                            SeisZeroSetStartButtonIsEnabled = true;
+                            SeisParaMsgVisibility = Visibility.Visible;
+                            SeisParaMsg = "通信未连接！";
+                            timerSeisParaMsgHidden.Start();
+                            SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
+                            EarthQuakeParaSetBtnIsEnabled = true;
+                            EarthQuakeParaReadBtnIsEnabled = true;
                             break;
                         }
                     }
@@ -2110,34 +2168,105 @@ namespace JiangsuEarthquake.ViewModels
                         }
                         else
                         {
-                            OpenSetMsgVisibility = Visibility.Visible;
-                            OpenSetMsg = "通信未连接！";
-                            timerOpenSetMsgHidden.Start();
-                            OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
-                            SeisZeroSetStartButtonIsEnabled = true;
+                            SeisParaMsgVisibility = Visibility.Visible;
+                            SeisParaMsg = "通信未连接！";
+                            timerSeisParaMsgHidden.Start();
+                            SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
+                            EarthQuakeParaSetBtnIsEnabled = true;
+                            EarthQuakeParaReadBtnIsEnabled = true;
                             break;
                         }
                     }
 
                     if (result)
                     {
-                        OpenSetMsgVisibility = Visibility.Visible;
-                        OpenSetMsg = "请求调零开启发送成功！";
-                        timerOpenSetMsgHidden.Start();
-                        OpenSetMsgForeground = new SolidColorBrush(Colors.Green);
-                        timerSeisZeroSetStart.Start();
+                        SeisParaMsgVisibility = Visibility.Visible;
+                        SeisParaMsg = "设置参数发送成功！";
+                        timerSeisParaMsgHidden.Start();
+                        SeisParaMsgForeground = new SolidColorBrush(Colors.Green);
+                        timerEarthQuakeParaSet.Start();
                     }
                     else
                     {
-                        OpenSetMsgVisibility = Visibility.Visible;
-                        OpenSetMsg = "请求调零开启发送失败！";
-                        timerOpenSetMsgHidden.Start();
-                        OpenSetMsgForeground = new SolidColorBrush(Colors.Red);
-                        SeisZeroSetStartButtonIsEnabled = true;
+                        SeisParaMsgVisibility = Visibility.Visible;
+                        SeisParaMsg = "设置参数发送失败！";
+                        timerSeisParaMsgHidden.Start();
+                        SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
+                        EarthQuakeParaSetBtnIsEnabled = true;
+                        EarthQuakeParaReadBtnIsEnabled = true;
                     }
                     break;
                 case "EarthQuakeParaReadBtn":
+                    EarthQuakeParaSetBtnIsEnabled = false;
+                    EarthQuakeParaReadBtnIsEnabled = false;
+                    earthQuakeParaReadIsReceived = false;
 
+                    sendDataSeis.Clear();
+                    sendDataSeis.AddRange(new byte[] { 0xBF, 0x13, 0x97, 0x74 });   //SYNC
+                    sendDataSeis.AddRange(new byte[] { 0xB0, 0x00 });       //CMD
+                    sendDataSeis.AddRange(new byte[] { 0x00, 0x02 });       //LENGTH
+                    sendDataSeis.AddRange(new byte[] { 0x00, 0x00 });       //地震计号
+                    checkByte.Clear();
+                    checkByte.AddRange(new byte[] { 0xB0, 0x00 });       //CMD
+                    checkByte.AddRange(new byte[] { 0x00, 0x02 });       //LENGTH
+                    checkByte.AddRange(new byte[] { 0x00, 0x00 });       //地震计号
+                    checkCode = Tools.CRCCalc(checkByte.ToArray());      //CHK_SUM
+
+                    sendDataSeis.AddRange(checkCode);
+
+                    result = false;
+                    if (station_id == 1)
+                    {
+                        if (clientModelDZY1.IsConnected)
+                        {
+                            result = clientModelDZY1.SendMessage(sendDataSeis.ToArray());
+                        }
+                        else
+                        {
+                            SeisParaMsgVisibility = Visibility.Visible;
+                            SeisParaMsg = "通信未连接！";
+                            timerSeisParaMsgHidden.Start();
+                            SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
+                            EarthQuakeParaSetBtnIsEnabled = true;
+                            EarthQuakeParaReadBtnIsEnabled = true;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        if (clientModelDZY2.IsConnected)
+                        {
+                            result = clientModelDZY2.SendMessage(sendDataSeis.ToArray());
+                        }
+                        else
+                        {
+                            SeisParaMsgVisibility = Visibility.Visible;
+                            SeisParaMsg = "通信未连接！";
+                            timerSeisParaMsgHidden.Start();
+                            SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
+                            EarthQuakeParaSetBtnIsEnabled = true;
+                            EarthQuakeParaReadBtnIsEnabled = true;
+                            break;
+                        }
+                    }
+
+                    if (result)
+                    {
+                        SeisParaMsgVisibility = Visibility.Visible;
+                        SeisParaMsg = "设置参数发送成功！";
+                        timerSeisParaMsgHidden.Start();
+                        SeisParaMsgForeground = new SolidColorBrush(Colors.Green);
+                        timerEarthQuakeParaSet.Start();
+                    }
+                    else
+                    {
+                        SeisParaMsgVisibility = Visibility.Visible;
+                        SeisParaMsg = "设置参数发送失败！";
+                        timerSeisParaMsgHidden.Start();
+                        SeisParaMsgForeground = new SolidColorBrush(Colors.Red);
+                        EarthQuakeParaSetBtnIsEnabled = true;
+                        EarthQuakeParaReadBtnIsEnabled = true;
+                    }
                     break;
                 default:
                     return;