theme picture

Author: 892768447

.gitignore

@@ -11,4 +11,5 @@ Library/*
 Library.zip
 *.log
 Resources/Data/*
-Resources/Images/Avatars/*.jpg
+Resources/Images/Avatars/*.jpg
+Resources/Images/Wallpaper/*

Resources/Themes/Dark/style.qss

@@ -376,20 +376,16 @@ ToolTip > QLabel {
 }
 
 /*主题图片tab标签*/
-PictureWidget::pane {
+#widgetCategories > QPushButton {
     border: none;
-}
-PictureWidget > QTabBar::tab {
     color: rgb(140, 140, 140);
-    font-size: 18px;
-    min-width: 100px;
-    min-height: 46px;
+    min-height: 26px;
     background: transparent;
 }
-PictureWidget > QTabBar::tab:hover {
+#widgetCategories > QPushButton:hover {
     color: black;
 }
-PictureWidget > QTabBar::tab:selected {
+#widgetCategories > QPushButton:checked {
     color: rgb(18, 183, 245);
 }
 

Resources/Themes/Default/style.qss

@@ -376,20 +376,16 @@ ToolTip > QLabel {
 }
 
 /*主题图片tab标签*/
-PictureWidget::pane {
+#widgetCategories > QPushButton {
     border: none;
-}
-PictureWidget > QTabBar::tab {
     color: rgb(140, 140, 140);
-    font-size: 18px;
-    min-width: 100px;
-    min-height: 46px;
+    min-height: 26px;
     background: transparent;
 }
-PictureWidget > QTabBar::tab:hover {
+#widgetCategories > QPushButton:hover {
     color: black;
 }
-PictureWidget > QTabBar::tab:selected {
+#widgetCategories > QPushButton:checked {
     color: rgb(18, 183, 245);
 }
 

Resources/Themes/春节/style.qss

@@ -377,20 +377,16 @@ ToolTip > QLabel {
 }
 
 /*主题图片tab标签*/
-PictureWidget::pane {
+#widgetCategories > QPushButton {
     border: none;
-}
-PictureWidget > QTabBar::tab {
     color: rgb(140, 140, 140);
-    font-size: 18px;
-    min-width: 100px;
-    min-height: 46px;
+    min-height: 26px;
     background: transparent;
 }
-PictureWidget > QTabBar::tab:hover {
+#widgetCategories > QPushButton:hover {
     color: black;
 }
-PictureWidget > QTabBar::tab:selected {
+#widgetCategories > QPushButton:checked {
     color: rgb(18, 183, 245);
 }
 

UiFiles/SkinDialog.ui

@@ -167,13 +167,13 @@
                  <number>30</number>
                 </property>
                 <property name="topMargin">
-                 <number>20</number>
+                 <number>10</number>
                 </property>
                 <property name="rightMargin">
                  <number>30</number>
                 </property>
                 <property name="bottomMargin">
-                 <number>20</number>
+                 <number>10</number>
                 </property>
                 <item>
                  <widget class="QWidget" name="widgetCategories" native="true"/>

UiFiles/Ui_SkinDialog.py

@@ -64,7 +64,7 @@ def setupUi(self, FormSkinDialog):
         self.widget = QtWidgets.QWidget(self.tabPicture)
         self.widget.setObjectName("widget")
         self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.widget)
-        self.verticalLayout_5.setContentsMargins(30, 20, 30, 20)
+        self.verticalLayout_5.setContentsMargins(30, 10, 30, 10)
         self.verticalLayout_5.setSpacing(0)
         self.verticalLayout_5.setObjectName("verticalLayout_5")
         self.widgetCategories = QtWidgets.QWidget(self.widget)

Utils/CommonUtil.py

@@ -156,14 +156,12 @@ class _Signals(QObject):
     # 主推item点击,路径
     themeItemClicked = pyqtSignal(str, object)
 
-    # 获取壁纸目录
-    getCategoriesFinished = pyqtSignal(list)
-    # 分类获取完成
-    getCategoryFinished = pyqtSignal(object, list)
-    # 分类图片下载完成信号
-    pictureDownloadFinished = pyqtSignal(object, int, list)
+    # 分类图片下载完成并添加item
+    pictureItemAdded = pyqtSignal(object, int, str, str)
     # 分类图片item点击,路径
     pictureItemClicked = pyqtSignal(str, object)
+    # 单个分类下载完成
+    pictureDownFinished = pyqtSignal(object)
 
 
 # 说白了就是全局信号定义

Utils/Constants.py

@@ -39,7 +39,7 @@
 LogFormatter = '[%(asctime)s %(name)s] %(levelname)-8s %(message)s'
 LogFile = 'Resources/Data/app.log'
 
