From f229cd4a285ff76c67e9873e09c91bd3a9b88580 Mon Sep 17 00:00:00 2001
From: kejingfan <jingfan_ke@bjtu.edu.cn>
Date: Mon, 29 Jul 2024 00:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E8=BF=94=E5=9B=9E=E5=90=8D=E5=AD=97=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=97=B6=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=BA=86=E8=83=BD=E5=90=A6=E5=85=85=E5=80=BC=E7=9A=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=82=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deviceAPI.h   | 5 ++++-
 settingPage.h | 7 +------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/deviceAPI.h b/deviceAPI.h
index 85c3cc5..712abe5 100644
--- a/deviceAPI.h
+++ b/deviceAPI.h
@@ -43,7 +43,10 @@ public:
 
     QString getName()
     {
-        if (connected) return name;
+        if (connected) {
+            if (depositAllowed) return name + QString("（可充值）");
+            else return name + QString("（仅可消费）");
+        }
         else return QString("未指定设备名");
     }
 };
diff --git a/settingPage.h b/settingPage.h
index b66a705..2539c74 100644
--- a/settingPage.h
+++ b/settingPage.h
@@ -88,13 +88,8 @@ void MainWindow::on_connectDatabaseButton_clicked()
     if (!device.is_connected())
     {
         QMessageBox::warning(this, QString("设备名提示"), QString("该设备名无效，请重试。"));
-        deviceLabel->setText(device.getName());
-    }
-    else
-    {
-        if (device.is_depositAllowed()) deviceLabel->setText(device.getName() + QString("（可充值）"));
-        else deviceLabel->setText(device.getName() + QString("（仅可消费）"));
     }
+    deviceLabel->setText(device.getName());
 }