Skip to content

分支合一,Qt5/Qt6编译兼容,将v20分支内容merge到v25分支#481

Closed
itsXuSt wants to merge 49 commits intolinuxdeepin:masterfrom
itsXuSt:v20-to-v25
Closed

分支合一,Qt5/Qt6编译兼容,将v20分支内容merge到v25分支#481
itsXuSt wants to merge 49 commits intolinuxdeepin:masterfrom
itsXuSt:v20-to-v25

Conversation

@itsXuSt
Copy link
Contributor

@itsXuSt itsXuSt commented Dec 17, 2025

  • fix: 更新类型判断
  • fix: 部分机型cpu的modelname为空时cpu信息错误
  • fix: 文管在系统监视器中进程中图标显示错误
  • fix: 添加进程结束数据上报
  • feat: 改造系统监视器服务
  • chore: 添加服务依赖
  • chore: 减少service的依赖
  • fix: 资源占用达到报警阈值时未弹出消息通知
  • chore: 更新版本5.9.34
  • fix: 微信、QQ、腾讯会议、钉钉、腾讯视频系统监视器,查看进程,会发现图标对不上的问题
  • chore: Sync by linuxdeepin/.github@2e5e092
  • chore: 增加hw新机型W585判断
  • fix: Graded control
  • fix: Graded control config Replaces and Conflicts
  • chore: update version 5.10.1
  • fix: 修复1060末启动server
  • chore: update version 5.10.2
  • feat: 新增pgw判断
  • feat: hw机型判断适配dconfig
  • chore: Sync by linuxdeepin/.github@559e911
  • feat: hw机型判断适配dconfig
  • fix: 修复在dde-dock中右键菜单系统监视器图标无法激活系统监视器窗口到顶层
  • fix: dbus开启系统监视器开关
  • fix: 修复升级版本问题
  • fix: 系统监视器占用资源过高优化
  • fix: 修复传输文件时,系统监视器不显示传输速度
  • fix: 插件功能回退
  • feat: merge branch chinalife
  • fix: 插件功能回退
  • feat: 优化底层数据读取
  • chore: bump version 5.10.5
  • fix: unvail "error" log output
  • fix: 通过dconfig屏蔽进程暂停与恢复进程功能
  • fix: some security issues
  • fix: “当前频率”显示所有 CPU 核中最大的值
  • fix: [security] cancel cap_dac_read_search
  • chore: redirect crash log to cache path.
  • fix: hide the model name
  • fix: relaunch app if exception was catched
  • fix: update wireless signal strength calculation and improve speed retrieval
  • chore: update .gitignore and add .clang-format file
  • fix: query cpu cache from lscpu command
  • chore: new tag 6.0.23
  • chore: new tag 6.0.24
  • feat: add CPU frequency reading from CPU7 sysfs interface
  • fix: fix v25/qt6 compilation errors

wyu71 and others added 30 commits January 10, 2023 05:16
更新类型判断

Log: 更新类型判断
修改了部分机型cpu的modelname为空时cpu信息错误

Log: cpu信息正常
添加进程结束数据上报

Log: 添加进程结束数据上报

Task: https://pms.uniontech.com/task-view-250733.html
改造系统监视器服务

Log: 改造系统监视器服务
添加服务依赖

Log: 添加服务依赖
减少service的依赖

Log: 减少service的依赖
deepin-server-manager无法启动GUI应用

Log: 正确显示消息通知
Bug: https://pms.uniontech.com/bug-view-194991.html
更新版本5.9.34

Log: 更新版本5.9.34
微信、QQ、腾讯会议、钉钉、腾讯视频系统监视器,查看进程,会发现图标对不上的问题

Log: 微信、QQ、腾讯会议、钉钉、腾讯视频系统监视器,查看进程,会发现图标对不上的问题

Bug: https://pms.uniontech.com/bug-view-196499.html
sync by github workflow

Log: none
Influence: none
Description: 增加hw新机型W585判断

Log: 增加hw新机型W585判断
Graded control

Log: Graded control
Graded control config Replaces and Conflicts

Log: Graded control config Replaces and Conflicts
update version 5.10.1

Log: update version 5.10.1
修复1060因deepin-service-manager不启动server

Log: 修复1060因deepin-service-manager不启动server
update version  5.10.2

Log: update version  5.10.2
新增pgw判断

Log: 新增pgw判断
Description: hw机型判断适配dconfig

Log: hw机型判断适配dconfig

Task: https://pms.uniontech.com/task-view-276433.html
sync by github workflow

Log: none
Influence: none
Description: 修改默认配置值为-1,存在dconfig接口但是底层未修改配置文件时,将采用以前判断hw的方式

Log: hw机型判断适配dconfig

Task: https://pms.uniontech.com/task-view-276433.html
在dde-dock中右键菜单系统监视器图标无法激活系统监视器窗口到顶层

Log: 修复在dde-dock中右键菜单系统监视器图标无法激活系统监视器窗口到顶层

Bug: https://pms.uniontech.com/bug-view-191373.html
dbus开启系统监视器开关

Bug: https://pms.uniontech.com/bug-view-211897.html
Log: dbus开启系统监视器开关
修复升级版本问题

Bug: https://pms.uniontech.com/bug-view-212375.html
Log: 修复升级版本问题
系统监视器占用资源过高优化

Log: 系统监视器占用资源过高优化
修复传输文件时,系统监视器不显示传输速度

Log: 修复传输文件时,系统监视器不显示传输速度

Bug: https://pms.uniontech.com/bug-view-200077.html
插件功能回退

Log: 插件功能回退
merge branch chinalife 73eb0006--db1f846e

Log: merge branch  for useraccounts
插件功能回退

