From b270a9f30e3c76a94ff443d07923020d6a8c3651 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 6 Feb 2025 16:26:44 +0100 Subject: [PATCH] Update main-window --- UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro | 2 +- UpdatePTUDevCtrl/mainwindow.cpp | 179 +++++++++++++++++++++++++- UpdatePTUDevCtrl/mainwindow.h | 7 + UpdatePTUDevCtrl/worker.h | 7 + 4 files changed, 193 insertions(+), 2 deletions(-) diff --git a/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro b/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro index 7befd96..5f386b5 100644 --- a/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro +++ b/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro @@ -310,7 +310,7 @@ HEADERS += \ process/check_ismas_connectivity_command.h \ process/check_update_activation_command.h \ process/check_and_fetch_customer_repository_command.h \ - process/exec_opkg_command.cpp \ + process/exec_opkg_command.h \ process/show_software_status_command.h \ message_handler.h \ worker.h \ diff --git a/UpdatePTUDevCtrl/mainwindow.cpp b/UpdatePTUDevCtrl/mainwindow.cpp index a83b75a..727a48f 100644 --- a/UpdatePTUDevCtrl/mainwindow.cpp +++ b/UpdatePTUDevCtrl/mainwindow.cpp @@ -4,6 +4,7 @@ #include "utils.h" #include "progress_event.h" #include "update_dc_event.h" +#include "process/update_command.h" #include #include @@ -85,7 +86,17 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent) connect(m_worker, SIGNAL(showDcDownload(QString)),this,SLOT(onShowDcDownload(QString))); connect(m_worker, SIGNAL(showJsonDownload(QString)),this,SLOT(onShowJsonDownload(QString))); connect(m_worker, SIGNAL(showTariffUpdate(QString)),this,SLOT(onShowTariffUpdate(QString))); + + // deprecated connect(m_worker, SIGNAL(showISMASChecks(QString)),this,SLOT(onShowISMASChecks(QString))); + + connect(m_worker, SIGNAL(showISMASConnectivity(QString)),this,SLOT(onShowISMASConnectivity(QString))); + connect(m_worker, SIGNAL(showUpdateRequest(QString)),this,SLOT(onShowUpdateRequest(QString))); + connect(m_worker, SIGNAL(showCustRepoStatus(QString)),this,SLOT(onShowCustRepoStatus(QString))); + connect(m_worker, SIGNAL(showExecOpkgStatus(QString)),this,SLOT(onShowExecOpkgStatus(QString))); + connect(m_worker, SIGNAL(showDownloadDCJsonFilesStatus(QString)),this,SLOT(onShowDownloadDCJsonFilesStatus(QString))); + connect(m_worker, SIGNAL(showSyncCustRepoStatus(QString)),this,SLOT(onShowSyncCustRepoStatus(QString))); + connect(m_worker, SIGNAL(showUpdateDCFirmware(QString)),this,SLOT(onShowUpdateDCFirmware(QString))); connect(m_worker, SIGNAL(setDcDownloadProgress(int)),this,SLOT(onSetDcDownloadProgress(int))); connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit())); connect(m_worker, SIGNAL(stopStartTimer()),this,SLOT(onStopStartTimer())); @@ -134,7 +145,170 @@ void MainWindow::onShowTariffUpdate(QString) { ui->stepLabel->setText(s); } +void MainWindow::onShowISMASConnectivity(QString status) { + // ausgabe: connected, not connected, connecting + + qCritical() << __func__ << ":" << __LINE__ << "status" << status; + + QString s = ui->stepLabel->text(); + + QString tmp("backend connection (ISMAS) "); + int len = m_showLineLength - tmp.length(); + while (--len > 0) { + tmp += " "; + } + + if (status.contains(UpdateCommand::ISMAS_CONNECTED, Qt::CaseInsensitive)) { + s += QString("%1 connected
").arg(tmp); + } else + if (status.contains(UpdateCommand::ISMAS_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) { + s += QString("%1 connecting
").arg(tmp); + } else + if (status.contains(UpdateCommand::ISMAS_NOT_CONNECTED, Qt::CaseInsensitive)) { + s += QString( "%1 NOT CONNECTED
").arg(tmp); + } else { + s += QString( "%1 UNKNOWN STATUS
").arg(tmp); + } + + ui->stepLabel->setText(s); +} + +void MainWindow::onShowCustRepoStatus(QString status) { + qCritical() << __func__ << ":" << __LINE__ << "status" << status; + + QString s = ui->stepLabel->text(); + + QString tmp("customer repository "); + int len = m_showLineLength - tmp.length(); + while (--len > 0) { + tmp += " "; + } + + if (status.contains(UpdateCommand::GIT_CUSTOMER_REPO_UP_TO_DATE, Qt::CaseInsensitive)) { + s += QString("%1 up to date
").arg(tmp); + } else { + s += QString( "%1 UNKNOWN STATUS
").arg(tmp); + } + + ui->stepLabel->setText(s); +} + +void MainWindow::onShowExecOpkgStatus(QString status) { + qCritical() << __func__ << ":" << __LINE__ << "status" << status; + + QString s = ui->stepLabel->text(); + + QString tmp = "execute opkg commands "; + int len = m_showLineLength - tmp.length(); + + while (--len > 0) { + tmp += " "; + } + + if (status.contains(UpdateCommand::EXEC_OPKG_COMMANDS_SUCCESS, Qt::CaseInsensitive)) { + s += QString("%1 success
").arg(tmp); + } else { + s += QString( "%1 UNKNOWN STATUS
").arg(tmp); + } + + ui->stepLabel->setText(s); +} + +void MainWindow::onShowDownloadDCJsonFilesStatus(QString status) { + qCritical() << __func__ << ":" << __LINE__ << "status" << status; + + QString s = ui->stepLabel->text(); + + QString tmp = "configure device controller "; + int len = m_showLineLength - tmp.length(); + + while (--len > 0) { + tmp += " "; + } + + if (status.contains(UpdateCommand::UPDATE_DC_JSON_FILES_SUCCESS, Qt::CaseInsensitive)) { + s += QString("%1 success
").arg(tmp); + } else { + s += QString( "%1 UNKNOWN STATUS
").arg(tmp); + } + + ui->stepLabel->setText(s); +} + +void MainWindow::onShowSyncCustRepoStatus(QString status) { + qCritical() << __func__ << ":" << __LINE__ << "status" << status; + + QString s = ui->stepLabel->text(); + + QString tmp = "synchronize repository/filesystem "; + int len = m_showLineLength - tmp.length(); + + while (--len > 0) { + tmp += " "; + } + + if (status.contains(UpdateCommand::SYNC_CUSTOMER_REPO_FILES_SUCCESS, Qt::CaseInsensitive)) { + s += QString("%1 success
").arg(tmp); + } else { + s += QString( "%1 UNKNOWN STATUS
").arg(tmp); + } + + ui->stepLabel->setText(s); +} + +void MainWindow::onShowUpdateDCFirmware(QString status) { + qCritical() << __func__ << ":" << __LINE__ << "status" << status; + + QString s = ui->stepLabel->text(); + + QString tmp = "device controller update "; + int len = m_showLineLength - tmp.length(); + + while (--len > 0) { + tmp += " "; + } + + if (status.contains(UpdateCommand::UPDATE_DC_FIRMARE_SUCCESS, Qt::CaseInsensitive)) { + s += QString("%1 success
").arg(tmp); + } else { + s += QString( "%1 UNKNOWN STATUS
").arg(tmp); + } + + ui->stepLabel->setText(s); +} + + +void MainWindow::onShowUpdateRequest(QString status) { + + qCritical() << __func__ << ":" << __LINE__ << "status" << status; + + QString s = ui->stepLabel->text(); + + QString tmp = "update request "; + int len = m_showLineLength - tmp.length(); + + while (--len > 0) { + tmp += " "; + } + + if (status.contains(UpdateCommand::UPDATE_NOT_REQUESTED, Qt::CaseInsensitive)) { + s += QString( "%1 NOT REQUESTED
").arg(tmp); + } else + if (status.contains(UpdateCommand::UPDATE_REQUESTED, Qt::CaseInsensitive)) { + s += QString("%1 requested
").arg(tmp); + } else + if (status.contains(UpdateCommand::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) { + s += QString("%1 not necessary
").arg(tmp); + } else { + s += QString( "%1 UNKNOWN STATUS
").arg(tmp); + } + + ui->stepLabel->setText(s); +} + void MainWindow::onShowISMASChecks(QString) { + // deprecated + QString s = ui->stepLabel->text(); QString tmp("Check ISMAS connectivity "); @@ -177,7 +351,10 @@ void MainWindow::onShowDcDownload(QString version) { ui->exit->setEnabled(false); // test - onShowISMASChecks(""); + // onShowISMASChecks(""); + onShowISMASConnectivity("connected"); + onShowUpdateRequest("activated"); + onShowTariffUpdate(""); onShowJsonDownload(""); diff --git a/UpdatePTUDevCtrl/mainwindow.h b/UpdatePTUDevCtrl/mainwindow.h index c17e361..28315d5 100644 --- a/UpdatePTUDevCtrl/mainwindow.h +++ b/UpdatePTUDevCtrl/mainwindow.h @@ -55,6 +55,13 @@ public slots: void onShowJsonDownload(QString); void onShowTariffUpdate(QString); void onShowISMASChecks(QString); + void onShowISMASConnectivity(QString); + void onShowUpdateRequest(QString); + void onShowCustRepoStatus(QString); + void onShowExecOpkgStatus(QString); + void onShowDownloadDCJsonFilesStatus(QString); + void onShowSyncCustRepoStatus(QString); + void onShowUpdateDCFirmware(QString); void onSetDcDownloadProgress(int); void onShowSummary(QString); #if EMERGENCY_LEAVE_BL==1 diff --git a/UpdatePTUDevCtrl/worker.h b/UpdatePTUDevCtrl/worker.h index 10750ac..e44ccca 100644 --- a/UpdatePTUDevCtrl/worker.h +++ b/UpdatePTUDevCtrl/worker.h @@ -493,6 +493,13 @@ signals: void showJsonDownload(QString); void showTariffUpdate(QString); void showISMASChecks(QString); + void showISMASConnectivity(QString); + void showCustRepoStatus(QString); + void showUpdateRequest(QString); + void showExecOpkgStatus(QString); + void showDownloadDCJsonFilesStatus(QString); + void showSyncCustRepoStatus(QString); + void showUpdateDCFirmware(QString); void showSummary(QString); void setDcDownloadProgress(int);