openkylin
/
ukui-screensaver
mirror of https://gitee.com/openkylin/ukui-screensaver.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

!104 fixbug 

Merge pull request !104 from 杨敏/openkylin/nile
This commit is contained in:
杨敏 2024-10-25 07:03:38 +00:00 committed by Gitee
parent b449e3e644 1b9bb71109
commit b44b8d323b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dbusifs/upowerhelper.cpp
View File

@ -37,8 +37,8 @@ UpowerHelper::UpowerHelper(QObject *parent) : QObject(parent)
= new QDBusInterface(upowerService, upowerPath, upowerInterface, QDBusConnection::systemBus(), this); = new QDBusInterface(upowerService, upowerPath, upowerInterface, QDBusConnection::systemBus(), this);
QString batteryPath = ""; QString batteryPath = "";
QDBusReply<QList<QDBusObjectPath>> reply = m_upowerService->call("EnumerateDevices");
if (m_upowerService->isValid()) { if (m_upowerService->isValid()) {
QDBusReply<QList<QDBusObjectPath>> reply = m_upowerService->call("EnumerateDevices");
for (QDBusObjectPath op : reply.value()) { for (QDBusObjectPath op : reply.value()) {
if (op.path().contains("battery_")) { if (op.path().contains("battery_")) {
batteryPath = op.path(); batteryPath = op.path();
@ -50,15 +50,16 @@ UpowerHelper::UpowerHelper(QObject *parent) : QObject(parent)
qDebug() << "Enumerate devices failed"; qDebug() << "Enumerate devices failed";
} }
if (!batteryPath.isEmpty()) {
QDBusConnection::systemBus().connect( QDBusConnection::systemBus().connect(
upowerService, batteryPath, propertiesInterface, "PropertiesChanged", this, SLOT(dealMessage(QDBusMessage))); upowerService, batteryPath, propertiesInterface, "PropertiesChanged", this, SLOT(dealMessage(QDBusMessage)));
m_batInterface
= new QDBusInterface(upowerService, batteryPath, propertiesInterface, QDBusConnection::systemBus(), this);
}
m_upowerInterface m_upowerInterface
= new QDBusInterface(upowerService, upowerPath, propertiesInterface, QDBusConnection::systemBus(), this); = new QDBusInterface(upowerService, upowerPath, propertiesInterface, QDBusConnection::systemBus(), this);
m_batInterface
= new QDBusInterface(upowerService, batteryPath, propertiesInterface, QDBusConnection::systemBus(), this);
if (m_upowerInterface->isValid()) { if (m_upowerInterface->isValid()) {
QDBusReply<QVariant> interfaceReply = m_upowerInterface->call("Get", "org.freedesktop.UPower", "LidIsPresent"); QDBusReply<QVariant> interfaceReply = m_upowerInterface->call("Get", "org.freedesktop.UPower", "LidIsPresent");
if (interfaceReply.isValid()) { if (interfaceReply.isValid()) {
@ -69,6 +70,7 @@ UpowerHelper::UpowerHelper(QObject *parent) : QObject(parent)
upowerService, upowerPath, propertiesInterface, "PropertiesChanged", this, SLOT(onLidWatcherMessage())); upowerService, upowerPath, propertiesInterface, "PropertiesChanged", this, SLOT(onLidWatcherMessage()));
} }
if (m_upowerService->isValid()) {
m_engineDevice = EngineDevice::getInstance(); m_engineDevice = EngineDevice::getInstance();
// onBatteryChanged(m_engineDevice->engine_get_state()); // onBatteryChanged(m_engineDevice->engine_get_state());
@ -85,13 +87,14 @@ UpowerHelper::UpowerHelper(QObject *parent) : QObject(parent)
connect(m_engineDevice, &EngineDevice::engine_signal_Battery_State, this, &UpowerHelper::onBatteryChanged); connect(m_engineDevice, &EngineDevice::engine_signal_Battery_State, this, &UpowerHelper::onBatteryChanged);
continue; continue;
} }
}
} }
UpowerHelper::~UpowerHelper() {} UpowerHelper::~UpowerHelper() {}
QString UpowerHelper::getBatteryIconName() QString UpowerHelper::getBatteryIconName()
{ {
if (m_upowerService->isValid() && m_upowerInterface->isValid()) { if (m_upowerService->isValid() && m_upowerInterface->isValid() && m_batInterface) {
bool batteryState = false; bool batteryState = false;
QDBusReply<QVariant> reply = m_upowerInterface->call("Get", upowerService, "OnBattery"); QDBusReply<QVariant> reply = m_upowerInterface->call("Get", upowerService, "OnBattery");
if (reply.isValid()) { if (reply.isValid()) {
@ -114,6 +117,9 @@ QString UpowerHelper::getBatteryIconName()
QStringList UpowerHelper::getBatteryArgs() QStringList UpowerHelper::getBatteryArgs()
{ {
if (!m_engineDevice) {
return QStringList();
}
return m_engineDevice->engine_get_state(); return m_engineDevice->engine_get_state();
} }

2
src/dbusifs/upowerhelper.h
View File

@ -72,7 +72,7 @@ private:
QDBusInterface *m_batInterface = nullptr; QDBusInterface *m_batInterface = nullptr;
QDBusInterface *m_upowerService = nullptr; QDBusInterface *m_upowerService = nullptr;
EngineDevice *m_engineDevice; EngineDevice *m_engineDevice = nullptr;
bool m_isBattery = false; bool m_isBattery = false;
}; };