diff --git a/Core/tcpclient.cpp b/Core/tcpclient.cpp index a03373f..7a2d8c9 100644 --- a/Core/tcpclient.cpp +++ b/Core/tcpclient.cpp @@ -1,5 +1,5 @@ #include "tcpclient.h" -#include "Core/updatecontroller.h" +#include "updatecontroller.h" #include "externalexecuter.h" #include diff --git a/Core/tools.h b/Core/tools.h index 3609ded..7febf34 100644 --- a/Core/tools.h +++ b/Core/tools.h @@ -27,6 +27,7 @@ enum PacketType{ TYPE_NEEDUPDATE = 7, TYPE_XMLANSWER = 8, TYPE_CHANGEPACKAGERESPONSE = 9, + TYPE_DISABLE = 11 }; class Tools { diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 299070f..92759c0 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -67,7 +67,7 @@ Desktop Qt 5.14.2 MinGW 64-bit Desktop Qt 5.14.2 MinGW 64-bit qt.qt5.5142.win64_mingw73_kit - 1 + 0 0 0 @@ -299,7 +299,7 @@ false true - E:/Projects/QT/GUIProj/RRJClient/Deploy + E:/Projects/QT/GUIProj/RRJClient/RRJClient 1 diff --git a/StaticData/authData.xml b/StaticData/authData.xml index cd2d30e..d128b5a 100644 --- a/StaticData/authData.xml +++ b/StaticData/authData.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/StaticData/hash.xml b/StaticData/hash.xml index 5c55dab..19d8b99 100644 --- a/StaticData/hash.xml +++ b/StaticData/hash.xml @@ -26,11 +26,177 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index 33396dd..ed5ea4d 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/UpdateController.o b/debug/UpdateController.o index ecfcb4d..6002a36 100644 Binary files a/debug/UpdateController.o and b/debug/UpdateController.o differ diff --git a/debug/dataparser.o b/debug/dataparser.o index 63b1337..cb0d3b3 100644 Binary files a/debug/dataparser.o and b/debug/dataparser.o differ diff --git a/debug/main.o b/debug/main.o index a357f4c..6d97803 100644 Binary files a/debug/main.o and b/debug/main.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 655fb66..9ca1cfc 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/debug/moc_UpdateController.o b/debug/moc_UpdateController.o index 0d380fd..7465794 100644 Binary files a/debug/moc_UpdateController.o and b/debug/moc_UpdateController.o differ diff --git a/debug/moc_externalexecuter.o b/debug/moc_externalexecuter.o index 00cdb5b..b4f4cfb 100644 Binary files a/debug/moc_externalexecuter.o and b/debug/moc_externalexecuter.o differ diff --git a/debug/moc_mainwindow.o b/debug/moc_mainwindow.o index 5aa1ae6..fa45590 100644 Binary files a/debug/moc_mainwindow.o and b/debug/moc_mainwindow.o differ diff --git a/debug/moc_recognizesystem.o b/debug/moc_recognizesystem.o index 93d2774..f7ed826 100644 Binary files a/debug/moc_recognizesystem.o and b/debug/moc_recognizesystem.o differ diff --git a/debug/moc_tcpclient.o b/debug/moc_tcpclient.o index 9dfa2f6..27e71ea 100644 Binary files a/debug/moc_tcpclient.o and b/debug/moc_tcpclient.o differ diff --git a/debug/recognizesystem.o b/debug/recognizesystem.o index 826a3b7..a943c0e 100644 Binary files a/debug/recognizesystem.o and b/debug/recognizesystem.o differ diff --git a/debug/tcpclient.o b/debug/tcpclient.o index b64f36f..ebcfe0b 100644 Binary files a/debug/tcpclient.o and b/debug/tcpclient.o differ diff --git a/debug/tools.o b/debug/tools.o index fafb9c5..d745f97 100644 Binary files a/debug/tools.o and b/debug/tools.o differ diff --git a/mainwindow.cpp b/mainwindow.cpp index 0ab1e30..52bcb1f 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -67,7 +67,7 @@ void MainWindow::initialize() connect(this,&MainWindow::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection); connect(this,&MainWindow::sigSendMessage,client,&TCPClient::slotMessageEntered,Qt::AutoConnection); connect(this,&MainWindow::sigSendClientAuthorization,client,&TCPClient::sendClientAutorization,Qt::AutoConnection); - connect(client,&TCPClient::sigConnectionState,this,&MainWindow::slotConnectionState); + connect(client,&TCPClient::sigConnectionState,this,&MainWindow::slotConnectionState,Qt::AutoConnection); connect(this,&MainWindow::sigCalculateHash,updateController,&UpdateController::calculateHash);