From d8c0b1134955ba5a0713987076788b71e3040bc0 Mon Sep 17 00:00:00 2001 From: gongheng Date: Mon, 30 Mar 2026 13:56:08 +0800 Subject: [PATCH] Fix: The screen size show error. -- Add Group Policy item to control whether to display screen size. Log: fix issue Bug: https://pms.uniontech.com/bug-view-354275.html --- .../src/DeviceManager/DeviceMonitor.cpp | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp index f5e021a0..cd2e877d 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp @@ -10,6 +10,7 @@ #include "DDLog.h" #include +#include // Qt库文件 #include @@ -22,6 +23,7 @@ DWIDGET_USE_NAMESPACE using namespace DDLog; +DCORE_USE_NAMESPACE DeviceMonitor::DeviceMonitor() : DeviceBaseInfo() @@ -409,12 +411,19 @@ void DeviceMonitor::loadOtherDeviceInfo() } } } - addOtherDeviceInfo("Primary Monitor", m_MainScreen); - if (Common::isShowScreenSize()) - addOtherDeviceInfo("Size", m_ScreenSize); - addOtherDeviceInfo("Serial Number", m_SerialNumber); -// addOtherDeviceInfo("Product Date", m_ProductionWeek); - + addOtherDeviceInfo(("Primary Monitor"), m_MainScreen); + bool showScreenSize { true }; + +#ifdef DTKCORE_CLASS_DConfigFile + DConfig *dconfig = DConfig::create("org.deepin.devicemanager","org.deepin.devicemanager"); + if(dconfig && dconfig->isValid() && dconfig->keyList().contains("showScreenSize")){ + showScreenSize = dconfig->value("showScreenSize").toBool(); + } +#endif + if (showScreenSize) + addOtherDeviceInfo(("Size"), m_ScreenSize); + addOtherDeviceInfo(("Serial Number"), m_SerialNumber); +// addOtherDeviceInfo(("Product Date"), m_ProductionWeek); mapInfoToList(); qCDebug(appLog) << "Other device info loaded"; }