From 2e7a4e6fa9f960964af97648e7672359f906af7c Mon Sep 17 00:00:00 2001 From: justforlxz Date: Thu, 13 Jun 2019 15:08:24 +0800 Subject: [PATCH] refactor(power): use onBattery to replace batteryState to check is used battery --- plugins/power/powerplugin.cpp | 3 +-- plugins/power/powerstatuswidget.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/power/powerplugin.cpp b/plugins/power/powerplugin.cpp index e4be38fd1..acf999e36 100644 --- a/plugins/power/powerplugin.cpp +++ b/plugins/power/powerplugin.cpp @@ -210,9 +210,8 @@ void PowerPlugin::refreshTipsData() const uint percentage = qMin(100.0, qMax(0.0, data.value("Display"))); const QString value = QString("%1%").arg(std::round(percentage)); const int batteryState = m_powerInter->batteryState()["Display"]; - const bool charging = (batteryState == BatteryState::CHARGING || batteryState == BatteryState::FULLY_CHARGED); - if (!charging) { + if (m_powerInter->onBattery()) { qulonglong timeToEmpty = m_systemPowerInter->batteryTimeToEmpty(); QDateTime time = QDateTime::fromTime_t(timeToEmpty).toUTC(); uint hour = time.toString("hh").toUInt(); diff --git a/plugins/power/powerstatuswidget.cpp b/plugins/power/powerstatuswidget.cpp index 06ff76b92..940996041 100644 --- a/plugins/power/powerstatuswidget.cpp +++ b/plugins/power/powerstatuswidget.cpp @@ -67,7 +67,7 @@ QPixmap PowerStatusWidget::getBatteryIcon() const uint value = qMin(100.0, qMax(0.0, data.value("Display"))); const int percentage = std::round(value); const int batteryState = m_powerInter->batteryState()["Display"]; - const bool plugged = (batteryState == BatteryState::CHARGING || batteryState == BatteryState::FULLY_CHARGED); + const bool plugged = !m_powerInter->onBattery(); QString percentageStr; if (percentage < 10 && percentage >= 0) {