feat(bluetooth): add battery level display for bluetooth devices

plugins/dde-dock/bluetooth/componments/adapter.cpp

@@ -38,6 +38,7 @@ void Adapter::addDevice(const QJsonObject &deviceObj)
     const Device::State state = Device::State(deviceObj["State"].toInt());
     const bool connectState = deviceObj["ConnectState"].toBool();
     const QString bluetoothDeviceType = deviceObj["Icon"].toString();
+    const int battery = deviceObj["Battery"].toInt();
 
     removeDevice(id);
 
@@ -52,6 +53,7 @@ void Adapter::addDevice(const QJsonObject &deviceObj)
     device->setRssi(rssi);
     device->setAdapterId(m_id);
     device->setDeviceType(bluetoothDeviceType);
+    device->setBattery(battery);
 
     m_devices[id] = device;
 
@@ -79,6 +81,7 @@ void Adapter::updateDevice(const QJsonObject &dviceJson)
     const Device::State state = Device::State(dviceJson["State"].toInt());
     const bool connectState = dviceJson["ConnectState"].toBool();
     const QString bluetoothDeviceType = dviceJson["Icon"].toString();
+    const int battery = dviceJson["Battery"].toInt();
 
     // FIXME: Solve the problem that the device name in the Bluetooth list is blank
     if (name.isEmpty() && alias.isEmpty())
@@ -96,6 +99,7 @@ void Adapter::updateDevice(const QJsonObject &dviceJson)
         device->setConnectState(connectState);
         device->setState(state);
         device->setDeviceType(bluetoothDeviceType);
+        device->setBattery(battery);
         emit deviceNameUpdated(device);
     }
 }
@@ -122,6 +126,7 @@ void Adapter::initDevicesList(const QJsonDocument &doc)
         const Device::State state = Device::State(deviceObj["State"].toInt());
         const bool connectState = deviceObj["ConnectState"].toBool();
         const QString bluetoothDeviceType = deviceObj["Icon"].toString();
+        const int battery = deviceObj["Battery"].toInt();
 
         auto device = new Device(this);
         device->setId(id);
@@ -133,6 +138,7 @@ void Adapter::initDevicesList(const QJsonDocument &doc)
         device->setRssi(rssi);
         device->setAdapterId(adapterId);
         device->setDeviceType(bluetoothDeviceType);
+        device->setBattery(battery);
 
         m_devices[id] = device;
     }

plugins/dde-dock/bluetooth/componments/bluetoothadapteritem.cpp

@@ -35,6 +35,11 @@ BluetoothDeviceItem::BluetoothDeviceItem(QStyle *style, const Device *device, Pl
     updateDeviceState(m_device->state());
 
     initConnect();
+
+    m_standardItem->updateBattery(m_device->battery());
+    connect(m_device, &Device::batteryChanged, this, [this](int battery) {
+        m_standardItem->updateBattery(battery);
+    });
 }
 
 BluetoothDeviceItem::~BluetoothDeviceItem()

plugins/dde-dock/bluetooth/componments/device.cpp

@@ -34,6 +34,7 @@ Device::Device(QObject *parent)
     , m_rssi(0)
     , m_state(StateUnavailable)
     , m_connectState(false)
+    , m_battery(0)
 {
 }
 
@@ -101,6 +102,14 @@ void Device::setRssi(int rssi)
     }
 }
 
+void Device::setBattery(const int battery)
+{
+    if (m_battery != battery) {
+        m_battery = battery;
+        Q_EMIT batteryChanged(m_battery);
+    }
+}
+
 void Device::setDeviceType(const QString &deviceType)
 {
     m_deviceType = deviceType2Icon[deviceType];

plugins/dde-dock/bluetooth/componments/device.h

@@ -53,18 +53,22 @@
     void setRssi(int rssi);
 
     inline void setAdapterId(const QString &id) { m_adapterId = id; }
     inline const QString &getAdapterId() const { return m_adapterId; }
 
+    inline int battery() const { return m_battery; }
+    void setBattery(const int battery);
+
     inline QString deviceType() const { return m_deviceType; }
     void setDeviceType(const QString &deviceType);
 
 Q_SIGNALS:
     void nameChanged(const QString &name) const;
     void aliasChanged(const QString &alias) const;
     void pairedChanged(const bool paired) const;
     void stateChanged(const State state) const;
     void connectStateChanged(const bool connectState) const;
     void rssiChanged(const int rssi) const;
+    void batteryChanged(const int battery) const;
 
 private:
     QString m_id;
@@ -76,6 +80,7 @@
     int m_rssi;
     State m_state;
     bool m_connectState;
+    int m_battery;
     QString m_adapterId;
     QString m_deviceType;
 };

plugins/dde-dock/bluetooth/resources/bluetooth.qrc

@@ -79,5 +79,27 @@
         <file>texts/plugin_item_select_16px.svg</file>
         <file>texts/refresh_16px.svg</file>
         <file>texts/arrow-up_12px.svg</file>
+        <file>icons/battery-000-symbolic.svg</file>
+        <file>icons/battery-010-symbolic.svg</file>
+        <file>icons/battery-020-symbolic.svg</file>
+        <file>icons/battery-030-symbolic.svg</file>
+        <file>icons/battery-040-symbolic.svg</file>
+        <file>icons/battery-050-symbolic.svg</file>
+        <file>icons/battery-060-symbolic.svg</file>
+        <file>icons/battery-070-symbolic.svg</file>
+        <file>icons/battery-080-symbolic.svg</file>
+        <file>icons/battery-090-symbolic.svg</file>
+        <file>icons/battery-100-symbolic.svg</file>
+        <file>icons/battery-000-symbolic-dark.svg</file>
+        <file>icons/battery-010-symbolic-dark.svg</file>
+        <file>icons/battery-020-symbolic-dark.svg</file>
+        <file>icons/battery-030-symbolic-dark.svg</file>
+        <file>icons/battery-040-symbolic-dark.svg</file>
+        <file>icons/battery-050-symbolic-dark.svg</file>
+        <file>icons/battery-060-symbolic-dark.svg</file>
+        <file>icons/battery-070-symbolic-dark.svg</file>
+        <file>icons/battery-080-symbolic-dark.svg</file>
+        <file>icons/battery-090-symbolic-dark.svg</file>
+        <file>icons/battery-100-symbolic-dark.svg</file>
     </qresource>
 </RCC>