diff --git a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp index 3daa08c8..f83b618c 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp @@ -37,10 +37,9 @@ void DeviceBluetooth::setInfoFromHciconfig(const QMap &mapInfo { qCDebug(appLog) << "DeviceBluetooth::setInfoFromHciconfig started."; // 获取设备的基本信息 - setAttribute(mapInfo, "Name", m_Name); + setAttribute(mapInfo, "Name", m_Name, false); setAttribute(mapInfo, "Alias", m_Alias); setAttribute(mapInfo, "Manufacturer", m_Vendor); - setAttribute(mapInfo, "HCI Version", m_Version, true); qCDebug(appLog) << "Basic attributes set from Hciconfig."; // 获取设备其他信息 diff --git a/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp b/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp index 943be265..afd47696 100644 --- a/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp +++ b/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp @@ -222,10 +222,13 @@ void DeviceGenerator::generatorCpuDevice() logicalNum_dmi += dd4["Thread Count"].toInt(); } } + if(coreNum_dmi > coreNum && coreNum_dmi <= 512) { //due to offline policy + // If obtaining data from /proc/cpuinfo is incorrect, refer to the content of dmidecode. + if (logicalNum != logicalNum_dmi) + coreNum = coreNum_dmi; + } if(logicalNum_dmi > logicalNum && logicalNum_dmi < 1024) //due to offline policy logicalNum = logicalNum_dmi; - if(coreNum_dmi > coreNum && coreNum_dmi <= 512) //due to offline policy - coreNum = coreNum_dmi; DeviceManager::instance()->setCpuNum(allCPUS.isEmpty() ? dmidecode4.size() : allCPUS.size()); qCDebug(appLog) << "DeviceGenerator::generatorCpuDevice set cpu num" << (allCPUS.isEmpty() ? dmidecode4.size() : allCPUS.size());