From 8f7a5c65db056cafb747c6fb87cde6426d20d075 Mon Sep 17 00:00:00 2001
From: keke <243768648@qq.com>
Date: Tue, 7 Feb 2023 10:56:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=B2=E5=AE=89=E8=A3=85=E5=8C=85?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=93=E5=BA=93=E8=BD=AF=E4=BB=B6=E5=8C=85=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=92=8C=E6=9E=B6=E6=9E=84=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/appmanagerwidget.cpp  |  3 ++-
 src/job/appmanagerjob.cpp | 22 ----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/appmanagerwidget.cpp b/src/appmanagerwidget.cpp
index 021046e..5c4cfac 100644
--- a/src/appmanagerwidget.cpp
+++ b/src/appmanagerwidget.cpp
@@ -518,7 +518,8 @@ void AppManagerWidget::showAppInfo(const AppInfo &info)
         }
 
         // 根据版本找到候选包中对应的包大小和下载地址
-        if (m_showingAppInfo.installedPkgInfo.version == srvPkgInfo.version) {
+        if (m_showingAppInfo.installedPkgInfo.version == srvPkgInfo.version
+                && m_showingAppInfo.installedPkgInfo.arch == srvPkgInfo.arch) {
             m_showingAppInfo.installedPkgInfo.pkgSize = srvPkgInfo.pkgSize;
             m_showingAppInfo.installedPkgInfo.downloadUrl = srvPkgInfo.downloadUrl;
         }
diff --git a/src/job/appmanagerjob.cpp b/src/job/appmanagerjob.cpp
index 1d49e59..b7f1c9b 100644
--- a/src/job/appmanagerjob.cpp
+++ b/src/job/appmanagerjob.cpp
@@ -15,28 +15,6 @@
 #include <zlib.h>
 #include <aio.h> // async I/O
 
-int zlibCompress(char *dest, int &destLen,
-                 char *source, int sourceLen)
-{
-    unsigned char *dest1 = reinterpret_cast<unsigned char *>(dest);
-    unsigned long destLen1 = static_cast<unsigned long>(destLen);
-    unsigned char *source1 = reinterpret_cast<unsigned char *>(source);
-    unsigned long sourceLen1 = static_cast<unsigned long>(sourceLen);
-
-    return (compress(dest1, &destLen1, source1, sourceLen1));
-}
-
-int zlibUncompress(char *dest, int &destLen,
-                   char *source, int sourceLen)
-{
-    unsigned char *dest1 = reinterpret_cast<unsigned char *>(dest);
-    unsigned long destLen1 = static_cast<unsigned long>(destLen);
-    unsigned char *source1 = reinterpret_cast<unsigned char *>(source);
-    unsigned long sourceLen1 = static_cast<unsigned long>(sourceLen);
-
-    return (uncompress(dest1, &destLen1, source1, sourceLen1));
-}
-
 enum ComPressError {
     Ok = 0,
     Fail = -1
-- 
Gitee