Log: 插件功能回退
优化底层数据读取

Log: 优化底层数据读取
shuaijie and others added 19 commits August 15, 2023 08:06
bump version  5.10.5

Log: bump version  5.10.5
   due to use 1070-v20 interfaces of dde-dock in community version-v23

Log: base master merge into release eagle
feat: base master  merge into release/eagle
 due to app_error list

Log:  modify "error" to unsucess in logdata
通过dconfig屏蔽进程暂停与恢复进程功能

Bug: https://pms.uniontech.com/bug-view-272331.html
Log: 通过dconfig屏蔽进程暂停与恢复进程功能
Fix some security issues.

Log: fix some security issues
Task: https://pms.uniontech.com/task-view-362563.html
压测时观察"当前频率”不明显,因取值首个CPU频率有效值

Log: 显示所有 CPU 核中最大的值

Bug: https://pms.uniontech.com/bug-view-277329.html
(cherry picked from commit de9d90e)
cancel cap_dac_read_search

Log:  cancel cap_dac_read_search

Bug: https://pms.uniontech.com/task-view-365257.html
hide the model name

Log: hide the model name

Bug: https://pms.uniontech.com/bug-view-298121.html
…trieval

Updated the signal strength calculation to provide a more accurate representation based on the signal level. Introduced a new method to retrieve wireless speed using the 'iw' command, replacing the previous method that relied on 'iwlist'.

Log: as above.

Bug: https://pms.uniontech.com/bug-view-315553.html
Added entry for clangd cache files to .gitignore to prevent them from being tracked.
Add .clang-format file.

Log: as above.
Using the lscpu command to retrieve cache information. Previously, obtaining cache data through the source code of older versions of lscpu might have had some calculation issues.

Log: as above.

Bug: https://pms.uniontech.com/bug-view-318243.html
update version to 6.0.23

Log: update version to 6.0.23
- update version to 6.0.24

lop: update tag
- Add new config option 'readCPUFreqByCPU7' to control frequency reading method
- Implement read_cpu_freq_range_by_cpu7() to read min/max frequency from sysfs
- Add DConfig support to dynamically switch between lscpu and CPU7 frequency sources
- Read frequency from /sys/devices/system/cpu/cpu7/cpufreq/scaling_{min,max}_freq
- Convert frequency unit from KHz to MHz automatically

Log: Add configurable CPU7 frequency reading feature with sysfs interface support

Bug: https://pms.uniontech.com/bug-view-334529.html
Task: https://pms.uniontech.com/task-view-384553.html
- Add SPLIT_SKIP_EMPTY macro to handle Qt::SkipEmptyParts vs QString::SkipEmptyParts
- Replace scattered #if QT_VERSION blocks with unified macro usage
- Fix typo: m_signal_levle -> m_signal_level in wireless.cpp
- Add 'using namespace DDLog' for app logging macro

Log: Fix Qt5/Qt6 compatibility issues and compilation errors for v25 branch
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: itsXuSt

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot
Copy link

deepin pr auto review

我来对这个 git diff 进行代码审查,主要关注语法逻辑、代码质量、性能和安全性方面:

  1. 代码格式和规范
  • 新增的 .clang-format 配置文件很好,统一了代码风格
  • ColumnLimit 设置为 0 是合理的,避免强制换行影响可读性
  • 配置了合适的缩进和空格规则
  1. Qt5/Qt6 兼容性处理
  • 通过 QT_VERSION_CHECK 宏正确处理了版本兼容性
  • 使用条件编译处理不同版本的 API 差异
  • 建议将版本检查宏统一放在一个头文件中维护
  1. 安全性改进
  • debian/postinst 中改进了权限设置逻辑,优先使用 setcap,失败时才回退到 setuid
  • 建议添加更详细的错误日志记录
  • stack_trace.h 中改进了崩溃处理,增加了自动重启机制
  1. 性能优化
  • CPU 频率读取增加了从 CPU7 读取的选项
  • 无线网络信息获取改用 D-Bus 接口,避免了直接 ioctl 调用
  • 建议添加缓存机制避免频繁的系统调用
  1. 代码质量改进建议:
  • wireless.cpp 中的信号强度计算逻辑可以优化:
// 当前实现
auto level = -100 + 70 * (1 - strenth / 100.0);

// 建议改为
auto level = -30 - 70 * (strenth / 100.0);  // 更符合实际的信号强度范围
  • systemdbusserver.cpp 中的集合转换:
// 当前实现
context.targetPids = QSet<int>(pids.constBegin(), pids.constEnd());

// 建议改为
context.targetPids = QSet<int>::fromList(pids);  // 更简洁
  1. 潜在问题:
  • dkapture.h 中的 mount_attr 结构体定义可能与系统头文件冲突
  • 建议添加更严格的版本检查:
#if defined(__linux__) && !defined(MOUNT_ATTR_SIZE_VER0)
// 定义结构体
#endif
  1. 其他建议:
  • 建议统一使用 qCDebug/qCInfo 等日志宏,而不是直接使用 qDebug/qInfo
  • 考虑添加单元测试覆盖新增的功能
  • 建议添加更详细的 API 文档注释
  1. 代码组织:
  • 建议将版本兼容性相关的宏定义集中管理
  • 可以考虑将一些通用的工具函数抽取到独立的头文件中

总的来说,这次改动主要关注了兼容性和功能完善,代码质量良好,但在一些细节实现上还有优化空间。建议在后续版本中逐步改进。

@itsXuSt itsXuSt marked this pull request as draft December 18, 2025 01:27
@itsXuSt itsXuSt closed this Dec 18, 2025
@itsXuSt itsXuSt deleted the v20-to-v25 branch December 18, 2025 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants