1.添加图片注册和前后板主题图片上传;2.修改mdns连接方式
This commit is contained in:
@@ -21,11 +21,16 @@
|
||||
#include <QElapsedTimer>
|
||||
#include <QStorageInfo>
|
||||
#include <QMessageBox>
|
||||
#include <QEventLoop>
|
||||
|
||||
#include "DelUserWindows.h"
|
||||
|
||||
#define TEST_TCP_MOVE_TO_MAIN 0
|
||||
#define GET_PIC_DATA_SIZE (480 * 640 * 1.5)
|
||||
#define IMG_ENROLL_W 480
|
||||
#define IMG_ENROLL_H 640
|
||||
#define CHANGE_THEME_W 720
|
||||
#define CHANGE_THEME_H 1280
|
||||
|
||||
class ClientHandler : public QObject, public QRunnable
|
||||
{
|
||||
@@ -98,6 +103,7 @@ public:
|
||||
void setThreadPriority(QThread::Priority priority);
|
||||
|
||||
signals:
|
||||
void startImageSharing(int width, int height, QString img_type, std::function<void(QString)> callback);
|
||||
// 数据接收信号
|
||||
void dataReceived(const QString& client, const QByteArray& data, unsigned char msg_id, int currentRecvItemIndex,
|
||||
int currentRecvFuncItemIndex, const QString& itemData, const QString& funcItemData,
|
||||
@@ -119,6 +125,7 @@ signals:
|
||||
void stopReadTimer(int client_Id);
|
||||
void sendDataToSomeClient(int client_Id, const QByteArray& data);
|
||||
void openFocusWindowRequested(int itemIndex);
|
||||
void currentSendItem(const QString& text);
|
||||
|
||||
public slots:
|
||||
#if !TEST_TCP_MOVE_TO_MAIN
|
||||
@@ -137,6 +144,7 @@ public slots:
|
||||
void processPendingData();
|
||||
void startReadVideoDataTimer(int client_Id);
|
||||
void stopReadVideoDataTimer(int client_Id);
|
||||
void onCommandError();
|
||||
|
||||
private:
|
||||
QTcpSocket* socket; // 客户端 socket
|
||||
@@ -171,9 +179,10 @@ private:
|
||||
bool isSingleSend; // 单独点击按键发送的标志
|
||||
bool isClickedSend; // 点击按键发送的标志,没有点击不接收数据
|
||||
bool isRecvVideoData;
|
||||
bool isRecvImgData = false;
|
||||
bool isStartVideo = false;
|
||||
bool isPowerOnSend = false; // 上电发送设备信息
|
||||
bool isRecvImgData = false;
|
||||
bool isStartVideo = false;
|
||||
bool isPowerOnSend = false; // 上电发送设备信息
|
||||
bool isCommandError = false;
|
||||
//QTimer* timeoutTimer; // 超时定时器
|
||||
|
||||
int size;
|
||||
|
||||
Reference in New Issue
Block a user