From f7e2079739530f51fc8efcccb36841b6f11631bb Mon Sep 17 00:00:00 2001 From: gongheng Date: Fri, 15 Aug 2025 17:47:47 +0800 Subject: [PATCH 1/5] Pref: [cppcheck] fix cppcheck warning. -- Funtion parameter should be passed by const reference. -- Unused parameter. -- The scope of the varible 'index' can reduced. pick from: https://github.com/linuxdeepin/deepin-devicemanager/commit/76729e9c6d5f1c28e80a7576e35c4beae1af1b03 --- deepin-devicemanager/src/Page/PageDriverControl.cpp | 8 +++++--- deepin-devicemanager/src/Page/PageDriverControl.h | 9 +++++---- deepin-devicemanager/src/Page/PageDriverManager.cpp | 10 +++++++--- deepin-devicemanager/src/Page/PageDriverManager.h | 4 ++-- .../src/Page/PageDriverRestoreInfo.cpp | 3 +++ deepin-devicemanager/src/Page/PageListView.cpp | 2 +- deepin-devicemanager/src/Page/PageListView.h | 2 +- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/deepin-devicemanager/src/Page/PageDriverControl.cpp b/deepin-devicemanager/src/Page/PageDriverControl.cpp index 935679e94..65e6b92ea 100644 --- a/deepin-devicemanager/src/Page/PageDriverControl.cpp +++ b/deepin-devicemanager/src/Page/PageDriverControl.cpp @@ -40,7 +40,9 @@ using namespace PolkitQt1; using namespace DDLog; -PageDriverControl::PageDriverControl(QWidget *parent, QString operation, bool install, QString deviceName, QString driverName, QString printerVendor, QString printerModel) +PageDriverControl::PageDriverControl(QWidget *parent, const QString &operation, bool install, + const QString &deviceName, const QString &driverName, + const QString &printerVendor, const QString &printerModel) : DDialog(parent) , mp_stackWidget(new DStackedWidget) , m_Install(install) @@ -168,14 +170,14 @@ void PageDriverControl::slotBtnNext() } } -void PageDriverControl::slotProcessChange(qint32 value, QString detail) +void PageDriverControl::slotProcessChange(qint32 value, const QString &detail) { qCDebug(appLog) << "PageDriverControl::slotProcessChange, value:" << value << "detail:" << detail; Q_UNUSED(detail) mp_WaitDialog->setValue(value); } -void PageDriverControl::slotProcessEnd(bool sucess, QString errCode) +void PageDriverControl::slotProcessEnd(bool sucess, const QString &errCode) { qCDebug(appLog) << "Process ended, success:" << sucess << "error:" << errCode; QString successStr = m_Install ? tr("Update successful") : tr("Uninstallation successful"); diff --git a/deepin-devicemanager/src/Page/PageDriverControl.h b/deepin-devicemanager/src/Page/PageDriverControl.h index 66a629850..bc970f206 100644 --- a/deepin-devicemanager/src/Page/PageDriverControl.h +++ b/deepin-devicemanager/src/Page/PageDriverControl.h @@ -27,8 +27,9 @@ class PageDriverControl : public DDialog * @param install 标识卸载还是更新 * @param parent */ - PageDriverControl(QWidget *parent, QString operation, bool install, - QString deviceName, QString driverName, QString printerVendor = "", QString printerModel = ""); + PageDriverControl(QWidget *parent, const QString &operation, bool install, + const QString &deviceName, const QString &driverName, + const QString &printerVendor = "", const QString &printerModel = ""); /** * @brief hasWidgetIsVisible 有驱动界面显示 @@ -68,13 +69,13 @@ private slots: * @param value 当前进度 0 ～ 100 * @param detail 当前处理的详细信息 */ - void slotProcessChange(qint32 value, QString detail); + void slotProcessChange(qint32 value, const QString &detail); /** * @brief slotProcessEnd 更新处理结束的信号 * @param sucess 更新是否成功 */ - void slotProcessEnd(bool sucess, QString errCode); + void slotProcessEnd(bool sucess, const QString &errCode); /** * @brief slotClose diff --git a/deepin-devicemanager/src/Page/PageDriverManager.cpp b/deepin-devicemanager/src/Page/PageDriverManager.cpp index 26452e07e..167812e03 100644 --- a/deepin-devicemanager/src/Page/PageDriverManager.cpp +++ b/deepin-devicemanager/src/Page/PageDriverManager.cpp @@ -224,6 +224,8 @@ void PageDriverManager::scanDriverInfo() void PageDriverManager::slotDriverOperationClicked(int index, int itemIndex, DriverOperationItem::Mode mode) { qCDebug(appLog) << "PageDriverManager::slotDriverOperationClicked, index:" << index << "itemIndex:" << itemIndex << "mode:" << mode; + Q_UNUSED(itemIndex) + mp_DriverInstallInfoPage->headWidget()->setReDetectEnable(false); mp_DriverBackupInfoPage->headWidget()->setReDetectEnable(false); mp_DriverRestoreInfoPage->headWidget()->setReDetectEnable(false); @@ -555,7 +557,7 @@ void PageDriverManager::slotListViewWidgetItemClicked(const QString &itemStr) void PageDriverManager::slotBackupProgressChanged(int progress) { qCDebug(appLog) << "PageDriverManager::slotBackupProgressChanged, progress:" << progress; - + Q_UNUSED(progress) } void PageDriverManager::slotBackupFinished(bool bsuccess) @@ -616,9 +618,10 @@ void PageDriverManager::slotBackupFinished(bool bsuccess) } } -void PageDriverManager::slotRestoreProgress(int progress, QString strDeatils) +void PageDriverManager::slotRestoreProgress(int progress, const QString &strDeatils) { qCDebug(appLog) << "PageDriverManager::slotRestoreProgress, progress:" << progress << "details:" << strDeatils; + Q_UNUSED(strDeatils) if(mp_CurRestoreDriverInfo == nullptr) { qCWarning(appLog) << "Current restore driver info is null, returning."; return; @@ -632,9 +635,10 @@ void PageDriverManager::slotRestoreProgress(int progress, QString strDeatils) } } -void PageDriverManager::slotRestoreFinished(bool success, QString msg) +void PageDriverManager::slotRestoreFinished(bool success, const QString &msg) { qCDebug(appLog) << "PageDriverManager::slotRestoreFinished, success:" << success << "msg:" << msg; + Q_UNUSED(msg) int index = -1; if (mp_CurRestoreDriverInfo) { index = m_ListDriverInfo.indexOf(mp_CurRestoreDriverInfo); diff --git a/deepin-devicemanager/src/Page/PageDriverManager.h b/deepin-devicemanager/src/Page/PageDriverManager.h index afc7f8ddf..864e181f4 100644 --- a/deepin-devicemanager/src/Page/PageDriverManager.h +++ b/deepin-devicemanager/src/Page/PageDriverManager.h @@ -171,12 +171,12 @@ private slots: /** * @brief slotRestoreProgress 还原进度刷新 */ - void slotRestoreProgress(int progress, QString strDeatils); + void slotRestoreProgress(int progress, const QString &strDeatils); /** * @brief slotRestoreFinished 还原结束 */ - void slotRestoreFinished(bool success, QString msg); + void slotRestoreFinished(bool success, const QString &msg); signals: void startScanning(); diff --git a/deepin-devicemanager/src/Page/PageDriverRestoreInfo.cpp b/deepin-devicemanager/src/Page/PageDriverRestoreInfo.cpp index 9ded05498..47aa605bd 100644 --- a/deepin-devicemanager/src/Page/PageDriverRestoreInfo.cpp +++ b/deepin-devicemanager/src/Page/PageDriverRestoreInfo.cpp @@ -207,6 +207,9 @@ void PageDriverRestoreInfo::setItemOperationEnable(int index, bool enable) void PageDriverRestoreInfo::slotOperatorClicked(int index, int itemIndex, DriverOperationItem::Mode mode) { qCDebug(appLog) << "Operator clicked, index:" << index << "itemIndex:" << itemIndex << "mode:" << mode; + Q_UNUSED(index) + Q_UNUSED(mode) + PageDriverTableView *view = mp_ViewBackable; // 设置状态 DriverStatusItem *statusItem = new DriverStatusItem(this, ST_DRIVER_RESTORING); diff --git a/deepin-devicemanager/src/Page/PageListView.cpp b/deepin-devicemanager/src/Page/PageListView.cpp index 502fa7b43..f91bc241a 100644 --- a/deepin-devicemanager/src/Page/PageListView.cpp +++ b/deepin-devicemanager/src/Page/PageListView.cpp @@ -100,7 +100,7 @@ void PageListView::clear() mp_ListView->clearItem(); } -void PageListView::setCurType(QString type) +void PageListView::setCurType(const QString &type) { qCDebug(appLog) << "PageListView::setCurType, type:" << type; m_CurType = type; diff --git a/deepin-devicemanager/src/Page/PageListView.h b/deepin-devicemanager/src/Page/PageListView.h index 29865ca15..688927564 100644 --- a/deepin-devicemanager/src/Page/PageListView.h +++ b/deepin-devicemanager/src/Page/PageListView.h @@ -46,7 +46,7 @@ class PageListView : public DWidget */ void clear(); - void setCurType(QString type); + void setCurType(const QString &type); protected: /**@brief:事件重写*/ From b8088855b5dab37098334c799f2a715ef9588141 Mon Sep 17 00:00:00 2001 From: gongheng Date: Thu, 28 Aug 2025 07:41:54 +0000 Subject: [PATCH 2/5] Revert "Fix: [Audio] The audio device of usb not show." This reverts commit 76729e9c6d5f1c28e80a7576e35c4beae1af1b03. pick from: https://github.com/linuxdeepin/deepin-devicemanager/commit/e883cd16a6c7843abb62113f52be3886444c6f2a --- deepin-devicemanager/src/GenerateDevice/CmdTool.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deepin-devicemanager/src/GenerateDevice/CmdTool.cpp b/deepin-devicemanager/src/GenerateDevice/CmdTool.cpp index a8355f237..599756a8b 100644 --- a/deepin-devicemanager/src/GenerateDevice/CmdTool.cpp +++ b/deepin-devicemanager/src/GenerateDevice/CmdTool.cpp @@ -695,9 +695,7 @@ void CmdTool::getMulHwinfoInfo(const QString &info) } QMap mapInfo; getMapInfoFromHwinfo(item, mapInfo); - if (mapInfo["Hardware Class"] == "sound" - || (mapInfo["Device"].contains("USB Audio") && mapInfo["Device"].contains("snd-usb-audio")) - || mapInfo["Driver"].contains("snd-usb-audio")) { + if (mapInfo["Hardware Class"] == "sound" || (mapInfo["Device"].contains("USB Audio") && mapInfo["Device"].contains("snd-usb-audio"))) { qCDebug(appLog) << "Found sound device."; // mapInfo["Device"].contains("USB Audio") 是为了处理未识别的USB声卡 Bug-118773 addMapInfo("hwinfo_sound", mapInfo); From fe00cf85bf23b1db922e22bf6b1ce59175815f15 Mon Sep 17 00:00:00 2001 From: gongheng Date: Wed, 3 Sep 2025 13:42:58 +0800 Subject: [PATCH 3/5] Fix: [GPU] Not show gpu on some platform. -- Not show gpu on some platform. Log: fix issue Bug: https://pms.uniontech.com/task-view-378987.html --- deepin-devicemanager-server/customgpuinfo/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deepin-devicemanager-server/customgpuinfo/main.cpp b/deepin-devicemanager-server/customgpuinfo/main.cpp index 969bcd551..725025133 100644 --- a/deepin-devicemanager-server/customgpuinfo/main.cpp +++ b/deepin-devicemanager-server/customgpuinfo/main.cpp @@ -98,7 +98,8 @@ bool getGpuMemInfoForFTDTM(QMap &mapInfo) int main(int argc, char *argv[]) { QMap mapInfo; - if (getGpuBaseInfo(mapInfo) && getGpuMemInfoForFTDTM(mapInfo)) { + if (getGpuBaseInfo(mapInfo)) { + getGpuMemInfoForFTDTM(mapInfo); for (auto it = mapInfo.begin(); it != mapInfo.end(); ++it) std::cout << it.key().toStdString() << ": " << it.value().toStdString() << std::endl; return 0; From d6735ac210f513aea8ec0038f232c6aec98eafab Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Wed, 3 Sep 2025 15:03:03 +0800 Subject: [PATCH 4/5] fix: add input device bus interface for USB Devices improve input device Bus interface detectionadd, add input device bus interface for USB Devices Log: add input device bus interface for USB Devices Bug: https://pms.uniontech.com/bug-view-331181.html Change-Id: Ie66f434275af797a31a083f9ea6eb8a63dd427ab --- deepin-devicemanager/src/DeviceManager/DeviceInput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp b/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp index 1e658aa68..b362bd166 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp @@ -18,7 +18,7 @@ using namespace DDLog; -QStringList DeviceInput::m_supportInterfaces= {"PS/2", "Bluetooth", "I2C"}; +QStringList DeviceInput::m_supportInterfaces= {"PS/2", "Bluetooth", "I2C", "USB"}; DeviceInput::DeviceInput() : DeviceBaseInfo() From 5ce8474a9096e0063f925852e332e85719248d56 Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Thu, 4 Sep 2025 13:11:27 +0800 Subject: [PATCH 5/5] fix: Prevent music playback interruption when opening Device Manager with USB headphones Fixed an issue where Device Manager's audio enable/disable functionality briefly toggled audio device states during initialization, causing USB headphone playback to pause. This occurred due to temporary audio device state switching logic during the initial setup phase. Log: Fix USB audio playback interruption from Device Manager Bug: https://pms.uniontech.com/bug-view-332095.html Change-Id: Idd98f8cd92884d3f7b7297adf64901c49f9807a0 --- deepin-devicemanager/src/DeviceManager/DeviceManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp b/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp index 774155c03..039109214 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp @@ -1324,7 +1324,10 @@ void DeviceManager::deleteDisableDuplicate_AudioDevice(void) continue; } m_ListDeviceAudio.push_back(enabledDevices.value(it)); - + qDebug() << enabledDevices.value(it)->name() << "is enable: " << enabledDevices.value(it)->enable(); + if (enabledDevices.value(it)->enable()){ + continue; + } setAudioDeviceEnable(enabledDevices.value(it), enabledDevices.value(it)->enable()); } qWarning()<<"delete after: "<< m_ListDeviceAudio.size();