diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
index 8941049..bf6a344 100644
--- a/Correlator/Dialog/CheckResponseDialog.xaml.cs
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -149,7 +149,7 @@
                     ReCheckButton.IsEnabled = false;
 
                     //分析数据
-                    Messenger.Default.Send(DevCode.Dev2, MessengerToken.StartHandleSensorData);
+                    Messenger.Default.Send(DevCode.Dev1, MessengerToken.StartHandleSensorData);
                 }
             };
 
@@ -182,7 +182,7 @@
                 }
                 else if (BlueSensorStepBar.StepIndex == 2)
                 {
-                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List<int>());
+                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List<int>());
                 }
                 else if (BlueSensorStepBar.StepIndex == 3)
                 {

diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
index 8941049..bf6a344 100644
--- a/Correlator/Dialog/CheckResponseDialog.xaml.cs
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -149,7 +149,7 @@
                     ReCheckButton.IsEnabled = false;
 
                     //分析数据
-                    Messenger.Default.Send(DevCode.Dev2, MessengerToken.StartHandleSensorData);
+                    Messenger.Default.Send(DevCode.Dev1, MessengerToken.StartHandleSensorData);
                 }
             };
 
@@ -182,7 +182,7 @@
                 }
                 else if (BlueSensorStepBar.StepIndex == 2)
                 {
-                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List<int>());
+                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List<int>());
                 }
                 else if (BlueSensorStepBar.StepIndex == 3)
                 {
diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs
index b0ad72a..2408769 100644
--- a/Correlator/Util/FlowStatus.cs
+++ b/Correlator/Util/FlowStatus.cs
@@ -42,10 +42,10 @@
         //水听器下发唤醒指令时间戳
         public static byte[] HydrophoneWakeUpTimeBytes = new byte[6];
 
-        //水听器红色信号接收器数据 TODO 计算结束别忘记清空
-        public static List<List<Tag>> RedSensorTagLists = new List<List<Tag>>();
+        //水听器红色信号接收器数据
+        public static readonly List<List<Tag>> RedSensorTagLists = new List<List<Tag>>();
 
-        //水听器蓝色信号接收器数据 TODO 计算结束别忘记清空
-        public static List<List<Tag>> BlueSensorTagLists = new List<List<Tag>>();
+        //水听器蓝色信号接收器数据
+        public static readonly List<List<Tag>> BlueSensorTagLists = new List<List<Tag>>();
     }
 }
\ No newline at end of file

diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
index 8941049..bf6a344 100644
--- a/Correlator/Dialog/CheckResponseDialog.xaml.cs
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -149,7 +149,7 @@
                     ReCheckButton.IsEnabled = false;
 
                     //分析数据
-                    Messenger.Default.Send(DevCode.Dev2, MessengerToken.StartHandleSensorData);
+                    Messenger.Default.Send(DevCode.Dev1, MessengerToken.StartHandleSensorData);
                 }
             };
 
@@ -182,7 +182,7 @@
                 }
                 else if (BlueSensorStepBar.StepIndex == 2)
                 {
-                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List<int>());
+                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List<int>());
                 }
                 else if (BlueSensorStepBar.StepIndex == 3)
                 {
diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs
index b0ad72a..2408769 100644
--- a/Correlator/Util/FlowStatus.cs
+++ b/Correlator/Util/FlowStatus.cs
@@ -42,10 +42,10 @@
         //水听器下发唤醒指令时间戳
         public static byte[] HydrophoneWakeUpTimeBytes = new byte[6];
 
-        //水听器红色信号接收器数据 TODO 计算结束别忘记清空
-        public static List<List<Tag>> RedSensorTagLists = new List<List<Tag>>();
+        //水听器红色信号接收器数据
+        public static readonly List<List<Tag>> RedSensorTagLists = new List<List<Tag>>();
 
-        //水听器蓝色信号接收器数据 TODO 计算结束别忘记清空
-        public static List<List<Tag>> BlueSensorTagLists = new List<List<Tag>>();
+        //水听器蓝色信号接收器数据
+        public static readonly List<List<Tag>> BlueSensorTagLists = new List<List<Tag>>();
     }
 }
\ No newline at end of file
diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs
index e645c1f..c4b4ccd 100644
--- a/Correlator/Util/SerialPortManager.cs
+++ b/Correlator/Util/SerialPortManager.cs
@@ -34,7 +34,6 @@
             {
                 if (id.Equals(DevCode.Dev1))
                 {
-                    "SerialPortManager".WriteLog(DevCode.Dev1 + "数据开始处理");
                     var tags = new List<Tag>();
                     foreach (var list in FlowStatus.RedSensorTagLists)
                     {
@@ -46,7 +45,6 @@
                 }
                 else
                 {
-                    "SerialPortManager".WriteLog(DevCode.Dev2 + "数据开始处理");
                     var tags = new List<Tag>();
                     foreach (var list in FlowStatus.BlueSensorTagLists)
                     {
@@ -55,6 +53,15 @@
 
                     HandleHydrophoneData(id, tags);
                     "SerialPortManager".WriteLog(DevCode.Dev2 + "数据处理完成");
+
+                    //清空缓存
+                    FlowStatus.RedSensorTagLists.Clear();
+                    FlowStatus.BlueSensorTagLists.Clear();
+
+                    //开始计算
+                    Messenger.Default.Send(_dataModel, MessengerToken.HomePageDeviceData);
+                    //重新定义dataModel，清空之前的缓存
+                    _dataModel = new CorrelatorDataModel();
                 }
             });
         }
