Repository navigation
feat: 讯飞机型内存配置频率按机型与CPU定制隐藏 - #960
Merged
Merged
Conversation
讯飞机型(specialComType=11)且 CPU 为飞腾 D3000(kSpecialCpuType2)/龙芯 3A6000(kSpecialCpuType3)时,隐藏内存详情页“配置频率”。同时为 kSpecialType11 增加 checkBoardVendorFlag 分支,板卡厂商保持空,避免误用华为 HWGenerator。 Task: https://pms.uniontech.com/task-view-397823.html
Reviewer's guide (collapsed on small PRs)Reviewer's Guide该 PR 增加讯飞机型及飞腾 D3000、龙芯 3A6000 的识别能力,并通过机型与 CPU 的组合判断隐藏内存详情中的“配置频率”;同时将讯飞机型从默认华为板卡逻辑中排除并同步配置元数据。 Sequence diagram for hiding configured memory speedsequenceDiagram
participant DeviceMemory
participant Common
participant MemoryDetails
DeviceMemory->>Common: read specialComType
DeviceMemory->>Common: read curCpuType
alt specialComType == kSpecialType11 and curCpuType == kSpecialCpuType2 or kSpecialCpuType3
DeviceMemory->>MemoryDetails: omit Configured Speed
else other machine or CPU combination
DeviceMemory->>MemoryDetails: addOtherDeviceInfo Configured Speed
end
Flow diagram for Xunfei board vendor handlingflowchart TD
A[checkBoardVendorFlag] --> B{specialComType}
B -->|kSpecialType11| C[boardVendorKey = empty]
B -->|other values| D[default board vendor handling]
C --> E[avoid Huawei PGUW fallback]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
max-lvs
approved these changes
Oct 29, 2026
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: max-lvs, Resurgamz The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Author
|
/forcemerge |
Contributor
|
This pr force merged! (status: unstable) |
deepin-bot
Bot
merged commit Oct 29, 2026
1c834d1
into
linuxdeepin:develop/eagle
16 of 17 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
需求
讯飞 Arm(D3000) + 龙芯(3A6000) 台式机,设备管理器隐藏内存详情页“配置频率”。
Task: https://pms.uniontech.com/task-view-397823.html
改动
commonfunction.h:SpecialComputerType新增kSpecialType11(讯飞);SpecialCpuType新增kSpecialCpuType2(飞腾D3000)、kSpecialCpuType3(龙芯3A6000)。commonfunction.cpp:checkBoardVendorFlag()为kSpecialType11增加分支,boardVendorKey置空,避免落到 default 被当成华为PGUW(否则 aarch64 会误用HWGenerator)。DeviceMemory.cpp:分别判断两个值,当specialComType==kSpecialType11且curCpuType为kSpecialCpuType2/kSpecialCpuType3时不再显示“配置频率”。assets/org.deepin.devicemanager.json:更新specialComType/specialCpuType描述。说明
specialComType/specialCpuType的值由 os-config 按机型下发:讯飞机型specialComType=11;飞腾D3000specialCpuType=2;龙芯3A6000specialCpuType=3。Summary by Sourcery
为讯飞机型适配特定 CPU 的内存信息展示和板卡厂商识别。
New Features:
Bug Fixes:
Enhancements: