Skip to content

feat: 讯飞机型内存配置频率按机型与CPU定制隐藏 #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Oct 29, 2026
+21 −6
Merged

feat: 讯飞机型内存配置频率按机型与CPU定制隐藏 #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deepin-devicemanager/assets/org.deepin.devicemanager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
},
Expand Down
12 changes: 10 additions & 2 deletions deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 4 additions & 0 deletions deepin-devicemanager/src/commonfunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ QString Common::checkBoardVendorFlag()
case kSpecialType8:
boardVendorKey = "CustomType";
break;
case kSpecialType11:
// 讯飞机型，非华为定制机型，保持默认(空)板卡厂商
boardVendorKey = "";
break;
default:
boardVendorKey = "PGUW";
break;
Expand Down
7 changes: 5 additions & 2 deletions deepin-devicemanager/src/commonfunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ class Common
kSpecialType7,
kSpecialType8,
kSpecialType9,
kSpecialType10
kSpecialType10,
kSpecialType11
};

enum SpecialCpuType {
kUnknowCpuType = 0,
kSpecialCpuType1
kSpecialCpuType1,
kSpecialCpuType2, // 飞腾 D3000
kSpecialCpuType3 // 龙芯 3A6000
};

enum SpecialVRAMType {
Expand Down
Loading