Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'work48' into DEV

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-18 17:21:21 +03:00
parent a3d6c2899b 594aa8311e
commit 517515e94e
9 changed files with 342 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
LibServer/Systems/recognizesystem.cpp
View File

@@ -1,7 +1,8 @@
#include "recognizesystem.h"
RecognizeSystem::RecognizeSystem(QObject *parent):
QObject(parent)
QObject(parent),
globalMutex(nullptr)
{
packetType = PacketType::TYPE_NONE;
filePath.clear();
@@ -13,7 +14,7 @@ QObject(parent)
}
void RecognizeSystem::initialize(UpdateController *updateController,DataParser* dataParser,SendSystem *sendSystem, ClientHandler *handler)
void RecognizeSystem::initialize(UpdateController *updateController,DataParser* dataParser, QMutex *globalMutex,SendSystem *sendSystem, ClientHandler *handler)
{
qDebug() << "RecognizeSystem::initialize thread ID " << QThread::currentThreadId();
@@ -22,6 +23,7 @@ void RecognizeSystem::initialize(UpdateController *updateController,DataParser*
this->clientHandler = handler;
this->sendSystem = sendSystem;
socket = handler->getSocket();
this->globalMutex = globalMutex;
connect(this,&RecognizeSystem::sigCalculateHash,updateController,&UpdateController::calculateFullHashWithSetup,Qt::AutoConnection);
connect(this,&RecognizeSystem::sigChangeVersion,updateController,&UpdateController::changeAssetVersion,Qt::AutoConnection);
@@ -453,6 +455,7 @@ void RecognizeSystem::recognize()
if(packetType == PacketType::GET_DOCS)
{
emit sigSendDocs(updateController->getPathAdditionalFile(tasksAMMfileName));
//globalMutex->unlock();
}
if (packetType == PacketType::SEND_HASH)