diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 97c6e6d..b1e3124 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -98,6 +98,8 @@
     QString content = counterData->timestamp + " " + counterData->rawFrame;
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
+    QJsonArray messageArray;
+
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
     {
@@ -120,24 +122,26 @@
 
             QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr);
 
-            // 3. 输出到中间件，执行后续处理过程
-            if (SettingConfig::getInstance().NEED_KAFKA == 1)
-            {
-                QJsonObject jsonObj = counterData->toJSON(i - 1);
-                jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
-                jsonObj.insert("master", SettingConfig::getInstance().MASTER);
-                jsonObj.insert("deviceId", deviceId);
-                kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
-            }
+            QJsonObject jsonObj = counterData->toJSON(i - 1);
+            jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
+            jsonObj.insert("master", SettingConfig::getInstance().MASTER);
+            jsonObj.insert("deviceId", deviceId);
+            messageArray.append(jsonObj);
         }
     }
 
-    // 4. 在界面上简单显示相差数据结果
-    emit this->sendDataToDraw(counterData);
-
+    // 3. 输出到中间件，执行后续处理过程
     QJsonObject statusObj = counterData->toStatusJSON();
     statusObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
     statusObj.insert("master", SettingConfig::getInstance().MASTER);
     statusObj.insert("deviceId", deviceId);
-    kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
+
+    if (SettingConfig::getInstance().NEED_KAFKA == 1)
+    {
+        kafkaUtil.produceMessage(QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+        kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
+    }
+
+    // 4. 在界面上简单显示相差数据结果
+    emit this->sendDataToDraw(counterData);
 }

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 97c6e6d..b1e3124 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -98,6 +98,8 @@
     QString content = counterData->timestamp + " " + counterData->rawFrame;
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
+    QJsonArray messageArray;
+
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
     {
@@ -120,24 +122,26 @@
 
             QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr);
 
-            // 3. 输出到中间件，执行后续处理过程
-            if (SettingConfig::getInstance().NEED_KAFKA == 1)
-            {
-                QJsonObject jsonObj = counterData->toJSON(i - 1);
-                jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
-                jsonObj.insert("master", SettingConfig::getInstance().MASTER);
-                jsonObj.insert("deviceId", deviceId);
-                kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
-            }
+            QJsonObject jsonObj = counterData->toJSON(i - 1);
+            jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
+            jsonObj.insert("master", SettingConfig::getInstance().MASTER);
+            jsonObj.insert("deviceId", deviceId);
+            messageArray.append(jsonObj);
         }
     }
 
-    // 4. 在界面上简单显示相差数据结果
-    emit this->sendDataToDraw(counterData);
-
+    // 3. 输出到中间件，执行后续处理过程
     QJsonObject statusObj = counterData->toStatusJSON();
     statusObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
     statusObj.insert("master", SettingConfig::getInstance().MASTER);
     statusObj.insert("deviceId", deviceId);
-    kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
+
+    if (SettingConfig::getInstance().NEED_KAFKA == 1)
+    {
+        kafkaUtil.produceMessage(QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+        kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
+    }
+
+    // 4. 在界面上简单显示相差数据结果
+    emit this->sendDataToDraw(counterData);
 }
diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp
index 35c5ac8..c4e78c4 100644
--- a/CounterAcq/CounterWindow.cpp
+++ b/CounterAcq/CounterWindow.cpp
@@ -22,7 +22,7 @@
     this->setWindowFlags(Qt::FramelessWindowHint);
 
     // 窗口大小为占满一屏
-    QRect screenRect = QApplication::desktop()->screenGeometry();
+    QRect screenRect = QApplication::desktop()->availableGeometry();
     resize(screenRect.width(), screenRect.height());
 
     // 将窗口移动到左上角

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 97c6e6d..b1e3124 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -98,6 +98,8 @@
     QString content = counterData->timestamp + " " + counterData->rawFrame;
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
+    QJsonArray messageArray;
+
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
     {
@@ -120,24 +122,26 @@
 
             QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr);
 
