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

Исправил AdditionalFiles папку

Browse Source
This commit is contained in:
krivoshein
2025-01-21 16:45:39 +03:00
parent 81886000a4
commit 2020a05dae
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,9 +297,9 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
QString xmlFileName = ""; QString xmlFileName = "";
if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM) if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM)
xmlFileName = "./AdditionalFiles/tasksFIM.xml"; xmlFileName = "./" + additionalFilesFolderName + "/tasksFIM.xml";
else else
xmlFileName = "./AdditionalFiles/tasksAMM.xml"; xmlFileName = "./" + additionalFilesFolderName + "/tasksAMM.xml";
QFile xmlInFile(xmlFileName); QFile xmlInFile(xmlFileName);
if (!xmlInFile.open(QFile::ReadOnly | QFile::Text)) if (!xmlInFile.open(QFile::ReadOnly | QFile::Text))

2
InstructorsAndTrainees/connectorToServer/Core/tools.cpp
View File

@@ -27,7 +27,7 @@ QString Tools::createLocalPath(QString path)
QString Tools::createFullPath(QString path) QString Tools::createFullPath(QString path)
{ {
QString fullPath; QString fullPath;
qint8 pos = path.indexOf("AdditionalFiles"); qint8 pos = path.indexOf(additionalFilesFolderName);
QString localPath = path.remove(0,--pos); QString localPath = path.remove(0,--pos);

1
InstructorsAndTrainees/connectorToServer/Core/tools.h
View File

@@ -10,6 +10,7 @@
static QString applicationEXEName = "RRJ.exe"; static QString applicationEXEName = "RRJ.exe";
static QString applicationFolderName = "/Application"; static QString applicationFolderName = "/Application";
static QString staticDataFolderName = "StaticData"; static QString staticDataFolderName = "StaticData";
static QString additionalFilesFolderName = "RRJ-95NEW-100";
static QString streamingAssetsPath = "/Application/RRJLoader/RRJ_Data/StreamingAssets"; static QString streamingAssetsPath = "/Application/RRJLoader/RRJ_Data/StreamingAssets";
static QString hashFilename = staticDataFolderName + "/clientHash.xml"; static QString hashFilename = staticDataFolderName + "/clientHash.xml";
static QString settingsName = staticDataFolderName + "/settings.xml"; static QString settingsName = staticDataFolderName + "/settings.xml";

2
ServerLMS/Systems/updatecontroller.cpp
View File

@@ -364,7 +364,7 @@ QList<FileData>* UpdateController::calculateHash(QString path)
QString UpdateController::getPathAdditionalFile(QString name) QString UpdateController::getPathAdditionalFile(QString name)
{ {
QString path = Tools::createSharedPath("/" + assetManager->getCurrentVersionData()->getViewName() + "/AdditionalFiles" + name); QString path = Tools::createSharedPath("/" + assetManager->getCurrentVersionData()->getViewName() + "/" + additionalFilesFolderName + name);
return path; return path;
} }