From 846163425e4e96dda8df7ba05da6e9701f8075ed Mon Sep 17 00:00:00 2001 From: shuaijie Date: Wed, 3 Apr 2024 14:26:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9F=90=E6=96=B0PGX=E6=9C=BA=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E9=A2=9D=E5=A4=96=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 据湛生20231224邮修改 Log: add t11string4 for PguX --- debian/changelog | 10 ++++++++-- deepin-devicemanager/src/commonfunction.cpp | 13 ++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 37c71de86..bbfbdd07a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,20 @@ +deepin-devicemanager (6.0.25) unstable; urgency=medium + + * new version 6.0.25. + + -- shuaijie Sun, 07 Apr 2024 10:19:06 +0800 + deepin-devicemanager (6.0.24) unstable; urgency=medium * Update tag to 6.0.24. - -- lvwujun Thur, 28 Mar 2024 17:03:34 +0800 + -- lvwujun Thu, 28 Mar 2024 17:03:34 +0800 deepin-devicemanager (6.0.23) unstable; urgency=medium * new version 6.0.23 - -- shuaijie Thu, 13 Mar 2024 14:50:06 +0800 + -- shuaijie Wed, 13 Mar 2024 14:50:06 +0800 deepin-devicemanager (6.0.22) unstable; urgency=medium diff --git a/deepin-devicemanager/src/commonfunction.cpp b/deepin-devicemanager/src/commonfunction.cpp index 6dd80d775..24c457e4a 100644 --- a/deepin-devicemanager/src/commonfunction.cpp +++ b/deepin-devicemanager/src/commonfunction.cpp @@ -92,6 +92,17 @@ static bool isModeW525(void) return ret; } +static QString readDmidecode11_String4(void) +{ + QProcess process; + process.start("bash", QStringList() << "-c" << "dmidecode -t 11 | grep -i \"String 4\""); + process.waitForStarted(); + process.waitForFinished(); + QString ret = process.readAll(); + process.close(); + return ret; +} + QString Common::checkBoardVendorFlag() { if(specialComType != -1){ @@ -134,7 +145,7 @@ QString Common::checkBoardVendorFlag() boardVendorKey = "PGUV"; } else if (info.contains("PGUW", Qt::CaseInsensitive)) { boardVendorKey = "PGUW"; - } else if (info.contains("PGUX", Qt::CaseInsensitive)) { // /HUAWEI QingYun WXXX PGUX-L5651 + } else if (readDmidecode11_String4().contains("PGUX", Qt::CaseInsensitive)) { boardVendorKey = "PGUX"; } process.close();