diff --git a/DeviceHub/FreqSwitcherForm.cpp b/DeviceHub/FreqSwitcherForm.cpp
index 54dc08a..f38ba09 100644
--- a/DeviceHub/FreqSwitcherForm.cpp
+++ b/DeviceHub/FreqSwitcherForm.cpp
@@ -50,7 +50,7 @@
         else if (statusFrameDto->digitalLockPhaseStatus == "3") lockPhaseStatusStr = "预热";
         else if (statusFrameDto->digitalLockPhaseStatus == "4") lockPhaseStatusStr = "锁定";
         ui->fsLockPhaseStatus->setText(lockPhaseStatusStr);
-        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "1" ? "手动" : "自动");
+        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "2" ? "手动" : "自动");
         ui->fsFreqAccOut->setText(QString("%1 pHz").arg(statusFrameDto->freqAdjustAcc));
         ui->fsOppsPhaseAcc->setText(QString("%1 fs").arg(statusFrameDto->phaseAdjustAcc * 10));
         ui->fsRefFreqSrc->setText(statusFrameDto->refFreqSrc.toInt() < 5 ? QString("参考%1").arg(statusFrameDto->refFreqSrc.toInt() + 1) : "融合");

diff --git a/DeviceHub/FreqSwitcherForm.cpp b/DeviceHub/FreqSwitcherForm.cpp
index 54dc08a..f38ba09 100644
--- a/DeviceHub/FreqSwitcherForm.cpp
+++ b/DeviceHub/FreqSwitcherForm.cpp
@@ -50,7 +50,7 @@
         else if (statusFrameDto->digitalLockPhaseStatus == "3") lockPhaseStatusStr = "预热";
         else if (statusFrameDto->digitalLockPhaseStatus == "4") lockPhaseStatusStr = "锁定";
         ui->fsLockPhaseStatus->setText(lockPhaseStatusStr);
-        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "1" ? "手动" : "自动");
+        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "2" ? "手动" : "自动");
         ui->fsFreqAccOut->setText(QString("%1 pHz").arg(statusFrameDto->freqAdjustAcc));
         ui->fsOppsPhaseAcc->setText(QString("%1 fs").arg(statusFrameDto->phaseAdjustAcc * 10));
         ui->fsRefFreqSrc->setText(statusFrameDto->refFreqSrc.toInt() < 5 ? QString("参考%1").arg(statusFrameDto->refFreqSrc.toInt() + 1) : "融合");
diff --git a/DeviceHub/TimeSwitcherForm.ui b/DeviceHub/TimeSwitcherForm.ui
index 067dffa..24adbeb 100644
--- a/DeviceHub/TimeSwitcherForm.ui
+++ b/DeviceHub/TimeSwitcherForm.ui
@@ -175,7 +175,7 @@
     <rect>
      <x>550</x>
      <y>120</y>
-     <width>300</width>
+     <width>431</width>
      <height>30</height>
     </rect>
    </property>
@@ -212,8 +212,8 @@
   <widget class="QLabel" name="label_28">
    <property name="geometry">
     <rect>
-     <x>870</x>
-     <y>120</y>
+     <x>960</x>
+     <y>230</y>
      <width>100</width>
      <height>30</height>
     </rect>
@@ -231,8 +231,8 @@
   <widget class="QLineEdit" name="tsOppsPhaseAccOut">
    <property name="geometry">
     <rect>
-     <x>970</x>
-     <y>120</y>
+     <x>1060</x>
+     <y>230</y>
      <width>50</width>
      <height>30</height>
     </rect>
@@ -328,7 +328,7 @@
   <widget class="QLabel" name="label_24">
    <property name="geometry">
     <rect>
-     <x>1050</x>
+     <x>1000</x>
      <y>120</y>
      <width>60</width>
      <height>30</height>
@@ -347,7 +347,7 @@
   <widget class="QLineEdit" name="tsCtrlStatus">
    <property name="geometry">
     <rect>
-     <x>1110</x>
+     <x>1060</x>
      <y>120</y>
      <width>50</width>
      <height>30</height>

diff --git a/DeviceHub/FreqSwitcherForm.cpp b/DeviceHub/FreqSwitcherForm.cpp
index 54dc08a..f38ba09 100644
--- a/DeviceHub/FreqSwitcherForm.cpp
+++ b/DeviceHub/FreqSwitcherForm.cpp
@@ -50,7 +50,7 @@
         else if (statusFrameDto->digitalLockPhaseStatus == "3") lockPhaseStatusStr = "预热";
         else if (statusFrameDto->digitalLockPhaseStatus == "4") lockPhaseStatusStr = "锁定";
         ui->fsLockPhaseStatus->setText(lockPhaseStatusStr);
