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

fix: server changable version

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

42
coremanager.cpp
View File

@@ -17,10 +17,13 @@ CoreManager::CoreManager(QObject *parent) :
resourceManager = new ResourceManager;
postProcessorSystem = new PostProcessorSystem;
client = new Client;
settings = new Settings;
}
void CoreManager::initialize(WidgetManager *widgetManager,QThread *workerThread)
{
createNewServerSettings();
this->workerThread = workerThread;
this->widgetManager = widgetManager;
@@ -44,19 +47,18 @@ void CoreManager::initialize(WidgetManager *widgetManager,QThread *workerThread)
void CoreManager::start()
{
saveServerSettingsWithConnect();
checkAppAvailable();
}
void CoreManager::loadStaticData()
{
ServerSettings *currentSettings = dataParser->getClientSettings();
setLanguage(currentSettings->Language);
settings = dataParser->getSettings();
setLanguage(settings->Language);
setLocalVersion();
externalExecuter->setIsAutoStart(currentSettings->isAutoStart);
externalExecuter->setIsAutoStart(settings->isAutoStart);
bool appAvailable = externalExecuter->findApp();
widgetManager->setAppAvailable(appAvailable);
emit sigSetLoadSettings(currentSettings);
emit sigSetLoadSettings(settings);
}
void CoreManager::binding()
@@ -68,7 +70,8 @@ void CoreManager::binding()
connect(this,&CoreManager::sigSendPacketType,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection);
connect(this,&CoreManager::sigSendCheckUpdate,sendSystem,&SendSystem::sendCheckHash,Qt::AutoConnection);
connect(this,&CoreManager::sigSendXMLAnswer,sendSystem,&SendSystem::xmlAnswer,Qt::AutoConnection);
connect(this,&CoreManager::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization);
connect(this,&CoreManager::sigSendAutorization,sendSystem,&SendSystem::sendClientAutorization,Qt::AutoConnection);
connect(this,&CoreManager::sigGetClientSettings,dataParser,&DataParser::getSettings,Qt::DirectConnection);
connect(this,&CoreManager::sigSendUpdateToServer,updateController,&UpdateController::checkCanUpdate,Qt::AutoConnection);
connect(this,&CoreManager::sigGetConnected,tcpClient,&TCPClient::getIsConnected);
@@ -106,6 +109,7 @@ void CoreManager::binding()
connect(sendSystem,&SendSystem::sigSend,this,&CoreManager::calcUpdateProgress,Qt::AutoConnection);
connect(sendSystem,&SendSystem::sigGetXmlAnswer,dataParserOutput,&DataParserOutput::xmlAnswer_notify,Qt::DirectConnection);
}
void CoreManager::initializeSystems()
@@ -123,7 +127,7 @@ void CoreManager::initializeSystems()
screenChecker->check();
emit sigSetConnect(dataParser->getClientSettings());
emit sigSetConnect(dataParser->getSettings());
}
void CoreManager::initializeWidgets()
@@ -178,14 +182,20 @@ void CoreManager::serverBlocked()
void CoreManager::setServerVersion(StreamingVersionData *version)
{
widgetManager->getMainWindow()->setServerVersion(version);
if (version->getViewName() == settings->versionData.getViewName())
{
settings->versionData.setIsChangeable(version->getIsChangeable());
versionContainer->getLocalVersionData()->setIsChangeable(version->getIsChangeable());
dataParserOutput->updateServerSettings(settings);
}
}
void CoreManager::setLocalVersion()
{
ServerSettings *currentSettings = dataParser->getClientSettings();
StreamingVersionData *version = new StreamingVersionData;
version->setName(currentSettings->LocalVersionName);
version->setIsChangeable(currentSettings->versionData.getIsChangeable());
version->setName(settings->LocalVersionName);
version->setIsChangeable(settings->versionData.getIsChangeable());
versionContainer->setLocalVersionData(version);
widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion());
@@ -198,7 +208,7 @@ void CoreManager::checkLoginResult(ServerAuthorization *auth)
widgetManager->activateLoadingAnimation(true);
checkAccessType(auth->AccessType);
dataParserOutput->createAuthData(auth);
setLocalVersion();
//setLocalVersion();
widgetManager->setLoginSuccess();
widgetManager->getMainWindow()->setClientVersionName(versionContainer->getLocalVersion());
client->setLogin(auth->ClientName);
@@ -361,9 +371,8 @@ void CoreManager::saveServerSettingsWithConnect()
EntryWidget *entryWidget = widgetManager->getEntryWidget();
entryWidget->isActive(false);
ServerSettings *settings = entryWidget->getServerSettings();
settings->LocalVersionName = dataParser->getClientSettings()->LocalVersionName;
dataParserOutput->createServerSettings(settings);
settings->LocalVersionName = dataParser->getSettings()->LocalVersionName;
dataParserOutput->updateServerSettings(settings);
if(tcpClient->getIsConnected())
{
@@ -377,6 +386,11 @@ void CoreManager::saveServerSettingsWithConnect()
emit sigSetConnect(settings);
}
void CoreManager::createNewServerSettings()
{
dataParserOutput->createServerSettings();
}
void CoreManager::checkAppAvailable()
{
bool isAvailable = externalExecuter->findApp();