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

карта блок-в. Блокировка правильная. Множ. доступ

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-21 15:44:01 +03:00
parent fe75f2c6ca
commit 2772c3aaba
26 changed files with 146 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp
View File

@@ -294,7 +294,7 @@ QByteArray DataParser::createDeAuthMessage(ClientDeAutorization *deAuth)
return array;
}
QByteArray DataParser::createQueryBlockAuth(bool block)
QByteArray DataParser::createQueryBlockAuth(bool block, QString type)
{
QByteArray array;
QXmlStreamWriter xmlWriter(&array);
@@ -304,6 +304,7 @@ QByteArray DataParser::createQueryBlockAuth(bool block)
xmlWriter.writeStartElement("BlockAuth");
xmlWriter.writeAttribute("Block", block ? "1" : "0");
xmlWriter.writeAttribute("type", type);
xmlWriter.writeEndElement();
xmlWriter.writeEndElement();

2
LibInstructorsAndTrainees/connectorToServer/Core/dataparser.h
View File

@@ -29,7 +29,7 @@ public:
QByteArray createQueryListSubProcMessage(QString dmCode);
QByteArray createDeAuthMessage(ClientDeAutorization *deAuth);
QByteArray createQueryBlockAuth(bool block);
QByteArray createQueryBlockAuth(bool block, QString type);
void createAuthData(ServerAuthorization *serverAuth);
void createAuthDataOffline(QString username,QString pass);

4
LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -260,12 +260,12 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
if(packetType == PacketType::BUSY)
{
emit sigAnimationActivated(true);
//emit sigAnimationActivated(true);
}
if(packetType == PacketType::FREE)
{
emit sigAnimationActivated(false);
//emit sigAnimationActivated(false);
}
if(packetType == PacketType::HASH_READY)

1
LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
View File

@@ -57,7 +57,6 @@ signals:
void sigShowServerDataList(QList<StreamingVersionData*> *versions);
void sigSetVersion(StreamingVersionData* serverVersion);
void sigNotifyVersionControl(QString text);
void sigAnimationActivated(bool flag);
void sigHashReady();
void sigAnswerQuerySubProc(QList<SubProc> listSubProc, QString parentTask_dmCode);

1
LibInstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -168,7 +168,6 @@ void ConnectorToServer::bindConnection()
connect(recognizeSystem,&RecognizeSystem::signal_AnswerDocsChanged,this,&ConnectorToServer::slot_AnswerDocsChanged);
connect(recognizeSystem, &RecognizeSystem::sigSetVersion, this, &ConnectorToServer::signal_SetVersion);
connect(recognizeSystem, &RecognizeSystem::sigAnimationActivated, this, &ConnectorToServer::signal_AnimationActivated);
connect(this, &ConnectorToServer::signal_SendCopyVersion, sendSystem, &SendSystem::sendCopyVersion);
connect(this, &ConnectorToServer::signal_SendDeleteVersion, sendSystem, &SendSystem::sendDeleteVersion);

3
LibInstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -47,7 +47,7 @@ public:
bool sendQueryTasksXML(QString type);
bool sendQueryListSubProc(QString dmCode);
bool sendQueryBlockAuth(bool block);
bool sendQueryBlockAuth(bool block, QString type);
void sendShowVersionSelect();
bool sendClientNotify(QString command);
@@ -149,7 +149,6 @@ signals:
void signal_AnswerDocsChanged();
void signal_SetVersion(StreamingVersionData* serverVersion);
void signal_AnimationActivated(bool flag);
void signal_SendDeleteVersion(StreamingVersionData *streaming);
void signal_SendSwitchVersion(StreamingVersionData *selectVersion);

4
LibInstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp
View File

@@ -95,14 +95,14 @@ bool ConnectorToServer::sendQueryListSubProc(QString dmCode)
return true;
}
bool ConnectorToServer::sendQueryBlockAuth(bool block)
bool ConnectorToServer::sendQueryBlockAuth(bool block, QString type)
{
if (!client->getIsConnected())
{
return false;
}
QByteArray array = dataParser->createQueryBlockAuth(block);
QByteArray array = dataParser->createQueryBlockAuth(block, type);
emit sigSendAnswerToServer(array);
return true;