mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
fix: instructor update
This commit is contained in:
@@ -189,13 +189,10 @@ bool DataParser::xmlParser(const QByteArray& array)
|
|||||||
if (name == "AccessType")
|
if (name == "AccessType")
|
||||||
{
|
{
|
||||||
serverAuth->AccessType = value;
|
serverAuth->AccessType = value;
|
||||||
postProcessSystem->checkAccessType(value);
|
|
||||||
//recognizeSystem->checkAccessType(value);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
postProcessSystem->saveLoginData(serverAuth);
|
postProcessSystem->saveLoginData(serverAuth);
|
||||||
//emit recognizeSystem->sigSaveLoginData(serverAuth);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(xmlReader.name() == "VersionData")
|
if(xmlReader.name() == "VersionData")
|
||||||
@@ -259,6 +256,7 @@ bool DataParser::xmlParser(const QByteArray& array)
|
|||||||
|
|
||||||
xmlReader.readNext();
|
xmlReader.readNext();
|
||||||
}
|
}
|
||||||
|
emit postProcessSystem->sigCallUpdateList();
|
||||||
}
|
}
|
||||||
|
|
||||||
xmlReader.readNext();
|
xmlReader.readNext();
|
||||||
|
|||||||
@@ -69,14 +69,6 @@ void PostProcessorSystem::compareFiles()
|
|||||||
updateController->updateFilesOnServer(hashComparer->getFilesForUpdate());
|
updateController->updateFilesOnServer(hashComparer->getFilesForUpdate());
|
||||||
}
|
}
|
||||||
|
|
||||||
void PostProcessorSystem::checkAccessType(const QString& type)
|
|
||||||
{
|
|
||||||
if(type == "instructor")
|
|
||||||
{
|
|
||||||
emit sigCallUpdateList();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void PostProcessorSystem::saveLoginData(ServerAuthorization *auth)
|
void PostProcessorSystem::saveLoginData(ServerAuthorization *auth)
|
||||||
{
|
{
|
||||||
emit sigSaveLoginData(auth);
|
emit sigSaveLoginData(auth);
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ public:
|
|||||||
void serverBlocked();
|
void serverBlocked();
|
||||||
void startCompare();
|
void startCompare();
|
||||||
void compareFiles();
|
void compareFiles();
|
||||||
void checkAccessType(const QString& type);
|
|
||||||
void saveLoginData(ServerAuthorization *auth);
|
void saveLoginData(ServerAuthorization *auth);
|
||||||
void setServerVersion(StreamingVersionData *serverVersion);
|
void setServerVersion(StreamingVersionData *serverVersion);
|
||||||
void calculateCommonHash();
|
void calculateCommonHash();
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ signals:
|
|||||||
void sigSendPacketType(PacketType packetType);
|
void sigSendPacketType(PacketType packetType);
|
||||||
void sigSendPacketTypeWithDelay(PacketType packetType,int delay);
|
void sigSendPacketTypeWithDelay(PacketType packetType,int delay);
|
||||||
void sigSendToInlineLog(QString message);
|
void sigSendToInlineLog(QString message);
|
||||||
void sigCallUpdateList();
|
//void sigCallUpdateList();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
VersionContainer *versionContainer;
|
VersionContainer *versionContainer;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
<ServerSettingsContainer>
|
<ServerSettingsContainer>
|
||||||
<ServerSettings Address="192.168.100.83" Port="6000" Language="RUS" AutoStart="0"/>
|
<ServerSettings Port="6000" Address="192.168.100.83" Language="RUS" AutoStart="0"/>
|
||||||
<VersionData Version="customND" isChangable="1"/>
|
<VersionData Version="customND" isChangable="1" Created="Пт мар 6 10:49:55 2026"/>
|
||||||
</ServerSettingsContainer>
|
</ServerSettingsContainer>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<ClientNotify Code="CHECKVERSIONLIST"/>
|
<ClientNotify Code="GETSERVERDATALIST"/>
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ void CoreManager::binding()
|
|||||||
connect(recognizeSystem,&RecognizeSystem::sigSendPacketType,this,&CoreManager::sendPacketType,Qt::AutoConnection);
|
connect(recognizeSystem,&RecognizeSystem::sigSendPacketType,this,&CoreManager::sendPacketType,Qt::AutoConnection);
|
||||||
connect(recognizeSystem,&RecognizeSystem::sigSendPacketTypeWithDelay,sendSystem,&SendSystem::sendPacketTypeWithDelay,Qt::AutoConnection);
|
connect(recognizeSystem,&RecognizeSystem::sigSendPacketTypeWithDelay,sendSystem,&SendSystem::sendPacketTypeWithDelay,Qt::AutoConnection);
|
||||||
connect(recognizeSystem,&RecognizeSystem::sigSendToInlineLog,this,&CoreManager::setInlineDebug,Qt::AutoConnection);
|
connect(recognizeSystem,&RecognizeSystem::sigSendToInlineLog,this,&CoreManager::setInlineDebug,Qt::AutoConnection);
|
||||||
connect(recognizeSystem,&RecognizeSystem::sigCallUpdateList,this,&CoreManager::callUpdateList,Qt::AutoConnection);
|
|
||||||
|
|
||||||
connect(hashComparer,&HashComparer::sigCallCheck,this,&CoreManager::checkUpdate);
|
connect(hashComparer,&HashComparer::sigCallCheck,this,&CoreManager::checkUpdate);
|
||||||
connect(hashComparer,&HashComparer::sigHaveDelta,this,&CoreManager::checkUpdateInfo);
|
connect(hashComparer,&HashComparer::sigHaveDelta,this,&CoreManager::checkUpdateInfo);
|
||||||
@@ -256,11 +255,11 @@ void CoreManager::setInlineDebug(QString text)
|
|||||||
|
|
||||||
void CoreManager::checkAccessType(const QString& accessType)
|
void CoreManager::checkAccessType(const QString& accessType)
|
||||||
{
|
{
|
||||||
if (accessType == traineeTypeName)
|
if (accessType == traineeTypeName)//если обучаемый вызываем обновление
|
||||||
{
|
{
|
||||||
checkUpdate();
|
checkUpdate();
|
||||||
}
|
}
|
||||||
else
|
else //если инструктор запрашивание версионирование
|
||||||
{
|
{
|
||||||
emit sigSendXMLAnswer(cmd_CheckVersionList);
|
emit sigSendXMLAnswer(cmd_CheckVersionList);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user