1修改震级阀值判断问题；

2 实时波形无停止问题；

StartServerWPF.Modules.Main/ViewModels/MainViewModel.cs

@@ -91,7 +91,6 @@ namespace StartServerWPF.Modules.Main.ViewModels
 
                            Application.Current.Dispatcher.Invoke(() =>
                             {
-                             //   HandyControl.Controls.MessageBox.Show(user.message, "提示");
                                 if (user.code == 200)
                                 {
                                     _websocket.SendMes(JsonSerializer.Serialize(new CSUserSubscribeMessage { type = CSMessage.subscribe }));
@@ -105,6 +104,10 @@ namespace StartServerWPF.Modules.Main.ViewModels
                                     };
                                    LogHelper.WriteSerLog(_systemConfig.vpnInfo.SystemLogPath, log.ToString());
                                 }
+                                else
+                                {
+                                    HandyControl.Controls.MessageBox.Show(user.message, "提示");
+                                }
                             });
                             break;
                         case CSMessage.subscribe:

StartServerWPF.Modules.Main/ViewModels/SetParamViewModel.cs

@@ -330,6 +330,7 @@ namespace StartServerWPF.Modules.Main.ViewModels
                         wareaModelSingleton.apmsavepath = _wareaModel.apmsavepath;
                         wareaModelSingleton.toolsavepath = _wareaModel.toolsavepath;
                         wareaModelSingleton.delayTime = _wareaModel.delayTime;
+                        wareaModelSingleton.apmpush2ddmag = _wareaModel.apmpush2ddmag;
                         wareaModelSingleton.apmModel = _wareaModel.apmModel;
                         wareaModelSingleton.StationConfig = _wareaModel.StationConfig;
                         if (WorkareaNameSource.Count <= 0)
@@ -381,7 +382,7 @@ namespace StartServerWPF.Modules.Main.ViewModels
                             ApmsModel apms = curWorkarea.apmModel;
                             apms.station = Path.GetFullPath(Path.Combine(curWorkarea.savepath, curWorkarea.apmModel.station)).Replace("\\", "/");
                             apms.ttime[0].ttime2d = Path.GetFullPath(Path.Combine(curWorkarea.savepath, curWorkarea.apmModel.ttime[0].ttime2d)).Replace("\\", "/");
-                            apms.savepath = Path.Combine(curWorkarea.savepath, curWorkarea.apmsavepath).Replace("\\", "/"); ;
+                            apms.savepath = Path.Combine(curWorkarea.savepath, curWorkarea.apmsavepath).Replace("\\", "/"); 
                             apms.push2wx = curWorkarea.apmpush2wx ? "YES" : "NO";
                             JsonParser.WriteSystemConfigFile(Path.Combine(_systemConfig.proApms.ProPath, "apms.json"), apms);
                         }
@@ -391,7 +392,7 @@ namespace StartServerWPF.Modules.Main.ViewModels
                             ApmsModel tools = curWorkarea.apmModel;
                             tools.station = Path.GetFullPath(Path.Combine(curWorkarea.savepath, curWorkarea.apmModel.station)).Replace("\\", "/");
                             tools.ttime[0].ttime2d = Path.GetFullPath(Path.Combine(curWorkarea.savepath, curWorkarea.apmModel.ttime[0].ttime2d)).Replace("\\", "/");
-                            tools.savepath = curWorkarea.savepath + "/" + curWorkarea.toolsavepath;
+                            tools.savepath = Path.Combine(curWorkarea.savepath, curWorkarea.toolsavepath).Replace("\\", "/");
                             tools.push2wx = curWorkarea.toolpush2wx ? "YES" : "NO"; ;
                             JsonParser.WriteSystemConfigFile(Path.Combine(_systemConfig.proTools.ProPath, "apms.json"), tools);
 

StartServerWPF.Modules.Main/WebsocketClient.cs

@@ -25,22 +25,22 @@ namespace StartServerWPF.Modules.Main
             webSocket4Net.Opened += WebSocket4Net_Opened;
             webSocket4Net.Error += new EventHandler<ErrorEventArgs>(WebSocket_Error);
             webSocket4Net.MessageReceived += WebSocket4Net_MessageReceived;
+            webSocket4Net.Open();
+            Task.Run(async () => {
+                await Task.Delay(2000);
+                isHeartbeat = true;
+                SendHeartbeat();
+            });
             Debug.WriteLine("客户端连接成功！");
         }
         private string name = string.Empty;
         private string pwd = string.Empty;
         public void SiginServer(string account,string password)
         {  
-
-            isHeartbeat = false;
             name = account;
             pwd = password;
-            webSocket4Net.Open();
+            string jsonstr = JsonSerializer.Serialize(new CSUserSigin { type = CSMessage.sigin, utype = "device", account = name, password = pwd });
-            Task.Run(async () =>{
+            SendMes(jsonstr);
-                await Task.Delay(2000);
-                isHeartbeat = true; 
-                SendHeartbeat();
-            });
         }
 
         public void Closed()
@@ -86,9 +86,12 @@ namespace StartServerWPF.Modules.Main
         private void WebSocket4Net_Opened(object sender, EventArgs e)
         {
             Debug.WriteLine("连接websocket成功,自动登录****************");
+            if (!string.IsNullOrEmpty(name))
+            {
                 string jsonstr = JsonSerializer.Serialize(new CSUserSigin { type = CSMessage.sigin, utype = "device", account = name, password = pwd });
                 SendMes(jsonstr);
             }
+        }
         void WebSocket_Error(object sender, ErrorEventArgs e)
         {
             WebsocketError?.Invoke(e);

StartServerWPF.Modules.MseedChart/ViewModels/ChartPlotRealDataViewModel.cs

@@ -1037,10 +1037,9 @@ namespace StartServerWPF.Modules.MseedChart.ViewModels
                 var d = _lChartAll.ViewXY.XAxes[0].DateTimeToAxisValue(item.Value.FirstSampleTime);
                 _lChartAll.ViewXY.SampleDataSeries[index].FirstSampleTimeStamp = d;// _lChartAll.ViewXY.XAxes[0].Minimum;// item.Value.FirstSampleTimeStamp;
             }
-            Parallel.For(0, _channelCount, (seriesIndex) =>
+            for(int seriesIndex = 0; seriesIndex < _channelCount; seriesIndex++)
             {
                 double[] thisSeriesData = _data[seriesIndex];
-
                 int yindex = _lChartAll.ViewXY.SampleDataSeries[seriesIndex].AssignYAxisIndex;
                 if (yindex >= 0)
                 {
@@ -1049,7 +1048,7 @@ namespace StartServerWPF.Modules.MseedChart.ViewModels
                 _lChartAll.ViewXY.SampleDataSeries[seriesIndex].AddSamples(thisSeriesData, false);
                 Debug.WriteLine($"{DateTime.Now}*********** index:{seriesIndex}," +
                     $" pointCount:{_lChartAll.ViewXY.SampleDataSeries[seriesIndex].PointCount}");
-            });
+            }
             _pointsAppended += 1;
 
             double lastX = _pointsAppended * XInterval;