From 24dbed886494ccdfaf4d1c9dbc13a1c44e7a149f Mon Sep 17 00:00:00 2001
From: uniartisan <lizhiyuan@uniartisan.com>
Date: Sat, 16 Sep 2023 18:21:45 +0800
Subject: [PATCH] =?UTF-8?q?Enhance:=20=E8=A7=84=E8=8C=83=E6=80=A7=E6=8F=90?=
=?UTF-8?q?=E5=8D=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/widgets/big_image.cpp | 3 ++-
src/widgets/downloadlistwidget.cpp | 41 ++++++++++++++++--------------
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/widgets/big_image.cpp b/src/widgets/big_image.cpp
index 2549b59..95944e1 100644
--- a/src/widgets/big_image.cpp
+++ b/src/widgets/big_image.cpp
@@ -17,7 +17,8 @@ big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent),
layout->addWidget(m_image);
layout->setMargin(0);
- // m_image->setParent(this);
+ // Make sure the image has a parent so that it will be freed.
+ m_image->setParent(this);
// m_image->setMaximumSize(1360,768);
m_image->setAlignment(Qt::AlignCenter);
}
diff --git a/src/widgets/downloadlistwidget.cpp b/src/widgets/downloadlistwidget.cpp
index 89fa8ba..a939270 100644
--- a/src/widgets/downloadlistwidget.cpp
+++ b/src/widgets/downloadlistwidget.cpp
@@ -169,6 +169,7 @@ void DownloadListWidget::httpFinished() // 完成下载
{
while (downloaditemlist[nowDownload - 1]->readyInstall() == -1) // 安装当前应用，堵塞安装，后面的下载suspend
{
+ QThread::msleep(500); // 休眠500ms，减少CPU负担
continue;
}
downloaditemlist[nowDownload - 1]->free = true;
@@ -179,17 +180,15 @@ void DownloadListWidget::httpFinished() // 完成下载
// 如果有排队则下载下一个
qDebug() << "Download: 切换下一个下载...";
nowDownload += 1;
- while (downloaditemlist[nowDownload - 1]->close)
+ while (nowDownload < allDownload && downloaditemlist[nowDownload - 1]->close)
{
nowDownload += 1;
- if (nowDownload >= allDownload)
- {
- nowDownload = allDownload;
- return;
- }
}
- QString fileName = downloaditemlist[nowDownload - 1]->getName();
- startRequest(urList.at(nowDownload - 1), fileName);
+ if (nowDownload < allDownload)
+ {
+ QString fileName = downloaditemlist[nowDownload - 1]->getName();
+ startRequest(urList.at(nowDownload - 1), fileName);
+ }
}
});
}
@@ -236,19 +235,23 @@ void DownloadListWidget::on_pushButton_clicked()
void DownloadListWidget::slotInstallFinished(bool success)
{
// NOTE: 仅在安装成功后判断是否需要退出后台
- if (success) {
- toDownload -= 1; // 安装完以后减少待安装数目
- qDebug() << "Download: 还没有下载的数目：" << toDownload;
+ if (!success) {
+ qDebug() << "Download: install failed";
+ return;
+ }
- if (toDownload == 0)
+ if (toDownload > 0) {
+ toDownload -= 1;
+ qDebug() << "Download: toDownload" << toDownload;
+ }
+
+ if (toDownload == 0) {
+ Application *app = qobject_cast<Application *>(qApp);
+ MainWindow *mainWindow = app->mainWindow();
+ if (mainWindow->isCloseWindowAnimation() == true)
{
- Application *app = qobject_cast<Application *>(qApp);
- MainWindow *mainWindow = app->mainWindow();
- if (mainWindow->isCloseWindowAnimation() == true)
- {
- qDebug() << "Download: 后台安装结束，退出程序";
- qApp->quit();
- }
+ qDebug() << "Download: 后台安装结束，退出程序";
+ qApp->quit();
}
}
}