-        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "1" ? "手动" : "自动");
+        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "2" ? "手动" : "自动");
         ui->fsFreqAccOut->setText(QString("%1 pHz").arg(statusFrameDto->freqAdjustAcc));
         ui->fsOppsPhaseAcc->setText(QString("%1 fs").arg(statusFrameDto->phaseAdjustAcc * 10));
         ui->fsRefFreqSrc->setText(statusFrameDto->refFreqSrc.toInt() < 5 ? QString("参考%1").arg(statusFrameDto->refFreqSrc.toInt() + 1) : "融合");
diff --git a/DeviceHub/TimeSwitcherForm.ui b/DeviceHub/TimeSwitcherForm.ui
index 067dffa..24adbeb 100644
--- a/DeviceHub/TimeSwitcherForm.ui
+++ b/DeviceHub/TimeSwitcherForm.ui
@@ -175,7 +175,7 @@
     <rect>
      <x>550</x>
      <y>120</y>
-     <width>300</width>
+     <width>431</width>
      <height>30</height>
     </rect>
    </property>
@@ -212,8 +212,8 @@
   <widget class="QLabel" name="label_28">
    <property name="geometry">
     <rect>
-     <x>870</x>
-     <y>120</y>
+     <x>960</x>
+     <y>230</y>
      <width>100</width>
      <height>30</height>
     </rect>
@@ -231,8 +231,8 @@
   <widget class="QLineEdit" name="tsOppsPhaseAccOut">
    <property name="geometry">
     <rect>
-     <x>970</x>
-     <y>120</y>
+     <x>1060</x>
+     <y>230</y>
      <width>50</width>
      <height>30</height>
     </rect>
@@ -328,7 +328,7 @@
   <widget class="QLabel" name="label_24">
    <property name="geometry">
     <rect>
-     <x>1050</x>
+     <x>1000</x>
      <y>120</y>
      <width>60</width>
      <height>30</height>
@@ -347,7 +347,7 @@
   <widget class="QLineEdit" name="tsCtrlStatus">
    <property name="geometry">
     <rect>
-     <x>1110</x>
+     <x>1060</x>
      <y>120</y>
      <width>50</width>
      <height>30</height>
diff --git a/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp b/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp
index a338f39..0547825 100644
--- a/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp
+++ b/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp
@@ -97,22 +97,22 @@
 QList<QByteArray> FreqSwitcherProtocolBM::extractFrameList(QByteArray rawData)
 {
     QList<QByteArray> resultList;
-    int start = rawData.indexOf("$GL");
-    if (start < 0)
-    {
-        return resultList;
-    }
-    rawData = rawData.right(rawData.size() - start);
-
-    int end = rawData.lastIndexOf("\r\n");
-    if (end < 0)
-    {
-        return resultList;
-    }
-    rawData = rawData.left(end);
-
-//    if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true)
+//    int start = rawData.indexOf("$GL");
+//    if (start < 0)
 //    {
+//        return resultList;
+//    }
+//    rawData = rawData.right(rawData.size() - start);
+
+//    int end = rawData.lastIndexOf("\r\n");
+//    if (end < 0)
+//    {
+//        return resultList;
+//    }
+//    rawData = rawData.left(end);
+
+    if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true)
+    {
         QByteArray ba;
         for (int i = 0; i < rawData.size() - 1; i++)
         {
@@ -133,7 +133,7 @@
                 }
             }
         }
-//    }
+    }
 
     return resultList;
 }

diff --git a/DeviceHub/FreqSwitcherForm.cpp b/DeviceHub/FreqSwitcherForm.cpp
index 54dc08a..f38ba09 100644
--- a/DeviceHub/FreqSwitcherForm.cpp
+++ b/DeviceHub/FreqSwitcherForm.cpp
@@ -50,7 +50,7 @@
         else if (statusFrameDto->digitalLockPhaseStatus == "3") lockPhaseStatusStr = "预热";
         else if (statusFrameDto->digitalLockPhaseStatus == "4") lockPhaseStatusStr = "锁定";
         ui->fsLockPhaseStatus->setText(lockPhaseStatusStr);
-        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "1" ? "手动" : "自动");
+        ui->fsRefSelectType->setText(statusFrameDto->refSelectType == "2" ? "手动" : "自动");
         ui->fsFreqAccOut->setText(QString("%1 pHz").arg(statusFrameDto->freqAdjustAcc));
         ui->fsOppsPhaseAcc->setText(QString("%1 fs").arg(statusFrameDto->phaseAdjustAcc * 10));
         ui->fsRefFreqSrc->setText(statusFrameDto->refFreqSrc.toInt() < 5 ? QString("参考%1").arg(statusFrameDto->refFreqSrc.toInt() + 1) : "融合");
