修复线程define控制隔离不完整的问题

Cigarette/Thread/Cleanthread.cpp

@@ -1,4 +1,6 @@
 #include "Cleanthread.h"
+
+#ifdef CLEAR_THREAD
 #include <QMutex>
 #include <QDate>
 #include <QDir>
@@ -6,7 +8,6 @@
 #include <Windows.h>
 #include <QSignalMapper>
 #include <QIntValidator>
-#include "common.h"///
 extern SysConf g_sys_conf;///
 extern ConfPath g_conf_path;
 
@@ -154,3 +155,4 @@ qint64 CleanWorkThread::DirFileSize(const QString& path)
     }
     return size;
 }
+#endif

Cigarette/Thread/Cleanthread.h

@@ -1,4 +1,6 @@
 #pragma once
+#include "common.h"
+#ifdef CLEAR_THREAD
 #include <QObject>
 class CleanWorkThread : public QObject
 {
@@ -22,3 +24,4 @@ public:
 private:
     int delSelection;
 };
+#endif

Cigarette/Thread/Logthread.cpp

@@ -1,8 +1,9 @@
 #include "Logthread.h"
+
+#ifdef LOG_RECORD
 #include <QDir>
 #include <QMutex>
 #include <QDate>
-#include <common.h>
 
 const char Suffix[] = ".txt";
 bool CLog::isFileReady = false;
@@ -162,3 +163,4 @@ void CLog::recMegFromCigarette(QString str)
     //qDebug() << GetCurrentThreadId() << "WinAPI";
     CLOG_INFO(str.toStdString().c_str());
 }
+#endif

Cigarette/Thread/Logthread.h

@@ -1,4 +1,6 @@
 #pragma once
+#include <common.h>
+#ifdef LOG_RECORD
 #include <QDialog>
 
 class  CLog : public QObject
@@ -70,3 +72,4 @@ private:
 #endif
 
 #define CLOG_INFO(...)       CLog::log(CLog::STARTAPP, __VA_ARGS__)
+#endif

Cigarette/Thread/threadSend.cpp

@@ -1,4 +1,6 @@
 #include "threadSend.h"
+
+#ifdef __UDPSend
 #include <QUdpSocket>
 #include "basecamera.h"
 #include <QFile>
@@ -172,3 +174,4 @@ void threadSend::sendFile(QString FilePath, int port)
     mSocket.writeDatagram(FileEndFrame.toLatin1(), QHostAddress(ip), port);
     file.close();
 }
+#endif

Cigarette/Thread/threadSend.h

@@ -1,4 +1,6 @@
 #pragma once
+#include "common.h"
+#ifdef __UDPSend
 #include <QThread>
 #include <QDebug>
 #include <QDateTime>
@@ -6,7 +8,6 @@
 #include <opencv2/imgproc/types_c.h>
 #include <atomic>
 #include <mutex>
-#include "common.h"
 #include "SyncQueue.h"
 
 #include <QUdpSocket>
@@ -94,3 +95,4 @@ public:
     std::atomic_bool isLoop = { 0 };
     QUdpSocket mSocket;
 };
+#endif

Cigarette/Thread/threadSendMqtt.cpp

@@ -1,6 +1,7 @@
 #include "threadSendMqtt.h"
-#include <stdio.h>
 
+#ifdef __MQTTSend
+#include <stdio.h>
 // 相关头文件
 #include <QFile>    // 文件操作
 #include <QJsonObject>  // JSON对象
@@ -96,3 +97,4 @@ void threadSendMqtt::sendData(_MqttSendInfo* TCPSendInfo, int Num) {
         auto result = m_client.publish(QMqttTopicName("topic"), jsonBytes, 0, true);
     }
 }
+#endif

Cigarette/Thread/threadSendMqtt.h

@@ -1,10 +1,12 @@
 #pragma once
+#include "common.h"
+
+#ifdef __MQTTSend
 #include <QDebug>
 #include <QDateTime>
 #include <iostream>
 #include <QThread>
 #include <QtMqtt/qmqttclient.h>
-#include "common.h"
 #include "SyncQueue.h"
 
 class _MqttSendInfo
@@ -54,3 +56,4 @@ public:
     std::atomic_bool isLoop = { 0 };
     QMqttClient m_client;
 };
+#endif

Cigarette/Thread/threadSendTCP.cpp

@@ -1,4 +1,6 @@
 #include "threadSendTCP.h"
+
+#ifdef __TCPSend
 #include <WinSock2.h>
 #include <WS2tcpip.h>
 #include <stdio.h>
@@ -223,3 +225,4 @@ void threadSendTCP::onClientDisconnected()
 	mySocket->deleteLater();
 }
 #endif
+#endif

Cigarette/Thread/threadSendTCP.h

@@ -1,5 +1,7 @@
 #pragma once
 #include "common.h"
+
+#ifdef __TCPSend
 #include <QWidget>
 #include <QDebug>
 #include <QDateTime>
@@ -70,3 +72,4 @@ public:
     QAbstractSocket::SocketState ClientStatus;
 #endif
 };
+#endif

Cigarette/Ui/dialogsetup.cpp

@@ -336,6 +336,7 @@ void DialogSetup::on_pushButton_close_released()
 
 void DialogSetup::on_pushButton_clear_pic_released()
 {
+#ifdef CLEAR_THREAD
     QThread* handleThread = new QThread();
     CleanWorkThread* cleanWorkThread = new CleanWorkThread();
 
@@ -347,6 +348,7 @@ void DialogSetup::on_pushButton_clear_pic_released()
     connect(cleanWorkThread, &CleanWorkThread::destroyed, handleThread, &QThread::quit);
     connect(handleThread, &QThread::finished, handleThread, &QThread::deleteLater);
     handleThread->start();
+#endif
 }
 
 void DialogSetup::on_toolButton_choose_config_path_released() {