Fix process alarm which sended by dms.

This commit is contained in:
sunwen
2023-11-16 15:50:10 +08:00
parent 3f6f328802
commit d0d94bff05

View File

@@ -498,7 +498,6 @@ void DeviceManager::timerEvent(QTimerEvent* event)
void DeviceManager::emitErrorCallback(const char *msg) void DeviceManager::emitErrorCallback(const char *msg)
{ {
mIsScanning = true;
QString m(msg); QString m(msg);
emit raiseGlobalError( m); emit raiseGlobalError( m);
} }
@@ -625,18 +624,26 @@ void DeviceManager::processAlarm(const QString& aAlarm)
{ {
QJsonObject jsonObj = toJsonObject(aAlarm); QJsonObject jsonObj = toJsonObject(aAlarm);
int alarmCode = jsonObj["code"].toInt(); int alarmCode = jsonObj["code"].toInt();
QString alarm = jsonObj["info"].toString(); QString alarm = QString::number(alarmCode);
qDebug()<<"processAlarm "<<alarm; qDebug()<<"processAlarm : "<<alarmCode;
switch(alarmCode) if(alarmCode >= 400 && alarmCode < 500)
{
if(mIsScanning)
{
prepareFinishScan(false, alarm);
}
else
{
THROW_ERROR(alarm);
}
}
else if(alarmCode >= 500 && alarmCode < 600)
{ {
case 1 :
prepareFinishScan(false, alarm);
break;
case 2 :
emitInfoCallback(alarm, MessageLevel::Warning); emitInfoCallback(alarm, MessageLevel::Warning);
break; }
default: else if(alarmCode >= 600 && alarmCode < 700)
break; {
emitInfoCallback(alarm, MessageLevel::Info);
} }
} }