diff --git a/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp b/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
index 3da5cc1f..76057b34 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
@@ -29,10 +29,10 @@ TomlFixMethod DeviceComputer::setInfoFromTomlOneByOne(const QMap<QString, QStrin
         TomlFixMethod ret = TOML_None;
 //  must cover the  loadOtherDeviceInfo
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "HOME_URL", m_HomeUrl);
-    ret = setTomlAttribute(mapInfo, "Type", m_Type);
-    ret = setTomlAttribute(mapInfo, "vendor", m_Vendor);
-    ret = setTomlAttribute(mapInfo, "OS", m_OS);
+    setTomlAttribute(mapInfo, "HOME_URL", m_HomeUrl);
+    setTomlAttribute(mapInfo, "Type", m_Type);
+    setTomlAttribute(mapInfo, "vendor", m_Vendor);
+    setTomlAttribute(mapInfo, "OS", m_OS);
     ret = setTomlAttribute(mapInfo, "OsDescription", m_OsDescription);
     qCDebug(appLog) << "Toml attributes set: HomeUrl=" << m_HomeUrl << ", Type=" << m_Type << ", Vendor=" << m_Vendor << ", OS=" << m_OS << ", OsDescription=" << m_OsDescription;
 //3. 获取设备的其它信息
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
index a0d18914..ee99622e 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
@@ -261,26 +261,26 @@ TomlFixMethod DeviceCpu::setInfoFromTomlOneByOne(const QMap<QString, QString> &m
     qCDebug(appLog) << "DeviceCpu::setInfoFromTomlOneByOne started.";
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "CPU ID", m_PhysicalID);
-    ret = setTomlAttribute(mapInfo, "Core ID", m_CoreID);
-    ret = setTomlAttribute(mapInfo, "Threads", m_ThreadNum);
-    ret = setTomlAttribute(mapInfo, "Frequency", m_Frequency);
-    ret = setTomlAttribute(mapInfo, "Current Frequency", m_CurFrequency);
-    ret = setTomlAttribute(mapInfo, "Max Frequency", m_MaxFrequency);
-    ret = setTomlAttribute(mapInfo, "BogoMIPS", m_BogoMIPS);
-    ret = setTomlAttribute(mapInfo, "Architecture", m_Architecture);
-    ret = setTomlAttribute(mapInfo, "CPU Family", m_Familly);
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "CPU ID", m_PhysicalID);
+    setTomlAttribute(mapInfo, "Core ID", m_CoreID);
+    setTomlAttribute(mapInfo, "Threads", m_ThreadNum);
+    setTomlAttribute(mapInfo, "Frequency", m_Frequency);
+    setTomlAttribute(mapInfo, "Current Frequency", m_CurFrequency);
+    setTomlAttribute(mapInfo, "Max Frequency", m_MaxFrequency);
+    setTomlAttribute(mapInfo, "BogoMIPS", m_BogoMIPS);
+    setTomlAttribute(mapInfo, "Architecture", m_Architecture);
+    setTomlAttribute(mapInfo, "CPU Family", m_Familly);
+    setTomlAttribute(mapInfo, "Model", m_Model);
     qCDebug(appLog) << "Basic toml attributes set.";
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
-    ret = setTomlAttribute(mapInfo, "Flags", m_Flags);
-    ret = setTomlAttribute(mapInfo, "Extensions", m_Extensions);
-    ret = setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4);
-    ret = setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3);
-    ret = setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2);
-    ret = setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order);
-    ret = setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data);
+    setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
+    setTomlAttribute(mapInfo, "Flags", m_Flags);
+    setTomlAttribute(mapInfo, "Extensions", m_Extensions);
+    setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4);
+    setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3);
+    setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2);
+    setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order);
+    setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data);
     ret = setTomlAttribute(mapInfo, "Stepping", m_Step);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceGpu.cpp b/deepin-devicemanager/src/DeviceManager/DeviceGpu.cpp
