Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-03 00:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(power): use onBattery to replace batteryState to check is used battery

Browse Source
This commit is contained in:
justforlxz 2019-06-13 15:08:24 +08:00
parent 099fa9f9f5
commit 2e7a4e6fa9
No known key found for this signature in database
GPG Key ID: 593AFD577C1B1A60
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/power/powerplugin.cpp
View File

@ -210,9 +210,8 @@ void PowerPlugin::refreshTipsData()
const uint percentage = qMin(100.0, qMax(0.0, data.value("Display"))); const uint percentage = qMin(100.0, qMax(0.0, data.value("Display")));
const QString value = QString("%1%").arg(std::round(percentage)); const QString value = QString("%1%").arg(std::round(percentage));
const int batteryState = m_powerInter->batteryState()["Display"]; 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(); qulonglong timeToEmpty = m_systemPowerInter->batteryTimeToEmpty();
QDateTime time = QDateTime::fromTime_t(timeToEmpty).toUTC(); QDateTime time = QDateTime::fromTime_t(timeToEmpty).toUTC();
uint hour = time.toString("hh").toUInt(); uint hour = time.toString("hh").toUInt();

2
plugins/power/powerstatuswidget.cpp
View File

@ -67,7 +67,7 @@ QPixmap PowerStatusWidget::getBatteryIcon()
const uint value = qMin(100.0, qMax(0.0, data.value("Display"))); const uint value = qMin(100.0, qMax(0.0, data.value("Display")));
const int percentage = std::round(value); const int percentage = std::round(value);
const int batteryState = m_powerInter->batteryState()["Display"]; 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; QString percentageStr;
if (percentage < 10 && percentage >= 0) { if (percentage < 10 && percentage >= 0) {