From f1a117275b70b79b49c9485d37fcf92ae9b12778 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 13 Sep 2023 13:47:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 17149 -> 17153 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 44 +++++++++--------- .../dialog_inputserialnum.cpp | 25 ++++++---- app/HGProductionTool/dialog_inputserialnum.ui | 8 ++-- 4 files changed, 42 insertions(+), 35 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index 3fca1629e924c8848e6d53d4937aad4f43c39b52..97e71836a00717d0b82782f0e589492a63f7ad20 100644 GIT binary patch delta 1987 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取消 - - - - - + + + + + tips 提示 @@ -172,27 +172,27 @@ 检测到配置%1不一致，已重新配置，请再次检查 - + Consistent configuration 配置一致！ - + device is lost 设备已丢失 - + Serial num is empty 序列号为空 - + sn is illegal 序列号不合法 - + The device is testing 该设备正在进行测试 @@ -217,7 +217,7 @@ - + Speep mode: %1PPM Speep mode: %1PPM @@ -226,7 +226,7 @@ Pass - 通过 + Pass @@ -239,7 +239,7 @@ - + Sleep time: %1minute Sleep time: %1minute @@ -249,7 +249,7 @@ - + Vid: %1 Pid: %2 Vid: %1 Pid: %2 @@ -263,7 +263,7 @@ Fail - 无法通过 + Fail @@ -273,17 +273,17 @@ 设置序列号: %1 - + Detected that the current device's vid-pid and device object are not consistent. 检测到当前设备的vid-pid和设备对象不一致. - + Please reboot device to update. 请重启设备刷新. - + Do you want to restart now? 是否立即重启设备? @@ -311,12 +311,12 @@ 检测到配置 %1不一致，请重启后再次检查 - + Set configuration to device 将目标配置设置到设备 - + Test content: 测试内容： @@ -328,13 +328,13 @@ - + Sleep time: Not sleeping 休眠时间: 不休眠 - + Tester: %1, Test item: %2 测试员: %1, 测试项: %2 diff --git a/app/HGProductionTool/dialog_inputserialnum.cpp b/app/HGProductionTool/dialog_inputserialnum.cpp index dd21af8..fb5819b 100644 --- a/app/HGProductionTool/dialog_inputserialnum.cpp +++ b/app/HGProductionTool/dialog_inputserialnum.cpp @@ -32,6 +32,9 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l ft.setPointSize(15); this->setFont(ft); + QFont ft2; + ft2.setPointSize(20); + if (m_logInType != Dialog_logIn::LogInType_InitTest) { ui->lineEdit_sn->setEnabled(false); @@ -46,6 +49,7 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l } updatePassStatus(false); + ui->pushButton_status->setFont(ft2); ui->pbtn_enterTest->setEnabled(false); ui->label_scanner->setText(tr("Device name: %1").arg(m_devName)); @@ -347,7 +351,7 @@ void Dialog_InputSerialNum::updatePassStatus(bool pass) if (pass) { ui->pushButton_status->setText(tr("Pass")); - ui->pushButton_status->setStyleSheet("background-color: yellow"); + ui->pushButton_status->setStyleSheet("background-color: green"); } else { @@ -432,6 +436,9 @@ void Dialog_InputSerialNum::on_pbtn_checkConfig_clicked() if (m_originVid != vid_to || m_originPid != pid_to) { right = false; + + QString info = tr("Detected that the current device's vid-pid and device object are not consistent. "); + addInteractInfo(info + tr("Please reboot device to update. "), false); } updatePassStatus(right); @@ -516,14 +523,14 @@ void Dialog_InputSerialNum::on_pbtn_setConfig_clicked() { QString info = tr("Detected that the current device's vid-pid and device object are not consistent. "); addInteractInfo(info + tr("Please reboot device to update. "), false); - QMessageBox msg(QMessageBox::Question, tr("tips"), - info + tr("Do you want to restart now?"), - QMessageBox::Yes | QMessageBox::No, this); - msg.exec(); - if (msg.clickedButton() == msg.button(QMessageBox::Yes)) - { - rebootDevice(); - } +// QMessageBox msg(QMessageBox::Question, tr("tips"), +// info + tr("Do you want to restart now?"), +// QMessageBox::Yes | QMessageBox::No, this); +// msg.exec(); +// if (msg.clickedButton() == msg.button(QMessageBox::Yes)) +// { +// rebootDevice(); +// } } //QMessageBox::information(this, tr("Prompt"), (tr("Success, please check the configuration"))); diff --git a/app/HGProductionTool/dialog_inputserialnum.ui b/app/HGProductionTool/dialog_inputserialnum.ui index 92e3341..a5abbde 100644 --- a/app/HGProductionTool/dialog_inputserialnum.ui +++ b/app/HGProductionTool/dialog_inputserialnum.ui @@ -234,10 +234,10 @@ - 610 - 120 - 111 - 51 + 600 + 110 + 121 + 61