mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
refactoring
This commit is contained in:
semenov
218
mainwindow.cpp
218
mainwindow.cpp
@@ -8,13 +8,13 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
, ui(new Ui::MainWindow)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
Initialize();
|
||||
initialize();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
void MainWindow::Initialize()
|
||||
void MainWindow::initialize()
|
||||
{
|
||||
|
||||
ui->settingsWidget->hide();
|
||||
@@ -43,17 +43,17 @@ void MainWindow::Initialize()
|
||||
externalExecuter = new ExternalExecuter;
|
||||
|
||||
timer = new QTimer;
|
||||
connect(timer,&QTimer::timeout,this,&MainWindow::disableNotify);
|
||||
connect(timer,&QTimer::timeout,this,&MainWindow::slotDisableNotify);
|
||||
|
||||
connect(recognizeSystem,&RecognizeSystem::UpdateBytesAvailable,this,&MainWindow::UpdateProgress);
|
||||
connect(recognizeSystem,&RecognizeSystem::LoadComplete,this,&MainWindow::LoadComplete);
|
||||
connect(recognizeSystem,&RecognizeSystem::onNeedUpdate,this,&MainWindow::SetNeedUpdate);
|
||||
connect(recognizeSystem,&RecognizeSystem::onSendDebugLog,this,&MainWindow::DebugLog);
|
||||
connect(recognizeSystem,&RecognizeSystem::SockedDisabled,this,&MainWindow::LostConnection);
|
||||
connect(recognizeSystem,&RecognizeSystem::SaveLoginData,this,&MainWindow::CheckLoginResult);
|
||||
connect(recognizeSystem,&RecognizeSystem::SocketWaitForReadyRead,client,&TCPClient::WaitRead,Qt::AutoConnection);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigUpdateBytesAvailable,this,&MainWindow::updateProgress);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigLoadComplete,this,&MainWindow::loadComplete);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigNeedUpdate,this,&MainWindow::setNeedUpdate);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigSendDebugLog,this,&MainWindow::debugLog);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigSocketDisabled,this,&MainWindow::lostConnection);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigSaveLoginData,this,&MainWindow::checkLoginResult);
|
||||
connect(recognizeSystem,&RecognizeSystem::sigSocketWaitForReadyRead,client,&TCPClient::waitRead,Qt::AutoConnection);
|
||||
|
||||
connect(client,&TCPClient::signalGetXmlAnswer,dataParser,&DataParser::slotGetXmlAnswer);
|
||||
connect(client,&TCPClient::sigGetXmlAnswer,dataParser,&DataParser::slotGetXmlAnswer);
|
||||
|
||||
connectionThread->start();
|
||||
updateControllerThread->start();
|
||||
@@ -61,22 +61,22 @@ void MainWindow::Initialize()
|
||||
updateControllerThread->setPriority(QThread::LowPriority);
|
||||
connectionThread->setPriority(QThread::HighestPriority);
|
||||
|
||||
connect(client,&TCPClient::onSendDebugLog,this,&MainWindow::DebugLog,Qt::AutoConnection);
|
||||
connect(client,&TCPClient::sigSendDebugLog,this,&MainWindow::debugLog,Qt::AutoConnection);
|
||||
|
||||
connect(this,&MainWindow::onInitializeClient,client,&TCPClient::Initialize,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::onSetConnect,client,&TCPClient::SetConnect,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::onSendMessage,client,&TCPClient::MessageEntered,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::SendClientAuthorization,client,&TCPClient::SendClientAutorization,Qt::AutoConnection);
|
||||
connect(client,&TCPClient::ConnectionState,this,&MainWindow::onConnectionState);
|
||||
connect(this,&MainWindow::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::sigSendMessage,client,&TCPClient::slotMessageEntered,Qt::AutoConnection);
|
||||
connect(this,&MainWindow::sigSendClientAuthorization,client,&TCPClient::sendClientAutorization,Qt::AutoConnection);
|
||||
connect(client,&TCPClient::sigConnectionState,this,&MainWindow::slotConnectionState);
|
||||
|
||||
connect(this,&MainWindow::onCalculateHash,updateController,&UpdateController::CalculateHash);
|
||||
connect(this,&MainWindow::sigCalculateHash,updateController,&UpdateController::calculateHash);
|
||||
|
||||
emit onCalculateHash();
|
||||
emit onInitializeClient(recognizeSystem,externalExecuter);
|
||||
emit sigCalculateHash();
|
||||
emit sigInitializeClient(recognizeSystem,externalExecuter);
|
||||
|
||||
recognizeSystem->Initialize(updateController,dataParser);
|
||||
recognizeSystem->initialize(updateController,dataParser);
|
||||
|
||||
screenChecker->Check();
|
||||
screenChecker->check();
|
||||
ui->updateButton->setEnabled(false);
|
||||
ui->startButton->setEnabled(false);
|
||||
|
||||
@@ -86,13 +86,13 @@ void MainWindow::Initialize()
|
||||
ui->loadingProgressBar->setValue(0);
|
||||
|
||||
loadStaticData();
|
||||
emit onSetConnect(dataParser->GetServerSettings());
|
||||
emit sigSetConnect(dataParser->getServerSettings());
|
||||
|
||||
CheckAppAvailable();
|
||||
checkAppAvailable();
|
||||
|
||||
}
|
||||
|
||||
void MainWindow::UpdateProgress(qint64 size,quint64 sended)
|
||||
void MainWindow::updateProgress(qint64 size,quint64 sended)
|
||||
{
|
||||
float currentValue = 100.00 / (maxBytesAvailable / size);
|
||||
globalValue += currentValue;
|
||||
@@ -100,17 +100,17 @@ void MainWindow::UpdateProgress(qint64 size,quint64 sended)
|
||||
ui->loadingProgressBar->setValue(globalValue);
|
||||
}
|
||||
|
||||
void MainWindow::LoadComplete()
|
||||
void MainWindow::loadComplete()
|
||||
{
|
||||
ui->loadingProgressBar->setValue(100);
|
||||
ui->updateButton->setEnabled(false);
|
||||
externalExecuter->FindApp();
|
||||
externalExecuter->findApp();
|
||||
ui->startButton->setEnabled(true);
|
||||
autoStart();
|
||||
ui->inlineTextDebug->setText(tr("Обновление завершено..."));
|
||||
}
|
||||
|
||||
void MainWindow::SetNeedUpdate(bool flag,quint64 size, quint64 fileCount)
|
||||
void MainWindow::setNeedUpdate(bool flag,quint64 size, quint64 fileCount)
|
||||
{
|
||||
maxBytesAvailable = 0;
|
||||
QString availableSizeText;
|
||||
@@ -132,15 +132,15 @@ void MainWindow::SetNeedUpdate(bool flag,quint64 size, quint64 fileCount)
|
||||
ui->loadingProgressBar->setRange(0,100);
|
||||
}
|
||||
|
||||
void MainWindow::LostConnection()
|
||||
void MainWindow::lostConnection()
|
||||
{
|
||||
ui->loadingProgressBar->setValue(0);
|
||||
}
|
||||
|
||||
void MainWindow::CheckLoginResult(ServerAuthorization *serverAuth)
|
||||
void MainWindow::checkLoginResult(ServerAuthorization *serverAuth)
|
||||
{
|
||||
if (serverAuth->Result){
|
||||
emit onSendMessage("check");
|
||||
emit sigSendMessage("check");
|
||||
|
||||
ui->inlineTextDebug->setText(tr("Проверка обновлений..."));
|
||||
|
||||
@@ -149,7 +149,7 @@ void MainWindow::CheckLoginResult(ServerAuthorization *serverAuth)
|
||||
ui->displayGroupWidget->show();
|
||||
ui->autostartCheckBox->show();
|
||||
|
||||
dataParser->CreateAuthData(serverAuth);
|
||||
dataParser->createAuthData(serverAuth);
|
||||
ui->loginWidget->hide();
|
||||
|
||||
}
|
||||
@@ -167,9 +167,9 @@ void MainWindow::CheckLoginResult(ServerAuthorization *serverAuth)
|
||||
|
||||
}
|
||||
|
||||
void MainWindow::CheckAppAvailable()
|
||||
void MainWindow::checkAppAvailable()
|
||||
{
|
||||
bool isAvailable = externalExecuter->FindApp();
|
||||
bool isAvailable = externalExecuter->findApp();
|
||||
ui->startButton->setEnabled(isAvailable);
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ void MainWindow::autoStart()
|
||||
|
||||
void MainWindow::loadStaticData()
|
||||
{
|
||||
ServerSettings *currentSettings = dataParser->GetServerSettings();
|
||||
ServerSettings *currentSettings = dataParser->getServerSettings();
|
||||
|
||||
ui->serverInputField->setText(currentSettings->Address);
|
||||
ui->portInputField->setText(currentSettings->Port);
|
||||
@@ -207,65 +207,7 @@ void MainWindow::loadStaticData()
|
||||
checkLanguage(currentSettings->Language);
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_loginButton_clicked()
|
||||
{
|
||||
QString username = ui->loginInputField->text();
|
||||
QString password = ui->passwordInputField->text();
|
||||
|
||||
ClientAutorization *autorization = new ClientAutorization;
|
||||
autorization->Login = username;
|
||||
autorization->Password = password;
|
||||
|
||||
dataParser->CreateAuthMessage(autorization);
|
||||
emit SendClientAuthorization();
|
||||
}
|
||||
|
||||
void MainWindow::on_updateButton_clicked()
|
||||
{
|
||||
emit onSendMessage("update");
|
||||
ui->updateButton->hide();
|
||||
ui->loadingProgressBar->setValue(0);
|
||||
}
|
||||
|
||||
void MainWindow::on_startButton_clicked()
|
||||
{
|
||||
client->SendUnityConnect();
|
||||
externalExecuter->CallApp();
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_saveServerButton_clicked()
|
||||
{
|
||||
ui->settingsWidget->hide();
|
||||
ui->loginWidget->show();
|
||||
|
||||
QString server = ui->serverInputField->text();
|
||||
QString port = ui->portInputField->text();
|
||||
|
||||
dataParser->CreateServerSettings(server,port);
|
||||
|
||||
emit onSetConnect(dataParser->GetServerSettings());
|
||||
}
|
||||
|
||||
void MainWindow::on_settingsButton_clicked()
|
||||
{
|
||||
ui->settingsWidget->show();
|
||||
ui->loginWidget->hide();
|
||||
}
|
||||
|
||||
void MainWindow::disableNotify()
|
||||
{
|
||||
ui->notificationLabel->hide();
|
||||
|
||||
QPalette palette = ui->notificationLabel->palette();
|
||||
palette.setColor(ui->notificationLabel->foregroundRole(), Qt::black);
|
||||
|
||||
ui->notificationLabel->setPalette(palette);
|
||||
timer->stop();
|
||||
}
|
||||
|
||||
void MainWindow::onConnectionState(bool flag)
|
||||
void MainWindow::slotConnectionState(bool flag)
|
||||
{
|
||||
ui->notificationLabel->show();
|
||||
QPalette palette = ui->notificationLabel->palette();
|
||||
@@ -287,12 +229,86 @@ void MainWindow::onConnectionState(bool flag)
|
||||
timer->start(3000);
|
||||
}
|
||||
|
||||
void MainWindow::DebugLog(QString message)
|
||||
|
||||
void MainWindow::slotDisableNotify()
|
||||
{
|
||||
ui->notificationLabel->hide();
|
||||
|
||||
QPalette palette = ui->notificationLabel->palette();
|
||||
palette.setColor(ui->notificationLabel->foregroundRole(), Qt::black);
|
||||
|
||||
ui->notificationLabel->setPalette(palette);
|
||||
timer->stop();
|
||||
}
|
||||
|
||||
|
||||
|
||||
void MainWindow::debugLog(QString message)
|
||||
{
|
||||
ui->debugText->append(message);
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_loginButton_clicked()
|
||||
{
|
||||
QString username = ui->loginInputField->text();
|
||||
QString password = ui->passwordInputField->text();
|
||||
|
||||
ClientAutorization *autorization = new ClientAutorization;
|
||||
autorization->Login = username;
|
||||
autorization->Password = password;
|
||||
|
||||
dataParser->createAuthMessage(autorization);
|
||||
emit sigSendClientAuthorization();
|
||||
}
|
||||
|
||||
void MainWindow::on_updateButton_clicked()
|
||||
{
|
||||
emit sigSendMessage("update");
|
||||
ui->updateButton->hide();
|
||||
ui->loadingProgressBar->setValue(0);
|
||||
}
|
||||
|
||||
void MainWindow::on_startButton_clicked()
|
||||
{
|
||||
client->sendUnityConnect();
|
||||
externalExecuter->callApp();
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_saveServerButton_clicked()
|
||||
{
|
||||
ui->settingsWidget->hide();
|
||||
ui->loginWidget->show();
|
||||
|
||||
QString server = ui->serverInputField->text();
|
||||
QString port = ui->portInputField->text();
|
||||
|
||||
dataParser->createServerSettings(server,port);
|
||||
|
||||
emit sigSetConnect(dataParser->getServerSettings());
|
||||
}
|
||||
|
||||
void MainWindow::on_settingsButton_clicked()
|
||||
{
|
||||
ui->settingsWidget->show();
|
||||
ui->loginWidget->hide();
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_connectButton_clicked()
|
||||
{
|
||||
emit sigSetConnect(dataParser->getServerSettings());
|
||||
}
|
||||
|
||||
void MainWindow::on_languageComboBox_activated(const QString &arg1)
|
||||
{
|
||||
qDebug() << arg1;
|
||||
dataParser->saveClientSettrings(arg1,ui->autostartCheckBox->isChecked());
|
||||
checkLanguage(arg1);
|
||||
ui->retranslateUi(this);
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
connectionThread->quit();
|
||||
@@ -308,15 +324,3 @@ MainWindow::~MainWindow()
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::on_connectButton_clicked()
|
||||
{
|
||||
emit onSetConnect(dataParser->GetServerSettings());
|
||||
}
|
||||
|
||||
void MainWindow::on_languageComboBox_activated(const QString &arg1)
|
||||
{
|
||||
qDebug() << arg1;
|
||||
dataParser->saveClientSettrings(arg1,ui->autostartCheckBox->isChecked());
|
||||
checkLanguage(arg1);
|
||||
ui->retranslateUi(this);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user