New Stop operation logic

This commit is contained in:
krad
2021-11-02 10:32:30 +08:00
parent 0d89f5b60a
commit c577a239b9

View File

@@ -81,13 +81,15 @@ void DeviceManager::initDevice() {
// check device status========================================= // check device status=========================================
//device is ready return //device is ready return
if (inf.status == READY) return; if (inf.status != SCANNING) {
if (inf.status == BUSY) { TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
QString msg("Device is busy, Stop operation fail!");
THROW_ERROR(msg);
return; return;
}; }
if (inf.status == SCANNING) { // if (inf.status == BUSY) {
// QString msg("Device is busy, Stop operation fail!");
// THROW_ERROR(msg);
// return;
// };
TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr); TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr);
//ScanControl fail //ScanControl fail
qDebug() << "Request stop!"; qDebug() << "Request stop!";
@@ -111,9 +113,6 @@ void DeviceManager::initDevice() {
TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr, (QObject *) &s); TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr, (QObject *) &s);
TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, nullptr); TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, nullptr);
TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr); TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
}
}); });
// preview // preview