mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
feat: send xml answer
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
#include <QList>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#ifndef FILEDATA_H
|
#ifndef FILEDATA_H
|
||||||
@@ -15,6 +16,17 @@ struct FileData
|
|||||||
|
|
||||||
}; //путь
|
}; //путь
|
||||||
|
|
||||||
|
struct SAttribute
|
||||||
|
{
|
||||||
|
QString name;
|
||||||
|
QString value;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
struct SXmlAnswerTag{
|
||||||
|
QString elementName;
|
||||||
|
QList<SAttribute> attr;
|
||||||
|
};
|
||||||
|
|
||||||
#endif // FILEDATA_H
|
#endif // FILEDATA_H
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "UpdateController.h"
|
#include "updatecontroller.h"
|
||||||
|
|
||||||
UpdateController::UpdateController(DataParser *parser, QObject *parent) :
|
UpdateController::UpdateController(DataParser *parser, QObject *parent) :
|
||||||
QObject(parent)
|
QObject(parent)
|
||||||
@@ -6,8 +6,6 @@ UpdateController::UpdateController(DataParser *parser, QObject *parent) :
|
|||||||
this->dataParser = parser;
|
this->dataParser = parser;
|
||||||
localPath = QDir::currentPath() + "/Application";
|
localPath = QDir::currentPath() + "/Application";
|
||||||
countSend = 0;
|
countSend = 0;
|
||||||
CalculateHash();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateController::SendFile(QDataStream &stream)
|
void UpdateController::SendFile(QDataStream &stream)
|
||||||
@@ -37,6 +35,9 @@ void UpdateController::SendFile(QDataStream &stream)
|
|||||||
|
|
||||||
void UpdateController::CalculateHash()
|
void UpdateController::CalculateHash()
|
||||||
{
|
{
|
||||||
|
qDebug() << "Try calculate";
|
||||||
|
|
||||||
|
|
||||||
QDirIterator iterator(localPath,QDirIterator::Subdirectories);
|
QDirIterator iterator(localPath,QDirIterator::Subdirectories);
|
||||||
fileDataList.clear();
|
fileDataList.clear();
|
||||||
QList<FileData> *files = new QList<FileData>;
|
QList<FileData> *files = new QList<FileData>;
|
||||||
@@ -107,6 +108,3 @@ UpdateController::~UpdateController()
|
|||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#ifndef FILEMANAGER_H
|
#ifndef UPDATECONTROLLER_H
|
||||||
#define FILEMANAGER_H
|
#define UPDATECONTROLLER_H
|
||||||
|
|
||||||
|
|
||||||
#include "Core\FileData.h"
|
#include "Core\FileData.h"
|
||||||
#include "Core\dataparser.h"
|
#include "Core\dataparser.h"
|
||||||
@@ -27,7 +28,6 @@ public:
|
|||||||
void CalculateHash();
|
void CalculateHash();
|
||||||
~UpdateController();
|
~UpdateController();
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DataParser *dataParser;
|
DataParser *dataParser;
|
||||||
QString localPath;
|
QString localPath;
|
||||||
@@ -37,4 +37,6 @@ private:
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // FILEMANAGER_H
|
|
||||||
|
|
||||||
|
#endif // UPDATECONTROLLER_H
|
||||||
|
|||||||
@@ -36,6 +36,28 @@ void DataParser::CreateXML(QList<FileData> fileDataList)
|
|||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DataParser::CreateAuthMessage(ClientAutorization *auth)
|
||||||
|
{
|
||||||
|
QFile file(tempName);
|
||||||
|
file.open(QIODevice::WriteOnly);
|
||||||
|
QXmlStreamWriter xmlWriter(&file);
|
||||||
|
|
||||||
|
xmlWriter.setAutoFormatting(true);
|
||||||
|
xmlWriter.writeStartDocument();
|
||||||
|
xmlWriter.writeStartElement("ClientAutorization");
|
||||||
|
|
||||||
|
xmlWriter.writeAttribute("Login",auth->Login);
|
||||||
|
xmlWriter.writeAttribute("Password",auth->Password);
|
||||||
|
|
||||||
|
xmlWriter.writeEndElement();
|
||||||
|
xmlWriter.writeEndElement();
|
||||||
|
xmlWriter.writeEndDocument();
|
||||||
|
|
||||||
|
file.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void DataParser::CreateServerSettings(QString address, QString port)
|
void DataParser::CreateServerSettings(QString address, QString port)
|
||||||
{
|
{
|
||||||
QFile file(settingsName);
|
QFile file(settingsName);
|
||||||
@@ -80,6 +102,10 @@ ServerSettings *DataParser::GetServerSettings()
|
|||||||
|
|
||||||
if(name == "Address"){
|
if(name == "Address"){
|
||||||
settings->Address = value;
|
settings->Address = value;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(name == "Port"){
|
if(name == "Port"){
|
||||||
|
|||||||
@@ -13,9 +13,10 @@ class DataParser
|
|||||||
public:
|
public:
|
||||||
DataParser();
|
DataParser();
|
||||||
~DataParser();
|
~DataParser();
|
||||||
void CreateServerSettings(QString server,QString port);
|
|
||||||
ServerSettings* GetServerSettings();
|
ServerSettings* GetServerSettings();
|
||||||
|
void CreateServerSettings(QString server,QString port);
|
||||||
void CreateXML(QList<FileData> fileDataList);
|
void CreateXML(QList<FileData> fileDataList);
|
||||||
|
void CreateAuthMessage(ClientAutorization *auth);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // DATAPARSER_H
|
#endif // DATAPARSER_H
|
||||||
|
|||||||
@@ -17,9 +17,10 @@ RecognizeSystem::~RecognizeSystem()
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void RecognizeSystem::Initialize(UpdateController *updateController)
|
void RecognizeSystem::Initialize(UpdateController *updateController,DataParser *dataParser)
|
||||||
{
|
{
|
||||||
this->updateController = updateController;
|
this->updateController = updateController;
|
||||||
|
this->dataParser = dataParser;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RecognizeSystem::SetSocket(QTcpSocket *socket)
|
void RecognizeSystem::SetSocket(QTcpSocket *socket)
|
||||||
@@ -34,7 +35,6 @@ void RecognizeSystem::Recognize()
|
|||||||
|
|
||||||
while(socket->bytesAvailable())
|
while(socket->bytesAvailable())
|
||||||
{
|
{
|
||||||
|
|
||||||
if(packetType == PacketType::TYPE_NONE){ //определение первичного пакета
|
if(packetType == PacketType::TYPE_NONE){ //определение первичного пакета
|
||||||
|
|
||||||
stream.startTransaction();
|
stream.startTransaction();
|
||||||
@@ -148,7 +148,11 @@ void RecognizeSystem::Recognize()
|
|||||||
stream >> tmpBlock;
|
stream >> tmpBlock;
|
||||||
|
|
||||||
if(!stream.commitTransaction()){
|
if(!stream.commitTransaction()){
|
||||||
//qDebug() << Tools::GetTime() << "CLIENT: tmpBlock - FAIL";
|
|
||||||
|
if(socket->state() == QAbstractSocket::UnconnectedState){
|
||||||
|
emit SockedDisabled();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
|
if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -157,7 +161,7 @@ void RecognizeSystem::Recognize()
|
|||||||
}
|
}
|
||||||
|
|
||||||
quint64 toFile = file.write(tmpBlock);
|
quint64 toFile = file.write(tmpBlock);
|
||||||
emit onSendDebugLog(Tools::GetTime() + "CLIENT: toFile :" + toFile);
|
emit onSendDebugLog(Tools::GetTime() + "CLIENT: toFile :" + toFile);
|
||||||
|
|
||||||
sizeReceiveData += toFile;
|
sizeReceiveData += toFile;
|
||||||
countSend++;
|
countSend++;
|
||||||
@@ -226,7 +230,7 @@ void RecognizeSystem::Recognize()
|
|||||||
packetType = PacketType::TYPE_NONE;
|
packetType = PacketType::TYPE_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(packetType == PacketType::TYPE_NEEDUPDATE){
|
if(packetType == PacketType::TYPE_NEEDUPDATE){ //нужно обновление
|
||||||
|
|
||||||
bool flag;
|
bool flag;
|
||||||
|
|
||||||
@@ -237,7 +241,52 @@ void RecognizeSystem::Recognize()
|
|||||||
emit onNeedUpdate(flag);
|
emit onNeedUpdate(flag);
|
||||||
packetType = PacketType::TYPE_NONE;
|
packetType = PacketType::TYPE_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(packetType == PacketType::TYPE_XMLANSWER){ //ответы формата XML
|
||||||
|
QByteArray array;
|
||||||
|
stream.startTransaction();
|
||||||
|
stream >> array;
|
||||||
|
|
||||||
|
XMLParser(array);
|
||||||
|
|
||||||
|
packetType = PacketType::TYPE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
packetType = PacketType::TYPE_NONE;
|
packetType = PacketType::TYPE_NONE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RecognizeSystem::XMLParser(QByteArray array)
|
||||||
|
{
|
||||||
|
QXmlStreamReader xmlReader(array);
|
||||||
|
|
||||||
|
xmlReader.readNext();
|
||||||
|
|
||||||
|
while(!xmlReader.atEnd())
|
||||||
|
{
|
||||||
|
if(!xmlReader.isStartElement()) {
|
||||||
|
xmlReader.readNext();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(xmlReader.name() == "ServerNotify")
|
||||||
|
{
|
||||||
|
foreach(const QXmlStreamAttribute &attr, xmlReader.attributes())
|
||||||
|
{
|
||||||
|
QString name = attr.name().toString();
|
||||||
|
QString value = attr.value().toString();
|
||||||
|
|
||||||
|
if(name == "Code"){
|
||||||
|
if (value == "END"){
|
||||||
|
|
||||||
|
emit SockedDisabled();
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
xmlReader.readNext();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include <QTcpSocket>
|
#include <QTcpSocket>
|
||||||
#include <mainwindow.h>
|
#include <mainwindow.h>
|
||||||
#include <Core\tools.h>
|
#include <Core\tools.h>
|
||||||
#include <Core\UpdateController.h>
|
#include <Core\updatecontroller.h>
|
||||||
|
|
||||||
class UpdateController;
|
class UpdateController;
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ class RecognizeSystem : public QObject
|
|||||||
public:
|
public:
|
||||||
explicit RecognizeSystem(QObject *parent = 0);
|
explicit RecognizeSystem(QObject *parent = 0);
|
||||||
~RecognizeSystem();
|
~RecognizeSystem();
|
||||||
void Initialize(UpdateController* updateController);
|
void Initialize(UpdateController* updateController,DataParser *dataParser);
|
||||||
void SetSocket(QTcpSocket *socket);
|
void SetSocket(QTcpSocket *socket);
|
||||||
void Recognize();
|
void Recognize();
|
||||||
|
|
||||||
@@ -27,9 +27,11 @@ signals:
|
|||||||
void LoadComplete();
|
void LoadComplete();
|
||||||
void onNeedUpdate(bool flag);
|
void onNeedUpdate(bool flag);
|
||||||
void onSendDebugLog(QString message);
|
void onSendDebugLog(QString message);
|
||||||
|
void SockedDisabled();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
UpdateController *updateController;
|
UpdateController *updateController;
|
||||||
|
DataParser *dataParser;
|
||||||
QTcpSocket *socket;
|
QTcpSocket *socket;
|
||||||
PacketType packetType;
|
PacketType packetType;
|
||||||
QString message;
|
QString message;
|
||||||
@@ -40,6 +42,8 @@ private:
|
|||||||
qint64 fileSize;
|
qint64 fileSize;
|
||||||
int countSend;
|
int countSend;
|
||||||
|
|
||||||
|
void XMLParser(QByteArray array);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // RECOGNIZESYSTEM_H
|
#endif // RECOGNIZESYSTEM_H
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#include "tcpclient.h"
|
#include "tcpclient.h"
|
||||||
#include "UpdateController.h"
|
#include "Core/updatecontroller.h"
|
||||||
#include "externalexecuter.h"
|
#include "externalexecuter.h"
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
@@ -7,9 +7,7 @@
|
|||||||
TCPClient::TCPClient(QObject *parent) :
|
TCPClient::TCPClient(QObject *parent) :
|
||||||
QObject(parent)
|
QObject(parent)
|
||||||
{
|
{
|
||||||
socket = new QTcpSocket(this);
|
|
||||||
|
|
||||||
connect(socket,&QTcpSocket::readyRead,this,&TCPClient::onReadyRead);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TCPClient::Initialize(UpdateController *updateController,
|
void TCPClient::Initialize(UpdateController *updateController,
|
||||||
@@ -20,22 +18,48 @@ void TCPClient::Initialize(UpdateController *updateController,
|
|||||||
this->recognizeSystem = recognize;
|
this->recognizeSystem = recognize;
|
||||||
this->externalExecuter = externalExecuter;
|
this->externalExecuter = externalExecuter;
|
||||||
|
|
||||||
recognize->SetSocket(socket);
|
|
||||||
emit onSendDebugLog(Tools::GetTime() + " Client started");
|
emit onSendDebugLog(Tools::GetTime() + " Client started");
|
||||||
}
|
}
|
||||||
|
|
||||||
void TCPClient::SetConnect(ServerSettings *serverSettings)
|
void TCPClient::SetConnect(ServerSettings *serverSettings)
|
||||||
{
|
{
|
||||||
|
socket = new QTcpSocket(this);
|
||||||
|
|
||||||
|
connect(socket,&QTcpSocket::readyRead,this,&TCPClient::onReadyRead);
|
||||||
|
connect(socket,&QTcpSocket::disconnected,this,&TCPClient::SetDisconnect);
|
||||||
|
|
||||||
socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort());
|
socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort());
|
||||||
emit onSendDebugLog("Try connect...");
|
emit onSendDebugLog("Try connect...");
|
||||||
|
|
||||||
|
recognizeSystem->SetSocket(socket);
|
||||||
socket->waitForReadyRead();
|
socket->waitForReadyRead();
|
||||||
|
|
||||||
if(socket->state() != QTcpSocket::ConnectedState){
|
if(socket->state() != QTcpSocket::ConnectedState){
|
||||||
emit onSendDebugLog("Connect invalid");
|
emit onSendDebugLog("Connect invalid");
|
||||||
return;
|
return;
|
||||||
|
}else{
|
||||||
|
emit onSendDebugLog("Connect complete");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void TCPClient::SendClientAutorization()
|
||||||
|
{
|
||||||
|
QDataStream stream(socket);
|
||||||
|
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
|
||||||
|
|
||||||
|
QFile file(tempName);
|
||||||
|
file.open(QIODevice::ReadOnly);
|
||||||
|
|
||||||
|
QByteArray array = file.readAll();
|
||||||
|
stream << PacketType::TYPE_XMLANSWER;
|
||||||
|
stream << array;
|
||||||
|
socket->waitForBytesWritten();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TCPClient::SetDisconnect()
|
||||||
|
{
|
||||||
|
socket->disconnect();
|
||||||
|
emit onSendDebugLog("Server disabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
void TCPClient::WaitWrites()
|
void TCPClient::WaitWrites()
|
||||||
@@ -48,12 +72,7 @@ QTcpSocket *TCPClient::GetSocket()
|
|||||||
return socket;
|
return socket;
|
||||||
}
|
}
|
||||||
|
|
||||||
TCPClient::~TCPClient()
|
void TCPClient::MessageEntered(QString message)
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void TCPClient::onMessageEntered(QString message)
|
|
||||||
{
|
{
|
||||||
QDataStream stream(socket);
|
QDataStream stream(socket);
|
||||||
QByteArray data;
|
QByteArray data;
|
||||||
@@ -94,7 +113,11 @@ void TCPClient::onReadyRead()
|
|||||||
emit onSendDebugLog("WRONG SOCKET");
|
emit onSendDebugLog("WRONG SOCKET");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//возврат на случай недоступного сокета
|
|
||||||
|
|
||||||
recognizeSystem->Recognize();
|
recognizeSystem->Recognize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TCPClient::~TCPClient()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include "Core\recognizesystem.h"
|
#include "Core\recognizesystem.h"
|
||||||
#include "Core\tools.h"
|
#include "Core\tools.h"
|
||||||
#include "Core\UpdateController.h"
|
#include "Core\updatecontroller.h"
|
||||||
#include "Core\externalexecuter.h"
|
#include "Core\externalexecuter.h"
|
||||||
|
|
||||||
class UpdateController;
|
class UpdateController;
|
||||||
@@ -23,6 +23,8 @@ public:
|
|||||||
explicit TCPClient(QObject *parent = 0);
|
explicit TCPClient(QObject *parent = 0);
|
||||||
void Initialize(UpdateController *updateController,RecognizeSystem *recognize,ExternalExecuter *externalExecuter);
|
void Initialize(UpdateController *updateController,RecognizeSystem *recognize,ExternalExecuter *externalExecuter);
|
||||||
void SetConnect(ServerSettings *serverSettings);
|
void SetConnect(ServerSettings *serverSettings);
|
||||||
|
void SendClientAutorization();
|
||||||
|
void SetDisconnect();
|
||||||
void WaitWrites();
|
void WaitWrites();
|
||||||
QTcpSocket* GetSocket();
|
QTcpSocket* GetSocket();
|
||||||
~TCPClient();
|
~TCPClient();
|
||||||
@@ -31,7 +33,7 @@ signals:
|
|||||||
void onSendDebugLog(QString message);
|
void onSendDebugLog(QString message);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void onMessageEntered(QString message);
|
void MessageEntered(QString message);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onReadyRead();
|
void onReadyRead();
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
static QString hashFilename = "hash.xml";
|
static QString hashFilename = "hash.xml";
|
||||||
static QString settingsName = "settings.xml";
|
static QString settingsName = "settings.xml";
|
||||||
|
static QString tempName = "temp.xml";
|
||||||
|
|
||||||
enum PacketType{
|
enum PacketType{
|
||||||
TYPE_NONE = 0,
|
TYPE_NONE = 0,
|
||||||
@@ -18,7 +19,8 @@ enum PacketType{
|
|||||||
TYPE_FOLDER = 4,
|
TYPE_FOLDER = 4,
|
||||||
TYPE_DELETE = 5,
|
TYPE_DELETE = 5,
|
||||||
TYPE_FINISH = 6,
|
TYPE_FINISH = 6,
|
||||||
TYPE_NEEDUPDATE =7
|
TYPE_NEEDUPDATE = 7,
|
||||||
|
TYPE_XMLANSWER = 8
|
||||||
};
|
};
|
||||||
|
|
||||||
class Tools {
|
class Tools {
|
||||||
|
|||||||
30
Datas.h
30
Datas.h
@@ -15,4 +15,34 @@ public:
|
|||||||
QString Password;
|
QString Password;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class ServerMessage
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
QString Text;
|
||||||
|
};
|
||||||
|
|
||||||
|
class ClientMessage
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
QString Text;
|
||||||
|
};
|
||||||
|
|
||||||
|
class ServerTask
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
QString Text;
|
||||||
|
};
|
||||||
|
|
||||||
|
class ServerNotify
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
QString Code;
|
||||||
|
};
|
||||||
|
|
||||||
|
class ClientNotify
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
QString Code;
|
||||||
|
};
|
||||||
|
|
||||||
#endif // DATAS_H
|
#endif // DATAS_H
|
||||||
|
|||||||
824
Makefile.Debug
824
Makefile.Debug
File diff suppressed because one or more lines are too long
824
Makefile.Release
824
Makefile.Release
File diff suppressed because one or more lines are too long
@@ -17,17 +17,18 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
|
Core/updatecontroller.cpp \
|
||||||
Core\externalexecuter.cpp\
|
Core\externalexecuter.cpp\
|
||||||
Core\dataparser.cpp\
|
Core\dataparser.cpp\
|
||||||
Core\recognizesystem.cpp\
|
Core\recognizesystem.cpp\
|
||||||
Core\screenchecker.cpp\
|
Core\screenchecker.cpp\
|
||||||
Core\tcpclient.cpp\
|
Core\tcpclient.cpp\
|
||||||
Core\tools.cpp\
|
Core\tools.cpp\
|
||||||
Core\UpdateController.cpp\
|
|
||||||
main.cpp \
|
main.cpp \
|
||||||
mainwindow.cpp
|
mainwindow.cpp
|
||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
|
Core/updatecontroller.h \
|
||||||
Core\externalexecuter.h\
|
Core\externalexecuter.h\
|
||||||
Core\dataparser.h\
|
Core\dataparser.h\
|
||||||
Core\FileData.h\
|
Core\FileData.h\
|
||||||
@@ -35,7 +36,6 @@ HEADERS += \
|
|||||||
Core\screenchecker.h\
|
Core\screenchecker.h\
|
||||||
Core\tcpclient.h\
|
Core\tcpclient.h\
|
||||||
Core\tools.h\
|
Core\tools.h\
|
||||||
Core\UpdateController.h\
|
|
||||||
Datas.h \
|
Datas.h \
|
||||||
mainwindow.h
|
mainwindow.h
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE QtCreatorProject>
|
<!DOCTYPE QtCreatorProject>
|
||||||
<!-- Written by QtCreator 4.11.1, 2024-08-13T18:14:45. -->
|
<!-- Written by QtCreator 4.11.1, 2024-08-14T18:03:15. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>EnvironmentId</variable>
|
<variable>EnvironmentId</variable>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
debug/main.o
BIN
debug/main.o
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** Meta object code from reading C++ file 'UpdateController.h'
|
** Meta object code from reading C++ file 'updatecontroller.h'
|
||||||
**
|
**
|
||||||
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
|
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
|
||||||
**
|
**
|
||||||
@@ -7,11 +7,11 @@
|
|||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include "../Core/UpdateController.h"
|
#include "../Core/updatecontroller.h"
|
||||||
#include <QtCore/qbytearray.h>
|
#include <QtCore/qbytearray.h>
|
||||||
#include <QtCore/qmetatype.h>
|
#include <QtCore/qmetatype.h>
|
||||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||||
#error "The header file 'UpdateController.h' doesn't include <QObject>."
|
#error "The header file 'updatecontroller.h' doesn't include <QObject>."
|
||||||
#elif Q_MOC_OUTPUT_REVISION != 67
|
#elif Q_MOC_OUTPUT_REVISION != 67
|
||||||
#error "This file was generated using the moc from 5.14.2. It"
|
#error "This file was generated using the moc from 5.14.2. It"
|
||||||
#error "cannot be used with the include files from this version of Qt."
|
#error "cannot be used with the include files from this version of Qt."
|
||||||
|
|||||||
Binary file not shown.
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
|
|||||||
QT_WARNING_PUSH
|
QT_WARNING_PUSH
|
||||||
QT_WARNING_DISABLE_DEPRECATED
|
QT_WARNING_DISABLE_DEPRECATED
|
||||||
struct qt_meta_stringdata_MainWindow_t {
|
struct qt_meta_stringdata_MainWindow_t {
|
||||||
QByteArrayData data[8];
|
QByteArrayData data[21];
|
||||||
char stringdata0[159];
|
char stringdata0[363];
|
||||||
};
|
};
|
||||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||||
@@ -33,16 +33,35 @@ struct qt_meta_stringdata_MainWindow_t {
|
|||||||
static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = {
|
static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = {
|
||||||
{
|
{
|
||||||
QT_MOC_LITERAL(0, 0, 10), // "MainWindow"
|
QT_MOC_LITERAL(0, 0, 10), // "MainWindow"
|
||||||
QT_MOC_LITERAL(1, 11, 22), // "on_loginButton_clicked"
|
QT_MOC_LITERAL(1, 11, 18), // "onInitializeClient"
|
||||||
QT_MOC_LITERAL(2, 34, 0), // ""
|
QT_MOC_LITERAL(2, 30, 0), // ""
|
||||||
QT_MOC_LITERAL(3, 35, 23), // "on_updateButton_clicked"
|
QT_MOC_LITERAL(3, 31, 17), // "UpdateController*"
|
||||||
QT_MOC_LITERAL(4, 59, 22), // "on_startButton_clicked"
|
QT_MOC_LITERAL(4, 49, 16), // "updateController"
|
||||||
QT_MOC_LITERAL(5, 82, 27), // "on_saveServerButton_clicked"
|
QT_MOC_LITERAL(5, 66, 16), // "RecognizeSystem*"
|
||||||
QT_MOC_LITERAL(6, 110, 25), // "on_settingsButton_clicked"
|
QT_MOC_LITERAL(6, 83, 15), // "recognizeSystem"
|
||||||
QT_MOC_LITERAL(7, 136, 22) // "on_checkUpdate_clicked"
|
QT_MOC_LITERAL(7, 99, 17), // "ExternalExecuter*"
|
||||||
|
QT_MOC_LITERAL(8, 117, 16), // "externalExecuter"
|
||||||
|
QT_MOC_LITERAL(9, 134, 12), // "onSetConnect"
|
||||||
|
QT_MOC_LITERAL(10, 147, 15), // "ServerSettings*"
|
||||||
|
QT_MOC_LITERAL(11, 163, 14), // "serverSettings"
|
||||||
|
QT_MOC_LITERAL(12, 178, 15), // "onCalculateHash"
|
||||||
|
QT_MOC_LITERAL(13, 194, 13), // "onSendMessage"
|
||||||
|
QT_MOC_LITERAL(14, 208, 7), // "message"
|
||||||
|
QT_MOC_LITERAL(15, 216, 22), // "on_loginButton_clicked"
|
||||||
|
QT_MOC_LITERAL(16, 239, 23), // "on_updateButton_clicked"
|
||||||
|
QT_MOC_LITERAL(17, 263, 22), // "on_startButton_clicked"
|
||||||
|
QT_MOC_LITERAL(18, 286, 27), // "on_saveServerButton_clicked"
|
||||||
|
QT_MOC_LITERAL(19, 314, 25), // "on_settingsButton_clicked"
|
||||||
|
QT_MOC_LITERAL(20, 340, 22) // "on_checkUpdate_clicked"
|
||||||
|
|
||||||
},
|
},
|
||||||
"MainWindow\0on_loginButton_clicked\0\0"
|
"MainWindow\0onInitializeClient\0\0"
|
||||||
|
"UpdateController*\0updateController\0"
|
||||||
|
"RecognizeSystem*\0recognizeSystem\0"
|
||||||
|
"ExternalExecuter*\0externalExecuter\0"
|
||||||
|
"onSetConnect\0ServerSettings*\0"
|
||||||
|
"serverSettings\0onCalculateHash\0"
|
||||||
|
"onSendMessage\0message\0on_loginButton_clicked\0"
|
||||||
"on_updateButton_clicked\0on_startButton_clicked\0"
|
"on_updateButton_clicked\0on_startButton_clicked\0"
|
||||||
"on_saveServerButton_clicked\0"
|
"on_saveServerButton_clicked\0"
|
||||||
"on_settingsButton_clicked\0"
|
"on_settingsButton_clicked\0"
|
||||||
@@ -56,20 +75,32 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||||||
8, // revision
|
8, // revision
|
||||||
0, // classname
|
0, // classname
|
||||||
0, 0, // classinfo
|
0, 0, // classinfo
|
||||||
6, 14, // methods
|
10, 14, // methods
|
||||||
0, 0, // properties
|
0, 0, // properties
|
||||||
0, 0, // enums/sets
|
0, 0, // enums/sets
|
||||||
0, 0, // constructors
|
0, 0, // constructors
|
||||||
0, // flags
|
0, // flags
|
||||||
0, // signalCount
|
4, // signalCount
|
||||||
|
|
||||||
|
// signals: name, argc, parameters, tag, flags
|
||||||
|
1, 3, 64, 2, 0x06 /* Public */,
|
||||||
|
9, 1, 71, 2, 0x06 /* Public */,
|
||||||
|
12, 0, 74, 2, 0x06 /* Public */,
|
||||||
|
13, 1, 75, 2, 0x06 /* Public */,
|
||||||
|
|
||||||
// slots: name, argc, parameters, tag, flags
|
// slots: name, argc, parameters, tag, flags
|
||||||
1, 0, 44, 2, 0x08 /* Private */,
|
15, 0, 78, 2, 0x08 /* Private */,
|
||||||
3, 0, 45, 2, 0x08 /* Private */,
|
16, 0, 79, 2, 0x08 /* Private */,
|
||||||
4, 0, 46, 2, 0x08 /* Private */,
|
17, 0, 80, 2, 0x08 /* Private */,
|
||||||
5, 0, 47, 2, 0x08 /* Private */,
|
18, 0, 81, 2, 0x08 /* Private */,
|
||||||
6, 0, 48, 2, 0x08 /* Private */,
|
19, 0, 82, 2, 0x08 /* Private */,
|
||||||
7, 0, 49, 2, 0x08 /* Private */,
|
20, 0, 83, 2, 0x08 /* Private */,
|
||||||
|
|
||||||
|
// signals: parameters
|
||||||
|
QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 0x80000000 | 7, 4, 6, 8,
|
||||||
|
QMetaType::Void, 0x80000000 | 10, 11,
|
||||||
|
QMetaType::Void,
|
||||||
|
QMetaType::Void, QMetaType::QString, 14,
|
||||||
|
|
||||||
// slots: parameters
|
// slots: parameters
|
||||||
QMetaType::Void,
|
QMetaType::Void,
|
||||||
@@ -88,16 +119,64 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
|||||||
auto *_t = static_cast<MainWindow *>(_o);
|
auto *_t = static_cast<MainWindow *>(_o);
|
||||||
Q_UNUSED(_t)
|
Q_UNUSED(_t)
|
||||||
switch (_id) {
|
switch (_id) {
|
||||||
case 0: _t->on_loginButton_clicked(); break;
|
case 0: _t->onInitializeClient((*reinterpret_cast< UpdateController*(*)>(_a[1])),(*reinterpret_cast< RecognizeSystem*(*)>(_a[2])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[3]))); break;
|
||||||
case 1: _t->on_updateButton_clicked(); break;
|
case 1: _t->onSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1]))); break;
|
||||||
case 2: _t->on_startButton_clicked(); break;
|
case 2: _t->onCalculateHash(); break;
|
||||||
case 3: _t->on_saveServerButton_clicked(); break;
|
case 3: _t->onSendMessage((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||||
case 4: _t->on_settingsButton_clicked(); break;
|
case 4: _t->on_loginButton_clicked(); break;
|
||||||
case 5: _t->on_checkUpdate_clicked(); break;
|
case 5: _t->on_updateButton_clicked(); break;
|
||||||
|
case 6: _t->on_startButton_clicked(); break;
|
||||||
|
case 7: _t->on_saveServerButton_clicked(); break;
|
||||||
|
case 8: _t->on_settingsButton_clicked(); break;
|
||||||
|
case 9: _t->on_checkUpdate_clicked(); break;
|
||||||
default: ;
|
default: ;
|
||||||
}
|
}
|
||||||
|
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||||
|
switch (_id) {
|
||||||
|
default: *reinterpret_cast<int*>(_a[0]) = -1; break;
|
||||||
|
case 0:
|
||||||
|
switch (*reinterpret_cast<int*>(_a[1])) {
|
||||||
|
default: *reinterpret_cast<int*>(_a[0]) = -1; break;
|
||||||
|
case 2:
|
||||||
|
*reinterpret_cast<int*>(_a[0]) = qRegisterMetaType< ExternalExecuter* >(); break;
|
||||||
|
case 1:
|
||||||
|
*reinterpret_cast<int*>(_a[0]) = qRegisterMetaType< RecognizeSystem* >(); break;
|
||||||
|
case 0:
|
||||||
|
*reinterpret_cast<int*>(_a[0]) = qRegisterMetaType< UpdateController* >(); break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else if (_c == QMetaObject::IndexOfMethod) {
|
||||||
|
int *result = reinterpret_cast<int *>(_a[0]);
|
||||||
|
{
|
||||||
|
using _t = void (MainWindow::*)(UpdateController * , RecognizeSystem * , ExternalExecuter * );
|
||||||
|
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onInitializeClient)) {
|
||||||
|
*result = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
using _t = void (MainWindow::*)(ServerSettings * );
|
||||||
|
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onSetConnect)) {
|
||||||
|
*result = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
using _t = void (MainWindow::*)();
|
||||||
|
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onCalculateHash)) {
|
||||||
|
*result = 2;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
using _t = void (MainWindow::*)(QString );
|
||||||
|
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onSendMessage)) {
|
||||||
|
*result = 3;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Q_UNUSED(_a);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QT_INIT_METAOBJECT const QMetaObject MainWindow::staticMetaObject = { {
|
QT_INIT_METAOBJECT const QMetaObject MainWindow::staticMetaObject = { {
|
||||||
@@ -129,15 +208,42 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
|||||||
if (_id < 0)
|
if (_id < 0)
|
||||||
return _id;
|
return _id;
|
||||||
if (_c == QMetaObject::InvokeMetaMethod) {
|
if (_c == QMetaObject::InvokeMetaMethod) {
|
||||||
if (_id < 6)
|
if (_id < 10)
|
||||||
qt_static_metacall(this, _c, _id, _a);
|
qt_static_metacall(this, _c, _id, _a);
|
||||||
_id -= 6;
|
_id -= 10;
|
||||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||||
if (_id < 6)
|
if (_id < 10)
|
||||||
*reinterpret_cast<int*>(_a[0]) = -1;
|
qt_static_metacall(this, _c, _id, _a);
|
||||||
_id -= 6;
|
_id -= 10;
|
||||||
}
|
}
|
||||||
return _id;
|
return _id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SIGNAL 0
|
||||||
|
void MainWindow::onInitializeClient(UpdateController * _t1, RecognizeSystem * _t2, ExternalExecuter * _t3)
|
||||||
|
{
|
||||||
|
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t3))) };
|
||||||
|
QMetaObject::activate(this, &staticMetaObject, 0, _a);
|
||||||
|
}
|
||||||
|
|
||||||
|
// SIGNAL 1
|
||||||
|
void MainWindow::onSetConnect(ServerSettings * _t1)
|
||||||
|
{
|
||||||
|
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
||||||
|
QMetaObject::activate(this, &staticMetaObject, 1, _a);
|
||||||
|
}
|
||||||
|
|
||||||
|
// SIGNAL 2
|
||||||
|
void MainWindow::onCalculateHash()
|
||||||
|
{
|
||||||
|
QMetaObject::activate(this, &staticMetaObject, 2, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
// SIGNAL 3
|
||||||
|
void MainWindow::onSendMessage(QString _t1)
|
||||||
|
{
|
||||||
|
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
||||||
|
QMetaObject::activate(this, &staticMetaObject, 3, _a);
|
||||||
|
}
|
||||||
QT_WARNING_POP
|
QT_WARNING_POP
|
||||||
QT_END_MOC_NAMESPACE
|
QT_END_MOC_NAMESPACE
|
||||||
|
|||||||
Binary file not shown.
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
|
|||||||
QT_WARNING_PUSH
|
QT_WARNING_PUSH
|
||||||
QT_WARNING_DISABLE_DEPRECATED
|
QT_WARNING_DISABLE_DEPRECATED
|
||||||
struct qt_meta_stringdata_RecognizeSystem_t {
|
struct qt_meta_stringdata_RecognizeSystem_t {
|
||||||
QByteArrayData data[10];
|
QByteArrayData data[11];
|
||||||
char stringdata0[104];
|
char stringdata0[119];
|
||||||
};
|
};
|
||||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||||
@@ -41,12 +41,13 @@ QT_MOC_LITERAL(5, 50, 12), // "LoadComplete"
|
|||||||
QT_MOC_LITERAL(6, 63, 12), // "onNeedUpdate"
|
QT_MOC_LITERAL(6, 63, 12), // "onNeedUpdate"
|
||||||
QT_MOC_LITERAL(7, 76, 4), // "flag"
|
QT_MOC_LITERAL(7, 76, 4), // "flag"
|
||||||
QT_MOC_LITERAL(8, 81, 14), // "onSendDebugLog"
|
QT_MOC_LITERAL(8, 81, 14), // "onSendDebugLog"
|
||||||
QT_MOC_LITERAL(9, 96, 7) // "message"
|
QT_MOC_LITERAL(9, 96, 7), // "message"
|
||||||
|
QT_MOC_LITERAL(10, 104, 14) // "SockedDisabled"
|
||||||
|
|
||||||
},
|
},
|
||||||
"RecognizeSystem\0UpdateBytesAvailable\0"
|
"RecognizeSystem\0UpdateBytesAvailable\0"
|
||||||
"\0size\0sended\0LoadComplete\0onNeedUpdate\0"
|
"\0size\0sended\0LoadComplete\0onNeedUpdate\0"
|
||||||
"flag\0onSendDebugLog\0message"
|
"flag\0onSendDebugLog\0message\0SockedDisabled"
|
||||||
};
|
};
|
||||||
#undef QT_MOC_LITERAL
|
#undef QT_MOC_LITERAL
|
||||||
|
|
||||||
@@ -56,24 +57,26 @@ static const uint qt_meta_data_RecognizeSystem[] = {
|
|||||||
8, // revision
|
8, // revision
|
||||||
0, // classname
|
0, // classname
|
||||||
0, 0, // classinfo
|
0, 0, // classinfo
|
||||||
4, 14, // methods
|
5, 14, // methods
|
||||||
0, 0, // properties
|
0, 0, // properties
|
||||||
0, 0, // enums/sets
|
0, 0, // enums/sets
|
||||||
0, 0, // constructors
|
0, 0, // constructors
|
||||||
0, // flags
|
0, // flags
|
||||||
4, // signalCount
|
5, // signalCount
|
||||||
|
|
||||||
// signals: name, argc, parameters, tag, flags
|
// signals: name, argc, parameters, tag, flags
|
||||||
1, 2, 34, 2, 0x06 /* Public */,
|
1, 2, 39, 2, 0x06 /* Public */,
|
||||||
5, 0, 39, 2, 0x06 /* Public */,
|
5, 0, 44, 2, 0x06 /* Public */,
|
||||||
6, 1, 40, 2, 0x06 /* Public */,
|
6, 1, 45, 2, 0x06 /* Public */,
|
||||||
8, 1, 43, 2, 0x06 /* Public */,
|
8, 1, 48, 2, 0x06 /* Public */,
|
||||||
|
10, 0, 51, 2, 0x06 /* Public */,
|
||||||
|
|
||||||
// signals: parameters
|
// signals: parameters
|
||||||
QMetaType::Void, QMetaType::LongLong, QMetaType::ULongLong, 3, 4,
|
QMetaType::Void, QMetaType::LongLong, QMetaType::ULongLong, 3, 4,
|
||||||
QMetaType::Void,
|
QMetaType::Void,
|
||||||
QMetaType::Void, QMetaType::Bool, 7,
|
QMetaType::Void, QMetaType::Bool, 7,
|
||||||
QMetaType::Void, QMetaType::QString, 9,
|
QMetaType::Void, QMetaType::QString, 9,
|
||||||
|
QMetaType::Void,
|
||||||
|
|
||||||
0 // eod
|
0 // eod
|
||||||
};
|
};
|
||||||
@@ -88,6 +91,7 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
|
|||||||
case 1: _t->LoadComplete(); break;
|
case 1: _t->LoadComplete(); break;
|
||||||
case 2: _t->onNeedUpdate((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
case 2: _t->onNeedUpdate((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||||
case 3: _t->onSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
case 3: _t->onSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||||
|
case 4: _t->SockedDisabled(); break;
|
||||||
default: ;
|
default: ;
|
||||||
}
|
}
|
||||||
} else if (_c == QMetaObject::IndexOfMethod) {
|
} else if (_c == QMetaObject::IndexOfMethod) {
|
||||||
@@ -120,6 +124,13 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
using _t = void (RecognizeSystem::*)();
|
||||||
|
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::SockedDisabled)) {
|
||||||
|
*result = 4;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -152,13 +163,13 @@ int RecognizeSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
|||||||
if (_id < 0)
|
if (_id < 0)
|
||||||
return _id;
|
return _id;
|
||||||
if (_c == QMetaObject::InvokeMetaMethod) {
|
if (_c == QMetaObject::InvokeMetaMethod) {
|
||||||
if (_id < 4)
|
if (_id < 5)
|
||||||
qt_static_metacall(this, _c, _id, _a);
|
qt_static_metacall(this, _c, _id, _a);
|
||||||
_id -= 4;
|
_id -= 5;
|
||||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||||
if (_id < 4)
|
if (_id < 5)
|
||||||
*reinterpret_cast<int*>(_a[0]) = -1;
|
*reinterpret_cast<int*>(_a[0]) = -1;
|
||||||
_id -= 4;
|
_id -= 5;
|
||||||
}
|
}
|
||||||
return _id;
|
return _id;
|
||||||
}
|
}
|
||||||
@@ -189,5 +200,11 @@ void RecognizeSystem::onSendDebugLog(QString _t1)
|
|||||||
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
|
||||||
QMetaObject::activate(this, &staticMetaObject, 3, _a);
|
QMetaObject::activate(this, &staticMetaObject, 3, _a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SIGNAL 4
|
||||||
|
void RecognizeSystem::SockedDisabled()
|
||||||
|
{
|
||||||
|
QMetaObject::activate(this, &staticMetaObject, 4, nullptr);
|
||||||
|
}
|
||||||
QT_WARNING_POP
|
QT_WARNING_POP
|
||||||
QT_END_MOC_NAMESPACE
|
QT_END_MOC_NAMESPACE
|
||||||
|
|||||||
Binary file not shown.
@@ -23,7 +23,7 @@ QT_WARNING_PUSH
|
|||||||
QT_WARNING_DISABLE_DEPRECATED
|
QT_WARNING_DISABLE_DEPRECATED
|
||||||
struct qt_meta_stringdata_TCPClient_t {
|
struct qt_meta_stringdata_TCPClient_t {
|
||||||
QByteArrayData data[6];
|
QByteArrayData data[6];
|
||||||
char stringdata0[63];
|
char stringdata0[61];
|
||||||
};
|
};
|
||||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||||
@@ -36,12 +36,12 @@ QT_MOC_LITERAL(0, 0, 9), // "TCPClient"
|
|||||||
QT_MOC_LITERAL(1, 10, 14), // "onSendDebugLog"
|
QT_MOC_LITERAL(1, 10, 14), // "onSendDebugLog"
|
||||||
QT_MOC_LITERAL(2, 25, 0), // ""
|
QT_MOC_LITERAL(2, 25, 0), // ""
|
||||||
QT_MOC_LITERAL(3, 26, 7), // "message"
|
QT_MOC_LITERAL(3, 26, 7), // "message"
|
||||||
QT_MOC_LITERAL(4, 34, 16), // "onMessageEntered"
|
QT_MOC_LITERAL(4, 34, 14), // "MessageEntered"
|
||||||
QT_MOC_LITERAL(5, 51, 11) // "onReadyRead"
|
QT_MOC_LITERAL(5, 49, 11) // "onReadyRead"
|
||||||
|
|
||||||
},
|
},
|
||||||
"TCPClient\0onSendDebugLog\0\0message\0"
|
"TCPClient\0onSendDebugLog\0\0message\0"
|
||||||
"onMessageEntered\0onReadyRead"
|
"MessageEntered\0onReadyRead"
|
||||||
};
|
};
|
||||||
#undef QT_MOC_LITERAL
|
#undef QT_MOC_LITERAL
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ void TCPClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v
|
|||||||
Q_UNUSED(_t)
|
Q_UNUSED(_t)
|
||||||
switch (_id) {
|
switch (_id) {
|
||||||
case 0: _t->onSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
case 0: _t->onSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||||
case 1: _t->onMessageEntered((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
case 1: _t->MessageEntered((*reinterpret_cast< QString(*)>(_a[1]))); break;
|
||||||
case 2: _t->onReadyRead(); break;
|
case 2: _t->onReadyRead(); break;
|
||||||
default: ;
|
default: ;
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
BIN
debug/sendsystem.o
Normal file
BIN
debug/sendsystem.o
Normal file
Binary file not shown.
Binary file not shown.
BIN
debug/tools.o
BIN
debug/tools.o
Binary file not shown.
193
hash.xml
193
hash.xml
@@ -1,4 +1,197 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<FileDataList>
|
<FileDataList>
|
||||||
<FileData Path="/Application" Hash="FOLDER"/>
|
<FileData Path="/Application" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/D3D12" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/EmbedRuntime" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/2.0" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/2.0/Browsers" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.0" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.0/Browsers" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.5" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.5/Browsers" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/mconfig" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_BurstDebugInformation_DoNotShip" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_BurstDebugInformation_DoNotShip/Data" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Plugins" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Plugins/x86_64" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Resources" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RUS/Docs" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RUS/Docs/FM" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RUS/Docs/MM" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RUS/Docs/QRH" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RUS/Procs" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/RUS/Procs/PMC-RRJNEW-AA62F-AMM00-00_002-00_ru-RU" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/D3D12/D3D12Core.dll" Hash="7fc05c9a8366d19302dfd13d09d3ebac"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll" Hash="1ce1473bec6862c3445a5697d28c3b7d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll" Hash="2734ad3f554d1b95d7b04766260175e5"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser" Hash="0d831c1264b5b32a39fa347de368fe48"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx" Hash="f7be9f1841ff92f9d4040aed832e0c79"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/2.0/machine.config" Hash="5b791b8493c4e9a55d8c5ee522ce1cef"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/2.0/settings.map" Hash="22c818a23169e12bd3c8587b6394c731"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/2.0/web.config" Hash="dc6dd6d8d1fc74e76c84b0b38dc6b1e3"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser" Hash="0d831c1264b5b32a39fa347de368fe48"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.0/DefaultWsdlHelpGenerator.aspx" Hash="f7be9f1841ff92f9d4040aed832e0c79"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.0/machine.config" Hash="32bf879734966ef6659d914a217691e0"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.0/settings.map" Hash="ba17ade8a8e3ee221377534c8136f617"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.0/web.config" Hash="d081581e16b06480a5aaef8cdfb305ab"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser" Hash="0d831c1264b5b32a39fa347de368fe48"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.5/DefaultWsdlHelpGenerator.aspx" Hash="f7be9f1841ff92f9d4040aed832e0c79"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.5/machine.config" Hash="25ff1ec49e3ac9285bd943cf036bd813"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.5/settings.map" Hash="ba17ade8a8e3ee221377534c8136f617"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/4.5/web.config" Hash="5075af18fe1d2b5f9555d5cc68029814"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/browscap.ini" Hash="378be809df7d15aac75a175693e25fbb"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/config" Hash="67611b783439b35abfe05a97413bba46"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/MonoBleedingEdge/etc/mono/mconfig/config.xml" Hash="f34b330f20dce1bdcce9058fca287099"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ.exe" Hash="d8d1ae60ce447c51879c27f15dde7195"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64/lib_burst_generated.txt" Hash="1297ad5a05f25a28837138cc51400e17"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/app.info" Hash="40abc32f793ac28bdd0bfa15c090595d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/boot.config" Hash="d5809a5d9330146c02b1c80486b3894e"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/globalgamemanagers" Hash="d363bc10413d98d83a59110e10e933ec"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/globalgamemanagers.assets" Hash="40685a9366c73ac8d5024a1f42f2a542"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/globalgamemanagers.assets.resS" Hash="cc481c35e79b509dcd950c6adf2346ce"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/level0" Hash="7c4b87d091f37906a2f88330853aff33"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/level1" Hash="268ff78d206861d330d50b64c991d531"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Assembly-CSharp.dll" Hash="5c866b757a27f4073c36ca9fe6a29113"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/IngameDebugConsole.Runtime.dll" Hash="05df4f935a0902bb439a96016c91371d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Mono.Security.dll" Hash="dbd7e99a9ac5352fd4febaa5a7660e09"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/mscorlib.dll" Hash="9c0f93ea22eb12021728a1effe48ccad"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/netstandard.dll" Hash="c61967ebe7f07f6a5a1b3f91842bbc3c"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.ComponentModel.Composition.dll" Hash="9a5463df5469541750cca835743414c1"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Configuration.dll" Hash="ea06fc126f0f0e6a9d44e089469b7653"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Core.dll" Hash="5df5fd16437d20f41e58f8db73b42b47"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Data.DataSetExtensions.dll" Hash="48ff393c9b420ade92a47c8cded8df57"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Data.dll" Hash="83260b81a7f2c359842ae712cf8403a5"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.dll" Hash="97151f7e52d13119d4b7fc147c01dcd7"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Drawing.dll" Hash="e9a4ee8d28124309d5068758ae9cf29a"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.EnterpriseServices.dll" Hash="ce5f01bef57e504e6bcba5136f6cac3f"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.IO.Compression.dll" Hash="968bf6f5309660610233bf75b21584c1"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.IO.Compression.FileSystem.dll" Hash="941b52daf342862624349b9cec0cb4a9"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Net.Http.dll" Hash="dab4d77c5675bd94394baa2c45e4a311"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Numerics.dll" Hash="73cd840f06347a172cdc8764564c6361"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Runtime.dll" Hash="77d74adcdea84d53a1fbe89e79737c1e"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Runtime.Serialization.dll" Hash="4ef33c922491087198e413279a709791"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Security.dll" Hash="c3030222a71dad399344f8067dd36299"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.ServiceModel.Internals.dll" Hash="0b563b4cf046e3e484669ce10ce3bfa1"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Transactions.dll" Hash="6191fb6d054e9f0910f42730230d7e5b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Xml.dll" Hash="6fed4a1385091135fcc224bda4f83222"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/System.Xml.Linq.dll" Hash="f59d549bdb4b3310647d344446958c3d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.Burst.dll" Hash="3d93246db4e4fa4e519fa15ff5ee3ff4"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.Burst.Unsafe.dll" Hash="129351e9879a83262ea92a4a45aacc46"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.Collections.dll" Hash="0b3bb39438121b4f31de0da10fc393e4"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.Collections.LowLevel.ILSupport.dll" Hash="a28c546a9e048223b6899d2856ef6c11"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.Mathematics.dll" Hash="88db1f1b78092627dd59ba7098212fb9"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.Rendering.LightTransport.Runtime.dll" Hash="86393503d61a3b57c3942bac0553d8a4"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.RenderPipelines.Core.Runtime.dll" Hash="b7f1b29575e39edb80529f80dbe96b51"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.RenderPipelines.Core.Runtime.Shared.dll" Hash="ebbeac963fbf7bb908ab0aa5d698c350"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.RenderPipelines.Core.ShaderLibrary.dll" Hash="b5f27626025df2464cc3216bfb349ff6"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.RenderPipelines.HighDefinition.Config.Runtime.dll" Hash="4232e384bb18cf0b470748f16a451077"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.RenderPipelines.HighDefinition.Runtime.dll" Hash="0f78e8221d6062c9a4caaf94a827a850"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll" Hash="bb8e7c89045af4b8e7886720e5dc2474"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.TextMeshPro.dll" Hash="a944c0a16abff15b71bf7c220de5bcbd"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.Timeline.dll" Hash="9d32cd828350ca76224a61f9cf98211c"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.VisualEffectGraph.Runtime.dll" Hash="ddd586575079cc22739a5e5e49d18a77"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.VisualScripting.Antlr3.Runtime.dll" Hash="62a6ef88ac683a13104417515323896b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.VisualScripting.Core.dll" Hash="de557512eb1a4da119ef4b7cdf0de9ea"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.VisualScripting.Flow.dll" Hash="6078b460cb8803b87f89410f2fdef9f2"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/Unity.VisualScripting.State.dll" Hash="0a778b955b1a2df7397f338386070323"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.AccessibilityModule.dll" Hash="bf51e59da996c816b7d3944d9d235ca3"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.AIModule.dll" Hash="245cfae2b9eaee92e87eae662d3b8ca5"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.AndroidJNIModule.dll" Hash="19aba924468d523bd6ab0af1977ce553"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.AnimationModule.dll" Hash="5301e420d7216e0376b2ae6771836a08"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ARModule.dll" Hash="5007e1920fd5f556be659d873b07f1a4"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.AssetBundleModule.dll" Hash="5c3168c646fb035e811a09fd4de30759"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.AudioModule.dll" Hash="12b91b4940b3418061837bc12e7d7050"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ClothModule.dll" Hash="6ca3c4a421c921526e07950998a89ee9"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ClusterInputModule.dll" Hash="9ed9069d73075969a156f89851e58d4c"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ClusterRendererModule.dll" Hash="525752cc5b0c1d39c49ec4ac50a4101b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.CommandStateObserverModule.dll" Hash="55957ff738edeb5fb2723f625112d4d3"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ContentLoadModule.dll" Hash="eedc3dcf14a3ce65072b84335b54b758"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.CoreModule.dll" Hash="7352cddb3575dbbcca53a8fa9568fe6f"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.CrashReportingModule.dll" Hash="ea3c9f6c8098cf864e3353697a32ff65"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.DirectorModule.dll" Hash="87d7f67b284b7e5748bb8cc4c645662c"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.dll" Hash="8ffa9dfdffe9c31b96856f5be0f839e4"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.DSPGraphModule.dll" Hash="347a60da7e315fbfeca71360aa69169b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.GameCenterModule.dll" Hash="ceb426370ca4ccd14de6d2bf86b143c6"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.GIModule.dll" Hash="2918d57cd975b218d0d5a94a0e6c386a"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.GraphToolsFoundationModule.dll" Hash="b2c7eea97fa9ee185d6be4dbccbaad68"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.GridModule.dll" Hash="3cb34eb625d4fabbbefed7563619f854"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.HierarchyCoreModule.dll" Hash="4f1dfca0153c6cda61b749cf04b864d4"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.HotReloadModule.dll" Hash="f1c6fd8ef2ec0c3a607b148bcd87038d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ImageConversionModule.dll" Hash="102bfdba9d7a2b1f876c7dd9ff0fd440"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.IMGUIModule.dll" Hash="c9fc2dcdf69f5c081ee1d809715624f5"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.InputForUIModule.dll" Hash="2c6253ae2586b692d55140e38fc3e242"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.InputLegacyModule.dll" Hash="a9a370555a93c547284b2e8a27945bc5"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.InputModule.dll" Hash="cf38dc062b4d1218628488ee5cbbdd5d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.JSONSerializeModule.dll" Hash="0b294a1c0dca9e8180f122ba7ac942dc"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.LocalizationModule.dll" Hash="ecc911c3f4fb74ef6fe9d756e3d18408"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.MarshallingModule.dll" Hash="4be2900caf53c5a77e14d40d26804016"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.MultiplayerModule.dll" Hash="3821d1940fef8c2fd2bc09f8cdc50b7b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.NVIDIAModule.dll" Hash="0dde1799779f99200903622ecf279b4b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ParticleSystemModule.dll" Hash="fb86ca13989f7357917cb8fad2bc9571"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.PerformanceReportingModule.dll" Hash="76ea7a15db5d193ffd90ac126ecdf573"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.Physics2DModule.dll" Hash="c2e6a62916ad3207cdc8daf42e033d37"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.PhysicsModule.dll" Hash="b3d8e6427893f8ed1c6717e8bc8480eb"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ProfilerModule.dll" Hash="f1f4d1ee69bff46452fba519b3a0c90b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.PropertiesModule.dll" Hash="dff0bf609e5e116146f3139297a8cf55"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll" Hash="b3c3f7cf1d76fbf5cb72d06b48fadce8"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.ScreenCaptureModule.dll" Hash="512a77e433577d2aea66bbf774b26e68"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.SharedInternalsModule.dll" Hash="b5dfed05ba23999348fb41a3946a8c60"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.SpriteMaskModule.dll" Hash="d35600c344dda3162201ee876109dfa2"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.SpriteShapeModule.dll" Hash="c1da3125886675c29f911186ba57c77f"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.StreamingModule.dll" Hash="3c1a919df199410b6d97d3233c2ae8af"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.SubstanceModule.dll" Hash="5654a4342f349a828d1e42100bd5b069"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.SubsystemsModule.dll" Hash="bd7ad5e02272b6cffc6ac3c9f64a5d00"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.TerrainModule.dll" Hash="3f4b1cca251fc0e4ac8ee5855c21c829"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.TerrainPhysicsModule.dll" Hash="2d87f1c8ac3b32158d0c8751989c97f7"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.TextCoreFontEngineModule.dll" Hash="f02c97fc1dc7cee24efb7a161761cad7"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.TextCoreTextEngineModule.dll" Hash="211586ac1307e75b04944ae69602d439"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.TextRenderingModule.dll" Hash="7c4b7a99c671f612956c8d9a8b059d3d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.TilemapModule.dll" Hash="680c311a782c27b84939de1109387abf"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.TLSModule.dll" Hash="f5e69a25d7e5711f9d96c6d72ebef3a6"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UI.dll" Hash="c5ff0bd048336c6e10704e5bf0151e05"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UIElementsModule.dll" Hash="edb209860d38406902f38078afb09dc4"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UIModule.dll" Hash="6dc8c0bd62247ae98f3ab47b58dbe79b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UmbraModule.dll" Hash="9e9645956824b3d24d0a5c721ebedfcc"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityAnalyticsCommonModule.dll" Hash="35cc2a3004f37694740edc9394bc05bf"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityAnalyticsModule.dll" Hash="07396be9516ddff18c7f49ba9ed9d5c2"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityConnectModule.dll" Hash="c2b0504f4621a92e91d5ed5e79017295"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityCurlModule.dll" Hash="92203292162a4a4ea627f41e2032855d"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityTestProtocolModule.dll" Hash="f7995ec8be70852443cefdf2b9ec8a4e"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll" Hash="57d96c793a720456cc5ebc45d0b6f4e1"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll" Hash="8490f076ba120cb60dab94932adff771"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityWebRequestModule.dll" Hash="f033891c341f917838a1ae9caa9c73e8"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll" Hash="fe6a04ff44a2f53a27331ca4834211e3"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll" Hash="3e9d46adb7d36d390783d7917dd043b8"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.VehiclesModule.dll" Hash="74065cdf5a92f299a5197a7cf2505725"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.VFXModule.dll" Hash="ae89bc0a52ba6cfeea7261e330bc972b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.VideoModule.dll" Hash="c00f0cfb424ad22ecf90a1f5d6f5bd2b"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.VirtualTexturingModule.dll" Hash="a68ac0d470b2de4b492e6c0d9b88e9de"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.VRModule.dll" Hash="1943a6b4296e967056f48f34e7cc10b3"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.WindModule.dll" Hash="4cb40be94a81fac1bb759d28e6dcd381"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Managed/UnityEngine.XRModule.dll" Hash="635e638a237f3b28a661c6cf4a18046a"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Plugins/x86_64/lib_burst_generated.dll" Hash="7f27d3db471dd122e3ed307aa971d504"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Plugins/x86_64/pdfrenderer.dll" Hash="bb9613277346c4b3bf0ea29a44c903e9"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Resources/unity default resources" Hash="510aeddf6e1cb415533ad2b13937f0bd"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/Resources/unity_builtin_extra" Hash="4ec578ed51d7dd617c9245fc406c1fc2"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/resources.assets" Hash="ef764597484bc0364417d1a0ed2e6802"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/resources.assets.resS" Hash="ac0c78b758e8ad15b22be4d1ee464451"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/RuntimeInitializeOnLoads.json" Hash="db3c75d5aeee9d0c9152f7e1427d3d96"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/sharedassets0.assets" Hash="a87051a24e80938c8c3ec281c9531ee7"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/sharedassets0.assets.resS" Hash="6533a8f0986255985ed16de7f62239c6"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/sharedassets1.assets" Hash="bb1a5c07b86f0b8e9cc46ed3a70fb2e5"/>
|
||||||
|
<FileData Path="/Application/RRJ_Build/RRJ_Data/sharedassets1.assets.resS" Hash="a42b7fc1f576d8d2fab624e364989139"/>
|
||||||
</FileDataList>
|
</FileDataList>
|
||||||
|
|||||||
1
main.cpp
1
main.cpp
@@ -7,5 +7,6 @@ int main(int argc, char *argv[])
|
|||||||
QApplication a(argc, argv);
|
QApplication a(argc, argv);
|
||||||
MainWindow w;
|
MainWindow w;
|
||||||
w.show();
|
w.show();
|
||||||
|
qDebug() << "WhatsUP";
|
||||||
return a.exec();
|
return a.exec();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,10 +16,17 @@ void MainWindow::Initialize()
|
|||||||
{
|
{
|
||||||
|
|
||||||
ui->settingsWidget->hide();
|
ui->settingsWidget->hide();
|
||||||
|
updateControllerThread = new QThread;
|
||||||
|
connectionThread = new QThread;
|
||||||
|
|
||||||
client = new TCPClient;
|
client = new TCPClient;
|
||||||
|
client->moveToThread(connectionThread);
|
||||||
|
|
||||||
dataParser = new DataParser;
|
dataParser = new DataParser;
|
||||||
|
|
||||||
updateController = new UpdateController(dataParser);
|
updateController = new UpdateController(dataParser);
|
||||||
|
updateController->moveToThread(updateControllerThread);
|
||||||
|
|
||||||
recognizeSystem = new RecognizeSystem;
|
recognizeSystem = new RecognizeSystem;
|
||||||
screenChecker = new ScreenChecker;
|
screenChecker = new ScreenChecker;
|
||||||
externalExecuter = new ExternalExecuter;
|
externalExecuter = new ExternalExecuter;
|
||||||
@@ -28,10 +35,22 @@ void MainWindow::Initialize()
|
|||||||
connect(recognizeSystem, &RecognizeSystem::LoadComplete,this,&MainWindow::LoadComplete);
|
connect(recognizeSystem, &RecognizeSystem::LoadComplete,this,&MainWindow::LoadComplete);
|
||||||
connect(recognizeSystem,&RecognizeSystem::onNeedUpdate,this,&MainWindow::SetNeedUpdate);
|
connect(recognizeSystem,&RecognizeSystem::onNeedUpdate,this,&MainWindow::SetNeedUpdate);
|
||||||
connect(recognizeSystem, &RecognizeSystem::onSendDebugLog,this,&MainWindow::DebugLog);
|
connect(recognizeSystem, &RecognizeSystem::onSendDebugLog,this,&MainWindow::DebugLog);
|
||||||
|
connect(recognizeSystem, &RecognizeSystem::SockedDisabled,this,&MainWindow::LostConnection);
|
||||||
|
|
||||||
connect(client,&TCPClient::onSendDebugLog,this,&MainWindow::DebugLog);
|
connect(client,&TCPClient::onSendDebugLog,this,&MainWindow::DebugLog);
|
||||||
|
|
||||||
client->Initialize(updateController,recognizeSystem,externalExecuter);
|
connect(this,&MainWindow::onInitializeClient,client,&TCPClient::Initialize);
|
||||||
recognizeSystem->Initialize(updateController);
|
connect(this,&MainWindow::onSetConnect,client,&TCPClient::SetConnect);
|
||||||
|
connect(this,&MainWindow::onSendMessage,client,&TCPClient::MessageEntered);
|
||||||
|
connect(this,&MainWindow::onCalculateHash,updateController,&UpdateController::CalculateHash);
|
||||||
|
|
||||||
|
connectionThread->start();
|
||||||
|
updateControllerThread->start();
|
||||||
|
|
||||||
|
emit onCalculateHash();
|
||||||
|
emit onInitializeClient(updateController,recognizeSystem,externalExecuter);
|
||||||
|
|
||||||
|
recognizeSystem->Initialize(updateController,dataParser);
|
||||||
|
|
||||||
screenChecker->Check();
|
screenChecker->Check();
|
||||||
ui->disblayCount->setText(screenChecker->getScreenCount());
|
ui->disblayCount->setText(screenChecker->getScreenCount());
|
||||||
@@ -41,7 +60,7 @@ void MainWindow::Initialize()
|
|||||||
maxBytesAvailable = 0;
|
maxBytesAvailable = 0;
|
||||||
ui->loadingProgressBar->setValue(0);
|
ui->loadingProgressBar->setValue(0);
|
||||||
|
|
||||||
client->SetConnect(dataParser->GetServerSettings());
|
emit onSetConnect(dataParser->GetServerSettings());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,20 +87,29 @@ void MainWindow::SetNeedUpdate(bool flag)
|
|||||||
ui->startButton->setEnabled(!flag);
|
ui->startButton->setEnabled(!flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::LostConnection()
|
||||||
|
{
|
||||||
|
ui->loadingProgressBar->setValue(0);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void MainWindow::on_loginButton_clicked()
|
void MainWindow::on_loginButton_clicked()
|
||||||
{
|
{
|
||||||
QString username = ui->loginInputField->text();
|
QString username = ui->loginInputField->text();
|
||||||
QString password = ui->passwordInputField->text();
|
QString password = ui->passwordInputField->text();
|
||||||
|
|
||||||
qDebug() << "Try login: " << username;
|
ClientAutorization *autorization = new ClientAutorization;
|
||||||
qDebug() << "Try pass: " << password;
|
autorization->Login = username;
|
||||||
|
autorization->Password = password;
|
||||||
|
|
||||||
|
dataParser->CreateAuthMessage(autorization);
|
||||||
|
client->SendClientAutorization();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::on_updateButton_clicked()
|
void MainWindow::on_updateButton_clicked()
|
||||||
{
|
{
|
||||||
client->onMessageEntered("update");
|
emit onSendMessage("update");
|
||||||
ui->loadingProgressBar->setValue(0);
|
ui->loadingProgressBar->setValue(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,7 +128,8 @@ void MainWindow::on_saveServerButton_clicked()
|
|||||||
QString port = ui->portInputField->text();
|
QString port = ui->portInputField->text();
|
||||||
|
|
||||||
dataParser->CreateServerSettings(server,port);
|
dataParser->CreateServerSettings(server,port);
|
||||||
client->SetConnect(dataParser->GetServerSettings());
|
|
||||||
|
emit onSetConnect(dataParser->GetServerSettings());
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::on_settingsButton_clicked()
|
void MainWindow::on_settingsButton_clicked()
|
||||||
@@ -122,11 +151,15 @@ void MainWindow::DebugLog(QString message)
|
|||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
{
|
{
|
||||||
|
connectionThread->quit();
|
||||||
|
connectionThread->wait();
|
||||||
|
|
||||||
|
delete connectionThread;
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void MainWindow::on_checkUpdate_clicked()
|
void MainWindow::on_checkUpdate_clicked()
|
||||||
{
|
{
|
||||||
client->onMessageEntered("check");
|
emit onSendMessage("check");
|
||||||
}
|
}
|
||||||
|
|||||||
26
mainwindow.h
26
mainwindow.h
@@ -3,9 +3,11 @@
|
|||||||
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QThread>
|
||||||
#include <Core/dataparser.h>
|
#include <Core/dataparser.h>
|
||||||
#include <Core/tcpclient.h>
|
#include <Core/tcpclient.h>
|
||||||
#include <Core/screenchecker.h>
|
#include <Core/screenchecker.h>
|
||||||
|
#include <Core/updatecontroller.h>
|
||||||
#include "Datas.h"
|
#include "Datas.h"
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
@@ -23,13 +25,18 @@ class MainWindow : public QMainWindow
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
MainWindow(QWidget *parent = nullptr);
|
MainWindow(QWidget *parent = nullptr);
|
||||||
void DebugLog(QString message);
|
|
||||||
void Initialize();
|
|
||||||
void UpdateProgress(qint64 size,quint64 sended);
|
|
||||||
void LoadComplete();
|
|
||||||
void SetNeedUpdate(bool flag);
|
|
||||||
~MainWindow();
|
~MainWindow();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void onInitializeClient(UpdateController *updateController,
|
||||||
|
RecognizeSystem *recognizeSystem,
|
||||||
|
ExternalExecuter *externalExecuter);
|
||||||
|
|
||||||
|
void onSetConnect(ServerSettings* serverSettings);
|
||||||
|
void onCalculateHash();
|
||||||
|
void onSendMessage(QString message);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void on_loginButton_clicked();
|
void on_loginButton_clicked();
|
||||||
|
|
||||||
@@ -51,6 +58,15 @@ private:
|
|||||||
RecognizeSystem *recognizeSystem;
|
RecognizeSystem *recognizeSystem;
|
||||||
ScreenChecker *screenChecker;
|
ScreenChecker *screenChecker;
|
||||||
ExternalExecuter *externalExecuter;
|
ExternalExecuter *externalExecuter;
|
||||||
|
QThread *connectionThread;
|
||||||
|
QThread *updateControllerThread;
|
||||||
quint64 maxBytesAvailable;
|
quint64 maxBytesAvailable;
|
||||||
|
|
||||||
|
void DebugLog(QString message);
|
||||||
|
void Initialize();
|
||||||
|
void UpdateProgress(qint64 size,quint64 sended);
|
||||||
|
void LoadComplete();
|
||||||
|
void SetNeedUpdate(bool flag);
|
||||||
|
void LostConnection();
|
||||||
};
|
};
|
||||||
#endif // MAINWINDOW_H
|
#endif // MAINWINDOW_H
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
|
debug/updatecontroller.o
|
||||||
debug/externalexecuter.o
|
debug/externalexecuter.o
|
||||||
debug/dataparser.o
|
debug/dataparser.o
|
||||||
debug/recognizesystem.o
|
debug/recognizesystem.o
|
||||||
debug/screenchecker.o
|
debug/screenchecker.o
|
||||||
debug/tcpclient.o
|
debug/tcpclient.o
|
||||||
debug/tools.o
|
debug/tools.o
|
||||||
debug/UpdateController.o
|
|
||||||
debug/main.o
|
debug/main.o
|
||||||
debug/mainwindow.o
|
debug/mainwindow.o
|
||||||
|
debug/moc_updatecontroller.o
|
||||||
debug/moc_externalexecuter.o
|
debug/moc_externalexecuter.o
|
||||||
debug/moc_recognizesystem.o
|
debug/moc_recognizesystem.o
|
||||||
debug/moc_tcpclient.o
|
debug/moc_tcpclient.o
|
||||||
debug/moc_UpdateController.o
|
|
||||||
debug/moc_mainwindow.o
|
debug/moc_mainwindow.o
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
|
release/updatecontroller.o
|
||||||
release/externalexecuter.o
|
release/externalexecuter.o
|
||||||
release/dataparser.o
|
release/dataparser.o
|
||||||
release/recognizesystem.o
|
release/recognizesystem.o
|
||||||
release/screenchecker.o
|
release/screenchecker.o
|
||||||
release/tcpclient.o
|
release/tcpclient.o
|
||||||
release/tools.o
|
release/tools.o
|
||||||
release/UpdateController.o
|
|
||||||
release/main.o
|
release/main.o
|
||||||
release/mainwindow.o
|
release/mainwindow.o
|
||||||
|
release/moc_updatecontroller.o
|
||||||
release/moc_externalexecuter.o
|
release/moc_externalexecuter.o
|
||||||
release/moc_recognizesystem.o
|
release/moc_recognizesystem.o
|
||||||
release/moc_tcpclient.o
|
release/moc_tcpclient.o
|
||||||
release/moc_UpdateController.o
|
|
||||||
release/moc_mainwindow.o
|
release/moc_mainwindow.o
|
||||||
|
|||||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<FileDataList/>
|
|
||||||
Reference in New Issue
Block a user