From 994162aceba33569e4ab021468cce6568c27a39e Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 5 Jan 2023 15:18:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E5=BD=95=E5=B7=A5=E5=85=B7=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=85=B3=E9=97=AD=E8=AE=BE=E5=A4=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 10837 -> 11058 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 48 +++++++++++----- app/HGProductionTool/dialog_setburnsn.cpp | 7 +++ app/HGProductionTool/form_burnmode.cpp | 56 ++++++++++++++++--- app/HGProductionTool/form_burnmode.h | 3 + app/HGProductionTool/form_burnmode.ui | 13 +++++ 6 files changed, 105 insertions(+), 22 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index afaea02384889709378e2ffd017ff4401f86b9f2..2f2601402c88a69c45bbee496a0eaad807072506 100644 GIT binary patch delta 1507 zcmY+Edu$X{6vn^ZoyX41?oM~xvhB9rE_E9MDs7OW1`$kCj0Wk0qo=Y`{`3=*fb# zZ)m?q&{ItI0Lf<|)eoJ2A?Vo*sbOe;SI~15Qga{Rm;mW~4XfQPn0!yre;D%QO2F3+ zdGjPD{1?=h>JUZRA5eF70>NUa4UIs2AJjt?fbD>wd{-}pB;*mCcs& z?AL*`RLjaGcL2{-%c@}~fK0dLtB?c?hvi!TA;8{dxi%Q$exK#%lEr{B!g_M_78bJ1 z+C8;^`>?g|iU$a!*cSSC1A33`;%Q2jyw!H8A~DPtyKO%fe9b^FOXE(y2)L!#b5?J( zSK9T=agI#ApjImw_k{F8dAr*k6>J*pnE_%Wjz9<-;gd$ z;7D5Em9_WxvK_T@{Eo|<7RQ%zZFmph&6SUSY^6YkeEOlWK!z-zGg$uv`{iCell)%3 zllLkE%u+@!V4vJA%9sf&X*W-Kq=)5Xj8Sqv;yBtCE8()6>}S3bZWUZ~cF!K_-^+TFv=G!N3qj3I<_S@BK8Ms?pdWn?N`l+Tf6i`~G{Wg6%CnIH)cB6!qI$QO07c-3CuV*(MVZ|%-*@Zb&{9Ch$q|1Mx|5_GTC56AVf@{RhLWBlNiPxNmB8avx)xcfG8 zA|@O8kw(V((+Hi9@*?MeF|&*Z<|w1ChkpWZywUiBjV&uSIxYr*VYx=<>V8(#Z=7kO zX6gdt%nAAp&oQnXn@Il*2QF`+H2n^xi3w+HcW7Pjv4BaA2M^HS+u$g?&GYyyN41}J zM#yn3k^V`8&T-KWW~#pJoIPhbE2(tOe}@kCOlQd{8YX2stACLwLDc#8`aA}{<63k- zfKSlQ8{48^mJHs8v4jR!S? za>xwcKX8pT+sjw;!ZP!0Vi6N*HP03A<;88K6mWmcrDet k^Hkkhf3w(KG`L-xifR4-vrLbrrFdgcrlhwF_~x7c0B&}7!T3?s9jR=kiz(&_aArAw9^^rhx`)6li%U)uaR)n8Qv;8W<~4 zjUwd(8qGm_fG~l9Jfg7zh5=Ndi5`GVGEzV?l{Qq2fn(Tr=l9oV&u@R{`#a}+f4|$7 zKIS;)W6LDsM~QsX8Ew0Wg!TB{b$qSAn-Ih!xWTB%jOJ=0X&aGYkWmX}3|`F`@hVYj z1CjU#QDz`f;EzPl*CKZlk-Lvbj$+hm7(;p(BUce$^B$49pV94eoA|mIBF@EVxk>yv zPkffqY6B;UY$EaXp7n1St%<}pc;Y*Z)SO(APYIyFEPagwBlMk4QzNxD!-q|av*zF;&gGOABAYK4s66O8^(Foqms zjOZp=JcvmgqAhXnqp)+7oR~mlN}^}8mWhm?Q|3E+G5^5-=!FFV6> z)?`={shgd)5{0Jgv+bveln?Y1gRm-KP=Bq^iS;r4jb!(C5L(B_^}j@9?&VJ&VX(qjq6(7MJ+o#v<%HEj~1f23PD6ody43vK6AUX#xCKbQc+BF!~q8^CR%c zuT$(T7{$hW5|`pb8HEZ zC^W*LYsI$63d5$Ou+Z*pSgd>lI%av#H8d2uELWAIAlp&7X3~Xyoo>0lS0U2+<@!F* zD@eXn3@`a;`Oma82Ogpmhv9WiXcAi0kG;PYgf_?tGO_jg%u;6jiy|M%d#(L#=@|CNM=4DMy zaUhP>0-Bpq=$sZlSdB}*TFb%fBikkI5Ok_i1?wt{b|U-$di_i5brnOpQ5*J6#gVtQ kk>~1gL`fd3nyHFWR<^eYN&5D9xyMo!6_nQgeb7$re_UQ!UH||9 diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index 54f21e7..dbf7afb 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -86,6 +86,7 @@ + tips 提示 @@ -95,6 +96,11 @@ Serial num is empty 序列号为空 + + + sn is illegal + 序列号不合法 + The device is testing @@ -523,8 +529,8 @@ - - + + tips 提示 @@ -534,12 +540,12 @@ 文件为空 - + upload succeed 上传成功 - + upload to service failed, already save to local host 上传至服务器失败，已保存至本地 @@ -571,39 +577,51 @@ 设置勾选项序列号 - + + Close + 关闭设备 + + + ID 序号 - + selected 选择 - + device 设备 - + serialNum 序列号 - - - + + + + tips 提示 - + + + Please check a devices at least + 请至少勾选一台设备 + + + Please check single devices to set sn 请只勾选一台设备再进行设置序列号 - + Please check a devices to set sn at least 请至少勾选一台设备再设置序列号 @@ -942,14 +960,14 @@ QObject - + success: success 成功: - + failed: 失败： diff --git a/app/HGProductionTool/dialog_setburnsn.cpp b/app/HGProductionTool/dialog_setburnsn.cpp index 595f357..8c9b535 100644 --- a/app/HGProductionTool/dialog_setburnsn.cpp +++ b/app/HGProductionTool/dialog_setburnsn.cpp @@ -1,6 +1,7 @@ #include "dialog_setburnsn.h" #include "ui_dialog_setburnsn.h" #include +#include Dialog_SetBurnSn::Dialog_SetBurnSn(const QString &originSn, QWidget *parent) : QDialog(parent), @@ -30,6 +31,12 @@ QString Dialog_SetBurnSn::getSn() void Dialog_SetBurnSn::on_pbtn_ok_clicked() { + if (ui->lineEdit->text().isEmpty()) + { + QMessageBox::information(this, tr("tips"), tr("Serial num is empty")); + return; + } + accept(); } diff --git a/app/HGProductionTool/form_burnmode.cpp b/app/HGProductionTool/form_burnmode.cpp index ea4925f..b27170c 100644 --- a/app/HGProductionTool/form_burnmode.cpp +++ b/app/HGProductionTool/form_burnmode.cpp @@ -46,6 +46,7 @@ void Form_BurnMode::addDevice(DeviceManager *devManager) QVariant var = QVariant::fromValue((void*)devManager); item->setData(Qt::UserRole, var); + updatetablewidget(); // for(int i = 0; i < ui->tableWidget->rowCount(); i++) // { // QTableWidgetItem *item = ui->tableWidget->item(i, 3); @@ -58,7 +59,7 @@ void Form_BurnMode::addDevice(DeviceManager *devManager) void Form_BurnMode::deleteDevice(QString devName) { - for(int i = 0; i < ui->tableWidget->columnCount(); i++) + for(int i = 0; i < ui->tableWidget->rowCount(); i++) { QTableWidgetItem *item = ui->tableWidget->item(i, 1); QTableWidgetItem *item2 = ui->tableWidget->item(i, 2); @@ -75,6 +76,7 @@ void Form_BurnMode::deleteDevice(QString devName) } } } + updatetablewidget(); } void Form_BurnMode::on_testResult(bool setStatus) @@ -111,12 +113,20 @@ void Form_BurnMode::initTableWidget() ui->tableWidget->clearContents(); } +void Form_BurnMode::updatetablewidget() +{ + for(int i = 0; i < ui->tableWidget->rowCount(); i++) + { + ui->tableWidget->setItem(i, 0, new QTableWidgetItem(QString::number(i + 1))); + } +} + void Form_BurnMode::on_cbox_selectAll_stateChanged(int arg1) { (void)arg1; bool check = ui->cbox_selectAll->isChecked(); - for(int i = 0; i < ui->tableWidget->columnCount(); i++) + for(int i = 0; i < ui->tableWidget->rowCount(); i++) { QTableWidgetItem *item = ui->tableWidget->item(i, 1); if (item != nullptr) @@ -132,7 +142,7 @@ void Form_BurnMode::on_cbox_selectAll_stateChanged(int arg1) void Form_BurnMode::on_pbtn_burn_clicked() { int select = 0; - for(int i = 0; i < ui->tableWidget->columnCount(); i++) + for(int i = 0; i < ui->tableWidget->rowCount(); i++) { QTableWidgetItem *item = ui->tableWidget->item(i, 1); if (item != nullptr && Qt::Checked == item->checkState()) @@ -142,11 +152,11 @@ void Form_BurnMode::on_pbtn_burn_clicked() } if (select == 0) { - QMessageBox::information(this, tr("tips"), tr("Please check a devices to set sn at least")); + QMessageBox::information(this, tr("tips"), tr("Please check a devices at least")); return; } - for(int i = 0; i < ui->tableWidget->columnCount(); i++) + for(int i = 0; i < ui->tableWidget->rowCount(); i++) { QTableWidgetItem *item = ui->tableWidget->item(i, 1); if (item != nullptr && Qt::Checked == item->checkState()) @@ -160,7 +170,7 @@ void Form_BurnMode::on_pbtn_burn_clicked() void Form_BurnMode::on_pbtn_setSn_clicked() { int select = 0; - for(int i = 0; i < ui->tableWidget->columnCount(); i++) + for(int i = 0; i < ui->tableWidget->rowCount(); i++) { QTableWidgetItem *item = ui->tableWidget->item(i, 1); if (item != nullptr && Qt::Checked == item->checkState()) @@ -181,7 +191,7 @@ void Form_BurnMode::on_pbtn_setSn_clicked() } else if (select == 1) { - for(int i = 0; i < ui->tableWidget->columnCount(); i++) + for(int i = 0; i < ui->tableWidget->rowCount(); i++) { QTableWidgetItem *item = ui->tableWidget->item(i, 1); QTableWidgetItem *item2 = ui->tableWidget->item(i, 3); @@ -314,4 +324,36 @@ void Form_BurnMode::on_tableWidget_itemDoubleClicked(QTableWidgetItem *item) } } +void Form_BurnMode::on_pbtn_close_clicked() +{ + int select = 0; + for(int i = 0; i < ui->tableWidget->rowCount(); i++) + { + QTableWidgetItem *item = ui->tableWidget->item(i, 1); + if (item != nullptr && Qt::Checked == item->checkState()) + { + select++; + } + } + if (select == 0) + { + QMessageBox::information(this, tr("tips"), tr("Please check a devices at least")); + return; + } + int i = 0; + while(ui->tableWidget->rowCount() > i) + { + QTableWidgetItem *item = ui->tableWidget->item(i, 1); + if (item != nullptr && Qt::Checked == item->checkState()) + { + DeviceManager *devManager = (DeviceManager*)item->data(Qt::UserRole).value(); + delete devManager; + + ui->tableWidget->removeRow(i); + m_curIndex--; + } + } + + updatetablewidget(); +} diff --git a/app/HGProductionTool/form_burnmode.h b/app/HGProductionTool/form_burnmode.h index 63a779c..c458ba9 100644 --- a/app/HGProductionTool/form_burnmode.h +++ b/app/HGProductionTool/form_burnmode.h @@ -74,8 +74,11 @@ private slots: void on_tableWidget_itemDoubleClicked(QTableWidgetItem *item); + void on_pbtn_close_clicked(); + private: void initTableWidget(); + void updatetablewidget(); private: Ui::Form_BurnMode *ui; diff --git a/app/HGProductionTool/form_burnmode.ui b/app/HGProductionTool/form_burnmode.ui index 7613b71..608b634 100644 --- a/app/HGProductionTool/form_burnmode.ui +++ b/app/HGProductionTool/form_burnmode.ui @@ -52,6 +52,19 @@ + + + + + 91 + 31 + + + + Close + + +