From a1b4f97d3a309d2466f64b29c10c7f28d7eaa7c7 Mon Sep 17 00:00:00 2001
From: fengli <fengli@uniontech.com>
Date: Tue, 7 Nov 2023 16:08:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A9=B1=E5=8A=A8=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E5=90=8E=E4=BE=9D=E7=84=B6=E5=B1=95=E7=A4=BA=E5=9C=A8=E5=8F=AF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=97=E8=A1=A8=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复驱动安装后依然展示在可更新列表中

Log: 修复驱动安装后依然展示在可更新列表中、

Bug: https://pms.uniontech.com/bug-view-227215.html
---
 .../src/DriverControl/HttpDriverInterface.cpp | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/deepin-devicemanager/src/DriverControl/HttpDriverInterface.cpp b/deepin-devicemanager/src/DriverControl/HttpDriverInterface.cpp
index 633b9da6..ca097205 100644
--- a/deepin-devicemanager/src/DriverControl/HttpDriverInterface.cpp
+++ b/deepin-devicemanager/src/DriverControl/HttpDriverInterface.cpp
@@ -186,6 +186,12 @@ void HttpDriverInterface::checkDriverInfo(QString strJson, DriverInfo *driverInf
                 index = i;
             }
         }
+        if (index == 0) {
+            int res = packageInstall(lstDriverInfo[index].strPackages, lstDriverInfo[index].strDebVersion);
+            if (res > 0) {
+                res_out = res;
+            }
+        }
     }
 
     // 找到最优选择后，设置状态，最新、可安装、可更新
@@ -225,7 +231,19 @@ int HttpDriverInterface::packageInstall(const QString &package_name, const QStri
         return 0;
     if (infoList[1].contains(version))
         return 2;
-    return 1;
+    //return 1;
+
+    QRegExp rxlen("(\\d+\\S*)");
+    int pos = rxlen.indexIn(infoList[1]);
+    QString curVersion;
+    if (pos > -1) {
+        curVersion = rxlen.cap(1);
+    }
+    // 若当前已安装版本高于推荐版本，不再更新
+    if (curVersion >= version)
+        return 2;
+    else
+        return 1;
 }
 
 QString HttpDriverInterface::getOsBuild()