-DirImages = 'Resources/Images'
+DirWallpaper = 'Resources/Images/Wallpaper'      # 壁纸目录
 DirThemes = 'Resources/Themes'                   # 主题目录
 DirErrors = 'Resources/Data/Errors'              # 错误日志目录
 DirProject = 'Resources/Data/Projects'           # 本地项目目录
@@ -53,8 +53,7 @@
 UrlQQ = 'tencent://message/?uin=892768447'
 UrlGroup = 'tencent://groupwpa/?subcmd=all&param=7B2267726F757055696E223A3234363236393931392C2274696D655374616D70223A313531383537323831357D0A'
 UrlIssues = 'https://github.com/PyQt5/PyQtClient/issues/new'
-UrlGetAllCategoriesV2 = 'http://wallpaper.apc.360.cn/index.php?c=WallPaper&a=getAllCategoriesV2'
-UrlGetAppsByCategory = 'http://wallpaper.apc.360.cn/index.php?c=WallPaper&a=getAppsByCategory&cid={cid}&start={start}&count={count}&from=360chrome'
+UrlGetAppsByCategory = 'http://bizhi.ludashi.com/live/wallpaper/categoryList?category={category}&pageno={pageno}&count={count}&type=1&_={time}'
 
 _Sha = ''
 _Account = ''

Utils/ThemeThread.py

