diff --git a/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/commonfunction.h b/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/commonfunction.h
index 3d1ba92d..93fd468f 100644
--- a/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/commonfunction.h
+++ b/deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/commonfunction.h
@@ -11,7 +11,8 @@
 
 #include <sys/utsname.h>
 
-static QMap<QString, QString> mapArch = {   {"aarch64", "arm64"}
+static QMap<QString, QString> mapArch = {
+    {"aarch64", "arm64"}
     , {"x86_64", "amd64"}
     , {"mips64", "mips64el"}
     , {"i386", "i386"}
diff --git a/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp b/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp
index a07b9a70..b2b034f0 100644
--- a/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp
+++ b/deepin-devicemanager-server/deepin-deviceinfo/src/mainjob.cpp
@@ -176,7 +176,7 @@ void MainJob::updateAllDevice()
         qCDebug(appLog) << "Updating existing device info";
         m_pool->updateDeviceInfo();
     }
-    m_pool->waitForDone(-1);
+    m_pool->waitForDone(60000);
     PERF_PRINT_END("POINT-01");
     m_firstUpdate = false;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
index ee99622e..005b5067 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
@@ -53,6 +53,13 @@ void DeviceCpu::setCpuInfo(const QMap<QString, QString> &mapLscpu, const QMap<QS
     m_Name.replace(QRegularExpression("x [0-9]*$"), "");
     qCDebug(appLog) << "CPU name after regex replacement: " << m_Name;
 
+    if (Common::specialComType == Common::kSpecialType5 ||
+        Common::specialComType == Common::kSpecialType6 ||
+        Common::specialComType == Common::kSpecialType7) {
+        m_Frequency = m_Frequency.replace("2.189", "2.188");
+        m_MaxFrequency = m_MaxFrequency.replace("2189", "2188");
+    }
+
     //  获取逻辑数和core数
     m_LogicalCPUNum = logicalNum;
     m_CPUCoreNum = coreNum;
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp b/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
index dc5c9328..f1c5cab4 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
@@ -43,7 +43,8 @@ void DeviceOthers::setInfoFromLshw(const QMap<QString, QString> &mapInfo)
     setAttribute(mapInfo, "maxpower", m_MaximumPower);
     setAttribute(mapInfo, "speed", m_Speed);
     setAttribute(mapInfo, "logical name", m_LogicalName);
-
+    if (m_Driver.toLower() == "usbfs")
+        m_Driver.clear();
     if(m_Driver.isEmpty() && !m_Avail.compare("yes", Qt::CaseInsensitive)){
         qCDebug(appLog) << "DeviceOthers::setInfoFromLshw, driver is empty and avail is yes";
         setForcedDisplay(true);
@@ -99,7 +100,8 @@ void DeviceOthers::setInfoFromHwinfo(const QMap<QString, QString> &mapInfo)
     setAttribute(mapInfo, "Module Alias", m_Modalias);
     setAttribute(mapInfo, "VID_PID", m_VID_PID);
     m_PhysID = m_VID_PID;
-
+    if (m_Driver.toLower() == "usbfs")
+        m_Driver.clear();
     if (mapInfo["Hardware Class"] != "fingerprint") {
         qCDebug(appLog) << "DeviceOthers::setInfoFromHwinfo, hardware class is not fingerprint";
         m_HardwareClass = "others";
diff --git a/deepin-devicemanager/src/Tool/DBusAnythingInterface.h b/deepin-devicemanager/src/Tool/DBusAnythingInterface.h
index 544af703..c35df746 100644
--- a/deepin-devicemanager/src/Tool/DBusAnythingInterface.h
+++ b/deepin-devicemanager/src/Tool/DBusAnythingInterface.h
@@ -64,8 +64,8 @@ class DBusAnythingInterface : public QObject
 
 private:
     static std::atomic<DBusAnythingInterface *> s_Instance;
-    static std::mutex m_mutex;
-    QDBusInterface       *mp_Iface;
+    static std::mutex                           m_mutex;
+    QDBusInterface                              *mp_Iface;
 };
 
 #endif // DBUSANYTHINGINTERFACE_H
diff --git a/deepin-devicemanager/src/Tool/EDIDParser.h b/deepin-devicemanager/src/Tool/EDIDParser.h
index 32aa9820..2287fdbf 100644
--- a/deepin-devicemanager/src/Tool/EDIDParser.h
+++ b/deepin-devicemanager/src/Tool/EDIDParser.h
@@ -148,7 +148,7 @@ class EDIDParser
 private:
     /**@brief:机器的存储模式不同，会导致计算结果不同，所以在解析的时候需要考虑大小端模式*/
     QString                m_Vendor;                           // 显示屏的厂商信息
-    QString                m_Model;                           // 显示屏的型号信息
+    QString                m_Model;                            // 显示屏的型号信息
     QString                m_ReleaseDate;                      // 显示屏的生产日期
     QString                m_ScreenSize;                       // 屏幕大小
     QString                m_MonitorName;                      // 监视器名称
@@ -156,7 +156,7 @@ class EDIDParser
     int                    m_Width;                            // width
     int                    m_Height;                           // heigth
     QStringList            m_ListEdid;                         // edid数据
-    QMap<QString, QString> m_MapCh;                            //
+    QMap<QString, QString> m_MapCh;                            // 二进制字符串映射到字母A-Z
 
 
 };
diff --git a/deepin-devicemanager/src/Tool/ThreadExecXrandr.h b/deepin-devicemanager/src/Tool/ThreadExecXrandr.h
index 563d90a9..5e36699d 100644
--- a/deepin-devicemanager/src/Tool/ThreadExecXrandr.h
+++ b/deepin-devicemanager/src/Tool/ThreadExecXrandr.h
@@ -76,7 +76,7 @@ class ThreadExecXrandr : public QThread
 private:
     bool m_Gpu;                //<!  判断是否是gpu
     bool m_isDXcbPlatform;     //<!  判断是否是DXcbPlatform
-    QStringList m_monitorLst;
+    QStringList m_monitorLst;  //<!  DBus中反馈的显示器列表
 };
 
 #endif // THREADEXECXRANDR_H
diff --git a/deepin-devicemanager/src/Tool/commontools.h b/deepin-devicemanager/src/Tool/commontools.h
index 96ec149a..c92a905d 100644
--- a/deepin-devicemanager/src/Tool/commontools.h
+++ b/deepin-devicemanager/src/Tool/commontools.h
@@ -90,8 +90,7 @@ public slots:
     static QMap<DriverType, QString> m_MapDriverType;
     static QMap<Status, QString>     m_MapStatusIcon;
     static QMap<Status, QString>     m_MapStatusType;
-
-    static QMap<int, QString>     m_MapErrorString;
+    static QMap<int, QString>        m_MapErrorString;
 };
 
 #endif // COMMONTOOLS_H
