Compare commits

..

2 Commits

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

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

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

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

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

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

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

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

@ -1,4 +1,6 @@
#include "threadSendTCP.h" #include "threadSendTCP.h"
#ifdef __TCPSend
#include <WinSock2.h> #include <WinSock2.h>
#include <WS2tcpip.h> #include <WS2tcpip.h>
#include <stdio.h> #include <stdio.h>
@ -222,4 +224,5 @@ void threadSendTCP::onClientDisconnected()
qDebug() << "ClientDisconnected"; qDebug() << "ClientDisconnected";
mySocket->deleteLater(); mySocket->deleteLater();
} }
#endif
#endif #endif

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

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

Loading…
Cancel
Save