From 36a5f51a0eb86c06bcd86ff389ed119911bf80bb Mon Sep 17 00:00:00 2001
From: chenwei <chenwei@uniontech.com>
Date: Thu, 21 Jan 2021 09:52:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=8A=B6=E6=80=81=E4=B8=8D=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

蓝牙图标和tips显示不准确是由于少判断了一个状态导致，蓝牙图标应该根据当前是否有蓝牙连接来显示。当有蓝牙连接时tips显示已连接的设备，有设备正在连接时显示"正在连接..."，没有蓝牙设备连接时显示“蓝牙”。

Log: 蓝牙断开连接正在断开时，任务栏蓝牙图标是蓝色且提示空白
Bug: https://pms.uniontech.com/zentao/bug-view-61146.html
Change-Id: I99b95a75f8499e746510de747e34003c1e2404e9
---
 plugins/bluetooth/bluetoothitem.cpp | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/plugins/bluetooth/bluetoothitem.cpp b/plugins/bluetooth/bluetoothitem.cpp
index ea3a8f167..62f0b024d 100644
--- a/plugins/bluetooth/bluetoothitem.cpp
+++ b/plugins/bluetooth/bluetoothitem.cpp
@@ -133,16 +133,10 @@ void BluetoothItem::refreshIcon()
     QString iconString;
 
     if (m_adapterPowered) {
-        switch (m_devState) {
-            case Device::StateConnected:
-                stateString = "active";
-                break;
-            case Device::StateAvailable: {
-                return ;
-            }
-            case Device::StateUnavailable: {
-                stateString = "disable";
-            }      break;
+        if (m_applet->connectedDevicesName().isEmpty()) {
+            stateString = "disable";
+        } else {
+            stateString = "active";
         }
     } else {
         stateString = "disable";
@@ -165,8 +159,7 @@ void BluetoothItem::refreshTips()
     QString tipsText;
 
     if (m_adapterPowered) {
-        switch (m_devState) {
-        case Device::StateConnected: {
+        if (!m_applet->connectedDevicesName().isEmpty() && m_devState != Device::StateAvailable) {
             QStringList textList;
             for (QString devName : m_applet->connectedDevicesName()) {
                 textList << tr("%1 connected").arg(devName);
@@ -174,15 +167,11 @@ void BluetoothItem::refreshTips()
             m_tipsLabel->setTextList(textList);
             return;
         }
-        case Device::StateAvailable: {
+        if (m_devState == Device::StateAvailable) {
             tipsText = tr("Connecting...");
-        }
-            break ;
-        case Device::StateUnavailable: {
+        } else {
             tipsText = tr("Bluetooth");
         }
-            break;
-        }
     } else {
         tipsText = tr("Turned off");
     }