From c6e72e8a17cfa5f13201674cc5aa560c1ca8d1b1 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 13 Sep 2023 11:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=BF=AE=E6=94=B9vidpid=E6=97=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=87=8D=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 16681 -> 17149 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 193 ++++++++++-------- .../dialog_inputserialnum.cpp | 45 +++- app/HGProductionTool/dialog_inputserialnum.h | 3 + app/HGProductionTool/dialog_inputserialnum.ui | 39 ++-- 5 files changed, 184 insertions(+), 96 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index 20cc42d2f5f08704d9b2731d26f984bf416526e2..3fca1629e924c8848e6d53d4937aad4f43c39b52 100644 GIT binary patch delta 2406 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 diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index 7f0c1d4..bb79dbc 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -116,6 +116,11 @@ Select Log Path 选择日志路径 + + + Status + + OK 确定 @@ -125,35 +130,36 @@ 取消 - - - - + + + + + tips 提示 - + Speed mode 速度模式 - + Failed! 失败! - + Succeed! 成功! - + Sleep time 休眠时间 - + Vid and Pid Vid和Pid @@ -166,96 +172,125 @@ 检测到配置%1不一致，已重新配置，请再次检查 - + Consistent configuration 配置一致！ - + device is lost 设备已丢失 - + Serial num is empty 序列号为空 - + sn is illegal 序列号不合法 - + The device is testing 该设备正在进行测试 - + set sn failed 设置序列号失败 - + Device name: %1 设备名： %1 - + Target Configration: Target Configration: 目标配置: - - - - + + + + Speep mode: %1PPM Speep mode: %1PPM 速度模式: %1PPM - - - + + Pass + 通过 + + + + + Set 设置 - - - - + + + + Sleep time: %1minute Sleep time: %1minute 休眠时间: %1分钟 - - - - + + + + Vid: %1 Pid: %2 Vid: %1 Pid: %2 Vid: %1 Pid: %2 - + Current Configration of device: 当前设备配置: - - + Fail + 无法通过 + + + + + Set serial number: %1 设置序列号: %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? + 是否立即重启设备? + + + Detected that the current device's vid-pid and device object are not consistent. Do you want to restart now? + 检测到当前设备的vid-pid和设备对象不是一致的，是否立即重启? + Test result: Failed! 测试结果：失败！ @@ -265,23 +300,23 @@ 测试结果：成功！ - - + + Inconsistent configuration %1detected, please reconfigure, and check again 检测到配置 %1不一致，请重新配置后再次检查 - + Inconsistent configuration %1detected, please reboot and reconfigure, and check again 检测到配置 %1不一致，请重启后再次检查 - + Set configuration to device 将目标配置设置到设备 - + Test content: 测试内容： @@ -290,21 +325,21 @@ 成功，请检查配置 - - - - + + + + Sleep time: Not sleeping 休眠时间: 不休眠 - - + + Tester: %1, Test item: %2 测试员: %1, 测试项: %2 - + set sn succeed 设置序列号成功 @@ -422,23 +457,21 @@ 选择路径 - - + tips 提示 - Directory can not be empty - 文件不能为空 + 文件不能为空 - + Create logPath failed 创建文件失败 - + Browse directory 打开文件 @@ -716,55 +749,55 @@ 退出 - + Set host and port 设置IP与端口 - + Minimize 最小化 - + Close 关闭 - + LogIn 登录 - - - - + + + + Prompt 提示 - + Account dose not exist 账户不存在 - + Password can not be empty 密码不能为空 - + Password error 密码错误 - + Please select a profile first 请先选择配置文件 - + Select profile 选择配置文件 @@ -1624,38 +1657,38 @@ 数据库错误 - - - - - + + + + + tips 提示 - + production tool-burn station 华高生产工具-烧录工位 - + production tool-init test station 华高生产工具-初检工位 - + production tool-image test station 华高生产工具-图像测试工位 - + production tool-pressure test station 华高生产工具-压力测试工位 - - - + + + Is testing, do not close! 测试中，请勿关闭！ @@ -1677,8 +1710,8 @@ 取消 - - + + cannot create more table 不能创建更多项目 diff --git a/app/HGProductionTool/dialog_inputserialnum.cpp b/app/HGProductionTool/dialog_inputserialnum.cpp index 91cbee8..dd21af8 100644 --- a/app/HGProductionTool/dialog_inputserialnum.cpp +++ b/app/HGProductionTool/dialog_inputserialnum.cpp @@ -20,7 +20,9 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l m_devType(devType), m_devName(devName), m_hg(nullptr), - m_curIndex(0) + m_curIndex(0), + m_originVid(0), + m_originPid(0) { ui->setupUi(this); @@ -43,10 +45,10 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l ui->pbtn_slectLogPath->setVisible(true); } + updatePassStatus(false); + ui->pbtn_enterTest->setEnabled(false); - ui->label_scanner->setText(tr("Device name: %1").arg(m_devName)); - ui->lineEdit_sn->setValidator(new QRegExpValidator(QRegExp("[a-zA-Z0-9]+$"))); ui->lineEdit_sn->setMaxLength(14); @@ -66,6 +68,9 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l connect(this, SIGNAL(testResult()), this, SLOT(on_testResult())); + m_originVid = getDevVid(); + m_originPid = getDevPid(); + setSleepTime(); updateTargetCfg(); updateCurDeviceCfg(); @@ -337,6 +342,20 @@ void Dialog_InputSerialNum::addInteractInfo(QString info, bool isNormal) ui->textBrowser_info->setTextColor(Qt::black); } +void Dialog_InputSerialNum::updatePassStatus(bool pass) +{ + if (pass) + { + ui->pushButton_status->setText(tr("Pass")); + ui->pushButton_status->setStyleSheet("background-color: yellow"); + } + else + { + ui->pushButton_status->setText(tr("Fail")); + ui->pushButton_status->setStyleSheet("background-color: red"); + } +} + void Dialog_InputSerialNum::on_testResult() { //m_mainWnd->releaseTesting(); @@ -410,6 +429,12 @@ void Dialog_InputSerialNum::on_pbtn_checkConfig_clicked() addInteractInfo(info, false); } + if (m_originVid != vid_to || m_originPid != pid_to) + { + right = false; + } + + updatePassStatus(right); ui->pbtn_enterTest->setEnabled(right); if (right) { @@ -487,6 +512,20 @@ void Dialog_InputSerialNum::on_pbtn_setConfig_clicked() updateTargetCfg(); updateCurDeviceCfg(); + if (m_originVid != vid_to || m_originPid != pid_to) + { + 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::information(this, tr("Prompt"), (tr("Success, please check the configuration"))); } diff --git a/app/HGProductionTool/dialog_inputserialnum.h b/app/HGProductionTool/dialog_inputserialnum.h index 3d5cba4..ad4135c 100644 --- a/app/HGProductionTool/dialog_inputserialnum.h +++ b/app/HGProductionTool/dialog_inputserialnum.h @@ -40,6 +40,7 @@ private: QString getLogPath(); void writeTestLog(QString logContent); void addInteractInfo(QString info, bool isNormal); + void updatePassStatus(bool pass); signals: void testResult(); @@ -88,6 +89,8 @@ private: hgscanner *m_hg; int m_curIndex; + int m_originVid; + int m_originPid; }; #endif // DIALOG_INPUTSERIALNUM_H diff --git a/app/HGProductionTool/dialog_inputserialnum.ui b/app/HGProductionTool/dialog_inputserialnum.ui index e11c015..92e3341 100644 --- a/app/HGProductionTool/dialog_inputserialnum.ui +++ b/app/HGProductionTool/dialog_inputserialnum.ui @@ -17,21 +17,21 @@ 570 - 150 + 210 190 - 30 + 35 190 - 30 + 35 190 - 30 + 35 @@ -45,21 +45,21 @@ 570 - 230 + 300 190 - 30 + 35 190 - 30 + 35 190 - 30 + 35 @@ -73,21 +73,21 @@ 570 - 310 + 380 190 - 30 + 35 190 - 30 + 35 190 - 30 + 35 @@ -149,7 +149,7 @@ 610 - 400 + 460 101 41 @@ -231,6 +231,19 @@ Select Log Path + + + + 610 + 120 + 111 + 51 + + + + Status + +