-            // 3. 输出到中间件，执行后续处理过程
-            if (SettingConfig::getInstance().NEED_KAFKA == 1)
-            {
-                QJsonObject jsonObj = counterData->toJSON(i - 1);
-                jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
-                jsonObj.insert("master", SettingConfig::getInstance().MASTER);
-                jsonObj.insert("deviceId", deviceId);
-                kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
-            }
+            QJsonObject jsonObj = counterData->toJSON(i - 1);
+            jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
+            jsonObj.insert("master", SettingConfig::getInstance().MASTER);
+            jsonObj.insert("deviceId", deviceId);
+            messageArray.append(jsonObj);
         }
     }
 
-    // 4. 在界面上简单显示相差数据结果
-    emit this->sendDataToDraw(counterData);
-
+    // 3. 输出到中间件，执行后续处理过程
     QJsonObject statusObj = counterData->toStatusJSON();
     statusObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
     statusObj.insert("master", SettingConfig::getInstance().MASTER);
     statusObj.insert("deviceId", deviceId);
-    kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
+
+    if (SettingConfig::getInstance().NEED_KAFKA == 1)
+    {
+        kafkaUtil.produceMessage(QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+        kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
+    }
+
+    // 4. 在界面上简单显示相差数据结果
+    emit this->sendDataToDraw(counterData);
 }
diff --git a/CounterAcq/CounterWindow.cpp b/CounterAcq/CounterWindow.cpp
index 35c5ac8..c4e78c4 100644
--- a/CounterAcq/CounterWindow.cpp
+++ b/CounterAcq/CounterWindow.cpp
@@ -22,7 +22,7 @@
     this->setWindowFlags(Qt::FramelessWindowHint);
 
     // 窗口大小为占满一屏
-    QRect screenRect = QApplication::desktop()->screenGeometry();
+    QRect screenRect = QApplication::desktop()->availableGeometry();
     resize(screenRect.width(), screenRect.height());
 
     // 将窗口移动到左上角
diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp
index 1f943be..1acf20d 100644
--- a/PhaseCompAcq/PhaseDevice.cpp
+++ b/PhaseCompAcq/PhaseDevice.cpp
@@ -114,6 +114,8 @@
     QString content = phaseData->timestamp + " " + QByteUtil::binToHexString(phaseData->rawFrame);
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
+    QJsonArray messageArray;
+
     // 2.2 各个通道的相差数据
     for (int i = 1; i <= phaseData->channelActive.size(); i++)
     {
@@ -132,24 +134,26 @@
 
             QLogUtil::writeChannelDataLogByDate(date, chFilename, channelDataStr);
 
-            // 3. 输出到中间件，执行后续处理过程
-            if (SettingConfig::getInstance().NEED_KAFKA == 1)
-            {
-                QJsonObject jsonObj = phaseData->toJSON(i - 1);
-                jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
-                jsonObj.insert("master", SettingConfig::getInstance().MASTER);
-                jsonObj.insert("deviceId", deviceId);
-                kafkaUtil.produceMessage(QString(QJsonDocument(jsonObj).toJson(QJsonDocument::Compact)));
-            }
+            QJsonObject jsonObj = phaseData->toJSON(i - 1);
+            jsonObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
+            jsonObj.insert("master", SettingConfig::getInstance().MASTER);
+            jsonObj.insert("deviceId", deviceId);
+            messageArray.append(jsonObj);
         }
     }
 
+    // 3. 输出到中间件，执行后续处理过程
+    if (SettingConfig::getInstance().NEED_KAFKA == 1)
+    {
+        kafkaUtil.produceMessage(QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+
+        QJsonObject statusObj = phaseData->toStatusJSON();
+        statusObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
+        statusObj.insert("deviceId", deviceId);
+        statusObj.insert("master", SettingConfig::getInstance().MASTER);
+        kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
+    }
+
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(phaseData);
-
-    QJsonObject statusObj = phaseData->toStatusJSON();
-    statusObj.insert("clientId", SettingConfig::getInstance().CLIENT_ID);
-    statusObj.insert("deviceId", deviceId);
-    statusObj.insert("master", SettingConfig::getInstance().MASTER);
-    kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact)));
 }