diff --git a/DeviceHub/TimeSwitcherForm.ui b/DeviceHub/TimeSwitcherForm.ui
index 067dffa..24adbeb 100644
--- a/DeviceHub/TimeSwitcherForm.ui
+++ b/DeviceHub/TimeSwitcherForm.ui
@@ -175,7 +175,7 @@
     <rect>
      <x>550</x>
      <y>120</y>
-     <width>300</width>
+     <width>431</width>
      <height>30</height>
     </rect>
    </property>
@@ -212,8 +212,8 @@
   <widget class="QLabel" name="label_28">
    <property name="geometry">
     <rect>
-     <x>870</x>
-     <y>120</y>
+     <x>960</x>
+     <y>230</y>
      <width>100</width>
      <height>30</height>
     </rect>
@@ -231,8 +231,8 @@
   <widget class="QLineEdit" name="tsOppsPhaseAccOut">
    <property name="geometry">
     <rect>
-     <x>970</x>
-     <y>120</y>
+     <x>1060</x>
+     <y>230</y>
      <width>50</width>
      <height>30</height>
     </rect>
@@ -328,7 +328,7 @@
   <widget class="QLabel" name="label_24">
    <property name="geometry">
     <rect>
-     <x>1050</x>
+     <x>1000</x>
      <y>120</y>
      <width>60</width>
      <height>30</height>
@@ -347,7 +347,7 @@
   <widget class="QLineEdit" name="tsCtrlStatus">
    <property name="geometry">
     <rect>
-     <x>1110</x>
+     <x>1060</x>
      <y>120</y>
      <width>50</width>
      <height>30</height>
diff --git a/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp b/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp
index a338f39..0547825 100644
--- a/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp
+++ b/DeviceHub/protocol/FreqSwitcherProtocolBM.cpp
@@ -97,22 +97,22 @@
 QList<QByteArray> FreqSwitcherProtocolBM::extractFrameList(QByteArray rawData)
 {
     QList<QByteArray> resultList;
-    int start = rawData.indexOf("$GL");
-    if (start < 0)
-    {
-        return resultList;
-    }
-    rawData = rawData.right(rawData.size() - start);
-
-    int end = rawData.lastIndexOf("\r\n");
-    if (end < 0)
-    {
-        return resultList;
-    }
-    rawData = rawData.left(end);
-
-//    if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true)
+//    int start = rawData.indexOf("$GL");
+//    if (start < 0)
 //    {
+//        return resultList;
+//    }
+//    rawData = rawData.right(rawData.size() - start);
+
+//    int end = rawData.lastIndexOf("\r\n");
+//    if (end < 0)
+//    {
+//        return resultList;
+//    }
+//    rawData = rawData.left(end);
+
+    if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true)
+    {
         QByteArray ba;
         for (int i = 0; i < rawData.size() - 1; i++)
         {
@@ -133,7 +133,7 @@
                 }
             }
         }
-//    }
+    }
 
     return resultList;
 }
diff --git a/DeviceHub/protocol/TimeSwitcherProtocolBM.cpp b/DeviceHub/protocol/TimeSwitcherProtocolBM.cpp
index dff6b42..fa645b5 100644
--- a/DeviceHub/protocol/TimeSwitcherProtocolBM.cpp
+++ b/DeviceHub/protocol/TimeSwitcherProtocolBM.cpp
@@ -93,22 +93,22 @@
 QList<QByteArray> TimeSwitcherProtocolBM::extractFrameList(QByteArray rawData)
 {
     QList<QByteArray> resultList;
-    int start = rawData.indexOf("$GL");
-    if (start < 0)
-    {
-        return resultList;
-    }
-    rawData = rawData.right(rawData.size() - start);
-
-    int end = rawData.lastIndexOf("\r\n");
-    if (end < 0)
-    {
-        return resultList;
-    }
-    rawData = rawData.left(end);
-
-//    if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true)
+//    int start = rawData.indexOf("$GL");
+//    if (start < 0)
 //    {
+//        return resultList;
+//    }
+//    rawData = rawData.right(rawData.size() - start);
+
+//    int end = rawData.lastIndexOf("\r\n");
+//    if (end < 0)
+//    {
+//        return resultList;
+//    }
+//    rawData = rawData.left(end);
+
+    if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true)
+    {
         QByteArray ba;
         for (int i = 0; i < rawData.size() - 1; i++)
         {
@@ -129,7 +129,7 @@
                 }
             }
         }
-//    }
+    }
 
     return resultList;
 }