diff --git a/deepin-devicemanager/src/commonfunction.cpp b/deepin-devicemanager/src/commonfunction.cpp
index 73bbaa15..8cdd24e4 100644
--- a/deepin-devicemanager/src/commonfunction.cpp
+++ b/deepin-devicemanager/src/commonfunction.cpp
@@ -20,7 +20,8 @@
 
 using namespace DDLog;
 
-static QMap<QString, QString> mapArch = {   {"aarch64", "arm64"}
+static QMap<QString, QString> mapArch = {
+    {"aarch64", "arm64"}
     , {"x86_64", "amd64"}
     , {"mips64", "mips64el"}
     , {"i386", "i386"}
@@ -165,7 +166,7 @@ QString Common::checkBoardVendorFlag()
         case PGUV:
             boardVendorKey = "PGUV";
             break;
-        case PGUX:
+        case kSpecialType5:
             boardVendorKey = "PGUX";
             break;
         case kCustomType:
diff --git a/deepin-devicemanager/src/commonfunction.h b/deepin-devicemanager/src/commonfunction.h
index 25146cb3..c0df2adc 100644
--- a/deepin-devicemanager/src/commonfunction.h
+++ b/deepin-devicemanager/src/commonfunction.h
@@ -22,7 +22,7 @@ class Common
         KLVV,
         KLVU,
         PGUV,
-        PGUX,
+        kSpecialType5,
         kSpecialType6,
         kSpecialType7,
         kCustomType