@@ -11,14 +11,14 @@
 """
 import os
 from pathlib import Path
+from time import time
 
 from PyQt5.QtCore import QObject, QThread, QRunnable
 from PyQt5.QtGui import QLinearGradient, QColor
 import requests
 
 from Utils.CommonUtil import AppLog, Signals
-from Utils.Constants import DirThemes, UrlGetAllCategoriesV2,\
-    UrlGetAppsByCategory, DirImages
+from Utils.Constants import DirThemes, UrlGetAppsByCategory, DirWallpaper
 
 
 __Author__ = "Irony"
@@ -154,63 +154,56 @@ def run(self):
         AppLog.info('theme thread end')
 
 
-class GetAllCategoriesRunnable(QRunnable):
-
-    def __init__(self, *args, **kwargs):
-        super(GetAllCategoriesRunnable, self).__init__(*args, **kwargs)
-        self.setAutoDelete(True)
-
-    def run(self):
-        categories = []
-        try:
-            req = requests.get(UrlGetAllCategoriesV2)
-            content = req.json()
-            categories = content.get('data', [])
-            AppLog.debug('errmsg: %s', content.get('errmsg', ''))
-            AppLog.debug('consume: %s', content.get('consume', ''))
-            AppLog.debug('total: %s', content.get('total', ''))
-        except Exception as e:
-            AppLog.exception(e)
-        Signals.getCategoriesFinished.emit(categories)
-
-
 class GetAllCategoryRunnable(QRunnable):
 
-    def __init__(self, cid, widget, *args, **kwargs):
+    def __init__(self, category, widget, *args, **kwargs):
         super(GetAllCategoryRunnable, self).__init__(*args, **kwargs)
         self.setAutoDelete(True)
-        self.cid = cid
+        self.category = category
         self.widget = widget
 
-    def download(self, index, url):
+    def download(self, index, title, url):
         try:
-            dirPath = os.path.join(DirImages, self.cid)
+            dirPath = os.path.join(DirWallpaper, self.category)
             os.makedirs(dirPath, exist_ok=True)
+            path = os.path.join(dirPath, os.path.basename(url))
+            if os.path.exists(path) and os.path.isfile(path):
+                Signals.pictureItemAdded.emit(
+                    self.widget, index, title, path)
+                return
             req = requests.get(url, headers=Headers)
             if req.status_code == 200:
-                path = os.path.join(dirPath, os.path.basename(url))
                 with open(path, 'wb') as fp:
                     fp.write(req.content)
-                self.pictureDownloadFinished.emit(self, index, path)
+                Signals.pictureItemAdded.emit(
+                    self.widget, index, title, path)
         except Exception as e:
             AppLog.exception(e)
 
     def run(self):
-        datas = []
         try:
             req = requests.get(UrlGetAppsByCategory.format(
-                cid=self.cid, start=0, count=200))
+                category=self.category, pageno=1, count=20, time=time()))
             content = req.json()
-            datas = content.get('data', [])
-            AppLog.debug('errmsg: %s', content.get('errmsg', ''))
-            AppLog.debug('consume: %s', content.get('consume', ''))
-            AppLog.debug('total: %s', content.get('total', ''))
-            # 加载前20个
-            for i, item in enumerate(datas[:20]):
-                url = item.get('url', None)
+            errno = content.get('errno', 0)
+            AppLog.debug('errno: %s', errno)
+            AppLog.debug('msg: %s', content.get('msg', ''))
+            if errno != 0:
+                return
+
+            content = content.get('data', {})
+            AppLog.debug('total_count: %s', content.get('total_count', ''))
+            AppLog.debug('total_page: %s', content.get('total_page', ''))
+            items = content.get('list', [])
+
+            for i, item in enumerate(items):
+                title = item.get('title', '')
+                url = item.get('image', None)
                 if not url:
                     continue
-                self.download(i, url)
+                self.download(i, title, url)
+                QThread.msleep(200)
+                QThread.yieldCurrentThread()
         except Exception as e:
             AppLog.exception(e)
-        Signals.getCategoryFinished.emit(self.widget, datas)
+        Signals.pictureDownFinished.emit(self.widget)

Widgets/Dialogs/SkinDialog.py

@@ -16,7 +16,6 @@
 from UiFiles.Ui_SkinDialog import Ui_FormSkinDialog
 from Utils.CommonUtil import Signals
 from Utils.ThemeManager import ThemeManager
-from Utils.ThemeThread import GetAllCategoriesRunnable
 from Widgets.Dialogs.MoveDialog import MoveDialog
 from Widgets.Layouts.FlowLayout import FlowLayout
 from Widgets.Skins.PictureWidget import PictureWidget
@@ -36,12 +35,7 @@ def __init__(self, *args, **kwargs):
         # 无边框
         self.setWindowFlags(self.windowFlags() | Qt.FramelessWindowHint)
         self.widgetBottom.setVisible(False)
-        # 背景图片面板
-        Signals.getCategoriesFinished.connect(self.onGetCategoriesFinished)
-        Signals.getCategoryFinished.connect(self.onGetCategoryFinished)
-        Signals.pictureDownloadFinished.connect(self.onPictureDownloadFinished)
-        self.categoryLayout = FlowLayout(self.widgetCategories)
-        self.categoryLayout.setSpacing(20)
+        Signals.pictureItemAdded.connect(self.onPictureItemAdded)
         # 加载鼠标样式
         ThemeManager.loadCursor(self)
         self.on_tabWidgetSkinMain_currentChanged(0)
@@ -52,24 +46,26 @@ def on_tabWidgetSkinMain_currentChanged(self, index):
         if w == self.tabPicture:
             if self.stackedWidgetPictures.count() > 0:
                 return
-            QThreadPool.globalInstance().start(GetAllCategoriesRunnable())
+            self.initCategories()
         else:
             w.init()
 
-    def onGetCategoriesFinished(self, categories):
+    def initCategories(self):
         """添加分类标签页
         :param categories:        分类
         """
+        self.categoryLayout = FlowLayout(self.widgetCategories)
+        self.categoryLayout.setSpacing(10)
         self.categoryBtnGroups = QButtonGroup(self)
         self.categoryBtnGroups.buttonToggled.connect(self.onCategoryChanged)
-        for category in categories:
-            button = QPushButton(category.get(
-                'name', '未知'), self.widgetCategories)
+        for category in ('4K', '双屏', '美女', '动漫', '风景', '明星', '萌宠', '游戏', '科技', '其他'):
+            button = QPushButton(category, self.widgetCategories)
             button.setCheckable(True)
             self.categoryBtnGroups.addButton(button)
             self.categoryLayout.addWidget(button)
-            self.stackedWidgetPictures.addWidget(
-                PictureWidget(category.get('id', '36'), self.stackedWidgetPictures))
+            widget = PictureWidget(category, self.stackedWidgetPictures)
+            button.setProperty('widget', widget)
+            self.stackedWidgetPictures.addWidget(widget)
         self.categoryBtnGroups.buttons()[0].setChecked(True)
 
     def onCategoryChanged(self, button, toggled):
@@ -79,21 +75,20 @@ def onCategoryChanged(self, button, toggled):
         """
         if not toggled:
             return
-        index = self.categoryBtnGroups.id(button)
-        self.stackedWidgetPictures.setCurrentIndex(index)
-        self.stackedWidgetPictures.widget(index).init()
-
-    def onGetCategoryFinished(self, widget, items):
-        """某个分类json下载完成
-        :param widget:            该分类对应的PictureWidget
-        :param items:             分类中的数组
-        """
-        widget.setItems(items)
+        widget = button.property('widget')
+        self.stackedWidgetPictures.setCurrentWidget(widget)
+        runnable = widget.init()
+        if runnable:
+            if not hasattr(self, '_threadPool'):
+                self._threadPool = QThreadPool(self)
+                self._threadPool.setMaxThreadCount(5)
+            self._threadPool.start(runnable)
 
-    def onPictureDownloadFinished(self, widget, index, path):
-        """分类图片下载完成
+    def onPictureItemAdded(self, widget, index, title, path):
+        """添加分类图片Item
         :param widget:            该分类对应的PictureWidget
         :param index:             序号
+        :param title:             标题
         :param path:              图片路径
         """
-        widget.addItem(index, path)
+        widget.addItem(index, title, path)