feat: 适配某机型CPU内集成网卡

  适配某机型CPU内集成网卡

Log: 适配某机型CPU内集成网卡

Task: https://pms.uniontech.com/task-view-359985.html

Author: shuaijie

deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp

@@ -102,6 +102,12 @@ void DeviceNetwork::setInfoFromLshw(const QMap<QString, QString> &mapInfo)
     if (driverIsKernelIn(m_DriverModules) || driverIsKernelIn(m_Driver)) {
         m_CanUninstall = false;
     }
+    if (m_Vendor.isEmpty() && !m_Name.isEmpty()) {
+        if (m_Name.contains("ARM", Qt::CaseInsensitive))
+            m_Vendor = "ARM Ltd";
+         else
+            m_Vendor = m_Name;
+    }
 
     // 加载其他信息
     getOtherMapInfo(mapInfo);
@@ -151,6 +157,7 @@ bool DeviceNetwork::setInfoFromHwinfo(const QMap<QString, QString> &mapInfo)
         m_CanUninstall = !driverIsKernelIn(m_Driver);
         return true;
     }
+    setAttribute(mapInfo, "Device", m_Name);
     setAttribute(mapInfo, "Device File", m_LogicalName);
     setAttribute(mapInfo, "HW Address", m_MACAddress);
     setAttribute(mapInfo, "Permanent HW Address", m_UniqueID);

deepin-devicemanager/src/GenerateDevice/CmdTool.cpp

@@ -580,7 +580,7 @@ void CmdTool::getMulHwinfoInfo(const QString &info)
             addMapInfo("hwinfo_sound", mapInfo);
         } else if (mapInfo["Hardware Class"].contains("network")) {
             //if (mapInfo.find("SysFS Device Link") != mapInfo.end() && mapInfo["SysFS Device Link"].contains("/devices/platform"))
-            bool hasAddress = mapInfo.find("HW Address") != mapInfo.end() && mapInfo.find("Permanent HW Address") != mapInfo.end();
+            bool hasAddress = mapInfo.find("HW Address") != mapInfo.end() || mapInfo.find("Permanent HW Address") != mapInfo.end();
             bool hasPath = mapInfo.find("path") != mapInfo.end();
             if (hasPath || hasAddress) {
                 addMapInfo("hwinfo_network", mapInfo);

deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp

@@ -254,7 +254,7 @@ void DeviceGenerator::generatorNetworkDevice()
 
         // 先判断是否是有效网卡信息
         // 符合两种情况中的一种 1. "HW Address" 和 "Permanent HW Address" 都必须有  2. 有 "unique_id"
-        if (((*it).find("HW Address") == (*it).end() || (*it).find("Permanent HW Address") == (*it).end()) && ((*it).find("unique_id") == (*it).end())) {
+        if (((*it).find("HW Address") == (*it).end() && (*it).find("Permanent HW Address") == (*it).end()) && ((*it).find("unique_id") == (*it).end())) {
             continue;
         }