Skip to content

pick develop/eagle to master #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 5 commits into from
Dec 1, 2025
Merged

pick develop/eagle to master #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b3aba6
fix: maintain the monitor info in special machine.
add-uos Jul 24, 2025
fefa0dd
feat: [GPU] Add logic to show GPU info.
GongHeng2017 Jul 24, 2025
bc57004
feat: [GPU] Add feature for GPU.
GongHeng2017 Jul 24, 2025
45df060
feat: [GPU] Add logic to show GPU info.
GongHeng2017 Jul 24, 2025
3947d08
Chore: [cppcheck] Resolve issue identified by cppcheck
GongHeng2017 Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ TomlFixMethod DeviceComputer::setInfoFromTomlOneByOne(const QMap<QString, QStrin
TomlFixMethod ret = TOML_None;
// must cover the loadOtherDeviceInfo
// 添加基本信息
ret = setTomlAttribute(mapInfo, "HOME_URL", m_HomeUrl);
ret = setTomlAttribute(mapInfo, "Type", m_Type);
ret = setTomlAttribute(mapInfo, "vendor", m_Vendor);
ret = setTomlAttribute(mapInfo, "OS", m_OS);
setTomlAttribute(mapInfo, "HOME_URL", m_HomeUrl);
setTomlAttribute(mapInfo, "Type", m_Type);
setTomlAttribute(mapInfo, "vendor", m_Vendor);
setTomlAttribute(mapInfo, "OS", m_OS);
ret = setTomlAttribute(mapInfo, "OsDescription", m_OsDescription);
qCDebug(appLog) << "Toml attributes set: HomeUrl=" << m_HomeUrl << ", Type=" << m_Type << ", Vendor=" << m_Vendor << ", OS=" << m_OS << ", OsDescription=" << m_OsDescription;
//3. 获取设备的其它信息
Expand Down
36 changes: 18 additions & 18 deletions deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,26 +261,26 @@ TomlFixMethod DeviceCpu::setInfoFromTomlOneByOne(const QMap<QString, QString> &m
qCDebug(appLog) << "DeviceCpu::setInfoFromTomlOneByOne started.";
TomlFixMethod ret = TOML_None;
// 添加基本信息
ret = setTomlAttribute(mapInfo, "CPU ID", m_PhysicalID);
ret = setTomlAttribute(mapInfo, "Core ID", m_CoreID);
ret = setTomlAttribute(mapInfo, "Threads", m_ThreadNum);
ret = setTomlAttribute(mapInfo, "Frequency", m_Frequency);
ret = setTomlAttribute(mapInfo, "Current Frequency", m_CurFrequency);
ret = setTomlAttribute(mapInfo, "Max Frequency", m_MaxFrequency);
ret = setTomlAttribute(mapInfo, "BogoMIPS", m_BogoMIPS);
ret = setTomlAttribute(mapInfo, "Architecture", m_Architecture);
ret = setTomlAttribute(mapInfo, "CPU Family", m_Familly);
ret = setTomlAttribute(mapInfo, "Model", m_Model);
setTomlAttribute(mapInfo, "CPU ID", m_PhysicalID);
setTomlAttribute(mapInfo, "Core ID", m_CoreID);
setTomlAttribute(mapInfo, "Threads", m_ThreadNum);
setTomlAttribute(mapInfo, "Frequency", m_Frequency);
setTomlAttribute(mapInfo, "Current Frequency", m_CurFrequency);
setTomlAttribute(mapInfo, "Max Frequency", m_MaxFrequency);
setTomlAttribute(mapInfo, "BogoMIPS", m_BogoMIPS);
setTomlAttribute(mapInfo, "Architecture", m_Architecture);
setTomlAttribute(mapInfo, "CPU Family", m_Familly);
setTomlAttribute(mapInfo, "Model", m_Model);
qCDebug(appLog) << "Basic toml attributes set.";
// 添加其他信息,成员变量
ret = setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
ret = setTomlAttribute(mapInfo, "Flags", m_Flags);
ret = setTomlAttribute(mapInfo, "Extensions", m_Extensions);
ret = setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4);
ret = setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3);
ret = setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2);
ret = setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order);
ret = setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data);
setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
setTomlAttribute(mapInfo, "Flags", m_Flags);
setTomlAttribute(mapInfo, "Extensions", m_Extensions);
setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4);
setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3);
setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2);
setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order);
setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data);
ret = setTomlAttribute(mapInfo, "Stepping", m_Step);
//3. 获取设备的其它信息
getOtherMapInfo(mapInfo);
Expand Down
1 change: 1 addition & 0 deletions deepin-devicemanager/src/DeviceManager/DeviceGpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ void DeviceGpu::setGpuInfo(const QMap<QString, QString> &mapInfo)
// 名称(Name) 厂商(Vendor) 型号(Model) 版本(Version) 显存(Graphics Memory)
void DeviceGpu::setGpuInfoByCustom(const QMap<QString, QString> &mapInfo)
{
m_extraInfo.clear();
QMap<QString, QString>::const_iterator it = mapInfo.constBegin();
for (; it != mapInfo.constEnd(); ++it) {
if (it.key() == "Name") {
Expand Down
12 changes: 6 additions & 6 deletions deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ TomlFixMethod DeviceImage::setInfoFromTomlOneByOne(const QMap<QString, QString>
TomlFixMethod ret = TOML_None;

// 添加基本信息
ret = setTomlAttribute(mapInfo, "Model", m_Model);
ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
ret = setTomlAttribute(mapInfo, "Version", m_Version);
setTomlAttribute(mapInfo, "Model", m_Model);
setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
setTomlAttribute(mapInfo, "Version", m_Version);
// 添加其他信息,成员变量
ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
setTomlAttribute(mapInfo, "Speed", m_Speed);
setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialID);
//3. 获取设备的其它信息
getOtherMapInfo(mapInfo);
Expand Down
5 changes: 2 additions & 3 deletions deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,10 +922,9 @@
{
if (key.isEmpty())
return QString("");
// qCInfo(appLog) << __FILE__ << __LINE__ << key << "after translation:"<< kk;
QList<QPair<QString, QString> > allBaseAttribs = getBaseAttribs();
for (const QPair<QString, QString>& pair : allBaseAttribs) {
if (key == pair.first)

Check warning on line 927 in deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Consider using std::find_if algorithm instead of a raw loop.
return pair.second;
}
QList<QPair<QString, QString> > allOtherAttribs = getOtherAttribs();
Expand Down Expand Up @@ -1029,9 +1028,9 @@
qCDebug(appLog) << "DeviceBaseInfo::mapInfoToList called";
// m_MapOtherInfo --> m_LstOtherInfo
// QMap内容转为QList存储
auto iter = m_MapOtherInfo.begin();
QMap<QString, QString>::const_iterator iter = m_MapOtherInfo.constBegin();

for (; iter != m_MapOtherInfo.end(); ++iter) {
for (; iter != m_MapOtherInfo.constEnd(); ++iter) {
if (isValueValid(iter.value()))
m_LstOtherInfo.append(QPair<QString, QString>(iter.key(), iter.value()));
}
Expand Down
10 changes: 5 additions & 5 deletions deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ TomlFixMethod DeviceInput::setInfoFromTomlOneByOne(const QMap<QString, QString>

TomlFixMethod ret = TOML_None;
// 添加基本信息
ret = setTomlAttribute(mapInfo, "Model", m_Model);
ret = setTomlAttribute(mapInfo, "Interface", m_Interface);
ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
setTomlAttribute(mapInfo, "Model", m_Model);
setTomlAttribute(mapInfo, "Interface", m_Interface);
setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
// 添加其他信息,成员变量
ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
ret = setTomlAttribute(mapInfo, "Maximum Current", m_MaximumPower); // 将最大功率改为最大电流
setTomlAttribute(mapInfo, "Speed", m_Speed);
setTomlAttribute(mapInfo, "Maximum Current", m_MaximumPower); // 将最大功率改为最大电流
ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);

//3. 获取设备的其它信息
Expand Down
20 changes: 10 additions & 10 deletions deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ TomlFixMethod DeviceMemory::setInfoFromTomlOneByOne(const QMap<QString, QString>
qCDebug(appLog) << "Setting memory info from TOML one by one";
TomlFixMethod ret = TOML_None;
// 添加基本信息
ret = setTomlAttribute(mapInfo, "Size", m_Size);
ret = setTomlAttribute(mapInfo, "Type", m_Type);
ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
ret = setTomlAttribute(mapInfo, "Total Width", m_TotalBandwidth);
ret = setTomlAttribute(mapInfo, "Locator", m_Locator);
ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
setTomlAttribute(mapInfo, "Size", m_Size);
setTomlAttribute(mapInfo, "Type", m_Type);
setTomlAttribute(mapInfo, "Speed", m_Speed);
setTomlAttribute(mapInfo, "Total Width", m_TotalBandwidth);
setTomlAttribute(mapInfo, "Locator", m_Locator);
setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
// 添加其他信息,成员变量
ret = setTomlAttribute(mapInfo, "Configured Voltage", m_ConfiguredVoltage);
ret = setTomlAttribute(mapInfo, "Maximum Voltage", m_MaximumVoltage);
ret = setTomlAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
ret = setTomlAttribute(mapInfo, "Configured Speed", m_ConfiguredSpeed);
setTomlAttribute(mapInfo, "Configured Voltage", m_ConfiguredVoltage);
setTomlAttribute(mapInfo, "Maximum Voltage", m_MaximumVoltage);
setTomlAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
setTomlAttribute(mapInfo, "Configured Speed", m_ConfiguredSpeed);
ret = setTomlAttribute(mapInfo, "Data Width", m_DataBandwidth);
//3. 获取设备的其它信息
getOtherMapInfo(mapInfo);
Expand Down
77 changes: 43 additions & 34 deletions deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ void DeviceMonitor::setInfoFromHwinfo(const QMap<QString, QString> &mapInfo)
setAttribute(mapInfo, "", m_DisplayInput);
setAttribute(mapInfo, "Size", m_ScreenSize);
setAttribute(mapInfo, "", m_MainScreen);
// setAttribute(mapInfo, "Resolution", m_SupportResolution);
if (Common::specialComType > 0){
setAttribute(mapInfo, "Resolution", m_SupportResolution);
}
qCDebug(appLog) << "Basic monitor attributes set - Name:" << m_Name << "Vendor:" << m_Vendor << "Model:" << m_Model;

double inch = 0.0;
Expand All @@ -147,23 +149,27 @@ void DeviceMonitor::setInfoFromHwinfo(const QMap<QString, QString> &mapInfo)
qCDebug(appLog) << "Screen size parsed:" << m_ScreenSize << "Width:" << size.width() << "Height:" << size.height();

// 获取当前分辨率 和 当前支持分辨率
// QStringList listResolution = m_SupportResolution.split(" ");
// m_SupportResolution = "";
// foreach (const QString &word, listResolution) {
// if (word.contains("@")) {
// m_SupportResolution.append(word);
// m_SupportResolution.append(", ");
// }
// }
if (Common::specialComType > 0){
QStringList listResolution = m_SupportResolution.split(" ");
m_SupportResolution = "";
foreach (const QString &word, listResolution) {
if (word.contains("@")) {
m_SupportResolution.append(word);
m_SupportResolution.append(", ");
}
}
}

// 计算显示比例
caculateScreenRatio();

#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// m_SupportResolution.replace(QRegExp(", $"), "");
#else
// m_SupportResolution.replace(QRegularExpression(", $"), "");
#endif
if (Common::specialComType > 0){
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_SupportResolution.replace(QRegExp(", $"), "");
#else
m_SupportResolution.replace(QRegularExpression(", $"), "");
#endif
}
qCDebug(appLog) << "Supported resolutions processed:" << m_SupportResolution;

m_ProductionWeek = transWeekToDate(mapInfo["Year of Manufacture"], mapInfo["Week of Manufacture"]);
Expand All @@ -182,21 +188,22 @@ TomlFixMethod DeviceMonitor::setInfoFromTomlOneByOne(const QMap<QString, QString
m_IsTomlSet = true;
TomlFixMethod ret = TOML_None;
// 添加基本信息
ret = setTomlAttribute(mapInfo, "Type", m_Model);
ret = setTomlAttribute(mapInfo, "Display Input", m_DisplayInput);
ret = setTomlAttribute(mapInfo, "Interface Type", m_Interface);
setTomlAttribute(mapInfo, "Type", m_Model);
setTomlAttribute(mapInfo, "Display Input", m_DisplayInput);
setTomlAttribute(mapInfo, "Interface Type", m_Interface);
qCDebug(appLog) << "Basic monitor attributes set from TOML - Model:" << m_Model << "Input:" << m_DisplayInput << "Interface:" << m_Interface;

// 添加其他信息,成员变量
ret = setTomlAttribute(mapInfo, "Support Resolution", m_SupportResolution);
ret = setTomlAttribute(mapInfo, "Current Resolution", m_CurrentResolution);
ret = setTomlAttribute(mapInfo, "Display Ratio", m_AspectRatio);
setTomlAttribute(mapInfo, "Support Resolution", m_SupportResolution);
setTomlAttribute(mapInfo, "Current Resolution", m_CurrentResolution);
setTomlAttribute(mapInfo, "Display Ratio", m_AspectRatio);
qCDebug(appLog) << "Resolution info set - Supported:" << m_SupportResolution << "Current:" << m_CurrentResolution << "Ratio:" << m_AspectRatio;

ret = setTomlAttribute(mapInfo, "Primary Monitor", m_MainScreen);
ret = setTomlAttribute(mapInfo, "Size", m_ScreenSize);
ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
ret = setTomlAttribute(mapInfo, "Product Date", m_ProductionWeek);
setTomlAttribute(mapInfo, "Primary Monitor", m_MainScreen);
setTomlAttribute(mapInfo, "Size", m_ScreenSize);
setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
setTomlAttribute(mapInfo, "Product Date", m_ProductionWeek);

ret = setTomlAttribute(mapInfo, "Refresh Rate", m_RefreshRate);
qCDebug(appLog) << "Additional info set - Primary:" << m_MainScreen << "Size:" << m_ScreenSize << "Serial:" << m_SerialNumber << "Date:" << m_ProductionWeek;

Expand Down Expand Up @@ -283,21 +290,23 @@ bool DeviceMonitor::setInfoFromXradr(const QString &main, const QString &edid, c
}
}

QMap<QString, QStringList> monitorResolutionMap = getMonitorResolutionMap(xrandr, m_RawInterface);
if (Common::specialComType <= 0) {
QMap<QString, QStringList> monitorResolutionMap = getMonitorResolutionMap(xrandr, m_RawInterface);

if (monitorResolutionMap.size() == 1) {
m_SupportResolution.clear();
foreach (const QString &word, monitorResolutionMap.value(m_RawInterface)) {
if (word.contains("@")) {
m_SupportResolution.append(word);
m_SupportResolution.append(", ");
if (monitorResolutionMap.size() == 1) {
m_SupportResolution.clear();
foreach (const QString &word, monitorResolutionMap.value(m_RawInterface)) {
if (word.contains("@")) {
m_SupportResolution.append(word);
m_SupportResolution.append(", ");
}
}
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_SupportResolution.remove(QRegExp(", $"));
m_SupportResolution.remove(QRegExp(", $"));
#else
m_SupportResolution.remove(QRegularExpression(", $"));
m_SupportResolution.remove(QRegularExpression(", $"));
#endif
}
}
qCDebug(appLog) << "Interface already processed, returning false";
return false;
Expand Down
36 changes: 18 additions & 18 deletions deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,27 +104,27 @@ TomlFixMethod DeviceNetwork::setInfoFromTomlOneByOne(const QMap<QString, QString
qCDebug(appLog) << "DeviceNetwork::setInfoFromTomlOneByOne";
TomlFixMethod ret = TOML_None;
// 添加基本信息
ret = setTomlAttribute(mapInfo, "Type", m_Model);
ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
ret = setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
setTomlAttribute(mapInfo, "Type", m_Model);
setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
// 添加其他信息,成员变量
ret = setTomlAttribute(mapInfo, "Maximum Rate", m_Capacity);
ret = setTomlAttribute(mapInfo, "Negotiation Rate", m_Speed);
ret = setTomlAttribute(mapInfo, "Port", m_Port);
ret = setTomlAttribute(mapInfo, "Multicast", m_Multicast);
ret = setTomlAttribute(mapInfo, "Link", m_Link);
ret = setTomlAttribute(mapInfo, "Latency", m_Latency);
ret = setTomlAttribute(mapInfo, "IP", m_Ip);
ret = setTomlAttribute(mapInfo, "Firmware", m_Firmware);
ret = setTomlAttribute(mapInfo, "Duplex", m_Duplex);
ret = setTomlAttribute(mapInfo, "Broadcast", m_Broadcast);
ret = setTomlAttribute(mapInfo, "Auto Negotiation", m_Autonegotiation);
setTomlAttribute(mapInfo, "Maximum Rate", m_Capacity);
setTomlAttribute(mapInfo, "Negotiation Rate", m_Speed);
setTomlAttribute(mapInfo, "Port", m_Port);
setTomlAttribute(mapInfo, "Multicast", m_Multicast);
setTomlAttribute(mapInfo, "Link", m_Link);
setTomlAttribute(mapInfo, "Latency", m_Latency);
setTomlAttribute(mapInfo, "IP", m_Ip);
setTomlAttribute(mapInfo, "Firmware", m_Firmware);
setTomlAttribute(mapInfo, "Duplex", m_Duplex);
setTomlAttribute(mapInfo, "Broadcast", m_Broadcast);
setTomlAttribute(mapInfo, "Auto Negotiation", m_Autonegotiation);
// ret = setTomlAttribute(mapInfo, "Clock", m_Clock);
// ret = setTomlAttribute(mapInfo, "Width", m_Width);
ret = setTomlAttribute(mapInfo, "Memory Address", m_Memory);
ret = setTomlAttribute(mapInfo, "IRQ", m_Irq);
ret = setTomlAttribute(mapInfo, "MAC Address", m_MACAddress);
setTomlAttribute(mapInfo, "Memory Address", m_Memory);
setTomlAttribute(mapInfo, "IRQ", m_Irq);
setTomlAttribute(mapInfo, "MAC Address", m_MACAddress);
ret = setTomlAttribute(mapInfo, "Logical Name", m_LogicalName);
//3. 获取设备的其它信息
getOtherMapInfo(mapInfo);
Expand Down
16 changes: 8 additions & 8 deletions deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ TomlFixMethod DeviceOtherPCI::setInfoFromTomlOneByOne(const QMap<QString, QStrin
{
qCDebug(appLog) << "DeviceOtherPCI::setInfoFromTomlOneByOne";
TomlFixMethod ret = TOML_None;
// 添加基本信息
ret = setTomlAttribute(mapInfo, "Model", m_Model);
ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
// 添加基本信息
setTomlAttribute(mapInfo, "Model", m_Model);
setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);

// 添加其他信息,成员变量
ret = setTomlAttribute(mapInfo, "Input/Output", m_InputOutput);
ret = setTomlAttribute(mapInfo, "Memory", m_Memory);
ret = setTomlAttribute(mapInfo, "IRQ", m_Irq);
ret = setTomlAttribute(mapInfo, "Latency", m_Latency);
setTomlAttribute(mapInfo, "Input/Output", m_InputOutput);
setTomlAttribute(mapInfo, "Memory", m_Memory);
setTomlAttribute(mapInfo, "IRQ", m_Irq);
setTomlAttribute(mapInfo, "Latency", m_Latency);
ret = setTomlAttribute(mapInfo, "Capabilities", m_Version);
//3. 获取设备的其它信息
//3. 获取设备的其它信息
getOtherMapInfo(mapInfo);
return ret;
}
Expand Down
14 changes: 7 additions & 7 deletions deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ TomlFixMethod DeviceOthers::setInfoFromTomlOneByOne(const QMap<QString, QString>
qCDebug(appLog) << "DeviceOthers::setInfoFromTomlOneByOne";
TomlFixMethod ret = TOML_None;
// 添加基本信息
ret = setTomlAttribute(mapInfo, "Model", m_Model);
ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
////Others
setTomlAttribute(mapInfo, "Model", m_Model);
setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
setTomlAttribute(mapInfo, "Speed", m_Speed);
// Others
ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialID);
//3. 获取设备的其它信息
// 3. 获取设备的其它信息
getOtherMapInfo(mapInfo);
return ret;
}
Expand Down
Loading