From 9abd925864f39170655b10595afcea9ac09c4667 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Wed, 27 Oct 2021 10:37:12 +0800
Subject: [PATCH] Stop current scan

---
 src/device/DeviceManager.cpp |  2 +-
 src/guimessagedialog.cpp     | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp
index 7558831..09844f9 100644
--- a/src/device/DeviceManager.cpp
+++ b/src/device/DeviceManager.cpp
@@ -204,7 +204,7 @@ void DeviceManager::timerEvent(QTimerEvent *event) {
         timerID=-1;
         lastStatus = -1;
         previewing = false;
-        TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr,nullptr);
+//        TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr,nullptr);
         return;
     } else{
         QString temp = QString(GetDeviceInfo(MEAN_TEMPERATURE));
diff --git a/src/guimessagedialog.cpp b/src/guimessagedialog.cpp
index 05ee2c2..5e0b358 100644
--- a/src/guimessagedialog.cpp
+++ b/src/guimessagedialog.cpp
@@ -54,6 +54,17 @@ void GUIMessageDialog::stopLoading() {
 void GUIMessageDialog::startLoading() {
     ui->lbl_progressicon->setVisible(true);
     timerID = startTimer(100);
+    ui->btn_main->setText("Stop");
+    ui->btn_main->setVisible(true);
+    disconnect(ui->btn_main);
+    connect(ui->btn_main,&QToolButton::clicked,[=](){
+        if (timerID != -1){
+            killTimer(timerID);
+            timerID = -1;
+        }
+        accept();
+        EventCenter::Default()->triggerEvent(GUIEvents::RequestStop, nullptr, nullptr);
+    });
 }
 
 void GUIMessageDialog::showMessage(QString msg) {
@@ -62,6 +73,7 @@ void GUIMessageDialog::showMessage(QString msg) {
 }
 
 void GUIMessageDialog::showExitButton() {
+    ui->btn_main->setText("OK");
     ui->btn_main->setVisible(true);
     disconnect(ui->btn_main);
     connect(ui->btn_main,&QToolButton::clicked,[=](){
@@ -79,6 +91,6 @@ void GUIMessageDialog::hideMessage() {
 }
 
 void GUIMessageDialog::hideExitButton() {
-    ui->btn_main->setVisible(false);
+    if(ui->btn_main->text()=="OK") ui->btn_main->setVisible(false);
     disconnect(ui->btn_main);
 }