diff --git a/src/backend/downloadworker.cpp b/src/backend/downloadworker.cpp index 7bbe142..8b70540 100644 --- a/src/backend/downloadworker.cpp +++ b/src/backend/downloadworker.cpp @@ -1,9 +1,7 @@ #include "downloadworker.h" -#include #include #include -#include #include #include diff --git a/src/backend/downloadworker.h b/src/backend/downloadworker.h index 83061c1..6b7110e 100644 --- a/src/backend/downloadworker.h +++ b/src/backend/downloadworker.h @@ -2,9 +2,7 @@ #define DOWNLOADWORKER_H #include -#include -#include -#include +#include class DownloadController : public QObject { @@ -19,23 +17,19 @@ public: qint64 getFileSize(const QString& url); QString replaceDomain(const QString& url, const QString domain); +signals: + void errorOccur(const QString& msg); + void downloadProcess(QString, qint64, qint64); + void downloadFinished(); + private: int threadNum; qint64 pidNumber = -1; QString filename; qint64 fileSize; QVector> ranges; - QFile *file; bool finished = false; QVector domains; - - - -signals: - void errorOccur(const QString& msg); - void downloadProcess(QString, qint64, qint64); - void downloadFinished(); - }; #endif // FILEDOWNLOADWORKER_H diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index ca7bb13..19582d0 100644 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -3,6 +3,7 @@ #include "utils/widgetanimation.h" #include "widgets/common/progressbutton.h" #include "widgets/downloadlistwidget.h" +#include "widgets/common/downloaditem.h" #include "dbus/dbussparkstoreservice.h" #include "application.h" @@ -10,6 +11,7 @@ #include #include +#include #include #include @@ -427,7 +429,8 @@ void MainWindow::notify(QObject *receiver, QEvent *event) return; } - if (receiver->inherits("QWidgetWindow")) { + if (receiver->inherits("QWidgetWindow") + || receiver->inherits("QStyleSheetStyle")) { return; } diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index 783f97d..1bd59f5 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -2,8 +2,10 @@ #include "ui_appintopage.h" #include "backend/sparkapi.h" #include "widgets/downloadlistwidget.h" +#include "widgets/common/downloaditem.h" #include "backend/image_show.h" #include "application.h" +#include "utils/utils.h" #include #include diff --git a/src/pages/appintopage.h b/src/pages/appintopage.h index f696e7a..5541d38 100644 --- a/src/pages/appintopage.h +++ b/src/pages/appintopage.h @@ -1,8 +1,6 @@ #ifndef APPINTOPAGE_H #define APPINTOPAGE_H -#include "utils/utils.h" - #include #include #include diff --git a/src/widgets/downloadlistwidget.cpp b/src/widgets/downloadlistwidget.cpp index 6e887f3..ba3c499 100644 --- a/src/widgets/downloadlistwidget.cpp +++ b/src/widgets/downloadlistwidget.cpp @@ -1,11 +1,14 @@ #include "downloadlistwidget.h" #include "ui_downloadlistwidget.h" -#include -#include -#include +#include "widgets/common/downloaditem.h" +#include "backend/sparkapi.h" +#include "backend/downloadworker.h" +#include "utils/utils.h" +#include "application.h" + +#include #include - - +#include DownloadListWidget::DownloadListWidget(QWidget *parent) : DBlurEffectWidget(parent), ui(new Ui::DownloadListWidget) @@ -118,14 +121,12 @@ void DownloadListWidget::startRequest(QUrl url, QString fileName) isdownload = true; downloaditemlist[allDownload - 1]->free = false; - // 使用懒汉式单例来存储downloadController if (downloadController == nullptr) { downloadController = new DownloadController; // 并发下载,在第一次点击下载按钮的时候才会初始化 } - if (downloadController) { downloadController->disconnect(); @@ -139,7 +140,6 @@ void DownloadListWidget::startRequest(QUrl url, QString fileName) downloadController->startDownload(url.toString()); } - /*************************************************************** * @brief 下载列表完成下载的回调函数 * @param @@ -178,8 +178,6 @@ void DownloadListWidget::httpFinished() // 完成下载 startRequest(urList.at(nowDownload - 1), fileName); } }); - - } void DownloadListWidget::updateDataReadProgress(QString speedInfo, qint64 bytesRead, qint64 totalBytes) diff --git a/src/widgets/downloadlistwidget.h b/src/widgets/downloadlistwidget.h index dc9c359..9500a11 100644 --- a/src/widgets/downloadlistwidget.h +++ b/src/widgets/downloadlistwidget.h @@ -1,20 +1,19 @@ #ifndef DOWNLOADLISTWIDGET_H #define DOWNLOADLISTWIDGET_H +#include + #include #include -#include -#include -#include -#include "widgets/common/downloaditem.h" -#include "backend/sparkapi.h" -#include "backend/downloadworker.h" -#include "utils/utils.h" -DWIDGET_USE_NAMESPACE + namespace Ui { class DownloadListWidget; } +DWIDGET_USE_NAMESPACE + +class DownloadItem; +class DownloadController; class DownloadListWidget : public DBlurEffectWidget { Q_OBJECT