diff --git a/deepin-devicemanager-server/deepin-deviceinfo/src/hotplug/monitorusb.cpp b/deepin-devicemanager-server/deepin-deviceinfo/src/hotplug/monitorusb.cpp
index 48a4642a..5ca88f48 100644
--- a/deepin-devicemanager-server/deepin-deviceinfo/src/hotplug/monitorusb.cpp
+++ b/deepin-devicemanager-server/deepin-deviceinfo/src/hotplug/monitorusb.cpp
@@ -55,8 +55,8 @@ void MonitorUsb::monitor()
         }
         FD_ZERO(&fds);
         FD_SET(fd, &fds);
-        tv.tv_sec = 0;
-        tv.tv_usec = 10000;
+        tv.tv_sec = 1;
+        tv.tv_usec = 0;
         int ret = select(fd + 1, &fds, nullptr, nullptr, &tv);
 
         // 判断是否有事件产生
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
index 919f7b27..3dbd5c68 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
@@ -567,6 +567,6 @@ bool DeviceMonitor::caculateScreenSize(const QString &edid)
         return true;
 
     double inch = std::sqrt(height * height + width * width) / 2.54 / 10;
-    m_ScreenSize = QString("%1 %2(%3mm X %4mm)").arg(QString::number(inch, '0', 1)).arg(("inch")).arg(width).arg(height);
+    m_ScreenSize = QString("%1 %2(%3mm X %4mm)").arg(QString::number(inch, '0', 1)).arg(translateStr("inch")).arg(width).arg(height);
     return true;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
index 26e1fdaa..734ac2e6 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
@@ -152,7 +152,9 @@ bool DeviceStorage::setHwinfoInfo(const QMap<QString, QString> &mapInfo)
         return false;
     }
 
-    setAttribute(mapInfo, "Model", m_Name);
+    if (Common::specialComType <= 0) {
+        setAttribute(mapInfo, "Model", m_Name);
+    }
     setAttribute(mapInfo, "Vendor", m_Vendor);
 
     // 希捷硬盘为ATA硬盘，无法直接获取厂商信息,只能特殊处理
@@ -520,21 +522,22 @@ void DeviceStorage::appendDisk(DeviceStorage *device)
 void DeviceStorage::checkDiskSize()
 {
     qCDebug(appLog) << "DeviceStorage::checkDiskSize";
-    if (Common::specialVendorType() != Common::specialHString()) {
+    if (Common::specialComType <= 0) {
         return; //定制机型专用，其它慎用
     }
     quint64 gbyte =  1000000000;
-    if (m_Interface.contains("UFS", Qt::CaseInsensitive)) {
-        if (m_SizeBytes > 255*gbyte && m_SizeBytes < 257*gbyte) {
-            m_Size = "256 GB";
-        } else if (m_SizeBytes > 511*gbyte && m_SizeBytes < 513*gbyte) {
-            m_Size = "512 GB";
-        } else if (m_SizeBytes > 999*gbyte && m_SizeBytes < 1025*gbyte) {
-            m_Size = "1 TB";
-        } else if (m_SizeBytes > 1999*gbyte && m_SizeBytes < 2049*gbyte) {
-            m_Size = "2 TB";
-        }
-    }
+
+//    if (m_Interface.contains("UFS", Qt::CaseInsensitive)) { // TODO Ignore ufs disk
+    if (m_SizeBytes > 255*gbyte && m_SizeBytes < 257*gbyte) {
+        m_Size = "256 GB";
+    } else if (m_SizeBytes > 511*gbyte && m_SizeBytes < 513*gbyte) {
+        m_Size = "512 GB";
+    } else if (m_SizeBytes > 999*gbyte && m_SizeBytes < 1025*gbyte) {
+        m_Size = "1 TB";
+    } else if (m_SizeBytes > 1999*gbyte && m_SizeBytes < 2049*gbyte) {
+        m_Size = "2 TB";
+    }
+//    }
     if (m_Interface.contains("USB", Qt::CaseInsensitive)) {
         if (m_SizeBytes > 15*gbyte && m_SizeBytes < 17*gbyte) {
             m_Size = "16 GB";
@@ -615,7 +618,21 @@ QString DeviceStorage::subTitle()
 const QString DeviceStorage::getOverviewInfo()
 {
     // qCDebug(appLog) << "DeviceStorage::getOverviewInfo";
-    return QString("%1 (%2)").arg(m_Name).arg(m_Size);;
+    QString overViewInfo = QString("%1 (%2)").arg(m_Name).arg(m_Size);
+
+    // 见内网gerrit项目 os-config 中机型的 specialComType , 示例配置文件位置如下：
+    // os-config/hardware/机型/etc/dsg/configs/overrides/org.deepin.devicemanager/org.deepin.devicemanager/4000-org.deepin.devicemanager.override.json
+    if (Common::specialComType == 5){
+        if (m_Interface.contains("UFS", Qt::CaseInsensitive)) {
+            overViewInfo = QString("%1 %2").arg(m_Size).arg("UFS");
+        } else if (m_Interface.contains("USB", Qt::CaseInsensitive)) {
+            overViewInfo = QString("%1 %2").arg(m_Size).arg("USB");
+        } else {
+            overViewInfo = QString("%1 %2").arg(m_Size).arg(m_MediaType);
+        }
+    }
+
+    return overViewInfo;
 }
 
 void DeviceStorage::initFilterKey()
diff --git a/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp b/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
index 9ac873b5..af1858ab 100644
--- a/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
+++ b/deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
@@ -310,6 +310,9 @@ void HWGenerator::generatorDiskDevice()
                 tempMap["Name"] = "nouse";
             // 应HW的要求，将描述固定为   Universal Flash Storage
             tempMap["Description"] = "Universal Flash Storage";
+            if (Common::specialComType == 2) {
+                tempMap["Interface"] = "UFS 3.1";
+            }
 
             // 读取interface版本
             QProcess process;
diff --git a/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp b/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp
index 8153a492..05657226 100644
--- a/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp
+++ b/deepin-devicemanager/src/Tool/ThreadExecXrandr.cpp
@@ -276,7 +276,7 @@ void ThreadExecXrandr::getMonitorInfoFromXrandrVerbose()
 
     QList<QMap<QString, QString>> lstMap;
     loadXrandrVerboseInfo(lstMap, "xrandr --verbose");
-
+    std::reverse(lstMap.begin(), lstMap.end());
     QList<QMap<QString, QString> >::const_iterator it = lstMap.begin();
     for (; it != lstMap.end(); ++it) {
         if ((*it).size() < 1)