Software/iDescriptor
1
0
Fork 0
mirror of https://github.com/iDescriptor/iDescriptor.git synced 2026-06-22 03:45:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor battery information handling for old and new devices

Browse Source
This commit is contained in:
uncor3
2025-09-27 11:31:25 +00:00
parent 43aa783433
commit 3b9df7577b
4 changed files with 141 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/deviceinfowidget.cpp
+6 -28
View File
@@ -322,35 +322,13 @@ void DeviceInfoWidget::updateBatteryInfo()
}
/*DATA*/
DeviceInfo &d = m_device->deviceInfo;
d.batteryInfo.isCharging =
PlistNavigator(diagnostics)["IORegistry"]["IsCharging"].getBool();
d.batteryInfo.fullyCharged =
PlistNavigator(diagnostics)["IORegistry"]["FullyCharged"].getBool();
d.batteryInfo.currentBatteryLevel =
PlistNavigator(diagnostics)["IORegistry"]["CurrentCapacity"].getUInt();
d.batteryInfo.usbConnectionType =
PlistNavigator(
diagnostics)["IORegistry"]["AdapterDetails"]["Description"]
.getString() == "usb type-c"
? BatteryInfo::ConnectionType::USB_TYPEC
: BatteryInfo::ConnectionType::USB;
d.batteryInfo.adapterVoltage =
PlistNavigator(diagnostics)["IORegistry"]["AppleRawAdapterDetails"][0]
["AdapterVoltage"]
.getUInt();
d.batteryInfo.watts =
PlistNavigator(
diagnostics)["IORegistry"]["AppleRawAdapterDetails"][0]["Watts"]
.getUInt();
qDebug() << "old device" << d.oldDevice;
PlistNavigator ioreg = PlistNavigator(diagnostics)["IORegistry"];
if (d.oldDevice)
parseOldDeviceBattery(ioreg, d);
else
parseDeviceBattery(ioreg, d);
/*UI*/
m_chargingStatusLabel->setText(d.batteryInfo.isCharging ? "Charging"
: "Not Charging");
m_chargingWattsLabel->setText(QString::number(d.batteryInfo.watts) + "W");