diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp
index b7669be..1a5e6dd 100644
--- a/DeviceHub/FrequencyTuningForm.cpp
+++ b/DeviceHub/FrequencyTuningForm.cpp
@@ -1,4 +1,4 @@
-#include "FrequencyTuningForm.h"
+#include "FrequencyTuningForm.h"
 #include "ui_FrequencyTuningForm.h"
 #include "DeviceHubWindow.h"
 
@@ -29,6 +29,28 @@
 
 void FrequencyTuningForm::drawDeviceFrameOnForm(DeviceFrameBaseDto * frameData)
 {
+    QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString();
+
+    std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl;
+    // 如果不是当前设备的帧，直接返回
+    if (frameData->devCode != currentDevCode)
+    {
+        ui->ftDevStatus->setText("-");
+        ui->ftInputValid->setText("-");
+        ui->ftInputTimeType->setText("");
+        ui->ftFreqAdjustAcc->setText("");
+        ui->ftPulseAdjustAcc->setText("");
+        ui->label_ts->setText("-");
+
+        ui->ftSynchStatus->setText("-");
+        ui->ftRefValid->setText("-");
+        ui->ftSecondDiff->setText("");
+        ui->ftPhaseShiftAcc->setText("");
+        ui->ftPulseWidth->setText("");
+
+        return;
+    }
+
     // 当前显示的设备编号
     if (frameData->frameType == "0301")
     {

diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp
index b7669be..1a5e6dd 100644
--- a/DeviceHub/FrequencyTuningForm.cpp
+++ b/DeviceHub/FrequencyTuningForm.cpp
@@ -1,4 +1,4 @@
-#include "FrequencyTuningForm.h"
+#include "FrequencyTuningForm.h"
 #include "ui_FrequencyTuningForm.h"
 #include "DeviceHubWindow.h"
 
@@ -29,6 +29,28 @@
 
 void FrequencyTuningForm::drawDeviceFrameOnForm(DeviceFrameBaseDto * frameData)
 {
+    QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString();
+
+    std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl;
+    // 如果不是当前设备的帧，直接返回
+    if (frameData->devCode != currentDevCode)
+    {
+        ui->ftDevStatus->setText("-");
+        ui->ftInputValid->setText("-");
+        ui->ftInputTimeType->setText("");
+        ui->ftFreqAdjustAcc->setText("");
+        ui->ftPulseAdjustAcc->setText("");
+        ui->label_ts->setText("-");
+
+        ui->ftSynchStatus->setText("-");
+        ui->ftRefValid->setText("-");
+        ui->ftSecondDiff->setText("");
+        ui->ftPhaseShiftAcc->setText("");
+        ui->ftPulseWidth->setText("");
+
+        return;
+    }
+
     // 当前显示的设备编号
     if (frameData->frameType == "0301")
     {
diff --git a/DeviceHub/device/FrequencyTuning.cpp b/DeviceHub/device/FrequencyTuning.cpp
index ea31920..bf54b94 100644
--- a/DeviceHub/device/FrequencyTuning.cpp
+++ b/DeviceHub/device/FrequencyTuning.cpp
@@ -16,12 +16,12 @@
     connect(this, &FrequencyTuning::sendCommandToDisplay,
             ((DeviceHubWindow *)this->parent())->freqTunForm, &FrequencyTuningForm::displayDeviceCommandOnForm);
 
-    connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved,
-            this, &FrequencyTuning::commandReceivedHandler);
+//    connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved,
+//            this, &FrequencyTuning::commandReceivedHandler);
 
-    kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS);
-    kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC);
-    kafkaProducer.createProducer();
+//    kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS);
+//    kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC);
+//    kafkaProducer.createProducer();
 
     this->protocol = DeviceProtocolBase::deviceProtocolFactory(devType);
 }
@@ -122,7 +122,7 @@
         QJsonObject jsonObj = frameDto->toJSON();
         jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
         jsonObj.insert("deviceId", deviceId);
-        kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
+//        kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
     }
 
     // 4. 在界面上简单显示相差数据结果
