微调

app/HGProductionTool/ProductionTool_zh_CN.ts

@@ -130,11 +130,11 @@
         <translation type="vanished">取消</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="458"/>
-        <location filename="dialog_inputserialnum.cpp" line="465"/>
-        <location filename="dialog_inputserialnum.cpp" line="474"/>
-        <location filename="dialog_inputserialnum.cpp" line="481"/>
-        <location filename="dialog_inputserialnum.cpp" line="522"/>
+        <location filename="dialog_inputserialnum.cpp" line="455"/>
+        <location filename="dialog_inputserialnum.cpp" line="462"/>
+        <location filename="dialog_inputserialnum.cpp" line="471"/>
+        <location filename="dialog_inputserialnum.cpp" line="478"/>
+        <location filename="dialog_inputserialnum.cpp" line="519"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
@@ -172,27 +172,27 @@
         <translation type="vanished">检测到配置%1不一致，已重新配置，请再次检查</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="435"/>
+        <location filename="dialog_inputserialnum.cpp" line="441"/>
         <source>Consistent configuration</source>
         <translation>配置一致！</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="458"/>
+        <location filename="dialog_inputserialnum.cpp" line="455"/>
         <source>device is lost</source>
         <translation>设备已丢失</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="465"/>
+        <location filename="dialog_inputserialnum.cpp" line="462"/>
         <source>Serial num is empty</source>
         <translation>序列号为空</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="474"/>
+        <location filename="dialog_inputserialnum.cpp" line="471"/>
         <source>sn is illegal</source>
         <translation>序列号不合法</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="481"/>
+        <location filename="dialog_inputserialnum.cpp" line="478"/>
         <source>The device is testing</source>
         <translation>该设备正在进行测试</translation>
     </message>
@@ -217,7 +217,7 @@
         <location filename="dialog_inputserialnum.cpp" line="121"/>
         <location filename="dialog_inputserialnum.cpp" line="256"/>
         <location filename="dialog_inputserialnum.cpp" line="283"/>
-        <location filename="dialog_inputserialnum.cpp" line="508"/>
+        <location filename="dialog_inputserialnum.cpp" line="505"/>
         <source>Speep mode: %1PPM</source>
         <oldsource>Speep mode: %1PPM
 	</oldsource>
@@ -226,7 +226,7 @@
     <message>
         <location filename="dialog_inputserialnum.cpp" line="349"/>
         <source>Pass</source>
-        <translation>通过</translation>
+        <translation>Pass</translation>
     </message>
     <message>
         <location filename="dialog_inputserialnum.cpp" line="121"/>
@@ -239,7 +239,7 @@
         <location filename="dialog_inputserialnum.cpp" line="138"/>
         <location filename="dialog_inputserialnum.cpp" line="257"/>
         <location filename="dialog_inputserialnum.cpp" line="284"/>
-        <location filename="dialog_inputserialnum.cpp" line="509"/>
+        <location filename="dialog_inputserialnum.cpp" line="506"/>
         <source>Sleep time: %1minute</source>
         <oldsource>Sleep time: %1minute
 	</oldsource>
@@ -249,7 +249,7 @@
         <location filename="dialog_inputserialnum.cpp" line="162"/>
         <location filename="dialog_inputserialnum.cpp" line="258"/>
         <location filename="dialog_inputserialnum.cpp" line="285"/>
-        <location filename="dialog_inputserialnum.cpp" line="510"/>
+        <location filename="dialog_inputserialnum.cpp" line="507"/>
         <source>Vid: %1  Pid: %2</source>
         <oldsource>Vid: %1  Pid: %2
 	</oldsource>
@@ -263,7 +263,7 @@
     <message>
         <location filename="dialog_inputserialnum.cpp" line="354"/>
         <source>Fail</source>
-        <translation>无法通过</translation>
+        <translation>Fail</translation>
     </message>
     <message>
         <location filename="dialog_inputserialnum.cpp" line="369"/>
@@ -273,17 +273,17 @@
         <translation>设置序列号: %1  </translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="520"/>
+        <location filename="dialog_inputserialnum.cpp" line="517"/>
         <source>Detected that the current device&apos;s vid-pid and device object are not consistent. </source>
         <translation>检测到当前设备的vid-pid和设备对象不一致. </translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="521"/>
+        <location filename="dialog_inputserialnum.cpp" line="518"/>
         <source>Please reboot device to update. </source>
         <translation>请重启设备刷新. </translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="523"/>
+        <location filename="dialog_inputserialnum.cpp" line="520"/>
         <source>Do you want to restart now?</source>
         <translation>是否立即重启设备?</translation>
     </message>
@@ -311,12 +311,12 @@
         <translation>检测到配置 %1不一致，请重启后再次检查</translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="512"/>
+        <location filename="dialog_inputserialnum.cpp" line="509"/>
         <source>Set configuration to device  </source>
         <translation>将目标配置设置到设备  </translation>
     </message>
     <message>
-        <location filename="dialog_inputserialnum.cpp" line="513"/>
+        <location filename="dialog_inputserialnum.cpp" line="510"/>
         <source>Test content: </source>
         <translation>测试内容： </translation>
     </message>
@@ -328,13 +328,13 @@
         <location filename="dialog_inputserialnum.cpp" line="138"/>
         <location filename="dialog_inputserialnum.cpp" line="257"/>
         <location filename="dialog_inputserialnum.cpp" line="284"/>
-        <location filename="dialog_inputserialnum.cpp" line="509"/>
+        <location filename="dialog_inputserialnum.cpp" line="506"/>
         <source>Sleep time: Not sleeping</source>
         <translation>休眠时间: 不休眠</translation>
     </message>
     <message>
         <location filename="dialog_inputserialnum.cpp" line="369"/>
-        <location filename="dialog_inputserialnum.cpp" line="512"/>
+        <location filename="dialog_inputserialnum.cpp" line="509"/>
         <source>Tester: %1,  Test item: %2</source>
         <translation>测试员: %1,  测试项: %2</translation>
     </message>

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")));

app/HGProductionTool/dialog_inputserialnum.ui

@@ -234,10 +234,10 @@
   <widget class="QPushButton" name="pushButton_status">
    <property name="geometry">
     <rect>
-     <x>610</x>
-     <y>120</y>
-     <width>111</width>
-     <height>51</height>
+     <x>600</x>
+     <y>110</y>
+     <width>121</width>
+     <height>61</height>
     </rect>
    </property>
    <property name="text">