mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
ref: draft
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
#include "Core/recognizesystem.h"
|
||||
|
||||
|
||||
RecognizeSystem::RecognizeSystem(QObject *parent):
|
||||
QObject(parent)
|
||||
{
|
||||
@@ -18,30 +19,10 @@ RecognizeSystem::~RecognizeSystem()
|
||||
|
||||
}
|
||||
|
||||
void RecognizeSystem::initialize(UpdateController *updateController,
|
||||
DataParser *dataParser,
|
||||
MainWindow *mainWindow,
|
||||
HashComparer *hashComparer,
|
||||
TCPClient *client,
|
||||
VersionContainer* versionContainer)
|
||||
void RecognizeSystem::initialize(VersionContainer *versionContainer,PostProcessorSystem *postProcessorSystem)
|
||||
{
|
||||
this->updateController = updateController;
|
||||
this->dataParser = dataParser;
|
||||
this->mainWindow = mainWindow;
|
||||
this->versionContainer = versionContainer;
|
||||
|
||||
connect(this,&RecognizeSystem::sigSaveLoginData,dataParser,&DataParser::createAuthData);
|
||||
connect(this,&RecognizeSystem::sigStartCompare,hashComparer,&HashComparer::CompareDeltas);
|
||||
connect(this,&RecognizeSystem::sigUpdateBytesAvailable,mainWindow,&MainWindow::updateProgress,Qt::AutoConnection); //todo autoConnection?
|
||||
connect(this,&RecognizeSystem::sigLoadComplete,mainWindow,&MainWindow::loadComplete);
|
||||
connect(this,&RecognizeSystem::sigNeedUpdate,mainWindow,&MainWindow::setNeedUpdate);
|
||||
connect(this,&RecognizeSystem::sigSocketDisabled,mainWindow,&MainWindow::lostConnection);
|
||||
connect(this,&RecognizeSystem::sigSaveLoginData,mainWindow,&MainWindow::checkLoginResult); //TODO: прибратся! 2 бинда на 1 сигнал
|
||||
connect(this,&RecognizeSystem::sigSocketWaitForReadyRead,client,&TCPClient::waitRead,Qt::DirectConnection);
|
||||
connect(this,&RecognizeSystem::sigServerBlocked,mainWindow,&MainWindow::serverBlocked);
|
||||
connect(this,&RecognizeSystem::sigShowServerList,mainWindow,&MainWindow::showServerListWidget);
|
||||
connect(this,&RecognizeSystem::sigAnimationActivated,mainWindow,&MainWindow::activateLoadingAnimation,Qt::AutoConnection);
|
||||
connect(this,&RecognizeSystem::sigShowUpdateList,mainWindow,&MainWindow::showUpdateInfo,Qt::AutoConnection);
|
||||
this->postProcessorSystem = postProcessorSystem;
|
||||
}
|
||||
|
||||
void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
@@ -153,7 +134,8 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
if(!stream.commitTransaction()){
|
||||
|
||||
if(socket->state() == QAbstractSocket::UnconnectedState){
|
||||
emit sigSocketDisabled();
|
||||
postProcessorSystem->socketDisable();
|
||||
//emit sigSocketDisabled();
|
||||
return;
|
||||
}
|
||||
if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
|
||||
@@ -229,7 +211,8 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
|
||||
if (packetType ==PacketType::TYPE_FINISH) //для повторного создания хэша после загрузки
|
||||
{
|
||||
updateController->calculateCommonHash();
|
||||
postProcessorSystem->calculateCommonHash();
|
||||
|
||||
emit sigLoadComplete();
|
||||
packetType = PacketType::TYPE_NONE;
|
||||
}
|
||||
@@ -271,12 +254,14 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
|
||||
if(packetType == PacketType::HASH_READY)
|
||||
{
|
||||
mainWindow->checkUpdate();
|
||||
emit sigCheckUpdate();
|
||||
//mainWindow->checkUpdate();
|
||||
}
|
||||
|
||||
if(packetType == PacketType::HASH_CALCULATE_START)
|
||||
{
|
||||
mainWindow->setInlineDebug(tr("Пересчет хэша на сервере..."));
|
||||
emit sigSetInineDebug(tr("Пересчет хэша на сервере..."));
|
||||
//mainWindow->setInlineDebug();
|
||||
}
|
||||
|
||||
if(packetType == PacketType::BUSY)
|
||||
@@ -292,21 +277,3 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
packetType = PacketType::TYPE_NONE;
|
||||
}
|
||||
}
|
||||
|
||||
void RecognizeSystem::checkAccessType(QString type)
|
||||
{
|
||||
if(type == "instructor")
|
||||
{
|
||||
mainWindow->callUpdateList();
|
||||
}
|
||||
}
|
||||
|
||||
void RecognizeSystem::setServerVersion(StreamingVersionData *serverVersion)
|
||||
{
|
||||
versionContainer->setServerVersionData(serverVersion);
|
||||
}
|
||||
|
||||
void RecognizeSystem::showServerDataList(QList<StreamingVersionData*> *showServerDataList)
|
||||
{
|
||||
//emit sigShowServerList(showServerDataList);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user