@@ -153,8 +153,8 @@
             // 3. 输出到中间件，执行后续处理过程
             if (SettingConfig::getInstance().NEED_KAFKA == 1)
             {
-                kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
-                                             QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
+//                kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
+//                                             QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
             }
             return;
         }
@@ -166,7 +166,7 @@
     QString date = now.toString("yyyy-MM-dd");
 
     // 1. 原始字节数组数据
-    QString filename = "raw_" + devCode + ".log";
+    QString filename = "rawCmd_" + devCode + ".log";
     QString content = now.toString("yyyy-MM-dd HH:mm:ss.zzz") + " [send] " + data.left(data.size() - FRAME_TAIL.size());
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
@@ -181,8 +181,8 @@
     // 3. 输出到中间件，执行后续处理过程
     if (SettingConfig::getInstance().NEED_KAFKA == 1)
     {
-        kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
-                                     QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
+//        kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
+//                                     QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
     }
 
     std::cout << content.toStdString() << std::endl;
@@ -206,7 +206,7 @@
     QString date = now.toString("yyyy-MM-dd");
 
     // 1. 原始字节数组数据
-    QString filename = "frame_" + devCode + ".log";
+    QString filename = "cmd_" + devCode + ".log";
     QString content = now.toString("yyyy-MM-dd HH:mm:ss.zzz") + " [recv] " + command.find("cmdStr")->toString();
     QLogUtil::writeChannelDataLogByDate(date, filename, content);
 

diff --git a/DeviceHub/FrequencyTuningForm.cpp b/DeviceHub/FrequencyTuningForm.cpp
index b7669be..1a5e6dd 100644
--- a/DeviceHub/FrequencyTuningForm.cpp
+++ b/DeviceHub/FrequencyTuningForm.cpp
@@ -1,4 +1,4 @@
-#include "FrequencyTuningForm.h"
+#include "FrequencyTuningForm.h"
 #include "ui_FrequencyTuningForm.h"
 #include "DeviceHubWindow.h"
 
@@ -29,6 +29,28 @@
 
 void FrequencyTuningForm::drawDeviceFrameOnForm(DeviceFrameBaseDto * frameData)
 {
+    QString currentDevCode = ((DeviceHubWindow *)this->parent()->parent())->getDevSelect()->currentData().toJsonObject().find("deviceNo")->toString();
+
+    std::cout << currentDevCode.toStdString() << " - " << frameData->devCode.toStdString() << std::endl;
+    // 如果不是当前设备的帧，直接返回
+    if (frameData->devCode != currentDevCode)
+    {
+        ui->ftDevStatus->setText("-");
+        ui->ftInputValid->setText("-");
+        ui->ftInputTimeType->setText("");
+        ui->ftFreqAdjustAcc->setText("");
+        ui->ftPulseAdjustAcc->setText("");
+        ui->label_ts->setText("-");
+
+        ui->ftSynchStatus->setText("-");
+        ui->ftRefValid->setText("-");
+        ui->ftSecondDiff->setText("");
+        ui->ftPhaseShiftAcc->setText("");
+        ui->ftPulseWidth->setText("");
+
+        return;
+    }
+
     // 当前显示的设备编号
     if (frameData->frameType == "0301")
     {
diff --git a/DeviceHub/device/FrequencyTuning.cpp b/DeviceHub/device/FrequencyTuning.cpp
index ea31920..bf54b94 100644
--- a/DeviceHub/device/FrequencyTuning.cpp
+++ b/DeviceHub/device/FrequencyTuning.cpp
@@ -16,12 +16,12 @@
     connect(this, &FrequencyTuning::sendCommandToDisplay,
             ((DeviceHubWindow *)this->parent())->freqTunForm, &FrequencyTuningForm::displayDeviceCommandOnForm);
 
-    connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved,
-            this, &FrequencyTuning::commandReceivedHandler);
+//    connect(((DeviceHubWindow *)this->parent())->kafkaConsumer, &QKafkaConsumer::messageRecieved,
+//            this, &FrequencyTuning::commandReceivedHandler);
 
-    kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS);
-    kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC);
-    kafkaProducer.createProducer();
+//    kafkaProducer.setBrokers(SettingConfig::getInstance().KAFKA_BROKERS);
+//    kafkaProducer.setTopic(SettingConfig::getInstance().KAFKA_DATA_TOPIC);
+//    kafkaProducer.createProducer();
 
     this->protocol = DeviceProtocolBase::deviceProtocolFactory(devType);
 }
