diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index 3fca162..97e7183 100644
Binary files a/app/HGProductionTool/ProductionTool_zh_CN.qm and b/app/HGProductionTool/ProductionTool_zh_CN.qm differ
diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index bb79dbc..91a953d 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -130,11 +130,11 @@
取消
-
-
-
-
-
+
+
+
+
+
提示
@@ -172,27 +172,27 @@
检测到配置%1不一致,已重新配置,请再次检查
-
+
配置一致!
-
+
设备已丢失
-
+
序列号为空
-
+
序列号不合法
-
+
该设备正在进行测试
@@ -217,7 +217,7 @@
-
+
Speep mode: %1PPM
@@ -226,7 +226,7 @@
- 通过
+ Pass
@@ -239,7 +239,7 @@
-
+
Sleep time: %1minute
@@ -249,7 +249,7 @@
-
+
Vid: %1 Pid: %2
@@ -263,7 +263,7 @@
- 无法通过
+ Fail
@@ -273,17 +273,17 @@
设置序列号: %1
-
+
检测到当前设备的vid-pid和设备对象不一致.
-
+
请重启设备刷新.
-
+
是否立即重启设备?
@@ -311,12 +311,12 @@
检测到配置 %1不一致,请重启后再次检查
-
+
将目标配置设置到设备
-
+
测试内容:
@@ -328,13 +328,13 @@
-
+
休眠时间: 不休眠
-
+
测试员: %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