diff --git a/app/fwupgrade/FWUpgrade_zh_CN.qm b/app/fwupgrade/FWUpgrade_zh_CN.qm index 38ac753c..cc7cefe4 100644 Binary files a/app/fwupgrade/FWUpgrade_zh_CN.qm and b/app/fwupgrade/FWUpgrade_zh_CN.qm differ diff --git a/app/fwupgrade/FWUpgrade_zh_CN.ts b/app/fwupgrade/FWUpgrade_zh_CN.ts index 7d713ae5..e9c3e2d3 100644 --- a/app/fwupgrade/FWUpgrade_zh_CN.ts +++ b/app/fwupgrade/FWUpgrade_zh_CN.ts @@ -1,6 +1,19 @@ + + Dialog_updateProgress + + + Dialog + 下载 + + + + stop + 停止 + + Dialog_upgradeFirmware @@ -19,14 +32,12 @@ - - + upgrade 更新升级 - - + firmware upgrade in progress, please wait... 设备固件自动升级中，请稍候... @@ -34,32 +45,32 @@ LoginDialog - + Login 用户登录 - + account 账户： - + password 密码： - + login 登录 - + help 帮助 - + exit 取消 @@ -82,114 +93,114 @@ MainWindow - + MainWindow 扫描仪维护工具 - + update firmware 固件升级 - - + + device list 设备列表： - + online upgrade - 在线升级： + 在线升级 - + get version list 获取版本列表 - + download and upgrade - 下载更新 + 下载并升级 - + version list 版本列表： - - - local upgrade - 本地升级： - + local upgrade + 本地升级 + + + file path - 目录： + 升级文件： - + open file path - 打开本地目录： + 打开本地文件 - + upgrade - 更新升级 + 升级 - + manager tools 管理工具 - + roll count: 滚轴计数： - - + + 0 0 - + scan count: 历史扫描张数： - + clear roll count 清除滚轴计数 - + password change 修改账户密码 - + old password 旧密码： - + new password 新密码： - + modify password 确认修改 - + confirm new password 确认新密码： - + exit 关闭 @@ -202,112 +213,151 @@ 安装中，请稍候... - open device: %1, firmware version: %2 - 打开设备：%1，固件版本号为：%2 + 打开设备：%1，固件版本号为：%2 - - + + + do not support - 设备不支持 + 不支持 - + open device error: %1 打开设备错误：%1 - + no device opened 无设备打开 - - - - - - - + + + + + + + + + + + tips - 提示： + 提示 - + no version available 未获取到可升级版本 - - - - - - - + + + + + + + + + + + yes 确定 - + Open File - 打开目录 + 打开文件 - Zip Files(*.zip *.zip) - 压缩文件(* .zip) + 压缩文件(* .zip) - - + + + device: %1 upgrade firmware success 设备：%1 固件升级成功 - device: %1 upgrade firmware failed, download file fail - 设备：%1 固件升级失败，文件下载失败 + 设备：%1 固件升级失败，文件下载失败 - - + + device: %1, firmware version: %2, upgrade: %3 + 设备: %1, 固件版本: %2, 升级: %3 + + + + support + 支持 + + + + ZIP Files(*.zip *.zip) + + + + + + the selected firmware is not newer than the current version + 选择的固件不比当前版本更新 + + + + firmware file mismatch + 固件不匹配 + + + + + device: %1 upgrade firmware failed, io error 设备：%1 固件升级失败，IO错误 - + + download firmware fail + 下载固件失败 + + + Roller scanned count has been set to 0. - 滚轴计数已清零。 + 滚轴计数已清零 - + Roller scanned count reset failed. - 清除滚轴计数失败。 + 清除滚轴计数失败 - + old password is wrong 旧密码错误 - + new password can not be empty 新密码不能为空 - + new password is inconsistent 新密码不一致 - + modify password fail 密码修改失败 - + modify password success 密码修改成功 diff --git a/app/fwupgrade/dialog_updateprogress.cpp b/app/fwupgrade/dialog_updateprogress.cpp new file mode 100644 index 00000000..ac428d7b --- /dev/null +++ b/app/fwupgrade/dialog_updateprogress.cpp @@ -0,0 +1,88 @@ +#include "dialog_updateprogress.h" +#include "ui_dialog_updateprogress.h" +#include "base/HGInfo.h" +#include +#include +#include +#include + +Dialog_updateProgress::Dialog_updateProgress(HGVersionMgr versionMgr, const QString &url, + const QString &savePath, QWidget *parent) : + QDialog(parent) + , m_versionMgr(versionMgr) + , m_url(url) + , m_savePath(savePath) + , ui(new Ui::Dialog_updateProgress) +{ + ui->setupUi(this); + ui->progressBar->setValue(0); + + connect(this, SIGNAL(updateProgress(int)), this, SLOT(on_updateProgress(int)), Qt::QueuedConnection); + connect(this, SIGNAL(finish()), this, SLOT(on_finish()), Qt::QueuedConnection); + + m_stopThread = false; + HGBase_OpenThread(ThreadFunc, this, &m_thread); +} + +Dialog_updateProgress::~Dialog_updateProgress() +{ + if (nullptr != m_thread) + { + HGBase_CloseThread(m_thread); + m_thread = nullptr; + } + + delete ui; +} + +HGInt HGAPI Dialog_updateProgress::HttpDownloadThreadFunc(HGULonglong totalSize, HGULonglong nowSize, HGPointer param) +{ + Dialog_updateProgress *p = (Dialog_updateProgress *)param; + if (p->m_stopThread) + { + return 1; + } + + if (totalSize != 0) + { + emit p->updateProgress(((double)nowSize / totalSize) * 100); + } + + return 0; +} + +void HGAPI Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param) +{ + (void)thread; + Dialog_updateProgress *p = (Dialog_updateProgress *)param; + + HGResult ret = HGVersion_HttpDownload(p->m_versionMgr, p->m_url.toStdString().c_str(), p->m_savePath.toStdString().c_str(), HttpDownloadThreadFunc, p); + if (HGBASE_ERR_OK != ret) + { + QFile::remove(p->m_savePath.toStdString().c_str()); + + HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "UpgradeHttpDownload:%u", ret); + } + + emit p->finish(); +} + +void Dialog_updateProgress::on_updateProgress(int value) +{ + ui->progressBar->setValue(value); +} + +void Dialog_updateProgress::on_finish() +{ + accept(); +} + +void Dialog_updateProgress::on_pushButton_clicked() +{ + close(); +} + +void Dialog_updateProgress::closeEvent(QCloseEvent* e) +{ + m_stopThread = true; +} diff --git a/app/fwupgrade/dialog_updateprogress.h b/app/fwupgrade/dialog_updateprogress.h new file mode 100644 index 00000000..8d1b4fcc --- /dev/null +++ b/app/fwupgrade/dialog_updateprogress.h @@ -0,0 +1,46 @@ +#ifndef DIALOG_UPDATEPROGRESS_H +#define DIALOG_UPDATEPROGRESS_H + +#include +#include "base/HGThread.h" +#include "version/HGVersion.h" +#include "mainwindow.h" + +namespace Ui { +class Dialog_updateProgress; +} + +class Dialog_updateProgress : public QDialog +{ + Q_OBJECT + +public: + explicit Dialog_updateProgress(HGVersionMgr versionMgr, const QString &url, + const QString &savePath, QWidget *parent = nullptr); + ~Dialog_updateProgress(); +private: + static HGInt HGAPI HttpDownloadThreadFunc(HGULonglong totalSize, HGULonglong nowSize, HGPointer param); + static void HGAPI ThreadFunc(HGThread thread, HGPointer param); + +signals: + void updateProgress(int value); + void finish(); +private slots: + void on_updateProgress(int value); + void on_finish(); + + void on_pushButton_clicked(); +protected: + virtual void closeEvent(QCloseEvent* e); + +private: + Ui::Dialog_updateProgress *ui; + + HGVersionMgr m_versionMgr; + QString m_url; + QString m_savePath; + bool m_stopThread; + HGThread m_thread; +}; + +#endif // DIALOG_UPDATEPROGRESS_H diff --git a/app/fwupgrade/dialog_updateprogress.ui b/app/fwupgrade/dialog_updateprogress.ui new file mode 100644 index 00000000..28a1918f --- /dev/null +++ b/app/fwupgrade/dialog_updateprogress.ui @@ -0,0 +1,65 @@ + + + Dialog_updateProgress + + + + 0 + 0 + 500 + 101 + + + + Dialog + + + + + + 24 + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + stop + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + diff --git a/app/fwupgrade/dialog_upgradefirmware.cpp b/app/fwupgrade/dialog_upgradefirmware.cpp index 316065e9..ba4fa479 100644 --- a/app/fwupgrade/dialog_upgradefirmware.cpp +++ b/app/fwupgrade/dialog_upgradefirmware.cpp @@ -5,46 +5,11 @@ #include #include "base/HGBase.h" -Dialog_upgradeFirmware::Dialog_upgradeFirmware(HGVersionMgr versionMgr, SANE_Handle handle, const std::string &url, const std::string &version, - const std::string& md5, QWidget *parent) : - QDialog(parent) - , m_versionMgr(versionMgr) - , m_handle(handle) - , m_url(url) - , m_version(version) - , m_md5(md5) - , m_filePath("") - , m_result(-1) - , ui(new Ui::Dialog_upgradeFirmware) -{ - ui->setupUi(this); - - setWindowTitle(tr("upgrade")); - setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); - - ui->label_text->setText(tr("firmware upgrade in progress, please wait...")); - - QMovie *movie = new QMovie(":images/image_rsc/logo/waiting.gif"); - ui->label_gif->setMovie(movie); - movie->setCacheMode(QMovie::CacheAll); - movie->setScaledSize(QSize(ui->label_gif->width(), ui->label_gif->height())); - movie->start(); - ui->label_gif->show(); - - connect(this, SIGNAL(finish()), this, SLOT(on_finish()), Qt::QueuedConnection); - - HGBase_OpenThread(ThreadFunc, this, &m_thread); -} - Dialog_upgradeFirmware::Dialog_upgradeFirmware(SANE_Handle handle, const std::string &filePath, QWidget *parent) : QDialog(parent) - , m_versionMgr(nullptr) , m_handle(handle) - , m_url("") - , m_version("") - , m_md5("") , m_filePath(filePath) - , m_result(-1) + , m_result(1) , ui(new Ui::Dialog_upgradeFirmware) { ui->setupUi(this); @@ -82,75 +47,9 @@ void HGAPI Dialog_upgradeFirmware::ThreadFunc(HGThread thread, HGPointer param) (void)thread; Dialog_upgradeFirmware *p = (Dialog_upgradeFirmware *)param; - if (nullptr != p->m_versionMgr) + if (SANE_STATUS_GOOD == sane_io_control(p->m_handle, IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)p->m_filePath.c_str(), nullptr)) { - HGChar suffix[64]; - HGBase_GetFileSuffix(p->m_url.c_str(), suffix, 64); - - HGChar savePath[512]; - HGBase_GetConfigPath(savePath, 512); - HGBase_CreateDir(savePath); - HGChar fileName[128]; - sprintf(fileName, "%s.%s", p->m_version.c_str(), suffix); - strcat(savePath, fileName); - - QFile saveFile(savePath); - saveFile.open(QFile::ReadOnly); - QByteArray fileMsg = saveFile.readAll(); - saveFile.close(); - QString md5_2 = QCryptographicHash::hash(fileMsg, QCryptographicHash::Md5).toHex(); - - QFile f(savePath); - if (!f.exists() || QString(p->m_md5.c_str()) != md5_2) - { - HGResult ret = HGVersion_HttpDownload(p->m_versionMgr, p->m_url.c_str(), savePath, nullptr, nullptr); - if (HGBASE_ERR_OK == ret) - { - QFile saveFile(savePath); - saveFile.open(QFile::ReadOnly); - QByteArray fileMsg = saveFile.readAll(); - saveFile.close(); - QString md5_2 = QCryptographicHash::hash(fileMsg, QCryptographicHash::Md5).toHex(); - - if (QString(p->m_md5.c_str()) == md5_2) - { - if (SANE_STATUS_GOOD == sane_io_control(p->m_handle, IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)savePath, nullptr)) - { - p->m_result = 0; - } - else - { - p->m_result = 2; - } - } - } - else - { - p->m_result = 1; - } - } - else - { - if (SANE_STATUS_GOOD == sane_io_control(p->m_handle, IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)savePath, nullptr)) - { - p->m_result = 0; - } - else - { - p->m_result = 2; - } - } - } - else - { - if (SANE_STATUS_GOOD == sane_io_control(p->m_handle, IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)p->m_filePath.c_str(), nullptr)) - { - p->m_result = 0; - } - else - { - p->m_result = 2; - } + p->m_result = 0; } emit p->finish(); diff --git a/app/fwupgrade/dialog_upgradefirmware.h b/app/fwupgrade/dialog_upgradefirmware.h index 1a0b81f7..e3ed5bd8 100644 --- a/app/fwupgrade/dialog_upgradefirmware.h +++ b/app/fwupgrade/dialog_upgradefirmware.h @@ -3,7 +3,6 @@ #include #include "base/HGThread.h" -#include "version/HGVersion.h" #include "sane/sane_ex.h" namespace Ui { @@ -15,9 +14,7 @@ class Dialog_upgradeFirmware : public QDialog Q_OBJECT public: - Dialog_upgradeFirmware(HGVersionMgr versionMgr, SANE_Handle handle, const std::string &url, const std::string &version, - const std::string& md5, QWidget *parent = nullptr); - Dialog_upgradeFirmware(SANE_Handle handle, const std::string &filePath, QWidget *parent = nullptr); + explicit Dialog_upgradeFirmware(SANE_Handle handle, const std::string &filePath, QWidget *parent = nullptr); ~Dialog_upgradeFirmware(); private: @@ -33,13 +30,9 @@ private slots: void on_finish(); private: - HGVersionMgr m_versionMgr; SANE_Handle m_handle; - std::string m_url; - std::string m_version; - std::string m_md5; std::string m_filePath; - int m_result; // 0-成功 1-下载失败 2-升级失败 + int m_result; // 0-成功 1-升级失败 HGThread m_thread; diff --git a/app/fwupgrade/logindialog.ui b/app/fwupgrade/logindialog.ui index a8b436c7..7e9ea54c 100644 --- a/app/fwupgrade/logindialog.ui +++ b/app/fwupgrade/logindialog.ui @@ -10,6 +10,18 @@ 328 + + + 498 + 328 + + + + + 498 + 328 + + Login diff --git a/app/fwupgrade/mainwindow.cpp b/app/fwupgrade/mainwindow.cpp index 6924e70e..ab92895e 100644 --- a/app/fwupgrade/mainwindow.cpp +++ b/app/fwupgrade/mainwindow.cpp @@ -4,7 +4,10 @@ #include #include #include +#include +#include #include "dialog_upgradefirmware.h" +#include "dialog_updateprogress.h" #include "base/HGBase.h" #define PASSWORD_KEY 4 @@ -90,6 +93,43 @@ QString MainWindow::passwordDecrypt(const QString& transcode) return password; } +QString MainWindow::GetDevType(const QString& fwVersion) +{ + QString devType; + if (fwVersion.length() == 10) + { + QString dev = fwVersion.left(2); + if (fwVersion.mid(2, 2) == "40" || fwVersion.mid(2, 2) == "50" + || fwVersion.mid(2, 2) == "60" || fwVersion.mid(2, 2) == "70") + { + // 3288 + QString ver = fwVersion.mid(2, 2); + QString date = fwVersion.mid(4, 6); + } + else + { + // 3399 + QString ver = fwVersion.mid(2, 3); + QString date = fwVersion.mid(5, 5); + if ((dev == "G1" || dev == "G2") && ver == "393") + { + if (date >= "A1220" && date <= "A1225") + devType = dev + ver + "/" + "A1220-A1225"; + else if (date >= "B0326" && date <= "B0331") + devType = dev + ver + "/" + "B0326-B0331"; + else if (date >= "B0429") + devType = dev + ver + "/" + "B0429-"; + } + else if (dev == "G4" && ver == "393") + { + devType = dev + ver + "/"; + } + } + } + + return devType; +} + void MainWindow::on_sane_dev_arrive(QString devName, bool opened) { int idx = -1; @@ -106,9 +146,15 @@ void MainWindow::on_sane_dev_arrive(QString devName, bool opened) if (-1 == idx) { + assert(!opened); ui->comboDevList->addItem(devName); ui->comboDevList2->addItem(devName); } + else if (opened) + { + ui->comboDevList->setCurrentIndex(-1); + ui->comboDevList->setCurrentIndex(idx); + } } void MainWindow::on_sane_dev_remove(QString devName) @@ -205,7 +251,10 @@ void MainWindow::on_comboDevList_currentIndexChanged(int index) } m_curFwVersion = QString::fromStdString(versionNum.c_str()); - ui->labelDevInfo->setText(QString(tr("open device: %1, firmware version: %2")).arg(name).arg(m_curFwVersion)); + QString devType = GetDevType(m_curFwVersion); + + ui->labelDevInfo->setText(QString(tr("device: %1, firmware version: %2, upgrade: %3")).arg(name) + .arg(m_curFwVersion).arg(!devType.isEmpty() ? tr("support") : tr("do not support"))); SANE_Int historyScanNum = 0; unsigned int historyScanNumLen = sizeof(SANE_Int); @@ -221,8 +270,11 @@ void MainWindow::on_comboDevList_currentIndexChanged(int index) ui->labelScanCount->setText(tr("do not support")); } - ui->btnGetVersionList->setEnabled(true); - ui->btnOpenFilePath->setEnabled(true); + if (!devType.isEmpty()) + { + ui->btnGetVersionList->setEnabled(true); + ui->btnOpenFilePath->setEnabled(true); + } ui->btnClearRollCount->setEnabled(true); } else @@ -243,17 +295,10 @@ void MainWindow::on_btnGetVersionList_clicked() m_versionCount = 0; ui->comboVersionList->clear(); - std::string devType; - if (m_curFwVersion.left(2) == "G1") - devType = "G100"; - else if (m_curFwVersion.left(2) == "G2") - devType = "G200"; - else if (m_curFwVersion.left(2) == "G3") - devType = "G300"; - else if (m_curFwVersion.left(2) == "G4") - devType = "G400"; + QString devType = GetDevType(m_curFwVersion); + assert(!devType.isEmpty()); - HGVersion_GetDriverVersionList(m_versionMgr, devType.c_str(), &m_versionInfo, &m_versionCount); + HGVersion_GetDriverVersionList(m_versionMgr, devType.toStdString().c_str(), &m_versionInfo, &m_versionCount); if (0 != m_versionCount) { for (HGUInt i = 0; i < m_versionCount; ++i) @@ -295,10 +340,35 @@ void MainWindow::on_editFilePath_textChanged(const QString &arg1) void MainWindow::on_btnOpenFilePath_clicked() { - QString filePath = QFileDialog::getOpenFileName(this, tr("Open File"), ".", tr("Zip Files(*.zip *.zip)")); + QString filePath = QFileDialog::getOpenFileName(this, tr("Open File"), ".", tr("ZIP Files(*.zip *.zip)")); if (!filePath.isEmpty()) { - ui->editFilePath->setText(filePath); + QString devType = GetDevType(m_curFwVersion); + assert(!devType.isEmpty()); + + HGChar fileName[256] = {0}; + HGBase_GetFileName(filePath.toStdString().c_str(), fileName, 256); + HGChar fileVersion[256] = {0}; + HGBase_GetFilePrefix(fileName, fileVersion, 256); + if (devType == GetDevType(fileVersion)) + { + if (m_curFwVersion >= fileVersion) + { + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("the selected firmware is not newer than the current version"), QMessageBox::Yes, this); + msg.setButtonText(QMessageBox::Yes, tr("yes")); + msg.exec(); + } + else + { + ui->editFilePath->setText(filePath); + } + } + else + { + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("firmware file mismatch"), QMessageBox::Yes, this); + msg.setButtonText(QMessageBox::Yes, tr("yes")); + msg.exec(); + } } } @@ -307,20 +377,81 @@ void MainWindow::on_btnDownloadUpgrade_clicked() int idx = ui->comboVersionList->currentIndex(); if (-1 != idx) { - Dialog_upgradeFirmware dlg(m_versionMgr, m_curDevHandle, m_versionInfo[idx].url, m_versionInfo[idx].version, - m_versionInfo[idx].md5, this); - dlg.exec(); - if (0 == dlg.getUpgradeStatus()) + QString url = m_versionInfo[idx].url; + QString md5 = m_versionInfo[idx].md5; + QString versionNum = m_versionInfo[idx].version; + + if (m_curFwVersion >= versionNum) { - ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName)); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("the selected firmware is not newer than the current version"), QMessageBox::Yes, this); + msg.setButtonText(QMessageBox::Yes, tr("yes")); + msg.exec(); + return; } - else if (1 == dlg.getUpgradeStatus()) + + assert(!url.isEmpty() && !md5.isEmpty() && !versionNum.isEmpty()); + + HGChar suffix[64]; + HGBase_GetFileSuffix(url.toStdString().c_str(), suffix, 64); + + HGChar savePath[512]; + HGBase_GetConfigPath(savePath, 512); + HGBase_CreateDir(savePath); + HGChar fileName[128]; + sprintf(fileName, "%s.%s", versionNum.toStdString().c_str(), suffix); + strcat(savePath, fileName); + + QFile saveFile(savePath); + saveFile.open(QFile::ReadOnly); + QByteArray fileMsg = saveFile.readAll(); + saveFile.close(); + QString md5_2 = QCryptographicHash::hash(fileMsg , QCryptographicHash::Md5).toHex(); + + QFile f(savePath); + if(!f.exists() || md5 != md5_2) { - ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware failed, download file fail")).arg(m_curDevName)); + Dialog_updateProgress dlg(m_versionMgr, url, savePath, this); + if (dlg.exec()) + { + QFile saveFile(savePath); + saveFile.open(QFile::ReadOnly); + QByteArray fileMsg = saveFile.readAll(); + saveFile.close(); + QString md5_2 = QCryptographicHash::hash(fileMsg , QCryptographicHash::Md5).toHex(); + + if (md5 == md5_2) + { + Dialog_upgradeFirmware dlg(m_curDevHandle, savePath, this); + dlg.exec(); + if (0 == dlg.getUpgradeStatus()) + { + ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName)); + } + else + { + ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware failed, io error")).arg(m_curDevName)); + } + } + else + { + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("download firmware fail"), QMessageBox::Yes, this); + msg.setButtonText(QMessageBox::Yes, tr("yes")); + msg.exec(); + } + } } - else if (2 == dlg.getUpgradeStatus()) + else { - ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware failed, io error")).arg(m_curDevName)); + Dialog_upgradeFirmware dlg(m_curDevHandle, savePath, this); + dlg.exec(); + if (0 == dlg.getUpgradeStatus()) + { + ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName)); + } + else + { + ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware failed, io error")).arg(m_curDevName)); + } } } } @@ -336,7 +467,7 @@ void MainWindow::on_btnUpgrade_clicked() { ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName)); } - else if (2 == dlg.getUpgradeStatus()) + else { ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware failed, io error")).arg(m_curDevName)); } @@ -405,6 +536,10 @@ void MainWindow::on_btnModifyPassword_clicked() return; } + ui->editOldPassword->setText(""); + ui->editNewPassword->setText(""); + ui->editNewPassword_2->setText(""); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("modify password success"), QMessageBox::Yes, this); msg.setButtonText(QMessageBox::Yes, tr("yes")); msg.exec(); diff --git a/app/fwupgrade/mainwindow.h b/app/fwupgrade/mainwindow.h index 9a11a168..893cb82e 100644 --- a/app/fwupgrade/mainwindow.h +++ b/app/fwupgrade/mainwindow.h @@ -19,6 +19,7 @@ public: static QString passwordEncrypt(const QString& password); static QString passwordDecrypt(const QString& transcode); + static QString GetDevType(const QString& fwVersion); signals: void sane_dev_arrive(QString devName, bool opened); diff --git a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro index aeb22424..415235f1 100644 --- a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro +++ b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro @@ -144,17 +144,20 @@ INCLUDEPATH += $$PWD/../../../modules/ INCLUDEPATH += $$PWD/../../../../sdk/include/ SOURCES += \ + ../../../app/fwupgrade/dialog_updateprogress.cpp \ ../../../app/fwupgrade/dialog_upgradefirmware.cpp \ ../../../app/fwupgrade/logindialog.cpp \ ../../../app/fwupgrade/main.cpp \ ../../../app/fwupgrade/mainwindow.cpp \ HEADERS += \ + ../../../app/fwupgrade/dialog_updateprogress.h \ ../../../app/fwupgrade/dialog_upgradefirmware.h \ ../../../app/fwupgrade/logindialog.h \ ../../../app/fwupgrade/mainwindow.h \ FORMS += \ + ../../../app/fwupgrade/dialog_updateprogress.ui \ ../../../app/fwupgrade/dialog_upgradefirmware.ui \ ../../../app/fwupgrade/logindialog.ui \ ../../../app/fwupgrade/mainwindow.ui