diff --git a/deepin-devicemanager/assets/org.deepin.devicemanager.json b/deepin-devicemanager/assets/org.deepin.devicemanager.json index 0b7b67ff0..3bed131b7 100644 --- a/deepin-devicemanager/assets/org.deepin.devicemanager.json +++ b/deepin-devicemanager/assets/org.deepin.devicemanager.json @@ -21,7 +21,7 @@ "flags": ["global"], "name": "Special Computer Type", "name[zh_CN]": "特殊机器类型", - "description": "special computer type:PGUW(value:1),KLVV/L540(value:2),KLVU(value:3),PGUV/W585(value:4),PGUX(value:5),FLMX(value:6)", + "description": "special computer type:PGUW(value:1),KLVV/L540(value:2),KLVU(value:3),PGUV/W585(value:4),PGUX(value:5),FLMX(value:6),IFLYTEK(value:11)", "permissions": "readwrite", "visibility": "private" }, @@ -31,7 +31,7 @@ "flags": ["global"], "name": "Special Cpu Type", "name[zh_CN]": "定制CPU类型", - "description": "Special Cpu Type: Unknow cpu type(value:0)", + "description": "Special Cpu Type: Unknow cpu type(value:0), Phytium D3000(value:2), Loongson 3A6000(value:3)", "permissions": "readwrite", "visibility": "private" }, diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp index 880fb0b49..1a17ce631 100755 --- a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp @@ -147,13 +147,21 @@ void DeviceMemory::loadOtherDeviceInfo() { // 倒序,头插,保证原来的顺序 // 添加其他信息,成员变量 + // 讯飞机型(specialComType)且为飞腾D3000/龙芯3A6000(specialCpuType)时隐藏“配置频率” + const bool hideConfiguredSpeed = + (Common::specialComType == Common::kSpecialType11) && + (Common::curCpuType == Common::kSpecialCpuType2 || Common::curCpuType == Common::kSpecialCpuType3); if (Common::boardVendorType().isEmpty()) { addOtherDeviceInfo(("Configured Voltage"), m_ConfiguredVoltage); addOtherDeviceInfo(("Maximum Voltage"), m_MaximumVoltage); addOtherDeviceInfo(("Minimum Voltage"), m_MinimumVoltage); - addOtherDeviceInfo(("Configured Speed"), m_ConfiguredSpeed); + if (!hideConfiguredSpeed) { + addOtherDeviceInfo(("Configured Speed"), m_ConfiguredSpeed); + } } else { - addOtherDeviceInfo(("Configured Speed"), m_ConfiguredSpeed); + if (!hideConfiguredSpeed) { + addOtherDeviceInfo(("Configured Speed"), m_ConfiguredSpeed); + } } addOtherDeviceInfo(("Data Width"), m_DataBandwidth); diff --git a/deepin-devicemanager/src/commonfunction.cpp b/deepin-devicemanager/src/commonfunction.cpp index 8b380b115..eebe68a8d 100644 --- a/deepin-devicemanager/src/commonfunction.cpp +++ b/deepin-devicemanager/src/commonfunction.cpp @@ -148,6 +148,10 @@ QString Common::checkBoardVendorFlag() case kSpecialType8: boardVendorKey = "CustomType"; break; + case kSpecialType11: + // 讯飞机型,非华为定制机型,保持默认(空)板卡厂商 + boardVendorKey = ""; + break; default: boardVendorKey = "PGUW"; break; diff --git a/deepin-devicemanager/src/commonfunction.h b/deepin-devicemanager/src/commonfunction.h index 2d1610a5c..e72730b7d 100644 --- a/deepin-devicemanager/src/commonfunction.h +++ b/deepin-devicemanager/src/commonfunction.h @@ -27,12 +27,15 @@ class Common kSpecialType7, kSpecialType8, kSpecialType9, - kSpecialType10 + kSpecialType10, + kSpecialType11 }; enum SpecialCpuType { kUnknowCpuType = 0, - kSpecialCpuType1 + kSpecialCpuType1, + kSpecialCpuType2, // 飞腾 D3000 + kSpecialCpuType3 // 龙芯 3A6000 }; enum SpecialVRAMType {