Constanta-Design/RRJClient
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git synced 2026-03-28 05:25:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: add server blocked behaviour

Browse Source
This commit is contained in:
semenov
2024-09-12 12:16:41 +03:00
parent a831e29ddc
commit 23982ecd6b
26 changed files with 172 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/UpdateController.cpp
View File

@@ -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)

2
Core/dataparser.cpp
View File

@@ -127,7 +127,7 @@ QByteArray DataParser::xmlAnswer_notify(QString code)
SAttribute attribute1 = {"Code", code}; SAttribute attribute1 = {"Code", code};
QList<SAttribute> listAttr = {attribute1}; QList<SAttribute> listAttr = {attribute1};
SXmlAnswerTag tag = {"ServerNotify", listAttr}; SXmlAnswerTag tag = {"ClientNotify", listAttr};
listTag.append(tag); listTag.append(tag);

2
Core/externalexecuter.cpp
View File

@@ -20,7 +20,7 @@ void ExternalExecuter::callApp()
args << "1"; args << "1";
myProcess->start(programPath,args); myProcess->start(programPath,args);
myProcess->waitForFinished(3000); myProcess->waitForStarted();
QCoreApplication::exit(); QCoreApplication::exit();
} }

11
Core/recognizesystem.cpp
View File

@@ -262,11 +262,16 @@ void RecognizeSystem::xmlParser(QByteArray array)
QString name = attr.name().toString(); QString name = attr.name().toString();
QString value = attr.value().toString(); QString value = attr.value().toString();
if(name == "Code"){ if(name == "Code")
if (value == "END"){ {
if (value == "END")
{
emit sigSocketDisabled(); emit sigSocketDisabled();
}
if(value == "BLOCKED")
{
emit sigServerBlocked();
} }
} }
} }

3
Core/recognizesystem.h
View File

@@ -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;
@@ -27,6 +27,7 @@ signals:
void sigNeedUpdate(bool flag,qint64 size,quint64 fileCount); void sigNeedUpdate(bool flag,qint64 size,quint64 fileCount);
void sigSendDebugLog(QString message); void sigSendDebugLog(QString message);
void sigSocketDisabled(); void sigSocketDisabled();
void sigServerBlocked();
void sigSaveLoginData(ServerAuthorization *serverAuth); void sigSaveLoginData(ServerAuthorization *serverAuth);
void sigSocketWaitForReadyRead(int waitTime); void sigSocketWaitForReadyRead(int waitTime);

35
Core/tcpclient.cpp
View File

@@ -89,11 +89,11 @@ void TCPClient::sendFile()
countSend = 0; countSend = 0;
} }
void TCPClient::sendUnityConnect()
void TCPClient::sendQTConnect()
{ {
QDataStream stream(socket); QString value = QString::number(PacketType::TYPE_QT);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); socket->write(value.toUtf8());
stream << PacketType::TYPE_CHANGEPACKAGERESPONSE;
socket->waitForBytesWritten(); socket->waitForBytesWritten();
} }
@@ -106,15 +106,15 @@ void TCPClient::setDisconnect()
void TCPClient::sendDisable() void TCPClient::sendDisable()
{ {
// QDataStream stream(socket); QDataStream stream(socket);
// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
// QByteArray data; QByteArray data;
// data = emit sigGetXmlAnswer("END"); data = emit sigGetXmlAnswer("DISABLE");
// stream << PacketType::TYPE_XMLANSWER; stream << PacketType::TYPE_XMLANSWER;
// stream << data; stream << data;
// socket->waitForBytesWritten(); socket->waitForBytesWritten();
} }
void TCPClient::waitRead(int time) void TCPClient::waitRead(int time)
@@ -162,13 +162,17 @@ void TCPClient::slotMessageEntered(QString message)
void TCPClient::slotConnectNotify() void TCPClient::slotConnectNotify()
{ {
if(socket->state() != QTcpSocket::ConnectedState){ if(socket->state() != QTcpSocket::ConnectedState)
{
emit sigSendDebugLog("Connect invalid"); emit sigSendDebugLog("Connect invalid");
emit sigConnectionState(false); emit sigConnectionState(false);
return; return;
}else{ }
else
{
emit sigSendDebugLog("Connect complete"); emit sigSendDebugLog("Connect complete");
emit sigConnectionState(true); emit sigConnectionState(true);
sendQTConnect();
} }
} }
@@ -178,9 +182,10 @@ void TCPClient::slotReadyRead()
emit sigSendDebugLog("WRONG SOCKET"); emit sigSendDebugLog("WRONG SOCKET");
return; return;
} }
// qDebug() << "Transaction before recognize: " << socket->isTransactionStarted();
// if(socket->isTransactionStarted()) return; // qDebug() << "Transaction before recognize: " << socket->isTransactionStarted();
// if(socket->isTransactionStarted()) return;
emit sigRecognize(socket); emit sigRecognize(socket);
} }

