diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs
index 555343a..d8ffe1e 100644
--- a/Correlator/Util/SerialPortManager.cs
+++ b/Correlator/Util/SerialPortManager.cs
@@ -132,7 +132,11 @@
UpdateDeviceSignal(strDeviceId, tags);
break;
case 11293: //数据采集
- HandleCorrelatorData(strDeviceId, tags);
+ if (!FlowStatus.IsHydrophone)
+ {
+ HandleCorrelatorData(strDeviceId, tags);
+ }
+
break;
case 30:
if (FlowStatus.IsHydrophone && FlowStatus.CanCollectData)
@@ -324,7 +328,7 @@
///
private void HandleHydrophoneData(string devCode, List tags)
{
- var clobData = new double[3750 * 60]; //3750*60个采样点
+ var clobData = new double[7500 * 60]; //7500*60个采样点
//处理接到的噪声数据
var noiseTag = tags.GetUploadNoiseTag();
if (noiseTag != null)
diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs
index 555343a..d8ffe1e 100644
--- a/Correlator/Util/SerialPortManager.cs
+++ b/Correlator/Util/SerialPortManager.cs
@@ -132,7 +132,11 @@
UpdateDeviceSignal(strDeviceId, tags);
break;
case 11293: //数据采集
- HandleCorrelatorData(strDeviceId, tags);
+ if (!FlowStatus.IsHydrophone)
+ {
+ HandleCorrelatorData(strDeviceId, tags);
+ }
+
break;
case 30:
if (FlowStatus.IsHydrophone && FlowStatus.CanCollectData)
@@ -324,7 +328,7 @@
///
private void HandleHydrophoneData(string devCode, List tags)
{
- var clobData = new double[3750 * 60]; //3750*60个采样点
+ var clobData = new double[7500 * 60]; //7500*60个采样点
//处理接到的噪声数据
var noiseTag = tags.GetUploadNoiseTag();
if (noiseTag != null)
diff --git a/Correlator/View/MainWindow.xaml b/Correlator/View/MainWindow.xaml
index c8c99a1..3f22db9 100644
--- a/Correlator/View/MainWindow.xaml
+++ b/Correlator/View/MainWindow.xaml
@@ -17,21 +17,14 @@
-
+ Foreground="Red"
+ Text="初始化中,请稍后..." />
private void HandleHydrophoneData(string devCode, List tags)
{
- var clobData = new double[3750 * 60]; //3750*60个采样点
+ var clobData = new double[7500 * 60]; //7500*60个采样点
//处理接到的噪声数据
var noiseTag = tags.GetUploadNoiseTag();
if (noiseTag != null)
diff --git a/Correlator/View/MainWindow.xaml b/Correlator/View/MainWindow.xaml
index c8c99a1..3f22db9 100644
--- a/Correlator/View/MainWindow.xaml
+++ b/Correlator/View/MainWindow.xaml
@@ -17,21 +17,14 @@
-
+ Foreground="Red"
+ Text="初始化中,请稍后..." />
0)
{
_counterOneTime--;
- SkipButton.Content = _counterOneTime + "s丨跳过";
}
else
{
@@ -53,15 +52,6 @@
Close();
}
};
-
- //点击事件
- SkipButton.Click += async (sender, args) =>
- {
- _timer.Stop();
- var homePageProWindow = await GetHomePageProWindow();
- homePageProWindow.Show();
- Close();
- };
}
///