Cigarette/Thread/Cleanthread.cpp

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

Cigarette/Thread/Cleanthread.h

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

Cigarette/Thread/Logthread.cpp

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

Cigarette/Thread/Logthread.h

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

Cigarette/Thread/threadSend.cpp

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

Cigarette/Thread/threadSend.h

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

Cigarette/Thread/threadSendMqtt.cpp

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

Cigarette/Thread/threadSendMqtt.h

@@ -1,12 +1,10 @@
 #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
@@ -56,4 +54,3 @@ public:
     std::atomic_bool isLoop = { 0 };
     QMqttClient m_client;
 };
-#endif

Cigarette/Thread/threadSendTCP.cpp

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

Cigarette/Thread/threadSendTCP.h

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

Cigarette/Ui/dialogsetup.cpp

@@ -336,7 +336,6 @@ void DialogSetup::on_pushButton_close_released()
 
 void DialogSetup::on_pushButton_clear_pic_released()
 {
-#ifdef CLEAR_THREAD
     QThread* handleThread = new QThread();
     CleanWorkThread* cleanWorkThread = new CleanWorkThread();
 
@@ -348,7 +347,6 @@ 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() {