hlp/VX5_KRO_GearPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V6.7.4 追加更新

Browse Source
This commit is contained in:
byons
2026-07-20 09:21:44 +08:00
parent 6425b11a96
commit e90e80000f
25 changed files with 2830 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rfid/rfidmanager.cpp
+23 -18
View File
@@ -238,8 +238,6 @@ QByteArray RFIDManager::buildMarkCardCommand(int block, int cardType, const QStr
QList<QString> list = str.split(":");
for(int i = 0;i < list.size();i++){
Cmd[i+6] = list.at(i).toInt();
LogInfo::setRunStatusText(tr("Cmd[%1]: %2").arg(i+6).arg(Cmd[i+6]));
qDebug()<<"Cmd["<<i+6<<"]: "<<Cmd[i+6];
}
#ifdef ARCH_X86
@@ -287,7 +285,7 @@ bool RFIDManager::verifyWriteResponse(const QByteArray &recResponse, QString not
{
//写数据块成功
qDebug() << notice << "成功！" << endl << endl;
LogInfo::setRunStatusText(notice+"成功！");
// LogInfo::setRunStatusText(notice+"成功！");
return true;
}
}
@@ -520,7 +518,7 @@ void RFIDManager::initRFIDMoudle(unsigned int addr, SysPara *sysPara)
//报警定时器一定要在初始化之后启动，不然就崩
#ifdef __RFID_CARD
if (warningTimer)
warningTimer->start(1000);
warningTimer->start(3000);
#endif
}
@@ -563,7 +561,8 @@ void RFIDManager::handleCheck(unsigned int addr)
else {
auto ret = RFIDmarkCardUsedAsync(0, strRevdata);
if(ret >= 0 || ret == -11){
emit sig_showMsg(tr("刷墨水卡成功!"));
const QString msg = sysPara->RFIDPara.addedInk ? tr("刷墨水卡成功!") : tr("刷墨水卡成功, 请及时将该墨水卡对应的墨水添加到机器中");
emit sig_showMsg(msg);
sysPara->RFIDPara.cardInk = true;
sysPara->saveRFIDPara();
}
@@ -595,7 +594,8 @@ void RFIDManager::handleCheck(unsigned int addr)
else {
auto ret = RFIDmarkCardUsedAsync(1, strRevdata);
if(ret >= 0 || ret == -11) {
emit sig_showMsg(tr("刷溶剂卡成功!"));
const QString msg = sysPara->RFIDPara.addedSolvent ? tr("刷溶剂卡成功!") : tr("刷溶剂卡成功, 请及时将该溶剂卡对应的溶剂添加到机器中");
emit sig_showMsg(msg);
sysPara->RFIDPara.cardSolvent = true;
sysPara->saveRFIDPara();
}
@@ -1127,10 +1127,10 @@ void RFIDManager::updateStatus()
}
}
bool RFIDManager::waitStatus()
int RFIDManager::waitStatus()
{
// updateStatus();
bool res = false;
int res = 0;
bool inkFlag = !(sysPara->status.statWarn & WARN_STATUS_INK_WARN);
bool solventFlag = !(sysPara->status.statWarn & WARN_STATUS_SOLV_WARN);
if (status.addedInk && status.cardInk) {
@@ -1148,7 +1148,7 @@ bool RFIDManager::waitStatus()
QDir dir("/home/plg");
dir.remove("inkRFIDTime.txt");
res = true;
res = 1;
}
} else if (status.addedSolvent && status.cardSolvent) {
if (sysPara && solventFlag) {
@@ -1164,8 +1164,8 @@ bool RFIDManager::waitStatus()
QDir dir("/home/plg");
dir.remove("solventRFIDTime.txt");
res = 2;
}
res = true;
}
return res;
@@ -1240,19 +1240,24 @@ void RFIDManager::slt_timerHandle()
void RFIDManager::slt_intervalTimerHandle()
{
updateStatus();
if (status.addedInk && !status.cardInk && status.firstPromptInkCard) { // 提醒频率定为5s一次,后续可能加界面显示
emit sig_showMsg(tr("请及时刷墨水卡"));
if(status.addedInk && !status.cardInk && status.firstPromptInkCard){
emit sig_showMsg(tr("请及时使用墨水盒附带的IC卡激活墨水盒"));
status.firstPromptInkCard = false;
}
else if(status.addedSolvent && !status.cardSolvent && status.firstPromptSolventCard) {
emit sig_showMsg(tr("请及时刷溶剂卡"));
}
if(status.addedSolvent && !status.cardSolvent && status.firstPromptSolventCard){
emit sig_showMsg(tr("请及时使用溶剂盒附带的IC卡激活溶剂盒"));
status.firstPromptSolventCard = false;
}
//不需要通知先后，成功即可
if (waitStatus()) {
LogInfo::setRunStatusText(tr("sucess"));
// totalTime = 0;
auto res = waitStatus();
if (res == 1) {
LogInfo::setRunStatusText("Ink progress finished, and the ink card has been used.");
return;
}
if (res == 2) {
LogInfo::setRunStatusText("Solvent progress finished, and the solvent card has been used.");
return;
}
}