From 2e2d6bf75fda275c06ac817dc11cd3b76ac3fb14 Mon Sep 17 00:00:00 2001 From: zhangjiarui Date: Tue, 14 Jul 2026 19:55:24 +0800 Subject: [PATCH] fix(camera): display FHD Camera for special computer types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当特殊机器类型为FLMZ或FLMZS时,统一显示图像设备名称为FHDCamera。 Log:修复特殊机型摄像头名称显示 Task: https://pms.uniontech.com/task-view-392807.html Influence:特殊机型的图像设备列表、概览和详情页将显示FHDCamera。 --- .../src/DeviceManager/DeviceImage.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp index 6a39ec33..81f48bb3 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -7,6 +7,19 @@ #include "DeviceManager.h" #include "DBusEnableInterface.h" #include "DBusInterface.h" +#include "commonfunction.h" + +namespace { +constexpr auto kFhdCameraName = "FHD Camera"; + +void setSpecialCameraName(QString &name) +{ + if (Common::specialComType == Common::kSpecialType9 + || Common::specialComType == Common::kSpecialType10) { + name = kFhdCameraName; + } +} +} DeviceImage::DeviceImage() : DeviceBaseInfo() @@ -27,6 +40,7 @@ void DeviceImage::setInfoFromLshw(const QMap &mapInfo) return; setAttribute(mapInfo, "product", m_Name, false); + setSpecialCameraName(m_Name); setAttribute(mapInfo, "vendor", m_Vendor); setAttribute(mapInfo, "version", m_Version); setAttribute(mapInfo, "bus info", m_BusInfo); @@ -62,6 +76,7 @@ void DeviceImage::setInfoFromHwinfo(const QMap &mapInfo) if (mapInfo.find("unique_id") != mapInfo.end()) { m_UniqueID = mapInfo["unique_id"]; m_Name = mapInfo["name"]; + setSpecialCameraName(m_Name); m_SysPath = mapInfo["path"]; m_HardwareClass = mapInfo["Hardware Class"]; m_Enable = false; @@ -80,6 +95,7 @@ void DeviceImage::setInfoFromHwinfo(const QMap &mapInfo) m_SerialID = m_UniqueID; setAttribute(mapInfo, "SysFS ID", m_SysPath); setAttribute(mapInfo, "Device", m_Name); + setSpecialCameraName(m_Name); setAttribute(mapInfo, "Vendor", m_Vendor); setAttribute(mapInfo, "Model", m_Model); setAttribute(mapInfo, "Revision", m_Version);