add picture code

Author: 892768447

UiFiles/SkinDialog.ui

@@ -137,10 +137,54 @@
              <string>Colourful</string>
             </attribute>
            </widget>
-           <widget class="PictureWidget" name="tabPicture">
+           <widget class="QWidget" name="tabPicture">
             <attribute name="title">
              <string>Picture</string>
             </attribute>
+            <layout class="QVBoxLayout" name="verticalLayout_4">
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QWidget" name="widget" native="true">
+               <layout class="QVBoxLayout" name="verticalLayout_5">
+                <property name="spacing">
+                 <number>0</number>
+                </property>
+                <property name="leftMargin">
+                 <number>30</number>
+                </property>
+                <property name="topMargin">
+                 <number>20</number>
+                </property>
+                <property name="rightMargin">
+                 <number>30</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>20</number>
+                </property>
+                <item>
+                 <widget class="QWidget" name="widgetCategories" native="true"/>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QStackedWidget" name="stackedWidgetPictures"/>
+             </item>
+            </layout>
            </widget>
           </widget>
          </item>
@@ -244,12 +288,6 @@
    <header location="global">Widgets.Skins.ColourfulWidget</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>PictureWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">Widgets.Skins.PictureWidget</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

UiFiles/Ui_SkinDialog.py

@@ -55,8 +55,25 @@ def setupUi(self, FormSkinDialog):
         self.tabColourful = ColourfulWidget()
         self.tabColourful.setObjectName("tabColourful")
         self.tabWidgetSkinMain.addTab(self.tabColourful, "")
-        self.tabPicture = PictureWidget()
+        self.tabPicture = QtWidgets.QWidget()
         self.tabPicture.setObjectName("tabPicture")
+        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.tabPicture)
+        self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout_4.setSpacing(0)
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        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.setSpacing(0)
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.widgetCategories = QtWidgets.QWidget(self.widget)
+        self.widgetCategories.setObjectName("widgetCategories")
+        self.verticalLayout_5.addWidget(self.widgetCategories)
+        self.verticalLayout_4.addWidget(self.widget)
+        self.stackedWidgetPictures = QtWidgets.QStackedWidget(self.tabPicture)
+        self.stackedWidgetPictures.setObjectName("stackedWidgetPictures")
+        self.verticalLayout_4.addWidget(self.stackedWidgetPictures)
         self.tabWidgetSkinMain.addTab(self.tabPicture, "")
         self.verticalLayout_3.addWidget(self.tabWidgetSkinMain)
         self.widgetBottom = QtWidgets.QWidget(self.widgetSkinBg)
@@ -104,7 +121,6 @@ def retranslateUi(self, FormSkinDialog):
         self.buttonRestore.setText(_translate("FormSkinDialog", "Restore the default theme"))
 
 from Widgets.Skins.ColourfulWidget import ColourfulWidget
-from Widgets.Skins.PictureWidget import PictureWidget
 from Widgets.Skins.ThemeWidget import ThemeWidget
 
 if __name__ == "__main__":

Utils/CommonUtil.py

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

Utils/Constants.py

@@ -39,6 +39,7 @@
 LogFormatter = '[%(asctime)s %(name)s] %(levelname)-8s %(message)s'
 LogFile = 'Resources/Data/app.log'
 
+DirImages = 'Resources/Images'
 DirThemes = 'Resources/Themes'                   # 主题目录
 DirErrors = 'Resources/Data/Errors'              # 错误日志目录
 DirProject = 'Resources/Data/Projects'           # 本地项目目录
@@ -52,6 +53,8 @@
 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'
 
 _Sha = ''
 _Account = ''

Utils/ThemeThread.py

@@ -9,18 +9,29 @@
 @file: Utils.ThemeThread
 @description: 
 """
+import os
 from pathlib import Path
 
-from PyQt5.QtCore import QObject, QThread
+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
+from Utils.Constants import DirThemes, UrlGetAllCategoriesV2,\
+    UrlGetAppsByCategory, DirImages
 
 
 __Author__ = "Irony"
 __Copyright__ = "Copyright (c) 2019"
 
+Headers = {
+    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8',
+    'Accept-Language': 'zh-CN,zh;q=0.9',
+    'Cache-Control': 'max-age=0',
+    'Upgrade-Insecure-Requests': '1',
+    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.26 Safari/537.36 Core/1.63.6824.400 QQBrowser/10.3.3137.400'
+}
+
 
 def splistList(src, length):
     # 等分列表
@@ -141,3 +152,65 @@ def run(self):
 
         Signals.themeItemAddFinished.emit()
         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):
+        super(GetAllCategoryRunnable, self).__init__(*args, **kwargs)
+        self.setAutoDelete(True)
+        self.cid = cid
+        self.widget = widget
+
+    def download(self, index, url):
+        try:
+            dirPath = os.path.join(DirImages, self.cid)
+            os.makedirs(dirPath, exist_ok=True)
+            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)
+        except Exception as e:
+            AppLog.exception(e)
+
+    def run(self):
+        datas = []
+        try:
+            req = requests.get(UrlGetAppsByCategory.format(
+                cid=self.cid, start=0, count=200))
+            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)
+                if not url:
+                    continue
+                self.download(i, url)
+        except Exception as e:
+            AppLog.exception(e)
+        Signals.getCategoryFinished.emit(self.widget, datas)

Widgets/Dialogs/SkinDialog.py

@@ -10,11 +10,16 @@
 @description: 
 """
 
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import Qt, QThreadPool
+from PyQt5.QtWidgets import QPushButton, QButtonGroup
 
 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
 
 
 __Author__ = "Irony"
@@ -31,10 +36,64 @@ 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)
         # 加载鼠标样式
         ThemeManager.loadCursor(self)
         self.on_tabWidgetSkinMain_currentChanged(0)
 
     def on_tabWidgetSkinMain_currentChanged(self, index):
         """tab标签切换"""
-        self.tabWidgetSkinMain.widget(index).init()
+        w = self.tabWidgetSkinMain.widget(index)
+        if w == self.tabPicture:
+            if self.stackedWidgetPictures.count() > 0:
+                return
+            QThreadPool.globalInstance().start(GetAllCategoriesRunnable())
+        else:
+            w.init()
+
+    def onGetCategoriesFinished(self, categories):
+        """添加分类标签页
+        :param categories:        分类
+        """
+        self.categoryBtnGroups = QButtonGroup(self)
+        self.categoryBtnGroups.buttonToggled.connect(self.onCategoryChanged)
+        for category in categories:
+            button = QPushButton(category.get(
+                'name', '未知'), self.widgetCategories)
+            button.setCheckable(True)
+            self.categoryBtnGroups.addButton(button)
+            self.categoryLayout.addWidget(button)
+            self.stackedWidgetPictures.addWidget(
+                PictureWidget(category.get('id', '36'), self.stackedWidgetPictures))
+        self.categoryBtnGroups.buttons()[0].setChecked(True)
+
+    def onCategoryChanged(self, button, toggled):
+        """分类切换
+        :param button:        分类按钮
+        :param 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)
+
+    def onPictureDownloadFinished(self, widget, index, path):
+        """分类图片下载完成
+        :param widget:            该分类对应的PictureWidget
+        :param index:             序号
+        :param path:              图片路径
+        """
+        widget.addItem(index, path)