From a9b6321b2ee4586859931daf7efe5a8c93f19c1b Mon Sep 17 00:00:00 2001 From: shuaijie Date: Mon, 14 Aug 2023 13:59:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7U=E7=9B=98=E4=B8=8D=E8=AE=A4=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复某些型号U盘不认识 Log: 修复某些型号U盘不认识 Bug: https://pms.uniontech.com/bug-view-211371.html --- debian/changelog | 7 +++++++ deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 65ddcedf..32fcab3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +deepin-devicemanager (5.9.19) unstable; urgency=medium + + * New version 5.9.19 + * 修复某些型号U盘不认识 + + -- shuaijie Mon, 14 Aug 2023 15:05:32 +0800 + deepin-devicemanager (5.9.12) unstable; urgency=medium * New version 5.9.12 diff --git a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp index 7b087d68..c72cd315 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp @@ -88,7 +88,8 @@ bool DeviceStorage::setHwinfoInfo(const QMap &mapInfo) if (m_SerialNumber.isEmpty()) { setAttribute(mapInfo, "Serial ID", m_SerialNumber); } - + if (m_SerialNumber.compare("0",Qt::CaseInsensitive) == 0) + m_SerialNumber = ""; setAttribute(mapInfo, "SysFS BusID", m_KeyToLshw); setAttribute(mapInfo, "Device File", m_DeviceFile); @@ -561,6 +562,9 @@ void DeviceStorage::getInfoFromLshw(const QMap &mapInfo) QRegExp re(".*\\((.*)\\)$"); if (re.exactMatch(m_Size)) m_Size = re.cap(1); + + if (m_SerialNumber.compare("0",Qt::CaseInsensitive) == 0) + m_SerialNumber = ""; } void DeviceStorage::getInfoFromsmartctl(const QMap &mapInfo)