sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix stop scan process while emergency button pushed.

Browse Source
This commit is contained in:
sunwen
2024-06-25 20:02:31 +08:00
parent 229ca8e755
commit 4f9e007868
5 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/DeviceManager.cpp
View File

@@ -393,11 +393,11 @@ void DeviceManager::prepareFinishScan(bool isNormalFinish, const QString& aReaso
bool isCompleteNotify = JsonObject::Instance()->getCompleteNotify();
if(!isNormalFinish)
{
TRIGGER_EVENT(InvokeOperationEnd, nullptr, var);
if(!mIsEmptyScan)
{
TRIGGER_EVENT(StopScanProcess, nullptr, nullptr);
}
TRIGGER_EVENT(InvokeOperationEnd, nullptr, var);
return;
}
@@ -755,7 +755,7 @@ void DeviceManager::processAlarm(const QString& aAlarm)
{
QJsonObject jsonObj = toJsonObject(aAlarm);
int alarmCode = jsonObj["code"].toInt();
QString alarm = QString::number(alarmCode);
QString alarm = tr("Error: ") + QString::number(alarmCode);
qDebug()<<"processAlarm : "<<alarmCode;
LOG_SYS_OPERATION("Dms alarm reported. code: " + alarm)
if(alarmCode >= 400 && alarmCode < 500)
@@ -1299,12 +1299,14 @@ void DeviceManager::startScanProcess()
return;
}
AppGlobalValues::setInProcessing(true);
mIsScanning = true;
startAutoLocate();
}
void DeviceManager::stopScanProcess()
{
AppGlobalValues::setInProcessing(false);
mIsScanning = false;
LOG_SYS_OPERATION("Stop scan process.")
stopAutoLocate();
}