Constanta-Design/RRJClient
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git synced 2026-03-28 05:25:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

ref:file path

Browse Source
This commit is contained in:
semenov
2024-09-02 17:06:32 +03:00
parent f333afe2b4
commit e9ca2dbd0b
14 changed files with 64 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Core/UpdateController.cpp
View File

@@ -4,7 +4,7 @@ UpdateController::UpdateController(DataParser *parser, QObject *parent) :
QObject(parent) QObject(parent)
{ {
this->dataParser = parser; this->dataParser = parser;
localPath = QDir::currentPath() + "/Application"; localPath = QDir::currentPath() + applicationFolderName;
} }
@@ -18,8 +18,8 @@ void UpdateController::calculateHash()
QList<FileData> *files = new QList<FileData>; QList<FileData> *files = new QList<FileData>;
QList<FileData> * folders = new QList<FileData>; QList<FileData> * folders = new QList<FileData>;
if(!QDir("Application").exists()){ //проверка на наличие папки if(!QDir(applicationFolderName).exists()){ //проверка на наличие папки
QDir().mkdir("Application"); QDir().mkdir(applicationFolderName);
} }
QDir dir(localPath); QDir dir(localPath);

8
Core/dataparser.cpp
View File

@@ -8,8 +8,8 @@
DataParser::DataParser(QObject *parent) : DataParser::DataParser(QObject *parent) :
QObject(parent) QObject(parent)
{ {
if(!QDir("StaticData").exists()){ if(!QDir(staticDataFolderName).exists()){
QDir().mkdir("StaticData"); QDir().mkdir(staticDataFolderName);
} }
} }
@@ -217,7 +217,7 @@ void DataParser::saveClientSettrings(QString language, bool isAutoStart)
QByteArray DataParser::xmlAnswer(QList<SXmlAnswerTag> listTag, QString elemUp1, QString elemUp2) QByteArray DataParser::xmlAnswer(QList<SXmlAnswerTag> listTag, QString elemUp1, QString elemUp2)
{ {
/* Открываем файл для Записи*/ /* Открываем файл для Записи*/
QFile file("save.xml"); QFile file(tempName);
file.open(QIODevice::WriteOnly); file.open(QIODevice::WriteOnly);
/* Создаем объект, с помощью которого осуществляется запись в файл */ /* Создаем объект, с помощью которого осуществляется запись в файл */
@@ -259,7 +259,7 @@ QByteArray DataParser::xmlAnswer(QList<SXmlAnswerTag> listTag, QString elemUp1,
QByteArray array; QByteArray array;
/* Открываем файл для Чтения*/ /* Открываем файл для Чтения*/
QFile fileR("save.xml"); QFile fileR(tempName);
if (!fileR.open(QFile::ReadOnly | QFile::Text)) if (!fileR.open(QFile::ReadOnly | QFile::Text))
{ {
QString str = "Не удалось открыть файл"; QString str = "Не удалось открыть файл";

4
Core/externalexecuter.cpp
View File

@@ -26,13 +26,13 @@ void ExternalExecuter::callApp()
bool ExternalExecuter::findApp() bool ExternalExecuter::findApp()
{ {
QString localPath = QDir::currentPath() + "/Application"; QString localPath = QDir::currentPath() + applicationFolderName;
QDirIterator iterator(localPath,QDirIterator::Subdirectories); QDirIterator iterator(localPath,QDirIterator::Subdirectories);
while(iterator.hasNext()){ while(iterator.hasNext()){
iterator.next(); iterator.next();
if(iterator.fileInfo().fileName() == "RRJ.exe"){ if(iterator.fileInfo().fileName() == applicationEXEName){
programPath = iterator.fileInfo().absoluteFilePath(); programPath = iterator.fileInfo().absoluteFilePath();
return true; return true;
} }

1
Core/externalexecuter.h
View File

@@ -7,6 +7,7 @@
#include <QDirIterator> #include <QDirIterator>
#include <QProcess> #include <QProcess>
#include <QDebug> #include <QDebug>
#include "tools.h"
class ExternalExecuter : public QObject class ExternalExecuter : public QObject
{ {

20
Core/tcpclient.cpp
View File

@@ -15,7 +15,7 @@ void TCPClient::initialize(RecognizeSystem *recognize,ExternalExecuter *external
this->recognizeSystem = recognize; this->recognizeSystem = recognize;
this->externalExecuter = externalExecuter; this->externalExecuter = externalExecuter;
emit sigSendDebugLog(Tools::GetTime() + " Client started"); emit sigSendDebugLog(Tools::getTime() + " Client started");
} }
void TCPClient::setConnect(ServerSettings *serverSettings) void TCPClient::setConnect(ServerSettings *serverSettings)
@@ -88,7 +88,7 @@ void TCPClient::sendFile()
countSend++; countSend++;
} }
qDebug() << Tools::GetTime() << "count end Final: " << countSend; qDebug() << Tools::getTime() << "count end Final: " << countSend;
} }
file.close(); file.close();
@@ -113,15 +113,15 @@ void TCPClient::setDisconnect()
void TCPClient::sendDisable() void TCPClient::sendDisable()
{ {
QDataStream stream(socket); // QDataStream stream(socket);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); // stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
QByteArray data; // QByteArray data;
data = emit sigGetXmlAnswer("END"); // data = emit sigGetXmlAnswer("END");
stream << PacketType::TYPE_XMLANSWER; // stream << PacketType::TYPE_XMLANSWER;
stream << data; // stream << data;
socket->waitForBytesWritten(); // socket->waitForBytesWritten();
} }
void TCPClient::waitRead(int time) void TCPClient::waitRead(int time)
@@ -149,7 +149,7 @@ void TCPClient::slotMessageEntered(QString message)
socket->waitForBytesWritten(); socket->waitForBytesWritten();
sendFile(); sendFile();
emit sigSendDebugLog(Tools::GetTime() + " Local checkFile sended"); emit sigSendDebugLog(Tools::getTime() + " Local checkFile sended");
socket->waitForReadyRead(1000); socket->waitForReadyRead(1000);
} }

13
Core/tools.h
View File

@@ -7,11 +7,14 @@
#define TCP_READ_TIMEOUT 1000 #define TCP_READ_TIMEOUT 1000
static QString hashFilename = "StaticData/hash.xml"; static QString applicationEXEName = "RRJ.exe";
static QString settingsName = "StaticData/settings.xml"; static QString applicationFolderName = "/Application";
static QString tempName = "StaticData/temp.xml"; static QString staticDataFolderName = "StaticData";
static QString authTempName = "StaticData/authData.xml"; static QString hashFilename = staticDataFolderName + "/hash.xml";
static QString displayTemp = "StaticData/displayData.xml"; static QString settingsName = staticDataFolderName + "/settings.xml";
static QString tempName = staticDataFolderName + "/temp.xml";
static QString authTempName = staticDataFolderName + "/authData.xml";
static QString displayTemp = staticDataFolderName + "/displayData.xml";
enum PacketType{ enum PacketType{
TYPE_NONE = 0, TYPE_NONE = 0,

6
RRJClient.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-08-29T18:07:33. --> <!-- Written by QtCreator 4.11.1, 2024-09-02T12:41:18. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@@ -67,7 +67,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -299,7 +299,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">E:/Projects/QT/GUIProj/RRJClient/RRJClient</value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">E:/Projects/QT/GUIProj/RRJClient/Deploy</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>

60
StaticData/hash.xml
View File

@@ -1,32 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<FileDataList> <FileDataList>
<FileData Path="/Application" Hash="FOLDER"/> <FileData Path="/Application" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/D3D12" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/D3D12" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/EmbedRuntime" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/EmbedRuntime" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono/2.0" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono/2.0/Browsers" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/2.0/Browsers" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono/4.0" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono/4.0/Browsers" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.0/Browsers" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono/4.5" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono/4.5/Browsers" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/4.5/Browsers" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/MonoBleedingEdge/etc/mono/mconfig" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/MonoBleedingEdge/etc/mono/mconfig" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_BurstDebugInformation_DoNotShip" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_BurstDebugInformation_DoNotShip/Data" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/Managed" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Managed" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/Plugins" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Plugins" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/Plugins/x86_64" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Plugins/x86_64" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/Resources" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/Resources" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RRJ-95NEW-100" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/RUS" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/SL" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/SL/plugins" Hash="FOLDER"/>
<FileData Path="/Application/RRJOnlyMain/RRJ_Data/Temp" Hash="FOLDER"/> <FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/SL/plugins/bearer" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/SL/translations" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/StreamingAssets/Sounds/UI" Hash="FOLDER"/>
<FileData Path="/Application/RRJLoader/RRJ_Data/Temp" Hash="FOLDER"/>
</FileDataList> </FileDataList>

2
StaticData/settings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ServerSettingsContainer> <ServerSettingsContainer>
<ServerSettings Address="127.0.0.17" Port="6000" Language="RUS" AutoStart="1"/> <ServerSettings Address="127.0.0.17" Port="6000" Language="RUS" AutoStart="0"/>
</ServerSettingsContainer> </ServerSettingsContainer>

BIN
debug/RRJClient.exe
View File

Binary file not shown.

BIN
debug/UpdateController.o
View File

Binary file not shown.

BIN
debug/recognizesystem.o
View File

Binary file not shown.

BIN
debug/tcpclient.o
View File

Binary file not shown.

BIN
debug/tools.o
View File

Binary file not shown.