fix: server changable version

This commit is contained in:
semenov
2025-12-12 11:34:02 +03:00
parent 14c1ffb66f
commit c23f3d519b
24 changed files with 13298 additions and 13264 deletions

View File

@@ -15,9 +15,9 @@ void DataParser::initialize(PostProcessorSystem *postProcessSystem)
}
ServerSettings *DataParser::getClientSettings()
Settings *DataParser::getSettings()
{
ServerSettings *settings = new ServerSettings;
Settings *settings = new Settings;
QFile file(settingsName);
file.open(QIODevice::ReadOnly);
QXmlStreamReader xmlReader(&file);

View File

@@ -20,7 +20,7 @@ public:
~DataParser() = default;
void initialize(PostProcessorSystem *postProcessSystem);
ServerSettings* getClientSettings();
Settings* getSettings();
bool xmlParser(const QByteArray& array);
private:
PostProcessorSystem *postProcessSystem;

View File

@@ -125,7 +125,42 @@ void DataParserOutput::createAuthMessage(ClientAutorization *auth)
file.close();
}
void DataParserOutput::createServerSettings(ServerSettings* serverSettings)
void DataParserOutput::createServerSettings()
{
QFile file(settingsName);
if (file.exists()) return;
file.open(QIODevice::WriteOnly);
QXmlStreamWriter xmlWriter(&file);
xmlWriter.setAutoFormatting(true);
xmlWriter.writeStartDocument();
xmlWriter.writeStartElement("ServerSettingsContainer");
xmlWriter.writeStartElement("ServerSettings");
xmlWriter.writeAttribute("Address","");
xmlWriter.writeAttribute("Port","");
xmlWriter.writeAttribute("Language","RUS");
xmlWriter.writeAttribute("AutoStart",QString::number(false));
xmlWriter.writeEndElement();
xmlWriter.writeStartElement("VersionData");
xmlWriter.writeAttribute("Version","-----");
xmlWriter.writeAttribute("isChangable","0");
xmlWriter.writeEndElement();
xmlWriter.writeEndElement();
xmlWriter.writeEndDocument();
file.close();
}
void DataParserOutput::updateServerSettings(Settings* serverSettings)
{
QFile file(settingsName);
file.open(QIODevice::WriteOnly);
@@ -142,9 +177,6 @@ void DataParserOutput::createServerSettings(ServerSettings* serverSettings)
xmlWriter.writeAttribute("Port",serverSettings->Port);
xmlWriter.writeAttribute("Language","RUS");
xmlWriter.writeAttribute("AutoStart",QString::number(false));
//xmlWriter.writeAttribute("DestPortMath","18003");
//xmlWriter.writeAttribute("LocalPortMath","18004");
//xmlWriter.writeAttribute("UseMathModel",QString::number(serverSettings->mathModelUse));
xmlWriter.writeEndElement();

View File

@@ -17,7 +17,8 @@ public:
explicit DataParserOutput(QObject *parent = 0);
void createFileDataList(const QList<FileData>& fileDataList,const QString& filename);
void createAuthMessage(ClientAutorization *auth);
void createServerSettings(ServerSettings *serverSettings);
void createServerSettings();
void updateServerSettings(Settings *serverSettings);
void changeVersion(StreamingVersionData *versionData);
void createAuthData(ServerAuthorization *serverAuth);
void createAuthDataOffline(const QString& username,const QString& pass);

View File

@@ -17,7 +17,7 @@ void TCPClient::initialize(RecognizeSystem *recognize,SendSystem *sendSystem)
emit sigSendDebugLog(Tools::getTime() + " Client started");
}
void TCPClient::setConnect(ServerSettings *serverSettings)
void TCPClient::setConnect(Settings *serverSettings)
{
socket = new QTcpSocket();
qDebug() << "TCPCLient thread: " << thread();

View File

@@ -21,7 +21,7 @@ class TCPClient : public QObject
public:
explicit TCPClient(QObject *parent = 0);
void initialize(RecognizeSystem *recognize,SendSystem *sendSystem);
void setConnect(ServerSettings *serverSettings);
void setConnect(Settings *serverSettings);
~TCPClient(){};
void setDisconnect();
bool getIsConnected() const;