2
Core/tcpclient.h
View File

@@ -26,7 +26,7 @@ public:
void initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter); void initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter);
void setConnect(ServerSettings *serverSettings); void setConnect(ServerSettings *serverSettings);
void sendClientAutorization(); void sendClientAutorization();
void sendUnityConnect(); void sendQTConnect();
void sendDisable(); void sendDisable();
void waitRead(int time); void waitRead(int time);

4
Core/tools.h
View File

@@ -18,7 +18,7 @@ static QString displayTemp = staticDataFolderName + "/displayData.xml";
enum PacketType{ enum PacketType{
TYPE_NONE = 0, TYPE_NONE = 0,
TYPE_MSG = 1, TYPE_UNITY = 1,
TYPE_FILE = 2, TYPE_FILE = 2,
TYPE_COMMAND = 3, TYPE_COMMAND = 3,
TYPE_FOLDER = 4, TYPE_FOLDER = 4,
@@ -26,7 +26,7 @@ enum PacketType{
TYPE_FINISH = 6, TYPE_FINISH = 6,
TYPE_NEEDUPDATE = 7, TYPE_NEEDUPDATE = 7,
TYPE_XMLANSWER = 8, TYPE_XMLANSWER = 8,
TYPE_CHANGEPACKAGERESPONSE = 9, TYPE_QT = 9,
TYPE_DISABLE = 11 TYPE_DISABLE = 11
}; };

47
Makefile.Debug
View File

@@ -328,6 +328,7 @@ debug/moc_updatecontroller.cpp: Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/UpdateController.h \
Core/externalexecuter.h \ Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \ D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
@@ -629,7 +630,7 @@ debug/moc_recognizesystem.cpp: Core/recognizesystem.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -662,6 +663,7 @@ debug/moc_recognizesystem.cpp: Core/recognizesystem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
debug/moc_predefs.h \ debug/moc_predefs.h \
D:/QT/5.14.2/mingw73_64/bin/moc.exe D:/QT/5.14.2/mingw73_64/bin/moc.exe
D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\recognizesystem.h -o debug\moc_recognizesystem.cpp D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\recognizesystem.h -o debug\moc_recognizesystem.cpp
@@ -945,7 +947,7 @@ debug/moc_tcpclient.cpp: Core/tcpclient.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -978,6 +980,7 @@ debug/moc_tcpclient.cpp: Core/tcpclient.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
debug/moc_predefs.h \ debug/moc_predefs.h \
D:/QT/5.14.2/mingw73_64/bin/moc.exe D:/QT/5.14.2/mingw73_64/bin/moc.exe
D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\tcpclient.h -o debug\moc_tcpclient.cpp D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\tcpclient.h -o debug\moc_tcpclient.cpp
@@ -1152,6 +1155,7 @@ debug/moc_mainwindow.cpp: mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/UpdateController.h \
Core/externalexecuter.h \ Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \ D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
@@ -1183,7 +1187,7 @@ compiler_clean: compiler_rcc_clean compiler_moc_predefs_clean compiler_moc_heade
####### Compile ####### Compile
debug/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \ debug/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \
Core/FileData.h \ Core/FileData.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \
D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \
@@ -1339,23 +1343,24 @@ debug/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/tools.h \ Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdir.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qfileinfo.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDirIterator \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdiriterator.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
D:/QT/5.14.2/mingw73_64/include/QtCore/qprocess.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
D:/QT/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDirIterator \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdiriterator.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdir.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qfileinfo.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTextStream \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTextStream \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDateTime D:/QT/5.14.2/mingw73_64/include/QtCore/QDateTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
D:/QT/5.14.2/mingw73_64/include/QtCore/qprocess.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\updatecontroller.o Core\updatecontroller.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\updatecontroller.o Core\updatecontroller.cpp
debug/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \ debug/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \
@@ -1667,7 +1672,7 @@ debug/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -1699,7 +1704,8 @@ debug/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\recognizesystem.o Core\recognizesystem.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\recognizesystem.o Core\recognizesystem.cpp
debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ debug/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \
@@ -2010,6 +2016,7 @@ debug/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/UpdateController.h \
Core/externalexecuter.h \ Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \ D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
@@ -2231,7 +2238,7 @@ debug/main.o: main.cpp mainwindow.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -2264,6 +2271,7 @@ debug/main.o: main.cpp mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h
@@ -2409,7 +2417,7 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -2442,6 +2450,7 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
ui_mainwindow.h \ ui_mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \
D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \

47
Makefile.Release
View File

@@ -328,6 +328,7 @@ release/moc_updatecontroller.cpp: Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/UpdateController.h \
Core/externalexecuter.h \ Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \ D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
@@ -629,7 +630,7 @@ release/moc_recognizesystem.cpp: Core/recognizesystem.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -662,6 +663,7 @@ release/moc_recognizesystem.cpp: Core/recognizesystem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
release/moc_predefs.h \ release/moc_predefs.h \
D:/QT/5.14.2/mingw73_64/bin/moc.exe D:/QT/5.14.2/mingw73_64/bin/moc.exe
D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\recognizesystem.h -o release\moc_recognizesystem.cpp D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\recognizesystem.h -o release\moc_recognizesystem.cpp
@@ -945,7 +947,7 @@ release/moc_tcpclient.cpp: Core/tcpclient.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -978,6 +980,7 @@ release/moc_tcpclient.cpp: Core/tcpclient.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
release/moc_predefs.h \ release/moc_predefs.h \
D:/QT/5.14.2/mingw73_64/bin/moc.exe D:/QT/5.14.2/mingw73_64/bin/moc.exe
D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\tcpclient.h -o release\moc_tcpclient.cpp D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\tcpclient.h -o release\moc_tcpclient.cpp
@@ -1152,6 +1155,7 @@ release/moc_mainwindow.cpp: mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/UpdateController.h \
Core/externalexecuter.h \ Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \ D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
@@ -1183,7 +1187,7 @@ compiler_clean: compiler_rcc_clean compiler_moc_predefs_clean compiler_moc_heade
####### Compile ####### Compile
release/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \ release/updatecontroller.o: Core/updatecontroller.cpp Core/UpdateController.h \
Core/FileData.h \ Core/FileData.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \
D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \
@@ -1339,23 +1343,24 @@ release/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/tools.h \ Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdir.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qfileinfo.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDirIterator \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdiriterator.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
D:/QT/5.14.2/mingw73_64/include/QtCore/qprocess.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
D:/QT/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDirIterator \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdiriterator.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdir.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qfileinfo.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTextStream \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTextStream \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDateTime D:/QT/5.14.2/mingw73_64/include/QtCore/QDateTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
D:/QT/5.14.2/mingw73_64/include/QtCore/qprocess.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\updatecontroller.o Core\updatecontroller.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\updatecontroller.o Core\updatecontroller.cpp
release/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \ release/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \
@@ -1667,7 +1672,7 @@ release/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -1699,7 +1704,8 @@ release/recognizesystem.o: Core/recognizesystem.cpp Core/recognizesystem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\recognizesystem.o Core\recognizesystem.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\recognizesystem.o Core\recognizesystem.cpp
release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \ release/screenchecker.o: Core/screenchecker.cpp Core/screenchecker.h \
@@ -2010,6 +2016,7 @@ release/tcpclient.o: Core/tcpclient.cpp Core/tcpclient.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
Core/UpdateController.h \
Core/externalexecuter.h \ Core/externalexecuter.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \ D:/QT/5.14.2/mingw73_64/include/QtCore/QDir \
D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \ D:/QT/5.14.2/mingw73_64/include/QtCore/QProcess \
@@ -2231,7 +2238,7 @@ release/main.o: main.cpp mainwindow.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -2264,6 +2271,7 @@ release/main.o: main.cpp mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h
@@ -2409,7 +2417,7 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \
Core/tools.h \ Core/tools.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTime \
D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qdatetime.h \
Core/updatecontroller.h \ Core/UpdateController.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamReader \
D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamAttribute \
D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ D:/QT/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \
@@ -2442,6 +2450,7 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \
D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \
Core/updatecontroller.h \
ui_mainwindow.h \ ui_mainwindow.h \
D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \ D:/QT/5.14.2/mingw73_64/include/QtCore/QTimer \
D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qtimer.h \

6
RRJClient.pro.user
View File

@@ -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-09-10T17:46:14. --> <!-- Written by QtCreator 4.11.1, 2024-09-11T17:25:10. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@@ -67,7 +67,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -299,7 +299,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">E:/Projects/QT/GUIProj/RRJClient/RRJClient</value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">E:/Projects/QT/GUIProj/RRJClient/Deploy</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>

2
StaticData/authData.xml
View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<AuthData Login="O4" Password="4444" InstructorName="Администратор" ClientName="Зайцев З.З." AccessType="trainee"/> <AuthData Login="O1" Password="1111" InstructorName="Администратор" ClientName="Иванов И.И." AccessType="trainee"/>

9
StaticData/hash.xml
View File

@@ -53,12 +53,10 @@
<FileData Path="/Application/RRJLoader/RRJ.exe" Hash="d8d1ae60ce447c51879c27f15dde7195"/> <FileData Path="/Application/RRJLoader/RRJ.exe" Hash="d8d1ae60ce447c51879c27f15dde7195"/>
<FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64/lib_burst_generated.txt" Hash="28a5d827e5b26c4e8af32f3022116f54"/> <FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64/lib_burst_generated.txt" Hash="28a5d827e5b26c4e8af32f3022116f54"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/app.info" Hash="40abc32f793ac28bdd0bfa15c090595d"/> <FileData Path="/Application/RRJLoader/RRJ_Data/app.info" Hash="40abc32f793ac28bdd0bfa15c090595d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/boot.config" Hash="5203ed467132b68fe5ee9b14131c1c27"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers" Hash="ccf2f112c62aab2351eb9b5c6f330b9e"/> <FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers" Hash="ccf2f112c62aab2351eb9b5c6f330b9e"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers.assets" Hash="7b6f114312deaa62f5a4b23649368b45"/> <FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers.assets" Hash="7b6f114312deaa62f5a4b23649368b45"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers.assets.resS" Hash="cc481c35e79b509dcd950c6adf2346ce"/> <FileData Path="/Application/RRJLoader/RRJ_Data/globalgamemanagers.assets.resS" Hash="cc481c35e79b509dcd950c6adf2346ce"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/level0" Hash="d5345419929a97f8d09683013406598b"/> <FileData Path="/Application/RRJLoader/RRJ_Data/level0" Hash="d5345419929a97f8d09683013406598b"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Assembly-CSharp.dll" Hash="c5e6c6c1c544ef849fb7c13babf43053"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/IngameDebugConsole.Runtime.dll" Hash="db7bfb1bd97dfba03252aa79e5dc4b53"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Managed/IngameDebugConsole.Runtime.dll" Hash="db7bfb1bd97dfba03252aa79e5dc4b53"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Mono.Security.dll" Hash="dbd7e99a9ac5352fd4febaa5a7660e09"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Managed/Mono.Security.dll" Hash="dbd7e99a9ac5352fd4febaa5a7660e09"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Managed/mscorlib.dll" Hash="9c0f93ea22eb12021728a1effe48ccad"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Managed/mscorlib.dll" Hash="9c0f93ea22eb12021728a1effe48ccad"/>
@@ -186,9 +184,8 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/> <FileData Path="/Application/RRJLoader/RRJ_Data/ScriptingAssemblies.json" Hash="bc1156dee1f08ecf1afb66a3cbd653a9"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="92ce18bfb39496d9601f59fe561fcc89"/> <FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets" Hash="92ce18bfb39496d9601f59fe561fcc89"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/> <FileData Path="/Application/RRJLoader/RRJ_Data/sharedassets0.assets.resS" Hash="897317a657f377346d8932827dc78da0"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file0.txt" Hash="063bcc07e60b845f3cdcb3b6c199a284"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file0.txt" Hash="ca765895feb52293e38d7d624ea5faaa"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file1.txt" Hash="1ab8bddcb7c7f90685063b56acb2d3f9"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file1.txt" Hash="2be7d97234cc4b0c4d1881b895d48178"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/file2.txt" Hash="bf4a8fdb8e3c197c08dc104cf4fff6e4"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100/docs.xml" Hash="fcad1626c1ef3851931bf68a1aa054c6"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS/024.31.00a.xml" Hash="e730fbd64cd77dd163732cfaf2bd0e75"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/ir_begin.wav" Hash="2e0057ee08c7b6fa07d28863a40d1cbf"/>
@@ -198,7 +195,7 @@
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Navigation Start.wav" Hash="b82aa79f496456ffc5b952b484af25f5"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Connection.wav" Hash="00882d550b9389c6183ee3da0b668b2d"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI/Proximity Notification.wav" Hash="e15f0210410a574af39b07840ccbe4cc"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Temp/UserData.xml" Hash="dfff243a25de3ace91512413a2908330"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Temp/UserData.xml" Hash="44634b9000d5dc9a18ca3b1e58965aa6"/>
<FileData Path="/Application/RRJLoader/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/> <FileData Path="/Application/RRJLoader/UnityCrashHandler64.exe" Hash="ea440810e323f7b7ca54727cd23d068e"/>
<FileData Path="/Application/RRJLoader/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/> <FileData Path="/Application/RRJLoader/UnityPlayer.dll" Hash="0486f8cc69625acdb24a62855754b228"/>
</FileDataList> </FileDataList>

2
StaticData/temp.xml
View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ClientAutorization Login="O4" Password="4444"/> <ClientAutorization Login="O1" Password="1111"/>

BIN
debug/RRJClient.exe
View File

Binary file not shown.

BIN
debug/dataparser.o
View File

Binary file not shown.

BIN
debug/externalexecuter.o
View File

Binary file not shown.

BIN
debug/mainwindow.o
View File

Binary file not shown.

BIN
debug/moc_mainwindow.o
View File

Binary file not shown.

84
debug/moc_recognizesystem.cpp
View File

@@ -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[17]; QByteArrayData data[18];
char stringdata0[224]; char stringdata0[241];
}; };
#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, \
@@ -44,19 +44,21 @@ QT_MOC_LITERAL(8, 88, 9), // "fileCount"
QT_MOC_LITERAL(9, 98, 15), // "sigSendDebugLog" QT_MOC_LITERAL(9, 98, 15), // "sigSendDebugLog"
QT_MOC_LITERAL(10, 114, 7), // "message" QT_MOC_LITERAL(10, 114, 7), // "message"
QT_MOC_LITERAL(11, 122, 17), // "sigSocketDisabled" QT_MOC_LITERAL(11, 122, 17), // "sigSocketDisabled"
QT_MOC_LITERAL(12, 140, 16), // "sigSaveLoginData" QT_MOC_LITERAL(12, 140, 16), // "sigServerBlocked"
QT_MOC_LITERAL(13, 157, 20), // "ServerAuthorization*" QT_MOC_LITERAL(13, 157, 16), // "sigSaveLoginData"
QT_MOC_LITERAL(14, 178, 10), // "serverAuth" QT_MOC_LITERAL(14, 174, 20), // "ServerAuthorization*"
QT_MOC_LITERAL(15, 189, 25), // "sigSocketWaitForReadyRead" QT_MOC_LITERAL(15, 195, 10), // "serverAuth"
QT_MOC_LITERAL(16, 215, 8) // "waitTime" QT_MOC_LITERAL(16, 206, 25), // "sigSocketWaitForReadyRead"
QT_MOC_LITERAL(17, 232, 8) // "waitTime"
}, },
"RecognizeSystem\0sigUpdateBytesAvailable\0" "RecognizeSystem\0sigUpdateBytesAvailable\0"
"\0size\0sended\0sigLoadComplete\0sigNeedUpdate\0" "\0size\0sended\0sigLoadComplete\0sigNeedUpdate\0"
"flag\0fileCount\0sigSendDebugLog\0message\0" "flag\0fileCount\0sigSendDebugLog\0message\0"
"sigSocketDisabled\0sigSaveLoginData\0" "sigSocketDisabled\0sigServerBlocked\0"
"ServerAuthorization*\0serverAuth\0" "sigSaveLoginData\0ServerAuthorization*\0"
"sigSocketWaitForReadyRead\0waitTime" "serverAuth\0sigSocketWaitForReadyRead\0"
"waitTime"
}; };
#undef QT_MOC_LITERAL #undef QT_MOC_LITERAL
@@ -66,21 +68,22 @@ static const uint qt_meta_data_RecognizeSystem[] = {
8, // revision 8, // revision
0, // classname 0, // classname
0, 0, // classinfo 0, 0, // classinfo
7, 14, // methods 8, 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
7, // signalCount 8, // signalCount
// signals: name, argc, parameters, tag, flags // signals: name, argc, parameters, tag, flags
1, 2, 49, 2, 0x06 /* Public */, 1, 2, 54, 2, 0x06 /* Public */,
5, 0, 54, 2, 0x06 /* Public */, 5, 0, 59, 2, 0x06 /* Public */,
6, 3, 55, 2, 0x06 /* Public */, 6, 3, 60, 2, 0x06 /* Public */,
9, 1, 62, 2, 0x06 /* Public */, 9, 1, 67, 2, 0x06 /* Public */,
11, 0, 65, 2, 0x06 /* Public */, 11, 0, 70, 2, 0x06 /* Public */,
12, 1, 66, 2, 0x06 /* Public */, 12, 0, 71, 2, 0x06 /* Public */,
15, 1, 69, 2, 0x06 /* Public */, 13, 1, 72, 2, 0x06 /* Public */,
16, 1, 75, 2, 0x06 /* Public */,
// signals: parameters // signals: parameters
QMetaType::Void, QMetaType::LongLong, QMetaType::ULongLong, 3, 4, QMetaType::Void, QMetaType::LongLong, QMetaType::ULongLong, 3, 4,
@@ -88,8 +91,9 @@ static const uint qt_meta_data_RecognizeSystem[] = {
QMetaType::Void, QMetaType::Bool, QMetaType::LongLong, QMetaType::ULongLong, 7, 3, 8, QMetaType::Void, QMetaType::Bool, QMetaType::LongLong, QMetaType::ULongLong, 7, 3, 8,
QMetaType::Void, QMetaType::QString, 10, QMetaType::Void, QMetaType::QString, 10,
QMetaType::Void, QMetaType::Void,
QMetaType::Void, 0x80000000 | 13, 14, QMetaType::Void,
QMetaType::Void, QMetaType::Int, 16, QMetaType::Void, 0x80000000 | 14, 15,
QMetaType::Void, QMetaType::Int, 17,
0 // eod 0 // eod
}; };
@@ -105,8 +109,9 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
case 2: _t->sigNeedUpdate((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< qint64(*)>(_a[2])),(*reinterpret_cast< quint64(*)>(_a[3]))); break; case 2: _t->sigNeedUpdate((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< qint64(*)>(_a[2])),(*reinterpret_cast< quint64(*)>(_a[3]))); break;
case 3: _t->sigSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break; case 3: _t->sigSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 4: _t->sigSocketDisabled(); break; case 4: _t->sigSocketDisabled(); break;
case 5: _t->sigSaveLoginData((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break; case 5: _t->sigServerBlocked(); break;
case 6: _t->sigSocketWaitForReadyRead((*reinterpret_cast< int(*)>(_a[1]))); break; case 6: _t->sigSaveLoginData((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break;
case 7: _t->sigSocketWaitForReadyRead((*reinterpret_cast< int(*)>(_a[1]))); break;
default: ; default: ;
} }
} else if (_c == QMetaObject::IndexOfMethod) { } else if (_c == QMetaObject::IndexOfMethod) {
@@ -146,17 +151,24 @@ 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::sigServerBlocked)) {
*result = 5;
return;
}
}
{ {
using _t = void (RecognizeSystem::*)(ServerAuthorization * ); using _t = void (RecognizeSystem::*)(ServerAuthorization * );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigSaveLoginData)) { if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigSaveLoginData)) {
*result = 5; *result = 6;
return; return;
} }
} }
{ {
using _t = void (RecognizeSystem::*)(int ); using _t = void (RecognizeSystem::*)(int );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigSocketWaitForReadyRead)) { if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigSocketWaitForReadyRead)) {
*result = 6; *result = 7;
return; return;
} }
} }
@@ -192,13 +204,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 < 7) if (_id < 8)
qt_static_metacall(this, _c, _id, _a); qt_static_metacall(this, _c, _id, _a);
_id -= 7; _id -= 8;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 7) if (_id < 8)
*reinterpret_cast<int*>(_a[0]) = -1; *reinterpret_cast<int*>(_a[0]) = -1;
_id -= 7; _id -= 8;
} }
return _id; return _id;
} }
@@ -237,17 +249,23 @@ void RecognizeSystem::sigSocketDisabled()
} }
// SIGNAL 5 // SIGNAL 5
void RecognizeSystem::sigSaveLoginData(ServerAuthorization * _t1) void RecognizeSystem::sigServerBlocked()
{ {
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 5, nullptr);
QMetaObject::activate(this, &staticMetaObject, 5, _a);
} }
// SIGNAL 6 // SIGNAL 6
void RecognizeSystem::sigSocketWaitForReadyRead(int _t1) void RecognizeSystem::sigSaveLoginData(ServerAuthorization * _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, 6, _a); QMetaObject::activate(this, &staticMetaObject, 6, _a);
} }
// SIGNAL 7
void RecognizeSystem::sigSocketWaitForReadyRead(int _t1)
{
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 7, _a);
}
QT_WARNING_POP QT_WARNING_POP
QT_END_MOC_NAMESPACE QT_END_MOC_NAMESPACE

