bugfix: stable

This commit is contained in:
semenov
2025-08-12 15:38:15 +03:00
parent f5c929021b
commit 303576b7f9
11 changed files with 26425 additions and 28 deletions

View File

@@ -219,7 +219,6 @@ void DataParser::xmlParser(QByteArray array)
} }
postProcessSystem->setServerVersion(serverVersion); postProcessSystem->setServerVersion(serverVersion);
//recognizeSystem->setServerVersion(serverVersion);
} }
if(xmlReader.name() == "VersionList") if(xmlReader.name() == "VersionList")
@@ -256,7 +255,6 @@ void DataParser::xmlParser(QByteArray array)
xmlReader.readNext(); xmlReader.readNext();
} }
postProcessSystem->showServerDataList(serverStreamingVersionDataList);
} }
xmlReader.readNext(); xmlReader.readNext();

View File

@@ -51,7 +51,7 @@ void PostProcessorSystem::showUpdateList()
void PostProcessorSystem::compareFiles() void PostProcessorSystem::compareFiles()
{ {
//emit sigCompareFiles() updateController->updateFilesOnServer(hashComparer->getFilesForUpdate());
} }
void PostProcessorSystem::checkAccessType(QString type) void PostProcessorSystem::checkAccessType(QString type)
@@ -64,7 +64,8 @@ void PostProcessorSystem::checkAccessType(QString type)
void PostProcessorSystem::saveLoginData(ServerAuthorization *auth) void PostProcessorSystem::saveLoginData(ServerAuthorization *auth)
{ {
emit sigSaveLoginData(auth);
dataParserOutput->createAuthData(auth);
} }
void PostProcessorSystem::setServerVersion(StreamingVersionData *serverVersion) void PostProcessorSystem::setServerVersion(StreamingVersionData *serverVersion)
@@ -72,11 +73,6 @@ void PostProcessorSystem::setServerVersion(StreamingVersionData *serverVersion)
versionContainer->setServerVersionData(serverVersion); versionContainer->setServerVersionData(serverVersion);
} }
void PostProcessorSystem::showServerDataList(QList<StreamingVersionData *> *versionList)
{
}
void PostProcessorSystem::calculateCommonHash() void PostProcessorSystem::calculateCommonHash()
{ {
updateController->calculateCommonHash(); updateController->calculateCommonHash();

View File

@@ -32,7 +32,6 @@ signals:
void sigStartCompare(QList<FileData> *serverStreamingHash, QList<FileData> localStreamingHash); void sigStartCompare(QList<FileData> *serverStreamingHash, QList<FileData> localStreamingHash);
void sigShowUpdateList(); void sigShowUpdateList();
void sigCallUpdateList(); void sigCallUpdateList();
void sigShowServerList(QList<StreamingVersionData *> *serverData);
void sigSaveLoginData(ServerAuthorization *serverAuth); void sigSaveLoginData(ServerAuthorization *serverAuth);

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<AuthData Login="O1" Password="1111" InstructorName="" ClientName="Иванов И.И." AccessType="trainee"/> <AuthData Login="I1" Password="1111" InstructorName="Горинин Г.Г." ClientName="Горинин Г.Г." AccessType="instructor"/>

File diff suppressed because it is too large Load Diff

8861
StaticData/serverHash.xml Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -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" DestPortMath="18003" LocalPortMath="18004" UseMathModel="1"/> <ServerSettings DestPortMath="18003" AutoStart="0" Language="RUS" UseMathModel="1" Port="6000" LocalPortMath="18004" Address="192.168.100.83"/>
<VersionData Version="" isChangable="13"/> <VersionData Version="base" Created="Пт авг 8 13:27:27 2025" isChangable="0"/>
</ServerSettingsContainer> </ServerSettingsContainer>

File diff suppressed because it is too large Load Diff

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ClientAutorization Login="O1" Password="1111"/> <ClientNotify Code="CHECKVERSIONLIST"/>

View File

@@ -19,7 +19,7 @@ void CommonButtonGroupWidget::initialize(ExternalExecuter *extExec,SendSystem *s
ui->startButton->setEnabled(false); ui->startButton->setEnabled(false);
connect(this,&CommonButtonGroupWidget::sigSendPacket,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection); connect(this,&CommonButtonGroupWidget::sigSendPacket,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection);
connect(this,&CommonButtonGroupWidget::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::DirectConnection); connect(this,&CommonButtonGroupWidget::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection);
} }
void CommonButtonGroupWidget::updateProgressBar(float value) void CommonButtonGroupWidget::updateProgressBar(float value)
@@ -90,7 +90,7 @@ void CommonButtonGroupWidget::on_updateButton_clicked()
void CommonButtonGroupWidget::on_startButton_clicked() void CommonButtonGroupWidget::on_startButton_clicked()
{ {
externalExecuter->callApp(); externalExecuter->callApp();
emit sigSendXMLAnswer("DISABLE"); emit sigSendXMLAnswer(cmd_Disable);
} }
CommonButtonGroupWidget::~CommonButtonGroupWidget() CommonButtonGroupWidget::~CommonButtonGroupWidget()

View File

@@ -156,8 +156,6 @@ void MainWindow::bindConnection()
connect(postProcessorSystem,&PostProcessorSystem::sigServerBlocked,this,&MainWindow::serverBlocked,Qt::AutoConnection); connect(postProcessorSystem,&PostProcessorSystem::sigServerBlocked,this,&MainWindow::serverBlocked,Qt::AutoConnection);
connect(postProcessorSystem,&PostProcessorSystem::sigStartCompare,hashComparer,&HashComparer::CompareDeltas,Qt::AutoConnection); // ОПАСНОСТЬ connect(postProcessorSystem,&PostProcessorSystem::sigStartCompare,hashComparer,&HashComparer::CompareDeltas,Qt::AutoConnection); // ОПАСНОСТЬ
connect(postProcessorSystem,&PostProcessorSystem::sigSaveLoginData,this,&MainWindow::checkLoginResult,Qt::AutoConnection); connect(postProcessorSystem,&PostProcessorSystem::sigSaveLoginData,this,&MainWindow::checkLoginResult,Qt::AutoConnection);
connect(postProcessorSystem,&PostProcessorSystem::sigSaveLoginData,dataParserOutput,&DataParserOutput::createAuthData,Qt::AutoConnection);
connect(postProcessorSystem,&PostProcessorSystem::sigShowServerList,this,&MainWindow::showServerListWidget);
connect(postProcessorSystem,&PostProcessorSystem::sigShowUpdateList,this,&MainWindow::showUpdateInfo,Qt::AutoConnection); connect(postProcessorSystem,&PostProcessorSystem::sigShowUpdateList,this,&MainWindow::showUpdateInfo,Qt::AutoConnection);
connect(versionContainer,&VersionContainer::sigSetServerVersion,this,&MainWindow::setServerVersion); connect(versionContainer,&VersionContainer::sigSetServerVersion,this,&MainWindow::setServerVersion);
@@ -524,7 +522,7 @@ void MainWindow::undoCurrentChanges()
emit sigSendCheck(); emit sigSendCheck();
ui->mainFrame->show(); ui->mainFrame->show();
commonButtonGroupWidget->showProgressBar(true); commonButtonGroupWidget->showProgressBar(false);
ui->offlineStartButton->setEnabled(false); ui->offlineStartButton->setEnabled(false);
updateWidget->hide(); updateWidget->hide();
@@ -539,7 +537,7 @@ void MainWindow::undoCurrentChanges()
activateLoadingAnimation(true); activateLoadingAnimation(true);
emit sigSendCommand(PacketType::TYPE_UPDATE); emit sigSendCommand(PacketType::TYPE_UPDATE);
commonButtonGroupWidget->startUpdateState(); ui->unsafeChangingButton->hide();
isRecovery = false; isRecovery = false;
activateLoadingAnimation(false); activateLoadingAnimation(false);
@@ -547,18 +545,16 @@ void MainWindow::undoCurrentChanges()
void MainWindow::on_unsafeChangingButton_clicked() void MainWindow::on_unsafeChangingButton_clicked()
{ {
//checkUpdate();
showUpdateInfo(); showUpdateInfo();
updateWidget->show(); updateWidget->show();
} }
void MainWindow::on_exitButton_clicked() void MainWindow::on_exitButton_clicked()
{ {
workerThread->quit();
workerThread->wait();
emit sigSendXMLAnswer(cmd_Disable); emit sigSendXMLAnswer(cmd_Disable);
client->disconnect();
workerThread->quit();
delete workerThread; delete workerThread;
delete ui; delete ui;
@@ -594,7 +590,7 @@ void MainWindow::showCompleteDialogBox()
void MainWindow::startUnityClient() void MainWindow::startUnityClient()
{ {
externalExecuter->callApp(); externalExecuter->callApp();
emit sigSendXMLAnswer("DISABLE"); emit sigSendXMLAnswer(cmd_Disable);
} }
void MainWindow::setCurrentVersionName(StreamingVersionData *version) void MainWindow::setCurrentVersionName(StreamingVersionData *version)