medvedych/harbour-batterybuddy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refine "Once" and "Never" behavior, remove redundant updateNotification

Browse source
This commit is contained in:
Matti Viljanen 2020-12-01 00:53:48 +02:00
parent b94df34839
commit 041adb3c85
2 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
service/src/battery.cpp
View file

@ -89,7 +89,6 @@ Battery::Battery(QObject *parent) : QObject(parent)
connect(lowNotifyTimer, SIGNAL(timeout()), this, SLOT(showLowNotification())); connect(lowNotifyTimer, SIGNAL(timeout()), this, SLOT(showLowNotification()));
updateData(); updateData();
resetTimers();
updateTimer->start(5000); updateTimer->start(5000);
} }
@ -112,6 +111,9 @@ void Battery::updateData()
chargerConnected = nextChargerConnected; chargerConnected = nextChargerConnected;
emit chargerConnectedChanged(chargerConnected); emit chargerConnectedChanged(chargerConnected);
qDebug() << "Charger is connected:" << chargerConnected; qDebug() << "Charger is connected:" << chargerConnected;
// Hide/show notification right away
resetTimers();
} }
chargerConnectedFile->close(); chargerConnectedFile->close();
} }
@ -121,11 +123,6 @@ void Battery::updateData()
state = nextState; state = nextState;
emit stateChanged(state); emit stateChanged(state);
qDebug() << "Charging status:" << state; qDebug() << "Charging status:" << state;
// Hide/show notification right away
updateNotification();
// Reset the timer, too
resetTimers();
} }
stateFile->close(); stateFile->close();
} }
@ -149,6 +146,7 @@ void Battery::resetTimers() {
if(settings->getHighNotificationsInterval() < 610) { if(settings->getHighNotificationsInterval() < 610) {
qDebug() << "Starting high level notification timer"; qDebug() << "Starting high level notification timer";
highNotifyTimer->start(); highNotifyTimer->start();
showHighNotification();
} }
else { else {
qDebug() << "High level notification timer not started"; qDebug() << "High level notification timer not started";
@ -156,6 +154,7 @@ void Battery::resetTimers() {
if(settings->getLowNotificationsInterval() < 610) { if(settings->getLowNotificationsInterval() < 610) {
qDebug() << "Starting low level notification timer"; qDebug() << "Starting low level notification timer";
lowNotifyTimer->start(); lowNotifyTimer->start();
showLowNotification();
} }
else { else {
qDebug() << "Low level notification timer not started"; qDebug() << "Low level notification timer not started";
@ -165,15 +164,15 @@ void Battery::resetTimers() {
void Battery::showHighNotification() { void Battery::showHighNotification() {
if(settings->getHighNotificationsInterval() < 610 && (charge >= settings->getHighAlert() && state != "discharging") if(settings->getHighNotificationsInterval() < 610 && (charge >= settings->getHighAlert() && state != "discharging")
&& !(charge == 100 && state == "idle")) { && !(charge == 100 && state == "idle")) {
qDebug() << "Battery notification timer: full enough battery"; qDebug() << "High notification timer: full enough battery";
notification->send(settings->getNotificationTitle().arg(charge), settings->getNotificationHighText(), settings->getHighAlertFile()); notification->send(settings->getNotificationTitle().arg(charge), settings->getNotificationHighText(), settings->getHighAlertFile());
if(settings->getLowNotificationsInterval() == 50) { if(settings->getHighNotificationsInterval() == 50) {
qDebug() << "Stop high notification timer (show only once)"; qDebug() << "Stop high notification timer (show only once)";
highNotifyTimer->stop(); highNotifyTimer->stop();
} }
} }
else { else {
qDebug() << "Battery notification timer: close notification"; qDebug() << "High notification timer: close notification";
notification->close(); notification->close();
} }
} }
@ -188,23 +187,7 @@ void Battery::showLowNotification() {
} }
} }
else { else {
qDebug() << "Battery notification timer: close notification"; qDebug() << "Low notification timer: close notification";
notification->close();
}
}
void Battery::updateNotification() {
if(settings->getHighNotificationsInterval() < 610 && (charge >= settings->getHighAlert() && state != "discharging")
&& !(charge == 100 && state == "idle")) {
qDebug() << "Battery notification timer: full enough battery";
notification->send(settings->getNotificationTitle().arg(charge), settings->getNotificationHighText(), settings->getHighAlertFile());
}
else if(settings->getLowNotificationsInterval() < 610 && charge <= settings->getLowAlert() && state != "charging") {
qDebug() << "Battery notification timer: empty enough battery";
notification->send(settings->getNotificationTitle().arg(charge), settings->getNotificationLowText(), settings->getLowAlertFile());
}
else {
qDebug() << "Battery notification timer: close notification";
notification->close(); notification->close();
} }
} }

1
service/src/battery.h
View file

@ -87,7 +87,6 @@ public slots:
void resetTimers(); void resetTimers();
void showHighNotification(); void showHighNotification();
void showLowNotification(); void showLowNotification();
void updateNotification();
}; };
#endif // BATTERY_H #endif // BATTERY_H