V6.7.5_beta

This commit is contained in:
2026-07-22 11:47:13 +08:00
parent e90e80000f
commit 50c4999d90
26 changed files with 798 additions and 743 deletions
+3 -1
View File
@@ -1249,15 +1249,17 @@ void RFIDManager::slt_intervalTimerHandle()
emit sig_showMsg(tr("请及时使用溶剂盒附带的IC卡激活溶剂盒"));
status.firstPromptSolventCard = false;
}
//不需要通知先后,成功即可
auto res = waitStatus();
if (res == 1) {
LogInfo::setRunStatusText("Ink progress finished, and the ink card has been used.");
emit sig_inkCardProgressFinished();
return;
}
if (res == 2) {
LogInfo::setRunStatusText("Solvent progress finished, and the solvent card has been used.");
emit sig_solventProgressFinished();
return;
}
}
+7
View File
@@ -114,6 +114,13 @@ signals:
void sig_maintenanceShow();
// 墨水流程已完成,(墨水、刷卡均已完成)
void sig_inkCardProgressFinished();
// 溶剂流程已完成
void sig_solventProgressFinished();
private slots:
//接收刷卡数据槽函数
void slt_readRFIDData();