fix: 解析edid显示设备模块

解析显示设备模块 Log: 解析显示设备模块 Bug: https://pms.uniontech.com/bug-view-246695.html
linuxdeepin · May 29, 2024 · 2358a5e · 2358a5e
1 parent f140ad8
commit 2358a5e
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 0 deletions.
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
@@ -163,6 +163,7 @@ void DeviceMonitor::setInfoFromEdid(const QMap<QString, QString> &mapInfo)
     setAttribute(mapInfo, "Vendor", m_Vendor);
     setAttribute(mapInfo, "Date", m_ProductionWeek);
     setAttribute(mapInfo, "Display Input", m_DisplayInput);
+    setAttribute(mapInfo, "Model", m_Model);
     getOtherMapInfo(mapInfo);
 }
 

diff --git a/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp b/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
@@ -4,10 +4,14 @@
 
 // 项目自身文件
 #include "HWGenerator.h"
+#include "EDIDParser.h"
 
 // Qt库文件
 #include <QDebug>
 #include <QProcess>
+#include <QFile>
+#include <QDir>
+#include <QDebug>
 
 // 其它头文件
 #include "DeviceManager/DeviceManager.h"
@@ -414,3 +418,69 @@ void HWGenerator::getMemoryInfoFromLshw()
         DeviceManager::instance()->addMemoryDevice(device);
     }
 }
+
+static void parseEDID(QStringList allEDIDS,QString input)
+{
+    for (auto edid:allEDIDS) {
+        QProcess process;
+        process.start(QString("hexdump %1").arg(edid));
+        process.waitForFinished(-1);
+
+        QString deviceInfo = process.readAllStandardOutput();
+        if(deviceInfo.isEmpty())
+            continue;
+
+        QString edidStr;
+        QStringList lines = deviceInfo.split("\n");
+        for (auto line:lines) {
+            QStringList words = line.trimmed().split(" ");
+            if(words.size() != 9)
+                continue;
+
+            words.removeAt(0);
+            QString l = words.join("");
+            l.append("\n");
+            edidStr.append(l);
+        }
+
+        lines = edidStr.split("\n");
+        if(lines.size() > 3){
+            EDIDParser edidParser;
+            QString errorMsg;
+            edidParser.setEdid(edidStr,errorMsg,"\n", false);
+
+            QMap<QString, QString> mapInfo;
+            mapInfo.insert("Vendor",edidParser.vendor());
+            mapInfo.insert("Model",edidParser.model());
+            mapInfo.insert("Date",edidParser.releaseDate());
+            mapInfo.insert("Size",edidParser.screenSize());
+            mapInfo.insert("Display Input",input);
+
+            DeviceMonitor *device = new DeviceMonitor();
+            device->setInfoFromEdid(mapInfo);
+            DeviceManager::instance()->addMonitor(device);
+        }
+    }
+}
+
+void HWGenerator::generatorMonitorDevice()
+{
+    QString toDir = "/sys/class/drm";
+    QDir toDir_(toDir);
+
+    if (!toDir_.exists())
+        return;
+
+    QFileInfoList fileInfoList = toDir_.entryInfoList();
+    foreach(QFileInfo fileInfo, fileInfoList) {
+        if(fileInfo.fileName() == "." || fileInfo.fileName() == ".." || !fileInfo.fileName().startsWith("card"))
+            continue;
+
+        if(QFile::exists(fileInfo.filePath() + "/" + "edid")) {
+            QStringList allEDIDS_all;
+            allEDIDS_all.append(fileInfo.filePath() + "/" + "edid");
+            QString interface = fileInfo.fileName().remove("card0-").remove("card1-").remove("card2-");
+            parseEDID(allEDIDS_all,interface);
+         }
+    }
+}
diff --git a/deepin-devicemanager/src/GenerateDevice/HWGenerator.h b/deepin-devicemanager/src/GenerateDevice/HWGenerator.h
@@ -92,6 +92,11 @@ class HWGenerator : public DeviceGenerator
      * @brief getMemoryInfoFromLshw:从lshw获取内存信息
      */
     virtual void getMemoryInfoFromLshw() override;
+
+    /**
+     * @brief generatorMonitorDevice:生成显示设备信息
+     */
+    virtual void generatorMonitorDevice() override;
 };
 
 #endif // PANGUVGENERATOR_H
diff --git a/deepin-devicemanager/src/Tool/EDIDParser.cpp b/deepin-devicemanager/src/Tool/EDIDParser.cpp
@@ -88,6 +88,11 @@ const QString &EDIDParser::vendor()const
     return m_Vendor;
 }
 
+const QString &EDIDParser::model()const
+{
+    return m_Model;
+}
+
 const QString &EDIDParser::releaseDate()const
 {
     return m_ReleaseDate;
@@ -134,6 +139,11 @@ void EDIDParser::parserVendor()
 
     m_Vendor = QString(name);
 
+    QString h0a = getBytes(0, 10);
+    QString h0b = getBytes(0, 11);
+
+    m_Model = h0a + h0b;
+
 //    // 将16进制的厂商信息转换成二进制的厂商信息
 //    QString binStr = hexToBin(vendorStr);
 

diff --git a/deepin-devicemanager/src/Tool/EDIDParser.h b/deepin-devicemanager/src/Tool/EDIDParser.h
@@ -34,6 +34,12 @@ class EDIDParser
      */
     const QString &vendor()const;
 
+    /**
+     * @brief model：获取厂商信息
+     * @return 厂商信息
+     */
+    const QString &model()const;
+
     /**
      * @brief releaseDate:获取生产日期
      * @return 生产日期
@@ -131,6 +137,7 @@ class EDIDParser
 private:
     /**@brief:机器的存储模式不同，会导致计算结果不同，所以在解析的时候需要考虑大小端模式*/
     QString                m_Vendor;                           // 显示屏的厂商信息
+    QString                m_Model;                           // 显示屏的型号信息
     QString                m_ReleaseDate;                      // 显示屏的生产日期
     QString                m_ScreenSize;                       // 屏幕大小
     bool                   m_LittleEndianMode;                 // 小端模式