mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
bugfix: auto-start init
This commit is contained in:
@@ -95,9 +95,10 @@ ServerSettings *DataParser::getClientSettings()
|
||||
return settings;
|
||||
}
|
||||
|
||||
void DataParser::xmlParser(const QByteArray& array)
|
||||
bool DataParser::xmlParser(const QByteArray& array)
|
||||
{
|
||||
QXmlStreamReader xmlReader(array);
|
||||
bool result = false;
|
||||
|
||||
xmlReader.readNext();
|
||||
|
||||
@@ -135,6 +136,7 @@ void DataParser::xmlParser(const QByteArray& array)
|
||||
if (value == "UNCHANGEABLE")
|
||||
{
|
||||
//версию нельзя изменять
|
||||
result = true;
|
||||
}
|
||||
|
||||
if (value == "CHANGEABLE")
|
||||
@@ -227,7 +229,7 @@ void DataParser::xmlParser(const QByteArray& array)
|
||||
QString name = attr.name().toString();
|
||||
QString value = attr.value().toString();
|
||||
|
||||
if(name == "Version")
|
||||
if (name == "Version")
|
||||
data->setName(value);
|
||||
else if(name == "Created")
|
||||
data->setCreateData(QDateTime::fromString(value));
|
||||
@@ -247,4 +249,5 @@ void DataParser::xmlParser(const QByteArray& array)
|
||||
|
||||
xmlReader.readNext();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <QObject>
|
||||
#include <QDomDocument>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <Data/FileData.h>
|
||||
#include <Data/Datas.h>
|
||||
#include <Data/FileData.h>
|
||||
#include <Core/tools.h>
|
||||
@@ -22,7 +21,7 @@ public:
|
||||
|
||||
void initialize(PostProcessorSystem *postProcessSystem);
|
||||
ServerSettings* getClientSettings();
|
||||
void xmlParser(const QByteArray& array);
|
||||
bool xmlParser(const QByteArray& array);
|
||||
private:
|
||||
PostProcessorSystem *postProcessSystem;
|
||||
};
|
||||
|
||||
@@ -77,7 +77,6 @@ QByteArray DataParserOutput::xmlAnswer(const QList<SXmlAnswerTag>& listTag, cons
|
||||
return array;
|
||||
}
|
||||
|
||||
|
||||
void DataParserOutput::createFileDataList(const QList<FileData>& fileDataList,const QString& filename)
|
||||
{
|
||||
QFile file(filename);
|
||||
@@ -129,7 +128,6 @@ void DataParserOutput::createAuthMessage(ClientAutorization *auth)
|
||||
void DataParserOutput::createServerSettings(ServerSettings* serverSettings)
|
||||
{
|
||||
QFile file(settingsName);
|
||||
|
||||
file.open(QIODevice::WriteOnly);
|
||||
|
||||
QXmlStreamWriter xmlWriter(&file);
|
||||
|
||||
@@ -38,7 +38,8 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
stream.startTransaction();
|
||||
stream >> packetType;
|
||||
|
||||
if(!stream.commitTransaction()){
|
||||
if(!stream.commitTransaction())
|
||||
{
|
||||
emit sigSendDebugLog(Tools::getTime() + " CLIENT: packetType - FAIL commitTransaction");
|
||||
|
||||
if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
|
||||
|
||||
Reference in New Issue
Block a user