@@ -81,7 +88,7 @@
 
             if (receiveData != null)
             {
-                "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""));
+                // "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""));
 
                 var deviceId = new byte[6];
                 Array.Copy(receiveData, 4, deviceId, 0, 6);
@@ -322,18 +329,6 @@
                 {
                     _dataModel.RightDeviceDataArray = clobData;
                 }
-
-                //发送消息计算数据
-                if (_dataModel.LeftDeviceDataArray != null && _dataModel.RightDeviceDataArray != null)
-                {
-                    Messenger.Default.Send(_dataModel, MessengerToken.HomePageDeviceData);
-                    //重新定义dataModel，清空之前的缓存
-                    _dataModel = new CorrelatorDataModel();
-                }
-                else
-                {
-                    "SerialPortManager".WriteLog("水听器数据未收集完整，无法计算");
-                }
             }
         }
 

diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
index 8941049..bf6a344 100644
--- a/Correlator/Dialog/CheckResponseDialog.xaml.cs
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -149,7 +149,7 @@
                     ReCheckButton.IsEnabled = false;
 
                     //分析数据
-                    Messenger.Default.Send(DevCode.Dev2, MessengerToken.StartHandleSensorData);
+                    Messenger.Default.Send(DevCode.Dev1, MessengerToken.StartHandleSensorData);
                 }
             };
 
@@ -182,7 +182,7 @@
                 }
                 else if (BlueSensorStepBar.StepIndex == 2)
                 {
-                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List<int>());
+                    CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List<int>());
                 }
                 else if (BlueSensorStepBar.StepIndex == 3)
                 {
diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs
index b0ad72a..2408769 100644
--- a/Correlator/Util/FlowStatus.cs
+++ b/Correlator/Util/FlowStatus.cs
@@ -42,10 +42,10 @@
         //水听器下发唤醒指令时间戳
         public static byte[] HydrophoneWakeUpTimeBytes = new byte[6];
 
-        //水听器红色信号接收器数据 TODO 计算结束别忘记清空
-        public static List<List<Tag>> RedSensorTagLists = new List<List<Tag>>();
+        //水听器红色信号接收器数据
+        public static readonly List<List<Tag>> RedSensorTagLists = new List<List<Tag>>();
 
-        //水听器蓝色信号接收器数据 TODO 计算结束别忘记清空
-        public static List<List<Tag>> BlueSensorTagLists = new List<List<Tag>>();
+        //水听器蓝色信号接收器数据
+        public static readonly List<List<Tag>> BlueSensorTagLists = new List<List<Tag>>();
     }
 }
\ No newline at end of file
diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs
index e645c1f..c4b4ccd 100644
--- a/Correlator/Util/SerialPortManager.cs
+++ b/Correlator/Util/SerialPortManager.cs
@@ -34,7 +34,6 @@
             {
                 if (id.Equals(DevCode.Dev1))
                 {
-                    "SerialPortManager".WriteLog(DevCode.Dev1 + "数据开始处理");
                     var tags = new List<Tag>();
                     foreach (var list in FlowStatus.RedSensorTagLists)
                     {
@@ -46,7 +45,6 @@
                 }
                 else
                 {
-                    "SerialPortManager".WriteLog(DevCode.Dev2 + "数据开始处理");
                     var tags = new List<Tag>();
                     foreach (var list in FlowStatus.BlueSensorTagLists)
                     {
@@ -55,6 +53,15 @@
 
                     HandleHydrophoneData(id, tags);
                     "SerialPortManager".WriteLog(DevCode.Dev2 + "数据处理完成");
+
+                    //清空缓存
+                    FlowStatus.RedSensorTagLists.Clear();
+                    FlowStatus.BlueSensorTagLists.Clear();
+
+                    //开始计算
+                    Messenger.Default.Send(_dataModel, MessengerToken.HomePageDeviceData);
+                    //重新定义dataModel，清空之前的缓存
+                    _dataModel = new CorrelatorDataModel();
                 }
             });
         }
@@ -81,7 +88,7 @@
 
             if (receiveData != null)
             {
-                "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""));
+                // "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""));
 
                 var deviceId = new byte[6];
                 Array.Copy(receiveData, 4, deviceId, 0, 6);
@@ -322,18 +329,6 @@
                 {
                     _dataModel.RightDeviceDataArray = clobData;
                 }
-
-                //发送消息计算数据
-                if (_dataModel.LeftDeviceDataArray != null && _dataModel.RightDeviceDataArray != null)
-                {
-                    Messenger.Default.Send(_dataModel, MessengerToken.HomePageDeviceData);
-                    //重新定义dataModel，清空之前的缓存
-                    _dataModel = new CorrelatorDataModel();
-                }
-                else
-                {
-                    "SerialPortManager".WriteLog("水听器数据未收集完整，无法计算");
-                }
             }
         }
 
diff --git a/Correlator/ViewModel/ViewModelLocator.cs b/Correlator/ViewModel/ViewModelLocator.cs
index 97ff502..60ad9ed 100644
--- a/Correlator/ViewModel/ViewModelLocator.cs
+++ b/Correlator/ViewModel/ViewModelLocator.cs
@@ -41,7 +41,6 @@
 
             #region VM
 
-            SimpleIoc.Default.Register<HomePageViewModel>();
             SimpleIoc.Default.Register<HomePageProViewModel>();
             SimpleIoc.Default.Register<AudioFileViewModel>();
             SimpleIoc.Default.Register<PictureFileViewModel>();
@@ -54,7 +53,6 @@
             #endregion
         }
 
-        public HomePageViewModel HomePage => ServiceLocator.Current.GetInstance<HomePageViewModel>();
         public HomePageProViewModel HomePagePro => ServiceLocator.Current.GetInstance<HomePageProViewModel>();
         public AudioFileViewModel AudioFile => ServiceLocator.Current.GetInstance<AudioFileViewModel>();
         public PictureFileViewModel PictureFile => ServiceLocator.Current.GetInstance<PictureFileViewModel>();