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

cfiController 1 + fix bug BUSY FREE not for Unity

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-27 12:34:20 +03:00
parent b452ef347d
commit 4ce3f53171
9 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LibServer/Systems/commonclienthandler.cpp
View File

@@ -105,17 +105,26 @@ void CommonClientHandler::slot_StatusTasksFIMofTraineeChanged(int trainee_id)
}*/
}
void CommonClientHandler::slot_sendPacketToAllClients(PacketType packetType)
void CommonClientHandler::slot_sendPacketToAllClients(PacketType packetType, bool flOnlyGUI)
{
foreach(int idSocket, clientsMap->keys())
{
ClientHandler *handler = clientsMap->value(idSocket);
if(flOnlyGUI)
{
if(handler->getClient()->getTypeClient() != TypeClientAutorization::TYPE_GUI)
continue;
}
//if(packetType != PacketType::BUSY && packetType != PacketType::FREE)
if (!handler->getClient()->getIsLoggedIn()) continue;
handler->sendPacketType(packetType);
Logger::instance().log("AllSending " + handler->getClient()->getLogin() + " " + enumToString(packetType));
if(flOnlyGUI)
Logger::instance().log("All GUI Sending " + handler->getClient()->getLogin() + " " + enumToString(packetType));
else
Logger::instance().log("All Sending " + handler->getClient()->getLogin() + " " + enumToString(packetType));
}
//emit sigSetServerState(packetType);

2
LibServer/Systems/commonclienthandler.h
View File

@@ -29,7 +29,7 @@ public:
void slot_DocsChanged();
public slots:
void slot_sendPacketToAllClients(PacketType packetType);
void slot_sendPacketToAllClients(PacketType packetType, bool flOnlyGUI);
signals:
//void sigSetServerState(PacketType packetType);

4
LibServer/Systems/processingsystem.cpp
View File

@@ -98,12 +98,12 @@ void ProcessingSystem::processingClientAutorization(ClientHandler *client, Clien
client->sendVersion();
//Отправляем состояние блокировки
/**/
/*
if(server->getStateBlockAutorization() == EStateBlockAutorization::blocked)
client->sendPacketType(PacketType::BUSY);
else
client->sendPacketType(PacketType::FREE);
*/
//client->sendPacketType(PacketType::BUSY);
//client->sendPacketType(PacketType::FREE);

6
LibServer/Systems/updatecontroller.cpp
View File

@@ -50,7 +50,7 @@ void UpdateController::changeAssetVersion(QString versionName)
currentStreamingPath = assetManager->setVersion(versionName);
setUpCurrentServerHash();
emit sigUpdateDocs();
commonClientHandler->slot_sendPacketToAllClients(PacketType::HASH_READY);
commonClientHandler->slot_sendPacketToAllClients(PacketType::HASH_READY, false);
commonClientHandler->sendCurrentVersionToAllClient();
//commonClientHandler->slot_sendPacketToAllClients(PacketType::FREE);
@@ -118,10 +118,10 @@ void UpdateController::calculateFullHash()
void UpdateController::calculateFullHashWithSetup()
{
bool res = emit signal_BlockAutorization(true, "SERVER", "CalculateFullHashWithSetup");
commonClientHandler->slot_sendPacketToAllClients(PacketType::RECALCULATE_HASH);
commonClientHandler->slot_sendPacketToAllClients(PacketType::RECALCULATE_HASH, false);
calculateCurrentSharedHash();
setUpCurrentServerHash();
commonClientHandler->slot_sendPacketToAllClients(PacketType::HASH_READY);
commonClientHandler->slot_sendPacketToAllClients(PacketType::HASH_READY, false);
res = emit signal_BlockAutorization(false, "SERVER", "CalculateFullHashWithSetup");
}