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

убрал мусор

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-27 10:52:13 +03:00
parent 6bde215bbe
commit 715d29a1ec
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Core/recognizesystem.cpp
View File

@@ -34,46 +34,29 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
int cntBytesAvl = 0; int cntBytesAvl = 0;
while((cntBytesAvl = socket->bytesAvailable()) > 0) while((cntBytesAvl = socket->bytesAvailable()) > 0)
{ {
/*
if(cntBytesAvl < 4)
{
//if(!socket->waitForReadyRead(TCP_READ_TIMEOUT))
//return;
socket->waitForReadyRead(TCP_READ_TIMEOUT);
continue;
}
*/
if (socket->state() != QTcpSocket::ConnectedState) if (socket->state() != QTcpSocket::ConnectedState)
{ {
qDebug() << "RecognizeSystem::recognize socket->state() != QTcpSocket::ConnectedState"; qDebug() << "RecognizeSystem::recognize socket->state() != QTcpSocket::ConnectedState";
return; return;
} }
/*
if(!socket->waitForReadyRead(TCP_READ_TIMEOUT))
{
continue;
}
*/
if(packetType == PacketType::TYPE_NONE) //определение первичного пакета if(packetType == PacketType::TYPE_NONE) //определение первичного пакета
{ {
stream.startTransaction(); stream.startTransaction();
stream >> packetType; stream >> packetType;
if(!stream.commitTransaction()) if(!stream.commitTransaction())
{ {
socket->waitForReadyRead(TCP_READ_TIMEOUT); socket->waitForReadyRead(TCP_READ_TIMEOUT);
continue; continue;
}
//qDebug() << Tools::GetTime() << "CLIENT: type: " << packetType;
if(packetType == PacketType::TYPE_FILE)
socket->waitForReadyRead(10);
else
socket->waitForReadyRead(100);
} }
//continue; //qDebug() << Tools::GetTime() << "CLIENT: type: " << packetType;
if(packetType == PacketType::TYPE_FILE)
socket->waitForReadyRead(10);
else
socket->waitForReadyRead(100);
}
switch ((int)packetType) switch ((int)packetType)
{ {
@@ -164,9 +147,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
continue; continue;
} }
//if(!socket->waitForReadyRead(TCP_READ_TIMEOUT))
//continue;
if(fileSize - sizeReceiveData >= BLOCK_SIZE) if(fileSize - sizeReceiveData >= BLOCK_SIZE)
tmpBlock = socket->read(BLOCK_SIZE); tmpBlock = socket->read(BLOCK_SIZE);
else else