BIN
debug/moc_recognizesystem.o
View File

Binary file not shown.

BIN
debug/moc_tcpclient.o
View File

Binary file not shown.

BIN
debug/recognizesystem.o
View File

Binary file not shown.

BIN
debug/tcpclient.o
View File

Binary file not shown.

15
mainwindow.cpp
View File

@@ -52,6 +52,7 @@ void MainWindow::initialize()
connect(recognizeSystem,&RecognizeSystem::sigSocketDisabled,this,&MainWindow::lostConnection); connect(recognizeSystem,&RecognizeSystem::sigSocketDisabled,this,&MainWindow::lostConnection);
connect(recognizeSystem,&RecognizeSystem::sigSaveLoginData,this,&MainWindow::checkLoginResult); connect(recognizeSystem,&RecognizeSystem::sigSaveLoginData,this,&MainWindow::checkLoginResult);
connect(recognizeSystem,&RecognizeSystem::sigSocketWaitForReadyRead,client,&TCPClient::waitRead,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::sigSocketWaitForReadyRead,client,&TCPClient::waitRead,Qt::AutoConnection);
connect(recognizeSystem,&RecognizeSystem::sigServerBlocked,this,&MainWindow::serverBlocked);
connect(client,&TCPClient::sigGetXmlAnswer,dataParser,&DataParser::slotGetXmlAnswer); connect(client,&TCPClient::sigGetXmlAnswer,dataParser,&DataParser::slotGetXmlAnswer);
@@ -140,6 +141,18 @@ void MainWindow::lostConnection()
slotConnectionState(false); slotConnectionState(false);
} }
void MainWindow::serverBlocked()
{
ui->notificationLabel->show();
QPalette palette = ui->notificationLabel->palette();
QColor orangeColor(255,165,0);
palette.setColor(ui->notificationLabel->foregroundRole(),orangeColor);
ui->notificationLabel->setText(tr("Сервер заблокирован"));
ui->notificationLabel->setPalette(palette);
timer->start(3000);
}
void MainWindow::checkLoginResult(ServerAuthorization *serverAuth) void MainWindow::checkLoginResult(ServerAuthorization *serverAuth)
{ {
if (serverAuth->Result){ if (serverAuth->Result){
@@ -287,8 +300,8 @@ void MainWindow::on_updateButton_clicked()
void MainWindow::on_startButton_clicked() void MainWindow::on_startButton_clicked()
{ {
client->sendUnityConnect();
externalExecuter->callApp(); externalExecuter->callApp();
client->sendDisable();
} }

1
mainwindow.h
View File

@@ -80,6 +80,7 @@ private:
void loadComplete(); void loadComplete();
void setNeedUpdate(bool flag,quint64 size,quint64 fileCount); void setNeedUpdate(bool flag,quint64 size,quint64 fileCount);
void lostConnection(); void lostConnection();
void serverBlocked();
void checkLoginResult(ServerAuthorization * serverAuth); void checkLoginResult(ServerAuthorization * serverAuth);
void checkAppAvailable(); void checkAppAvailable();
void checkLanguage(QString language); void checkLanguage(QString language);