@@ -122,7 +122,7 @@
         QJsonObject jsonObj = frameDto->toJSON();
         jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
         jsonObj.insert("deviceId", deviceId);
-        kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
+//        kafkaProducer.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
     }
 
     // 4. 在界面上简单显示相差数据结果
@@ -153,8 +153,8 @@
             // 3. 输出到中间件，执行后续处理过程
             if (SettingConfig::getInstance().NEED_KAFKA == 1)
             {
-                kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
-                                             QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
+//                kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
+//                                             QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
             }
             return;
         }
@@ -166,7 +166,7 @@
     QString date = now.toString("yyyy-MM-dd");
 
     // 1. 原始字节数组数据
-    QString filename = "raw_" + devCode + ".log";
+    QString filename = "rawCmd_" + devCode + ".log";
     QString content = now.toString("yyyy-MM-dd HH:mm:ss.zzz") + " [send] " + data.left(data.size() - FRAME_TAIL.size());
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
@@ -181,8 +181,8 @@
     // 3. 输出到中间件，执行后续处理过程
     if (SettingConfig::getInstance().NEED_KAFKA == 1)
     {
-        kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
-                                     QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
+//        kafkaProducer.produceMessage(SettingConfig::getInstance().KAFKA_CMDCB_TOPIC,
+//                                     QString(QJsonDocument(replyDto.toJSON()).toJson(QJsonDocument::Compact)));
     }
 
     std::cout << content.toStdString() << std::endl;
@@ -206,7 +206,7 @@
     QString date = now.toString("yyyy-MM-dd");
 
     // 1. 原始字节数组数据
-    QString filename = "frame_" + devCode + ".log";
+    QString filename = "cmd_" + devCode + ".log";
     QString content = now.toString("yyyy-MM-dd HH:mm:ss.zzz") + " [recv] " + command.find("cmdStr")->toString();
     QLogUtil::writeChannelDataLogByDate(date, filename, content);
 
diff --git a/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp b/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp
index 60d7a8a..9a1bf9f 100644
--- a/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp
+++ b/DeviceHub/protocol/FrequencyTuningProtocolBM.cpp
@@ -69,28 +69,28 @@
 {
     QList<QByteArray> resultList;
 
-    int start = rawData.indexOf("$GL");
-    if (start < 0)
-    {
-        return resultList;
-    }
-    int end = rawData.indexOf(QByteArray("\r\n"), start);
-    if (end < 0)
-    {
-        return resultList;
-    }
+//    int start = rawData.indexOf("$GL");
+//    if (start < 0)
+//    {
+//        return resultList;
+//    }
+//    int end = rawData.indexOf(QByteArray("\r\n"), start);
+//    if (end < 0)
+//    {
+//        return resultList;
+//    }
 
-    while (start > 0 & end > 0)
-    {
-        QByteArray ba = rawData.mid(start, end - start + 2);
-        resultList.append(ba);
+//    while (start >= 0 & end >= 0)
+//    {
+//        QByteArray ba = rawData.mid(start, end - start + 2);
+//        resultList.append(ba);
 
-        rawData = rawData.right(end);
+//        rawData = rawData.right(end);
 
-        start = rawData.indexOf("$GL");
-        end = rawData.indexOf(QByteArray("\r\n"), start);
-    }
-/*
+//        start = rawData.indexOf("$GL");
+//        end = rawData.indexOf(QByteArray("\r\n"), start);
+//    }
+
     if (rawData.endsWith(QByteArray("\r\n")) == true && rawData.startsWith("$") == true)
     {
         QByteArray ba;
@@ -114,7 +114,7 @@
             }
         }
     }
-*/
+
     return resultList;
 }