index d0c004d3..e44ec2fb 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceGpu.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceGpu.cpp
@@ -356,6 +356,7 @@ void DeviceGpu::setGpuInfo(const QMap<QString, QString> &mapInfo)
 //  名称(Name) 厂商(Vendor) 型号(Model) 版本(Version) 显存(Graphics Memory)
 void DeviceGpu::setGpuInfoByCustom(const QMap<QString, QString> &mapInfo)
 {
+    m_extraInfo.clear();
     QMap<QString, QString>::const_iterator it = mapInfo.constBegin();
     for (; it != mapInfo.constEnd(); ++it) {
         if (it.key() == "Name") {
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
index 861a518b..66725b3e 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
@@ -56,13 +56,13 @@ TomlFixMethod DeviceImage::setInfoFromTomlOneByOne(const QMap<QString, QString>
     TomlFixMethod ret = TOML_None;
 
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
-    ret = setTomlAttribute(mapInfo, "Version", m_Version);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Version", m_Version);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
     ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialID);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp b/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp
index b68edbaa..41b74765 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp
@@ -922,7 +922,6 @@ const QString DeviceBaseInfo::readDeviceInfoKeyValue(const QString &key)
 {
     if (key.isEmpty())
         return QString("");
-    // qCInfo(appLog) << __FILE__ << __LINE__  << key << "after translation:"<< kk;
     QList<QPair<QString, QString> > allBaseAttribs = getBaseAttribs();
     for (const QPair<QString, QString>& pair : allBaseAttribs) {
         if (key == pair.first)
@@ -1029,9 +1028,9 @@ void DeviceBaseInfo::mapInfoToList()
     qCDebug(appLog) << "DeviceBaseInfo::mapInfoToList called";
     // m_MapOtherInfo --> m_LstOtherInfo
     // QMap内容转为QList存储
-    auto iter = m_MapOtherInfo.begin();
+    QMap<QString, QString>::const_iterator iter = m_MapOtherInfo.constBegin();
 
-    for (; iter != m_MapOtherInfo.end(); ++iter) {
+    for (; iter != m_MapOtherInfo.constEnd(); ++iter) {
         if (isValueValid(iter.value()))
             m_LstOtherInfo.append(QPair<QString, QString>(iter.key(), iter.value()));
     }
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp b/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
index 468ceb1b..08d9e1b9 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
@@ -81,12 +81,12 @@ TomlFixMethod DeviceInput::setInfoFromTomlOneByOne(const QMap<QString, QString>
 
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Interface", m_Interface);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Interface", m_Interface);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Maximum Current", m_MaximumPower);   // 将最大功率改为最大电流
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Maximum Current", m_MaximumPower);   // 将最大功率改为最大电流
     ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
 
 //3. 获取设备的其它信息
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
index 13bd4b8e..59021aee 100755
--- a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
@@ -66,17 +66,17 @@ TomlFixMethod DeviceMemory::setInfoFromTomlOneByOne(const QMap<QString, QString>
     qCDebug(appLog) << "Setting memory info from TOML one by one";
     TomlFixMethod ret = TOML_None;
         // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Size", m_Size);
-    ret = setTomlAttribute(mapInfo, "Type", m_Type);
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Total Width", m_TotalBandwidth);
-    ret = setTomlAttribute(mapInfo, "Locator", m_Locator);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Size", m_Size);
+    setTomlAttribute(mapInfo, "Type", m_Type);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Total Width", m_TotalBandwidth);
+    setTomlAttribute(mapInfo, "Locator", m_Locator);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Configured Voltage", m_ConfiguredVoltage);
-    ret = setTomlAttribute(mapInfo, "Maximum Voltage", m_MaximumVoltage);
-    ret = setTomlAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
-    ret = setTomlAttribute(mapInfo, "Configured Speed", m_ConfiguredSpeed);
+    setTomlAttribute(mapInfo, "Configured Voltage", m_ConfiguredVoltage);
+    setTomlAttribute(mapInfo, "Maximum Voltage", m_MaximumVoltage);
+    setTomlAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
+    setTomlAttribute(mapInfo, "Configured Speed", m_ConfiguredSpeed);
     ret = setTomlAttribute(mapInfo, "Data Width", m_DataBandwidth);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
index e7a2ab2d..d8da22f5 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
@@ -137,7 +137,9 @@ void DeviceMonitor::setInfoFromHwinfo(const QMap<QString, QString> &mapInfo)
     setAttribute(mapInfo, "", m_DisplayInput);
     setAttribute(mapInfo, "Size", m_ScreenSize);
     setAttribute(mapInfo, "", m_MainScreen);
-    // setAttribute(mapInfo, "Resolution", m_SupportResolution);
+    if (Common::specialComType > 0){
+        setAttribute(mapInfo, "Resolution", m_SupportResolution);
+    }
     qCDebug(appLog) << "Basic monitor attributes set - Name:" << m_Name << "Vendor:" << m_Vendor << "Model:" << m_Model;
 
     double inch = 0.0;
@@ -147,23 +149,27 @@ void DeviceMonitor::setInfoFromHwinfo(const QMap<QString, QString> &mapInfo)
     qCDebug(appLog) << "Screen size parsed:" << m_ScreenSize << "Width:" << size.width() << "Height:" << size.height();
 
     // 获取当前分辨率 和 当前支持分辨率
-//    QStringList listResolution = m_SupportResolution.split(" ");
-//    m_SupportResolution = "";
-//    foreach (const QString &word, listResolution) {
-//        if (word.contains("@")) {
-//            m_SupportResolution.append(word);
-//            m_SupportResolution.append(", ");
-//        }
-//    }
+    if (Common::specialComType > 0){
+        QStringList listResolution = m_SupportResolution.split(" ");
+        m_SupportResolution = "";
+        foreach (const QString &word, listResolution) {
+            if (word.contains("@")) {
+                m_SupportResolution.append(word);
+                m_SupportResolution.append(", ");
+            }
+        }
+    }
 
     // 计算显示比例
     caculateScreenRatio();
 
-    #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        // m_SupportResolution.replace(QRegExp(", $"), "");
-    #else
-        // m_SupportResolution.replace(QRegularExpression(", $"), "");
-    #endif
+    if (Common::specialComType > 0){
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+        m_SupportResolution.replace(QRegExp(", $"), "");
+#else
+        m_SupportResolution.replace(QRegularExpression(", $"), "");
+#endif
+    }
     qCDebug(appLog) << "Supported resolutions processed:" << m_SupportResolution;
 
     m_ProductionWeek  = transWeekToDate(mapInfo["Year of Manufacture"], mapInfo["Week of Manufacture"]);
@@ -182,21 +188,22 @@ TomlFixMethod DeviceMonitor::setInfoFromTomlOneByOne(const QMap<QString, QString
         m_IsTomlSet = true;
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Type", m_Model);
-    ret = setTomlAttribute(mapInfo, "Display Input", m_DisplayInput);
-    ret = setTomlAttribute(mapInfo, "Interface Type", m_Interface);
+    setTomlAttribute(mapInfo, "Type", m_Model);
+    setTomlAttribute(mapInfo, "Display Input", m_DisplayInput);
+    setTomlAttribute(mapInfo, "Interface Type", m_Interface);
     qCDebug(appLog) << "Basic monitor attributes set from TOML - Model:" << m_Model << "Input:" << m_DisplayInput << "Interface:" << m_Interface;
 
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Support Resolution", m_SupportResolution);
-    ret = setTomlAttribute(mapInfo, "Current Resolution", m_CurrentResolution);
-    ret = setTomlAttribute(mapInfo, "Display Ratio", m_AspectRatio);
+    setTomlAttribute(mapInfo, "Support Resolution", m_SupportResolution);
+    setTomlAttribute(mapInfo, "Current Resolution", m_CurrentResolution);
+    setTomlAttribute(mapInfo, "Display Ratio", m_AspectRatio);    
     qCDebug(appLog) << "Resolution info set - Supported:" << m_SupportResolution << "Current:" << m_CurrentResolution << "Ratio:" << m_AspectRatio;
 
-    ret = setTomlAttribute(mapInfo, "Primary Monitor", m_MainScreen);
-    ret = setTomlAttribute(mapInfo, "Size", m_ScreenSize);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
-    ret = setTomlAttribute(mapInfo, "Product Date", m_ProductionWeek);
+    setTomlAttribute(mapInfo, "Primary Monitor", m_MainScreen);
+    setTomlAttribute(mapInfo, "Size", m_ScreenSize);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Product Date", m_ProductionWeek);
+
     ret = setTomlAttribute(mapInfo, "Refresh Rate", m_RefreshRate);
     qCDebug(appLog) << "Additional info set - Primary:" << m_MainScreen << "Size:" << m_ScreenSize << "Serial:" << m_SerialNumber << "Date:" << m_ProductionWeek;
 
@@ -283,21 +290,23 @@ bool DeviceMonitor::setInfoFromXradr(const QString &main, const QString &edid, c
             }
         }
 
-        QMap<QString, QStringList> monitorResolutionMap = getMonitorResolutionMap(xrandr, m_RawInterface);
+        if (Common::specialComType <= 0) {
+            QMap<QString, QStringList> monitorResolutionMap = getMonitorResolutionMap(xrandr, m_RawInterface);
 
-        if (monitorResolutionMap.size() == 1) {
-            m_SupportResolution.clear();
-            foreach (const QString &word, monitorResolutionMap.value(m_RawInterface)) {
-                if (word.contains("@")) {
-                    m_SupportResolution.append(word);
-                    m_SupportResolution.append(", ");
+            if (monitorResolutionMap.size() == 1) {
+                m_SupportResolution.clear();
+                foreach (const QString &word, monitorResolutionMap.value(m_RawInterface)) {
+                    if (word.contains("@")) {
+                        m_SupportResolution.append(word);
+                        m_SupportResolution.append(", ");
+                    }
                 }
-            }
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-            m_SupportResolution.remove(QRegExp(", $"));
+                m_SupportResolution.remove(QRegExp(", $"));
 #else
-            m_SupportResolution.remove(QRegularExpression(", $"));
+                m_SupportResolution.remove(QRegularExpression(", $"));
 #endif
+            }
         }
         qCDebug(appLog) << "Interface already processed, returning false";
         return false;
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp b/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
index 520868c8..4163e072 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
@@ -104,27 +104,27 @@ TomlFixMethod DeviceNetwork::setInfoFromTomlOneByOne(const QMap<QString, QString
     qCDebug(appLog) << "DeviceNetwork::setInfoFromTomlOneByOne";
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Type", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
-    ret = setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
+    setTomlAttribute(mapInfo, "Type", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Maximum Rate", m_Capacity);
-    ret = setTomlAttribute(mapInfo, "Negotiation Rate", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Port", m_Port);
-    ret = setTomlAttribute(mapInfo, "Multicast", m_Multicast);
-    ret = setTomlAttribute(mapInfo, "Link", m_Link);
-    ret = setTomlAttribute(mapInfo, "Latency", m_Latency);
-    ret = setTomlAttribute(mapInfo, "IP", m_Ip);
-    ret = setTomlAttribute(mapInfo, "Firmware", m_Firmware);
-    ret = setTomlAttribute(mapInfo, "Duplex", m_Duplex);
-    ret = setTomlAttribute(mapInfo, "Broadcast", m_Broadcast);
-    ret = setTomlAttribute(mapInfo, "Auto Negotiation", m_Autonegotiation);
+    setTomlAttribute(mapInfo, "Maximum Rate", m_Capacity);
+    setTomlAttribute(mapInfo, "Negotiation Rate", m_Speed);
+    setTomlAttribute(mapInfo, "Port", m_Port);
+    setTomlAttribute(mapInfo, "Multicast", m_Multicast);
+    setTomlAttribute(mapInfo, "Link", m_Link);
+    setTomlAttribute(mapInfo, "Latency", m_Latency);
+    setTomlAttribute(mapInfo, "IP", m_Ip);
+    setTomlAttribute(mapInfo, "Firmware", m_Firmware);
+    setTomlAttribute(mapInfo, "Duplex", m_Duplex);
+    setTomlAttribute(mapInfo, "Broadcast", m_Broadcast);
+    setTomlAttribute(mapInfo, "Auto Negotiation", m_Autonegotiation);
 //    ret = setTomlAttribute(mapInfo, "Clock", m_Clock);
 //    ret = setTomlAttribute(mapInfo, "Width", m_Width);
-    ret = setTomlAttribute(mapInfo, "Memory Address", m_Memory);
-    ret = setTomlAttribute(mapInfo, "IRQ", m_Irq);
-    ret = setTomlAttribute(mapInfo, "MAC Address", m_MACAddress);
+    setTomlAttribute(mapInfo, "Memory Address", m_Memory);
+    setTomlAttribute(mapInfo, "IRQ", m_Irq);
+    setTomlAttribute(mapInfo, "MAC Address", m_MACAddress);
     ret = setTomlAttribute(mapInfo, "Logical Name", m_LogicalName);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp b/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
index 114d4c50..198adb41 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
@@ -27,17 +27,17 @@ TomlFixMethod DeviceOtherPCI::setInfoFromTomlOneByOne(const QMap<QString, QStrin
 {
     qCDebug(appLog) << "DeviceOtherPCI::setInfoFromTomlOneByOne";
     TomlFixMethod ret = TOML_None;
-   // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    // 添加基本信息
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
 
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Input/Output", m_InputOutput);
-    ret = setTomlAttribute(mapInfo, "Memory", m_Memory);
-    ret = setTomlAttribute(mapInfo, "IRQ", m_Irq);
-    ret = setTomlAttribute(mapInfo, "Latency", m_Latency);
+    setTomlAttribute(mapInfo, "Input/Output", m_InputOutput);
+    setTomlAttribute(mapInfo, "Memory", m_Memory);
+    setTomlAttribute(mapInfo, "IRQ", m_Irq);
+    setTomlAttribute(mapInfo, "Latency", m_Latency);
     ret = setTomlAttribute(mapInfo, "Capabilities", m_Version);
-//3. 获取设备的其它信息
+    //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp b/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
index 7bb82319..dc5c9328 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
@@ -64,14 +64,14 @@ TomlFixMethod DeviceOthers::setInfoFromTomlOneByOne(const QMap<QString, QString>
     qCDebug(appLog) << "DeviceOthers::setInfoFromTomlOneByOne";
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
-    ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-////Others
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    // Others
     ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialID);
-//3. 获取设备的其它信息
+    // 3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DevicePower.cpp b/deepin-devicemanager/src/DeviceManager/DevicePower.cpp
index 46c593c0..1fb90680 100644
--- a/deepin-devicemanager/src/DeviceManager/DevicePower.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DevicePower.cpp
@@ -48,19 +48,19 @@ TomlFixMethod DevicePower::setInfoFromTomlOneByOne(const QMap<QString, QString>
     qCDebug(appLog) << "DevicePower::setInfoFromTomlOneByOne";
     TomlFixMethod ret = TOML_None;
     // 添加基本信息    
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);    
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
-    ret = setTomlAttribute(mapInfo, "Type", m_Type);
-    ret = setTomlAttribute(mapInfo, "Status", m_Status);
-    ret = setTomlAttribute(mapInfo, "Capacity", m_Capacity);
-    ret = setTomlAttribute(mapInfo, "Voltage", m_Voltage);
-    ret = setTomlAttribute(mapInfo, "Slot", m_Slot);
-    ret = setTomlAttribute(mapInfo, "Design Capacity", m_DesignCapacity);
-    ret = setTomlAttribute(mapInfo, "Design Voltage", m_DesignVoltage);
-    ret = setTomlAttribute(mapInfo, "SBDS Version", m_SBDSVersion);
-    ret = setTomlAttribute(mapInfo, "SBDS Serial Number", m_SBDSSerialNumber);
-    ret = setTomlAttribute(mapInfo, "SBDS Manufacture Date", m_SBDSManufactureDate);
-    ret = setTomlAttribute(mapInfo, "SBDS Chemistry", m_SBDSChemistry);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Type", m_Type);
+    setTomlAttribute(mapInfo, "Status", m_Status);
+    setTomlAttribute(mapInfo, "Capacity", m_Capacity);
+    setTomlAttribute(mapInfo, "Voltage", m_Voltage);
+    setTomlAttribute(mapInfo, "Slot", m_Slot);
+    setTomlAttribute(mapInfo, "Design Capacity", m_DesignCapacity);
+    setTomlAttribute(mapInfo, "Design Voltage", m_DesignVoltage);
+    setTomlAttribute(mapInfo, "SBDS Version", m_SBDSVersion);
+    setTomlAttribute(mapInfo, "SBDS Serial Number", m_SBDSSerialNumber);
+    setTomlAttribute(mapInfo, "SBDS Manufacture Date", m_SBDSManufactureDate);
+    setTomlAttribute(mapInfo, "SBDS Chemistry", m_SBDSChemistry);
     ret = setTomlAttribute(mapInfo, "Temperature", m_Temp);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp b/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp
index 65cb5709..90b0c9db 100644
--- a/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp
@@ -36,15 +36,15 @@ TomlFixMethod DevicePrint::setInfoFromTomlOneByOne(const QMap<QString, QString>
     qCDebug(appLog) << "DevicePrint::setInfoFromTomlOneByOne";
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Shared", m_Shared);
-    ret = setTomlAttribute(mapInfo, "URI", m_URI);
-    ret = setTomlAttribute(mapInfo, "Status", m_Status);
-    ret = setTomlAttribute(mapInfo, "Interface Type", m_InterfaceType);
+    setTomlAttribute(mapInfo, "Shared", m_Shared);
+    setTomlAttribute(mapInfo, "URI", m_URI);
+    setTomlAttribute(mapInfo, "Status", m_Status);
+    setTomlAttribute(mapInfo, "Interface Type", m_InterfaceType);
     ret = setTomlAttribute(mapInfo, "printer-make-and-model", m_MakeAndModel);
-//3. 获取设备的其它信息
+    // 3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
index b8bdf1b5..2eba86b3 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
@@ -43,16 +43,16 @@ TomlFixMethod DeviceStorage::setInfoFromTomlOneByOne(const QMap<QString, QString
     qCDebug(appLog) << "DeviceStorage::setInfoFromTomlOneByOne";
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Media Type", m_MediaType);
-    ret = setTomlAttribute(mapInfo, "Size", m_Size);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Media Type", m_MediaType);
+    setTomlAttribute(mapInfo, "Size", m_Size);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Firmware Version", m_FirmwareVersion);
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
-    ret = setTomlAttribute(mapInfo, "Interface", m_Interface);
+    setTomlAttribute(mapInfo, "Firmware Version", m_FirmwareVersion);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Interface", m_Interface);
     ret = setTomlAttribute(mapInfo, "Rotation Rate", m_RotationRate);
-    //3. 获取设备的其它信息
+    // 3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }
diff --git a/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp b/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
index dea5bbfe..2d4f514e 100644
--- a/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
+++ b/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
@@ -8,6 +8,7 @@
 #include "commonfunction.h"
 #include "commondefine.h"
 #include "DDLog.h"
+#include "commontools.h"
 
 // Qt库文件
 #include <QLoggingCategory>
@@ -455,51 +456,6 @@ void HWGenerator::getMemoryInfoFromLshw()
     }
 }
 
-static void parseEDID(QStringList allEDIDS,QString input)
-{
-    qCDebug(appLog) << "HWGenerator::generatorMonitorDevice start";
-    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";
@@ -520,7 +476,7 @@ void HWGenerator::generatorMonitorDevice()
             QStringList allEDIDS_all;
             allEDIDS_all.append(fileInfo.filePath() + "/" + "edid");
             QString interface = fileInfo.fileName().remove("card0-").remove("card1-").remove("card2-");
-            parseEDID(allEDIDS_all,interface);
+            CommonTools::parseEDID(allEDIDS_all,interface);
          }
     }
 }
diff --git a/deepin-devicemanager/src/Page/MainWindow.cpp b/deepin-devicemanager/src/Page/MainWindow.cpp
index 58cf708f..42bac79d 100644
--- a/deepin-devicemanager/src/Page/MainWindow.cpp
+++ b/deepin-devicemanager/src/Page/MainWindow.cpp
@@ -590,12 +590,14 @@ void MainWindow::slotLoadingFinish(const QString &message)
             mp_DeviceWidget->updateDevice(mp_DeviceWidget->currentIndex(), lst);
 
             // bug-325731
-            if (mp_DeviceWidget->currentIndex() == QObject::tr("Monitor")) {
-                QtConcurrent::run([=](){
-                    QThread::msleep(700);
-                    emit mp_DeviceWidget->itemClicked(mp_DeviceWidget->currentIndex());
-                    qWarning() << mp_DeviceWidget->currentIndex();
-                });
+            if (Common::specialComType <= 0) {
+                if (mp_DeviceWidget->currentIndex() == QObject::tr("Monitor")) {
+                    QtConcurrent::run([=](){
+                        QThread::msleep(700);
+                        emit mp_DeviceWidget->itemClicked(mp_DeviceWidget->currentIndex());
+                        qWarning() << mp_DeviceWidget->currentIndex();
+                    });
+                }
             }
         } else {
             QMap<QString, QString> overviewMap = DeviceManager::instance()->getDeviceOverview();
diff --git a/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp b/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp
index 22b465ed..222e6888 100644
--- a/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp
+++ b/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp
@@ -187,7 +187,6 @@ void ThreadExecXrandr::loadXrandrVerboseInfo(QList<QMap<QString, QString>> &lstM
 
         // 获取当前频率
         if ((*it).contains("*current")) {
-            // QString ss = *it;
             if ((it += 2) >= lines.end())
                 return;
             QRegularExpression regRate(".*([0-9]{1,5}\\.[0-9]{1,5}Hz).*");