From 6e69a27d12683eea4c6bbedc20582862d520d67e Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Mon, 19 Jan 2026 11:46:31 +0800 Subject: [PATCH] refactor(enum): rename special computer type enums to consistent naming convention - Rename kCustomType to kSpecialType8 - Add new kSpecialType9 enum value - Update all references throughout codebase to use new enum names - Add support for kSpecialType9 in CPU frequency and monitor display logic log: rename special computer type enums to consistent naming convention task: https://pms.uniontech.com/task-view-385813.html Change-Id: Id3da3d2b9ca530992ecddff69beb0da7a8fffcb6 --- .../src/DeviceManager/DeviceCpu.cpp | 3 ++- .../src/DeviceManager/DeviceMonitor.cpp | 26 ++++++++++++++----- .../src/GenerateDevice/HWGenerator.cpp | 2 +- deepin-devicemanager/src/commonfunction.cpp | 12 ++++----- deepin-devicemanager/src/commonfunction.h | 11 ++++---- deepin-devicemanager/src/main.cpp | 2 +- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp index bf24ad91..8c587fc8 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp @@ -118,7 +118,8 @@ void DeviceCpu::setCpuInfo(const QMap &mapLscpu, const QMap &mapInfo) TomlFixMethod DeviceMonitor::setInfoFromTomlOneByOne(const QMap &mapInfo) { - if (Common::specialComType == 2) + if (Common::specialComType == Common::kSpecialType2) m_IsTomlSet = true; TomlFixMethod ret = TOML_None; // 添加基本信息 @@ -299,7 +299,9 @@ QString DeviceMonitor::subTitle() const QString DeviceMonitor::getOverviewInfo() { QString ov; - if (Common::specialComType == 6 || Common::specialComType == 7) { + if (Common::specialComType == Common::kSpecialType6 || + Common::specialComType == Common::kSpecialType7 || + Common::specialComType == Common::kSpecialType9) { ov = QString("(%1)").arg(m_ScreenSize); } else { ov = QString("%1(%2)").arg(m_Name).arg(m_ScreenSize); @@ -316,7 +318,10 @@ void DeviceMonitor::initFilterKey() void DeviceMonitor::loadBaseDeviceInfo() { // 添加基本信息 - if (Common::specialComType != 6 && Common::specialComType != 5 && Common::specialComType != 7) { + if (Common::specialComType != Common::kSpecialType5 && + Common::specialComType != Common::kSpecialType6 && + Common::specialComType != Common::kSpecialType7 && + Common::specialComType != Common::kSpecialType9) { addBaseDeviceInfo(("Name"), m_Name); addBaseDeviceInfo(("Vendor"), m_Vendor); addBaseDeviceInfo(("Type"), m_Model); @@ -334,7 +339,7 @@ void DeviceMonitor::loadOtherDeviceInfo() addOtherDeviceInfo(("Current Resolution"), m_CurrentResolution); addOtherDeviceInfo(("Display Ratio"), m_AspectRatio); - if (Common::specialComType == 4) { + if (Common::specialComType == Common::kSpecialType4) { if (m_CurrentResolution.contains("@")) { QStringList refreshList = m_CurrentResolution.split('@', QString::SkipEmptyParts); if (refreshList.size() == 2) { @@ -391,16 +396,23 @@ bool DeviceMonitor::setMainInfoFromXrandr(const QString &info, const QString &ra QRegExp rateStart("[a-zA-Z]"); int pos = curRate.indexOf(rateStart); if (pos > 0 && curRate.size() > pos && !Common::boardVendorType().isEmpty()) { - if (Common::specialComType == 1) { + if (Common::specialComType == Common::kSpecialType1) { curRate = QString::number(ceil(curRate.left(pos).toDouble())) + ".00" + curRate.right(curRate.size() - pos); } else { curRate = QString::number(ceil(curRate.left(pos).toDouble())) + curRate.right(curRate.size() - pos); } } - if (Common::specialComType == 1 || Common::specialComType == 5 || Common::specialComType == 6 || Common::specialComType == 7) { + if (Common::specialComType == Common::kSpecialType1 || + Common::specialComType == Common::kSpecialType5 || + Common::specialComType == Common::kSpecialType6 || + Common::specialComType == Common::kSpecialType7 || + Common::specialComType == Common::kSpecialType9) { m_RefreshRate = QString("%1").arg(curRate); } - if (Common::specialComType == 5 || Common::specialComType == 6 || Common::specialComType == 7) { + if (Common::specialComType == Common::kSpecialType5 || + Common::specialComType == Common::kSpecialType6 || + Common::specialComType == Common::kSpecialType7 || + Common::specialComType == Common::kSpecialType9) { m_CurrentResolution = QString("%1").arg(reScreenSize.cap(1)).replace("x", "×", Qt::CaseInsensitive); } else { m_CurrentResolution = QString("%1 @%2").arg(reScreenSize.cap(1)).arg(curRate).replace("x", "×", Qt::CaseInsensitive); diff --git a/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp b/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp index d03cda59..4766b89f 100644 --- a/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp +++ b/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp @@ -280,7 +280,7 @@ void HWGenerator::generatorDiskDevice() if (name.contains("SDINFDO4-256G",Qt::CaseInsensitive)) tempMap["Name"] = "nouse"; - if (Common::specialComType == 2) { + if (Common::specialComType == Common::kSpecialType2) { tempMap["Interface"] = "UFS"; } diff --git a/deepin-devicemanager/src/commonfunction.cpp b/deepin-devicemanager/src/commonfunction.cpp index a02d47c4..5c4cfcec 100644 --- a/deepin-devicemanager/src/commonfunction.cpp +++ b/deepin-devicemanager/src/commonfunction.cpp @@ -124,22 +124,22 @@ QString Common::checkBoardVendorFlag() case NormalCom: boardVendorKey = ""; break; - case PGUW: + case kSpecialType1: boardVendorKey = "PGUW"; break; - case KLVV: + case kSpecialType2: boardVendorKey = "KLVV"; break; - case KLVU: + case kSpecialType3: boardVendorKey = "KLVU"; break; - case PGUV: + case kSpecialType4: boardVendorKey = "PGUV"; break; case kSpecialType5: boardVendorKey = "PGUX"; break; - case kCustomType: + case kSpecialType8: boardVendorKey = "CustomType"; break; default: @@ -209,7 +209,7 @@ void Common::tomlFilesNameSet(const QString &name) bool Common::isHwPlatform() { - if (specialComType == Unknow || specialComType == NormalCom || specialComType == kCustomType) + if (specialComType == Unknow || specialComType == NormalCom || specialComType == kSpecialType8) return false; return true; } diff --git a/deepin-devicemanager/src/commonfunction.h b/deepin-devicemanager/src/commonfunction.h index 1792170b..a1b8d14f 100644 --- a/deepin-devicemanager/src/commonfunction.h +++ b/deepin-devicemanager/src/commonfunction.h @@ -18,14 +18,15 @@ class Common enum SpecialComputerType{ Unknow = -1, NormalCom, - PGUW, - KLVV, - KLVU, - PGUV, + kSpecialType1, + kSpecialType2, + kSpecialType3, + kSpecialType4, kSpecialType5, kSpecialType6, kSpecialType7, - kCustomType + kSpecialType8, + kSpecialType9 }; enum SpecialCpuType { diff --git a/deepin-devicemanager/src/main.cpp b/deepin-devicemanager/src/main.cpp index f261edfd..19b138a9 100644 --- a/deepin-devicemanager/src/main.cpp +++ b/deepin-devicemanager/src/main.cpp @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) } // 特殊机型，提前缓存GPU信息 - if (Common::specialComType == Common::kCustomType && !CommonTools::hasPciGraphicsCard()) { + if (Common::specialComType == Common::kSpecialType8 && !CommonTools::hasPciGraphicsCard()) { CommonTools::preGenerateGpuInfo(); }