修改： debian/spark-store.postinst

修改：     debian/spark-store.prerm
	修改：     pkg/usr/lib/systemd/system/spark-update-notifier.service

.gitee/Dockerfile

@@ -0,0 +1,2 @@
+FROM python:3
+RUN pip3 install requests 

.gitee/callback.py

@@ -0,0 +1,31 @@
+import os
+import requests
+import json
+
+
+# sha=os.system("git rev-parse HEAD")
+sha = os.getenv("GIT_COMMIT")
+# sha = '48fed26c51a8c42554e45f72f43e49703e04c97f'
+#get sha from environment 
+url = "https://gitee.com/api/v5/repos/deepin-community-store/spark-store/commits/{}/comments".format(sha)
+
+token = os.getenv("gitee_token")
+
+# process = os.popen("git symbolic-ref --short -q HEAD")
+
+body = "构建详情请见" + os.getenv("JENKINS_URL") + "blue/organizations/jenkins/" + os.getenv("JOB_NAME").replace("/", "/detail/") + "/" + str(os.getenv("BUILD_ID"))
+
+# process.close()
+
+d = {
+    'access_token': token,
+    "body": body
+}
+
+h = {
+    "Content-Type": "application/json;charset=UTF-8"
+}
+
+res = requests.post(url,headers=h, data=json.dumps(d))
+# print(res.status_code)
+# print(res.content)

.gitignore

@@ -1,3 +1,53 @@
-spark-store.pro.user*
-build/
-.vscode/
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+
+# Qt unit tests
+target_wrapper.*
+
+# Qt qm files
+translations/*.qm
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+build
+
+# Debian dpkg-buildpackage
+debian/*.debhelper*
+debian/files
+debian/*.substvars
+debian/spark-store

Jenkinsfile

@@ -0,0 +1,33 @@
+pipeline {
+  agent any
+  stages {
+    stage('build') {
+      agent {
+        docker {
+          image 'jerry979/dtke:5.11.1'
+        }
+
+      }
+      steps {
+        sh 'mkdir build && cd build && qmake .. && make '
+        archiveArtifacts(artifacts: 'build/src/spark-store', allowEmptyArchive: true, defaultExcludes: true)
+      }
+    }
+
+    stage('send') {
+      agent {
+        dockerfile {
+          filename '.gitee/Dockerfile'
+        }
+
+      }
+      environment {
+        gitee_token = credentials('1')
+      }
+      steps {
+        sh "python3 .gitee/callback.py"
+      }
+    }
+
+  }
+}

README.md

@@ -1,5 +1,4 @@
-[![Fork me on Gitee](https://gitee.com/deepin-community-store/spark-store/widgets/widget_5.svg?color=undefined)](https://gitee.com/deepin-community-store/spark-store)
-#  星火应用商店[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=dark)](https://gitee.com/deepin-community-store/spark-store/stargazers)
+#  星火应用商店
 
 
 众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
@@ -12,7 +11,7 @@
 
 希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
 
-### [在这里投稿](http://upload.spark-app.store)
+### [在这里投稿](https://upload.deepinos.org/index)
 
 web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/deepin-community-store/DCSAPP_WEB)
 
@@ -22,9 +21,8 @@ web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/de
 当前服务器线路列表（项目中包含）：
 
 ```
-http://sucdn.jerrywang.top/
-http://store.jerrywang.top/
-http://dcstore.spark-app.store/
+https://d.store.deepinos.org.cn/
+https://store.deepinos.org.cn/
 ```
 
 #### 调用参数(spk规则)
@@ -60,19 +58,20 @@ http://dcstore.spark-app.store/
 Deepin V20/UOS 系统下, 安装依赖
 
 ```shell
-sudo apt install qt5-default libdtkcore-dev libdtkwidget-dev qtwebengine5-dev libnotify-dev
+sudo apt install qt5-default libdtkcore-dev libdtkgui-dev libdtkwidget-dev qtwebengine5-dev libnotify-dev
 ```
 
 ```shell
 git clone https://gitee.com/deepin-community-store/spark-store.git
 cd spark-store
-mkdir build
-cd build
+mkdir build && cd build
 qmake ..
 make -j
 ```
 
-./build文件下的spark-store即为可执行文件
+./build 文件夹下的 spark-store 即为可执行文件
+
+P.S. 安装依赖后直接运行 build.sh 即可编译并打包
 
 # 星火应用商店文档
 

assets/icons.qrc

@@ -35,17 +35,6 @@
     </qresource>
     <qresource prefix="/">
         <file>Logo-Spark.png</file>
-        <file>big_image.cpp</file>
-        <file>big_image.h</file>
-        <file>downloadlist.cpp</file>
-        <file>downloadlist.h</file>
-        <file>image_show.cpp</file>
-        <file>image_show.h</file>
-        <file>main.cpp</file>
-        <file>progressload.cpp</file>
-        <file>progressload.h</file>
-        <file>widget.cpp</file>
-        <file>widget.h</file>
         <file>tags/a2d.png</file>
         <file>tags/community.svg</file>
         <file>tags/deepin.svg</file>
@@ -64,6 +53,6 @@
         <file>tags/dwine2-small.png</file>
     </qresource>
     <qresource prefix="/fonts">
-        <file>fonts/华康少女字体.ttf</file>
+        <file>fonts/hksnzt.ttf</file>
     </qresource>
 </RCC>

assets/icons/category_active.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#536076" d="M10.138807,3.52000025 L10.138,12.5230002 L14.6066017,8.05523757 L15.3137085,8.76234435 L9.65685425,14.4191986 L4,8.76234435 L4.70710678,8.05523757 L9.138,12.4870002 L9.138807,3.52000025 L10.138807,3.52000025 Z" transform="rotate(90 9.657 11.518)"/>
+</svg>

assets/icons/category_active_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#536076" d="M10.138807,3.52000025 L10.138,12.5230002 L14.6066017,8.05523757 L15.3137085,8.76234435 L9.65685425,14.4191986 L4,8.76234435 L4.70710678,8.05523757 L9.138,12.4870002 L9.138807,3.52000025 L10.138807,3.52000025 Z" transform="rotate(90 9.657 11.518)"/>
+</svg>

assets/tags/uos.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+  <defs>
+    <linearGradient id="uos-托盘1-a" x1="15.968%" x2="100%" y1="14.224%" y2="60.554%">
+      <stop offset="0%" stop-color="#0071FF"/>
+      <stop offset="48.72%" stop-color="#00E8FC"/>
+      <stop offset="100%" stop-color="#00A2FF"/>
+    </linearGradient>
+  </defs>
+  <g fill="none" transform="translate(1 1)">
+    <circle cx="9" cy="9" r="9" fill="url(#uos-托盘1-a)"/>
+    <path fill="#FFF" d="M13,4.5 C13.5128358,4.5 13.9355072,4.88604019 13.9932723,5.38337887 L14,5.5 L14,9.5 C14,12.5 12,14.5 9,14.5 C6,14.5 4,12.5 4.0043492,9.70016408 L4,9.5 L4,5.5 C4,4.94771525 4.44771525,4.5 5,4.5 C5.51283584,4.5 5.93550716,4.88604019 5.99327227,5.38337887 L6,5.5 L6,9.5 C6,11.5 7.5,12.5 9,12.5 C10.5,12.5 12,11.5 12,9.5 L12,5.5 C12,4.94771525 12.4477153,4.5 13,4.5 Z"/>
+  </g>
+</svg>

debian/changelog

@@ -0,0 +1,21 @@
+spark-store (3.0.3-11) stable; urgency=medium
+
+  * Now support autoupdate
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
+
+
+
+
+spark-store (3.0.3-10) stable; urgency=medium
+
+  * Now also compile dstore patch
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.0.3-9) stable; urgency=medium
+
+  * Support dpkg-buildpackage
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,37 @@
+Source: spark-store
+Maintainer: shenmo <shenmo@spark-app.store>
+Section: utils
+Priority: optional
+Build-Depends:
+ debhelper (>= 9),
+ pkg-config,
+ qtchooser (>= 55-gc9562a1-1~),
+ libqt5core5a,
+ libqt5gui5,
+ libqt5widgets5,
+ libqt5network5,
+ libqt5concurrent5,
+ libdtkcore-dev(>=5.4),
+ libdtkgui-dev(>=5.4),
+ libdtkwidget-dev(>=5.4),
+ qttools5-private-dev,
+ libnotify-dev,
+ qtwebengine5-dev
+Standards-Version: 3.0
+Homepage: https://www.spark-app.store/
+
+
+Package: spark-store
+Architecture: any
+Depends:${shlibs:Depends}, ${misc:Depends},
+ libqt5core5a,
+ libqt5gui5,
+ libqt5widgets5,
+ libqt5network5,
+ libqt5concurrent5,
+ libdtkcore5(>=5.4),
+ libdtkgui5(>=5.4),
+ libdtkwidget5(>=5.4),
+ libnotify4
+Description: Spark Store
+ A community powered app store, based on DTK.

debian/copyright

@@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: spark-store
+Source: https://gitee.com/deepin-community-store/spark-store
+
+Files: *
+Copyright: The Spark Project Developers
+ 
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General

debian/rules

@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+
+export QT_SELECT=5
+include /usr/share/dpkg/default.mk
+
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DH_AUTO_ARGS = --parallel --buildsystem=qmake
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ --parallel
+
+override_dh_auto_clean:
+	rm -rf $(CURDIR)/build
+
+override_dh_auto_configure:
+	mkdir -p $(CURDIR)/build
+
+	dh_auto_configure MAKEFLAGS=-j$(JOBS) -- spark-store-project.pro \
+	-spec linux-g++ CONFIG+=qtquickcompiler \
+	-o $(CURDIR)/build/
+
+override_dh_auto_build:
+	make -C $(CURDIR)/build -j$(JOBS)
+
+override_dh_auto_install:
+	make -C $(CURDIR)/build install \
+	INSTALL_ROOT=$(CURDIR)/debian/spark-store
+
+# Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
+# Qt Mutidedia lib will ref to network libraray.
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0

debian/source/format

@@ -0,0 +1 @@
+1.0

debian/spark-store.postinst

@@ -0,0 +1,61 @@
+#!/bin/sh
+
+case "$1" in
+	configure)
+		# Check if /usr/local/bin existed
+		mkdir -p /usr/local/bin
+
+		# Create symbol links for binary files
+		ln -s -f /opt/durapps/spark-store/bin/ussinstall /usr/local/bin/ussinstall
+		ln -s -f /opt/durapps/spark-store/bin/ussremove /usr/local/bin/ussremove
+		ln -s -f /opt/durapps/spark-store/bin/spark-store /usr/local/bin/spark-store
+		ln -s -f /opt/durapps/spark-store/bin/ssinstall /usr/local/bin/ssinstall
+		ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch
+
+
+
+		# Download and install key
+		wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc 
+		gpg --dearmor /tmp/spark-store-install/spark-store.asc 
+		cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg
+
+        	# Run apt update to avoid users being fucked up by the non-exist dependency problem
+        	apt update
+
+		# Create symbo links to start upgrade detect
+		ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop /etc/xdg/autostart/spark-update-notifier.desktop
+
+		# Start upgrade detect service
+		systemctl enable spark-update-notifier
+		service spark-update-notifier start
+		
+
+		# Update certain caches
+		update-icon-caches /usr/share/icons/hicolor || true
+		update-desktop-database /usr/share/applications || true
+		xdg-mime default spark-store.desktop x-scheme-handler/spk
+		update-mime-database /usr/share/mime || true
+
+		# Send email for statistics
+		# /tmp/spark-store-install/feedback.sh
+
+		# Remove temp dir
+		rm -rf /tmp/spark-store-install
+	;;
+
+	triggered)
+		# Quit if deepin-app-store-tool existed
+		if [ -x "/usr/bin/deepin-app-store-tool" ] ; then 
+			exit 0
+		fi
+
+		# Trigger for UOS debs installation
+		echo '--------检测到Uniontech标准软件包，运行补丁以修正安装--------'
+		if [ -x "/usr/local/bin/spark-dstore-patch" ] ; then
+			/usr/local/bin/spark-dstore-patch
+			echo '-----------spark-dstore-patch补丁工具已运行完毕-----------'
+		else
+			echo '------------spark-dstore-patch补丁工具运行失败------------'
+		fi
+	;;
+esac

debian/spark-store.postrm

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Update certain caches
+update-icon-caches /usr/share/icons/hicolor || true
+update-desktop-database /usr/share/applications || true
+update-mime-database /usr/share/mime || true

debian/spark-store.prerm

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Remove residual symbol links
+rm /usr/local/bin/spark-store
+rm /usr/local/bin/ssinstall
+rm /usr/local/bin/spark-dstore-patch
+rm /usr/local/bin/ussinstall
+rm /usr/local/bin/ussremove
+
+# Remove residual symbol links to stop upgrade detect if exist
+if [ -f /etc/xdg/autostart/spark-update-notifier.desktop ];then
+rm /etc/xdg/autostart/spark-update-notifier.desktop
+fi
+
+# Shutdown services 
+service spark-update-notifier stop
+
+# Stop update detect service
+systemctl disable spark-update-notifier
+
+
+
+# Clean the service place file
+if [ -d "/tmp/spark-store-updatenum/" ] ; then
+	rm -rf /tmp/spark-store-updatenum/s
+fi
+
+# Remove gpg key file
+if [ -f "/etc/apt/trusted.gpg.d/spark-store.gpg" ] ; then
+	rm /etc/apt/trusted.gpg.d/spark-store.gpg
+fi
+
+apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
+

debian/spark-store.triggers

@@ -0,0 +1 @@
+interest-noawait /opt/apps

icons/category_active.svg

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg22"
-   sodipodi:docname="category_active_16px_l.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>category_active_16px</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="987"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-4"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg22" />
-  <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title2">category_active_16px</title>
-  <desc
-     id="desc4">Created with Sketch.</desc>
-  <defs
-     id="defs6" />
-  <g
-     id="Page-1"
-     stroke="none"
-     stroke-width="1"
-     fill="none"
-     fill-rule="evenodd"
-     style="fill:#000000;fill-opacity:0.94999999">
-    <g
-       id="category_active_16px"
-       style="fill:#000000;fill-opacity:0.94999999">
-      <rect
-         id="Rectangle-1-Copy-44"
-         fill="#747568"
-         opacity="0"
-         x="0"
-         y="0"
-         width="16"
-         height="16"
-         style="fill:#000000;fill-opacity:0.94999999" />
-      <g
-         id="Group-2"
-         transform="translate(2.000000, 2.000000)"
-         fill="#FFFFFF"
-         style="fill:#000000;fill-opacity:0.94999999">
-        <rect
-           id="Rectangle-94"
-           x="0"
-           y="0"
-           width="2"
-           height="2"
-           style="fill:#000000;fill-opacity:0.94999999" />
-        <rect
-           id="Rectangle-97"
-           x="3"
-           y="0"
-           width="9"
-           height="2"
-           style="fill:#000000;fill-opacity:0.94999999" />
-        <rect
-           id="rect11"
-           x="0"
-           y="5"
-           width="2"
-           height="2"
-           style="fill:#000000;fill-opacity:0.94999999" />
-        <rect
-           id="rect13"
-           x="3"
-           y="5"
-           width="9"
-           height="2"
-           style="fill:#000000;fill-opacity:0.94999999" />
-        <rect
-           id="rect15"
-           x="0"
-           y="10"
-           width="2"
-           height="2"
-           style="fill:#000000;fill-opacity:0.94999999" />
-        <rect
-           id="rect17"
-           x="3"
-           y="10"
-           width="9"
-           height="2"
-           style="fill:#000000;fill-opacity:0.94999999" />
-      </g>
-    </g>
-  </g>
-</svg>

icons/category_active_dark.svg

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg22"
-   sodipodi:docname="category_active_16px.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="987"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg22" />
-  <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title2">category_active_16px</title>
-  <desc
-     id="desc4">Created with Sketch.</desc>
-  <defs
-     id="defs6" />
-  <g
-     id="Page-1"
-     stroke="none"
-     stroke-width="1"
-     fill="none"
-     fill-rule="evenodd"
-     style="fill:#ffffff;fill-opacity:0.60000002">
-    <g
-       id="category_active_16px"
-       style="fill:#ffffff;fill-opacity:0.60000002">
-      <rect
-         id="Rectangle-1-Copy-44"
-         fill="#747568"
-         opacity="0"
-         x="0"
-         y="0"
-         width="16"
-         height="16"
-         style="fill:#ffffff;fill-opacity:0.60000002" />
-      <g
-         id="Group-2"
-         transform="translate(2.000000, 2.000000)"
-         fill="#FFFFFF"
-         style="fill:#ffffff;fill-opacity:0.60000002">
-        <rect
-           id="Rectangle-94"
-           x="0"
-           y="0"
-           width="2"
-           height="2"
-           style="fill:#ffffff;fill-opacity:0.60000002" />
-        <rect
-           id="Rectangle-97"
-           x="3"
-           y="0"
-           width="9"
-           height="2"
-           style="fill:#ffffff;fill-opacity:0.60000002" />
-        <rect
-           id="rect11"
-           x="0"
-           y="5"
-           width="2"
-           height="2"
-           style="fill:#ffffff;fill-opacity:0.60000002" />
-        <rect
-           id="rect13"
-           x="3"
-           y="5"
-           width="9"
-           height="2"
-           style="fill:#ffffff;fill-opacity:0.60000002" />
-        <rect
-           id="rect15"
-           x="0"
-           y="10"
-           width="2"
-           height="2"
-           style="fill:#ffffff;fill-opacity:0.60000002" />
-        <rect
-           id="rect17"
-           x="3"
-           y="10"
-           width="9"
-           height="2"
-           style="fill:#ffffff;fill-opacity:0.60000002" />
-      </g>
-    </g>
-  </g>
-</svg>

image_show.cpp

@@ -1,46 +0,0 @@
-#include "image_show.h"
-#include <QHBoxLayout>
-#include <QDebug>
-#include <QPainter>
-#include <DDialog>
-#include <DBlurEffectWidget>
-#include <DWidgetUtil>
-#include <DApplication>
-#include <QDesktopWidget>
-DWIDGET_USE_NAMESPACE
-image_show::image_show(QWidget *parent) : QWidget(parent)
-{
-    QHBoxLayout *layout=new QHBoxLayout;
-    layout->addWidget(m_label);
-    setLayout(layout);
-    m_label->setText("layout");
-}
-
-void image_show::setImage(QPixmap image)
-{
-    QImage screen0;
-    screen0=image.toImage();
-//    QPainter painter(&screen0);
-    QImage re_screen1;
-    QImage re_screen0=screen0.scaled(QSize(400,300),Qt::KeepAspectRatio,Qt::SmoothTransformation);
-    desktop_w=DApplication::desktop()->width();
-    desktop_h=DApplication::desktop()->height();
-    if(screen0.width()>(desktop_w-20) || screen0.height()>(desktop_h-20)){
-         re_screen1=screen0.scaled(QSize(desktop_w-20,desktop_h-20),Qt::KeepAspectRatio,Qt::SmoothTransformation);
-         m_image=QPixmap::fromImage(re_screen1);
-    }else {
-        m_image=image;
-    }
-
-    m_label->setPixmap(QPixmap::fromImage(re_screen0));
-}
-
-void image_show::mousePressEvent(QMouseEvent *)
-{
-   m_dialog->setimage(m_image);
-   m_dialog->showFullScreen();
-   m_dialog->setFixedSize(desktop_w,desktop_h);
-   m_dialog->move(0,0);/*
-   moveToCenter(m_dialog);*/
-
-}

pkg/etc/apt/preferences.d/sparkstore

@@ -0,0 +1,3 @@
+Package: *
+Pin: origin *.deepinos.org.cn
+Pin-Priority: 400

pkg/etc/apt/sources.list.d/sparkstore.list

@@ -0,0 +1 @@
+deb [by-hash=force] https://d.store.deepinos.org.cn / 

pkg/tmp/spark-store-install/feedback.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+echo "From:sparkstorefeedback@163.com
+To:sparkstorefeedback@163.com
+Subject: spark-store_3.0.2: $(lsb_release -a | grep "Description" | sed -e "s#\t#@#" | cut -d "@" -f 2)
+
+$(uname -a)" | tee /tmp/spark-store-install/feedback.txt > /dev/null
+
+curl -s --url "smtp://smtp.163.com" --mail-from "sparkstorefeedback@163.com" --mail-rcpt "sparkstorefeedback@163.com" --upload-file /tmp/spark-store-install/feedback.txt --user "sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY"

pkg/usr/lib/systemd/system/spark-update-notifier.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Spark Store update notifier
+After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
+
+
+[Service]
+Type=simple
+RemainAfterExit=yes 
+ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notify-placer.sh
+Restart=on-failure
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target

pkg/usr/share/applications/spark-store.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Categories=System;
+Exec=spark-store %u
+Icon=spark-store
+Name=Spark Store
+Name[zh_CN]=星火应用商店
+Keywords=appstore;
+Terminal=false
+StartupNotify=true
+StartupWMClass=spark-store
+MimeType=x-scheme-handler/spk

pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg

@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="200mm"
+   height="200mm"
+   viewBox="0 0 200 200"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="deepin-community-store.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1200">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1299435"
+         offset="0"
+         id="stop1196" />
+      <stop
+         style="stop-color:#dadada;stop-opacity:0.81960785"
+         offset="1"
+         id="stop1198" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1138"
+       inkscape:collect="always">
+      <stop
+         id="stop1134"
+         offset="0"
+         style="stop-color:#99e7ea;stop-opacity:1" />
+      <stop
+         id="stop1136"
+         offset="1"
+         style="stop-color:#007ffc;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1128">
+      <stop
+         style="stop-color:#99e7ea;stop-opacity:1"
+         offset="0"
+         id="stop1124" />
+      <stop
+         style="stop-color:#007ffc;stop-opacity:1"
+         offset="1"
+         id="stop1126" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect960"
+       is_visible="true"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1128"
+       id="radialGradient1130"
+       cx="100.35268"
+       cy="199.86011"
+       fx="100.35268"
+       fy="199.86011"
+       r="90.135414"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1138"
+       id="radialGradient1132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       cx="100.35268"
+       cy="199.86011"
+       fx="100.35268"
+       fy="199.86011"
+       r="90.135414" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1200"
+       id="radialGradient1202"
+       cx="100.35268"
+       cy="199.86011"
+       fx="100.35268"
+       fy="199.86011"
+       r="90.135414"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter1448">
+      <feFlood
+         flood-opacity="0.372549"
+         flood-color="rgb(145,145,145)"
+         result="flood"
+         id="feFlood1438" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite1440" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="5.2918"
+         result="blur"
+         id="feGaussianBlur1442" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset1444" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite1446" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter2201">
+      <feFlood
+         flood-opacity="0.372549"
+         flood-color="rgb(145,145,145)"
+         result="flood"
+         id="feFlood2191" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite2193" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="3.76995"
+         result="blur"
+         id="feGaussianBlur2195" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset2197" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite2199" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="120.33119"
+     inkscape:cy="507.94585"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1040"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-97)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:2.87003541;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter2201)"
+       id="rect2119"
+       width="162.54665"
+       height="170.16383"
+       x="20.431099"
+       y="112.51035"
+       rx="30"
+       ry="30" />
+    <circle
+       style="opacity:1;fill:#959595;fill-opacity:1;stroke:#e9e9e9;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2121"
+       cx="58.208336"
+       cy="131.8244"
+       r="6.0476193" />
+    <circle
+       style="opacity:1;fill:#9c9c9c;fill-opacity:1;stroke:#eaeaea;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2121-5"
+       cx="143.63095"
+       cy="133.71429"
+       r="6.0476193" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2">
+    <path
+       style="fill:#ffc344;fill-opacity:1;stroke:none;stroke-width:0.3091144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 94.205599,42.389243 c 0,0 11.145081,-0.157476 22.599701,6.928753 11.45465,7.086223 18.11074,13.857508 20.27783,18.266716 2.16708,4.409209 9.28755,12.125332 9.13277,26.297795 -0.15488,14.172433 -3.40543,23.620763 -8.97797,31.494323 -5.57254,7.87359 -15.63405,13.85751 -27.70786,14.17247 -12.073829,0.31494 -19.813453,-7.55863 -22.444927,-11.96786 -2.631469,-4.4092 -3.715019,-13.85751 -0.464377,-20.62877 3.250645,-6.77132 8.358796,-6.77132 10.061513,-6.14141 1.702724,0.6299 2.167092,1.5747 3.095852,3.30689 0.928749,1.73219 1.547929,1.41726 2.941089,0.47243 1.39311,-0.94484 1.85748,-2.04715 1.54792,-3.46439 -0.30958,-1.417253 -2.16711,-3.149433 -3.71505,-3.621853 -1.547909,-0.47241 -3.715016,-1.88966 -6.810869,-1.41721 -3.095848,0.47238 -9.132757,2.04711 -14.240906,8.975843 -5.108153,6.92875 -4.488988,17.63684 -1.393134,22.67593 3.095849,5.0391 8.977962,14.48739 21.980539,17.79431 13.00259,3.30693 34.05435,-6.45633 41.32959,-21.57361 7.27524,-15.1173 7.43004,-22.20352 7.12048,-34.643764 C 148.22821,76.875544 137.23793,58.293884 125.00933,51.522601 112.78073,44.751315 103.64797,40.814522 94.205599,42.389243 Z"
+       id="path1002"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f06767;fill-opacity:1;stroke:none;stroke-width:0.3091144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 100.67541,105.29647 c 0,0 -3.06474,-2.8951 -5.801108,2.22698 -2.736373,5.12205 -4.049827,9.68737 -1.313459,15.25486 2.736367,5.56745 8.428007,8.90792 17.184447,8.79659 8.75636,-0.11148 15.21419,-2.22699 19.0451,-8.5739 3.83094,-6.34692 6.7862,-11.02357 7.11457,-13.36191 0.32839,-2.33835 2.07965,0.33404 1.53239,2.33834 -0.54728,2.00426 -0.43783,5.9015 1.09454,5.12204 1.53237,-0.77942 2.73637,-2.00427 2.95526,-1.44753 0.21893,0.55673 -1.75127,4.00859 -2.68162,5.73449 -0.93039,1.7259 -3.83094,5.90153 -5.5275,7.51607 -1.69652,1.61458 -4.04981,3.89724 -6.84092,5.56747 -2.79109,1.67024 -7.11454,3.61887 -9.52255,4.06427 -2.40801,0.44539 -7.22403,1.39184 -9.96042,1.2805 -2.73635,-0.11137 -6.23892,-0.61243 -10.124558,-2.56104 -3.885645,-1.94859 -8.099657,-4.95505 -9.741479,-7.96148 -1.641825,-3.00643 -4.159283,-5.73449 -3.61201,-13.30623 0.547277,-7.57175 3.010008,-11.46899 4.870741,-13.25056 1.860731,-1.7816 4.597103,-2.56105 6.403105,-2.17131 1.806004,0.38971 2.955282,1.44755 3.393102,2.22697 0.43781,0.77944 1.149279,2.22699 1.532369,2.50538 z"
+       id="path1012"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#3f62eb;fill-opacity:1;stroke:none;stroke-width:0.3091144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 128.47695,145.38219 c 0,0 13.13457,-7.6831 19.26404,-19.82016 6.12948,-12.13707 8.7564,-19.93152 7.99021,-31.84592 -0.76619,-11.914358 -2.62692,-6.012854 -0.54728,-11.134928 2.07964,-5.122074 -1.31345,-15.254857 0.10943,-15.922949 1.42292,-0.668097 4.48765,4.453971 5.3633,8.573903 0.87562,4.119922 4.70654,16.813721 1.64181,32.959394 -3.06472,16.14564 -10.28872,22.60391 -15.10475,26.94655 -4.81603,4.34261 -15.7615,11.91437 -17.40332,11.80302 -1.64183,-0.11148 -1.86073,-0.11148 -1.31348,-1.55891 z"
+       id="path1014"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#fce102;fill-opacity:1;stroke:none;stroke-width:0.3091144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,121.99883 c 0,0 7.00512,1.5589 12.36838,-1.78156 5.3633,-3.3405 9.5226,-8.79661 10.17931,-10.91225 0.65672,-2.11564 0.76619,1.89294 1.53236,-0.11125 0.76618,-2.00432 3.83093,-6.01288 2.29855,-15.366239 -1.53237,-9.35333 -1.64182,-9.798747 -4.48762,-14.809463 -2.84586,-5.010719 -9.63207,-11.91437 -13.79134,-14.141359 -4.15927,-2.226986 -9.96037,-5.567464 -17.950594,-5.344766 -7.990202,0.222699 -5.363286,-0.334048 -13.025124,1.002146 -7.661836,1.336187 -14.557491,5.010717 -16.856041,7.015006 -2.298552,2.004286 -8.428023,7.460405 -10.61712,10.46684 -2.189098,3.00643 -8.209113,9.798741 -11.383303,19.263442 -3.174189,9.464683 -4.487646,10.466823 -4.706555,16.702393 -0.21891,6.23557 0.547274,7.90578 -0.766185,8.46256 -1.31346,0.55673 -1.094547,-4.67668 -0.985094,-8.35123 0.109463,-3.6745 0.109463,-13.25056 4.925468,-23.940084 4.816015,-10.689538 13.353489,-19.597489 18.169503,-22.826622 4.816009,-3.229128 10.398208,-7.571752 19.045135,-9.687392 8.646933,-2.115635 17.293863,-1.781586 22.65716,-0.779443 5.3633,1.002145 13.68187,4.453974 18.1695,7.905802 4.48766,3.45183 9.41314,7.683099 13.13459,14.586765 3.72146,6.903648 4.70654,15.700251 4.59709,19.374771 -0.10943,3.674543 -1.97019,12.137103 -4.81601,16.257013 -2.84583,4.11993 -6.67674,9.0193 -10.61711,10.80089 -3.94039,1.78157 -8.75642,2.33833 -12.69675,0.55674 -3.94039,-1.78161 -3.72147,-2.44969 -4.3782,-4.34263 z"
+       id="path1016"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#5ed938;fill-opacity:1;stroke:none;stroke-width:0.3091144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,121.99883 c 0,0 5.54674,1.56707 10.22918,-0.55878 4.68248,-2.12587 6.4239,-4.17301 7.54615,-5.3934 1.12223,-1.22042 3.25064,-3.50376 3.83112,-4.56669 0.58046,-1.06292 1.19962,-1.69282 1.19962,-2.08649 0,-0.39369 -1.08353,-1.33853 -0.0386,-3.62186 1.04482,-2.28333 1.97361,-7.519273 1.50922,-9.881333 -0.46438,-2.362073 -1.54792,-15.471616 -10.83547,-24.211303 -9.28753,-8.739678 -18.497709,-9.763242 -18.497709,-9.763242 0,0 14.705309,4.645415 21.593569,18.739134 6.88828,14.093741 4.64376,23.148344 0.23218,28.659854 -4.41158,5.51151 -10.68068,6.14141 -12.38342,4.72415 -1.70268,-1.41725 -5.2113,6.47164 -4.38574,7.95996 z"
+       id="path1018"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#8fdbe9;fill-opacity:1;stroke:none;stroke-width:0.3091144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 86.930353,71.44277 c 0,0 -9.906718,-0.07875 -17.414156,4.881616 -7.507436,4.960371 -11.14506,8.975903 -13.23476,12.125332 -2.089697,3.149446 -4.488981,7.479909 -4.179395,7.401179 0.309585,-0.0788 9.055364,-12.2828 15.866229,-15.432236 6.81087,-3.149436 13.621741,-7.558644 22.986687,-4.330482 9.364952,3.228184 13.776542,7.716118 15.788842,6.613829 2.0123,-1.1023 2.3993,-2.440824 1.23835,-3.936804 -1.16094,-1.495979 -9.364961,-8.818417 -21.051797,-7.322434 z"
+       id="path1020"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#fd7aff;fill-opacity:1;stroke:none;stroke-width:0.3091144px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.107699,134.35862 c 0.65673,0.33404 5.58219,8.90795 9.522571,10.35548 3.940372,1.44755 6.567286,1.55888 7.005104,2.227 0.437821,0.66809 0.328367,4.00858 3.830921,5.45614 3.502555,1.44753 19.920785,6.01284 24.627325,6.45824 4.70658,0.4454 0.76621,3.22911 3.61202,4.23125 2.84584,1.00217 14.99532,1.5589 17.95061,0.33405 2.95527,-1.22483 2.95527,1.1135 -2.1891,3.1178 -5.14437,2.00427 -18.71677,6.79231 -27.58261,5.67882 -8.86586,-1.1135 -19.373526,-3.00644 -25.284086,-7.23772 -5.910565,-4.23126 -8.42802,-6.1242 -6.238924,-6.45824 2.189096,-0.33407 7.990199,5.9015 10.507662,6.56959 2.517463,0.66809 4.597103,0.66809 3.064735,-0.8908 -1.532366,-1.55888 -11.492755,-8.46253 -12.477849,-8.1285 -0.985092,0.33405 -3.064737,0.55674 -4.816012,-1.78159 -1.751278,-2.33832 -10.945484,-15.25485 -10.39821,-22.1585 0.547273,-6.90365 2.298552,-5.12208 4.378195,-2.56103 2.079641,2.56103 4.487648,4.78801 4.487648,4.78801 z"
+       id="path1022"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#939393;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 56.889259,34.981831 c 0,0 16.252976,26.08036 43.845241,26.83631 27.59226,0.75596 42.33333,-23.8125 42.33333,-23.8125"
+       id="path2138"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

progressload.cpp

@@ -1,37 +0,0 @@
-#include "progressload.h"
-
-ProgressLoad::ProgressLoad(QWidget *parent) : QWidget(parent)
-{
-    m_progess=new QWidget(this);
-    m_progess->move(0,0);
-    m_progess->show();
-    timer=new QTimer;
-    value=0;
-    timer->setInterval(10);
-    timer->start();
-    connect(timer,&QTimer::timeout,[=](){
-        m_progess->setFixedWidth(width()/100*value);
-        m_progess->setFixedHeight(height());
-    });
-}
-
-void ProgressLoad::setValue(int v)
-{
-    value=v;
-    m_progess->setFixedWidth(width()/100*value);
-}
-
-void ProgressLoad::setTheme(bool dark, QColor color)
-{
-    if(dark){
-        plt.setColor(QPalette::Background,QColor(28,28,28));
-        setAutoFillBackground(true);
-        setPalette(plt);
-
-    }else {
-        plt.setColor(QPalette::Background,QColor(255,255,255));
-        setAutoFillBackground(true);
-        setPalette(plt);
-    }
-    m_progess->setStyleSheet("background-color:"+color.name());
-}

spark-store-project.pro

@@ -0,0 +1,51 @@
+TARGET = spark-store
+TEMPLATE = subdirs
+
+CONFIG += ordered
+
+SUBDIRS += \
+    src/spark-dstore-patch \
+    third-party/QtNetworkService \
+    src/spark-store.pro
+
+    
+spark-store.depends = third-party/QtNetworkService
+
+# Update translation files
+CONFIG(release, debug|release): system(bash $${PWD}/translate_generation.sh)
+
+# Rules for deployment
+tool.files += tool/*
+tool.path = /opt/durapps/$${TARGET}/bin
+
+qm.files += translations/*.qm
+qm.path = /usr/share/spark-store/translations
+
+preferences.files += pkg/etc/apt/preferences.d/sparkstore
+preferences.path = /etc/apt/preferences.d
+
+sourceslist.files += pkg/etc/apt/sources.list.d/sparkstore.list
+sourceslist.path = /etc/apt/sources.list.d
+
+desktop.files += pkg/usr/share/applications/spark-store.desktop
+desktop.path = /usr/share/applications
+
+service.files += pkg/usr/lib/systemd/system/spark-update-notifier.service
+service.path = /usr/lib/systemd/system/
+
+
+icon.files += pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+icon.path = /usr/share/icons/hicolor/scalable/apps
+
+tmp.files += pkg/tmp/spark-store-install/feedback.sh
+tmp.path = /tmp/spark-store-install
+
+INSTALLS += \
+    tool \
+    qm \
+    desktop \
+    icon \
+    sourceslist \
+    preferences \
+    tmp \
+    service

spark-store.pro

@@ -1,68 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2019-06-30T12:53:03
-#
-#-------------------------------------------------
-
-QT       += core gui network concurrent webenginewidgets
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += c++11 link_pkgconfig
-PKGCONFIG += dtkwidget glib-2.0 gdk-pixbuf-2.0 libnotify
-
-TARGET = spark-store
-TEMPLATE = app
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked as deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += main.cpp\
-    widget.cpp \
-    downloadlist.cpp \
-    image_show.cpp \
-    big_image.cpp \
-    progressload.cpp \
-    workerthreads.cpp
-
-HEADERS  += \
-    widget.h \
-    downloadlist.h \
-    image_show.h \
-    big_image.h \
-    progressload.h \
-    workerthreads.h
-
-FORMS += \
-    widget.ui \
-    downloadlist.ui
-
-RESOURCES += \
-    icons.qrc
-
-DISTFILES += \
-    tags/a2d-small.png \
-    tags/a2d.png \
-    tags/community-small.png \
-    tags/community.png \
-    tags/deepin-small.png \
-    tags/dtk-small.png \
-    tags/ubuntu-small.png \
-    tags/ubuntu.png \
-    tags/uos-small.png \
-    tags/community.svg \
-    tags/deepin.svg \
-    tags/logo_icon.svg \
-    tags/uos.svg
-
-TRANSLATIONS = ./trans/spark-store_en.ts \
-               ./trans/spark-store_zh_CN.ts \
-               ./trans/spark-store_fr.ts

src/appitem.cpp

@@ -0,0 +1,102 @@
+#include "appitem.h"
+#include "ui_appitem.h"
+#include <QtConcurrent>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QEventLoop>
+#include <QPainter>
+#include <QGraphicsDropShadowEffect>
+
+AppItem::AppItem(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::AppItem)
+{
+    ui->setupUi(this);
+
+    // auto shadow = new QGraphicsDropShadowEffect();
+    // shadow->setXOffset(0);
+    // shadow->setYOffset(1);
+    // shadow->setBlurRadius(2);
+    // shadow->setColor(QColor::fromRgba(qRgba(0, 0, 0, 180)));
+    // ui->container->setGraphicsEffect(shadow);
+}
+
+AppItem::~AppItem()
+{
+    delete ui;
+}
+
+void AppItem::setTitle(QString title)
+{
+    m_title = title;
+    ui->lbl_title->setText(title);
+}
+
+void AppItem::setDescription(QString description)
+{
+    m_description = description;
+    QString elidedText = ui->lbl_desc->fontMetrics().elidedText(
+                description, Qt::ElideRight,
+                ui->lbl_desc->width(), Qt::TextShowMnemonic);
+    ui->lbl_desc->setText(elidedText);
+    ui->lbl_desc->setAlignment(Qt::AlignTop);
+}
+
+void AppItem::setIcon(QString icon)
+{
+    m_icon = icon;
+    if(!icon.isEmpty())
+    {
+        downloadIcon(icon);
+    }
+}
+
+void AppItem::setUrl(QString url)
+{
+    m_url = url;
+}
+
+void AppItem::mousePressEvent(QMouseEvent *event)
+{
+    Q_UNUSED(event)
+
+    emit clicked(QUrl(m_url));
+}
+
+/**
+ * @brief 下载图标
+ * @param icon
+ */
+void AppItem::downloadIcon(QString icon)
+{
+    QtConcurrent::run([=]()
+    {
+        auto reqManager = new QNetworkAccessManager();
+
+        QUrl url(icon);
+        QNetworkReply *reply = reqManager->get(QNetworkRequest(url));
+        QEventLoop loop;
+        connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+        connect(reply, &QNetworkReply::finished, this, [=] () { emit finished(); });
+        loop.exec();
+        reqManager->deleteLater();
+
+        QPixmap pixmap;
+        pixmap.loadFromData(reply->readAll());
+        pixmap = pixmap.scaled(78, 78, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        if (reply->error() == QNetworkReply::NoError)
+        {
+            QMetaObject::invokeMethod(this, "loadIcon", Qt::QueuedConnection, Q_ARG(QPixmap, pixmap));
+        }
+        else
+        {
+            qDebug() << reply->errorString();
+        }
+    });
+}
+
+void AppItem::loadIcon(QPixmap pic)
+{
+    ui->lbl_icon->setPixmap(pic);
+}

src/appitem.h

@@ -0,0 +1,45 @@
+#ifndef APPITEM_H
+#define APPITEM_H
+
+#include <QWidget>
+#include <QUrl>
+
+namespace Ui {
+class AppItem;
+}
+
+class AppItem : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit AppItem(QWidget *parent = nullptr);
+    ~AppItem() override;
+
+    void setTitle(QString title);
+    void setDescription(QString description);
+    void setIcon(QString icon);
+    void setUrl(QString url);
+
+protected:
+    void mousePressEvent(QMouseEvent *event) override;
+
+private:
+    Ui::AppItem *ui;
+
+    QString m_title;
+    QString m_description;
+    QString m_icon;
+    QString m_url;
+
+public slots:
+    void downloadIcon(QString icon);
+    void loadIcon(QPixmap pic);
+
+signals:
+    void clicked(QUrl url);
+    void finished();
+
+};
+
+#endif // APPITEM_H

src/appitem.ui

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AppItem</class>
+ <widget class="QWidget" name="AppItem">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>333</width>
+    <height>133</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QWidget#AppItem {
+	width: 300px;
+	height: 100px;
+	margin: 15px;
+	color: #6d6d6d;
+    border-radius: 18px;
+     background-color: 	width: 300px;
+	height: 100px;
+	margin: 15px;
+	color: #6d6d6d;
+    border-radius: 18px;
+     background-color: #F4F4F6;
+}
+
+QWidget#container {
+     background-color: #F4F4F6;
+}
+
+QLabel#lbl_icon {
+    background: transparent;
+    border-radius: 10px;
+}
+
+QLabel#lbl_title {
+    text-align: left;
+    white-space: nowrap;
+    padding-right: 10px;
+   font-size: 19px;
+  
+}
+
+QLabel#lbl_desc {
+	text-align: left;
+    font-weight: lighter;
+    white-space: nowrap;
+   font-size: 12px;
+	color: grey;
+}</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <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="container" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <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="QLabel" name="lbl_icon">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>100</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">width: 78px;
+height: 70px;
+padding: 10px;</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="scaledContents">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="lbl_title">
+          <property name="minimumSize">
+           <size>
+            <width>200</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>200</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="lbl_desc">
+          <property name="minimumSize">
+           <size>
+            <width>200</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>200</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/big_image.cpp

@@ -1,22 +1,30 @@
 #include "big_image.h"
+
 #include <QHBoxLayout>
 #include <QtConcurrent>
-big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent)
+
+big_image::big_image(DBlurEffectWidget *parent) :
+    DBlurEffectWidget(parent),
+    m_image(new QLabel)
 {
-//    m_image->setParent(this);
-    QHBoxLayout *layout=new QHBoxLayout;
-    setLayout(layout);
-    layout->addWidget(m_image);
-    layout->setMargin(0);
-    m_image->setAlignment(Qt::AlignCenter);
-//    m_image->setMaximumSize(1360,768);
-    setWindowFlags(this->windowFlags() | Qt::WindowStaysOnTopHint);//设置图片对话框总在最前
+    setWindowFlags(this->windowFlags() | Qt::WindowStaysOnTopHint); // 设置图片对话框总在最前
     setRadius(0);
     setMaskAlpha(60);
     setMaskColor(QColor("#000000"));
 
+    QHBoxLayout *layout = new QHBoxLayout;
+    setLayout(layout);
+    layout->addWidget(m_image);
+    layout->setMargin(0);
 
+    // m_image->setParent(this);
+    // m_image->setMaximumSize(1360,768);
+    m_image->setAlignment(Qt::AlignCenter);
+}
 
+void big_image::setimage(QPixmap image)
+{
+    m_image->setPixmap(image);
 }
 
 void big_image::mousePressEvent(QMouseEvent *)
@@ -25,11 +33,6 @@ void big_image::mousePressEvent(QMouseEvent *)
     m_image->clear();
 }
 
-void big_image::setimage(QPixmap image)
-{
-    m_image->setPixmap(image);
-}
-
 void big_image::focusOutEvent(QFocusEvent *)
 {
     hide();

src/big_image.h

@@ -1,25 +1,27 @@
 #ifndef BIG_IMAGE_H
 #define BIG_IMAGE_H
 
-#include <QWidget>
-#include <DBlurEffectWidget>
 #include <QMouseEvent>
 #include <QLabel>
+
+#include <DBlurEffectWidget>
+
 DWIDGET_USE_NAMESPACE
 
 class big_image : public DBlurEffectWidget
 {
     Q_OBJECT
+
 public:
     explicit big_image(DBlurEffectWidget *parent = nullptr);
-    void mousePressEvent(QMouseEvent *event);
-    QLabel *m_image=new QLabel;
+
+    QLabel *m_image;
+
     void setimage(QPixmap);
-    void focusOutEvent(QFocusEvent *event);
 
-signals:
-
-public slots:
+protected:
+    void mousePressEvent(QMouseEvent *event) override;
+    void focusOutEvent(QFocusEvent *event) override;
 };
 
 #endif // BIG_IMAGE_H

src/downloadlist.cpp

@@ -1,19 +1,27 @@
 #include "downloadlist.h"
 #include "ui_downloadlist.h"
-#include "widget.h"
-#include <QDebug>
-#include <QIcon>
-#include <QPixmap>
+
 #include <QtConcurrent>
 #include <QProcess>
-#include <QTextBrowser>
-bool downloadlist::isInstall=false;
+
+#include "widget.h"
+
+bool downloadlist::isInstall = false;
 
 downloadlist::downloadlist(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::downloadlist)
+    reinstall(false),
+    close(false),
+    ui(new Ui::downloadlist),
+    menu_install(new QMenu),
+    action_dpkg(new QAction),
+    action_deepin(new QAction),
+    action_gdebi(new QAction),
+    output_w(new DDialog),
+    textbrowser(new QTextBrowser)
 {
     ui->setupUi(this);
+
     ui->pushButton_install->setEnabled(false);
     ui->progressBar->setValue(0);
     ui->label_filename->hide();
@@ -21,25 +29,35 @@ downloadlist::downloadlist(QWidget *parent) :
     ui->pushButton_3->hide();
     ui->widget_spinner->start();
     ui->widget_spinner->hide();
-    action_dpkg->setText(tr("dpkg"));
-    action_gdebi->setText(tr("gdebi"));
+    action_dpkg->setText(tr("Spark Store App Installer"));
     action_deepin->setText(tr("deepin deb installer"));
-    connect(action_dpkg,&QAction::triggered,[=](){downloadlist::install(1);});
-    connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(0);});
-    connect(action_deepin,&QAction::triggered,[=](){downloadlist::install(2);});
-    menu_install->addAction(action_gdebi);
-    //ssinstall命令存在时再加入该选项
-    QFile ssinstall("/bin/ssinstall");
+    action_gdebi->setText(tr("gdebi"));
+
+    connect(action_dpkg,&QAction::triggered,[=](){downloadlist::install(0);});
+    connect(action_deepin,&QAction::triggered,[=](){downloadlist::install(1);});
+    connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(2);});
+
+    // ssinstall 命令存在时再加入该选项
+    QFile ssinstall("/usr/local/bin/ssinstall");
     ssinstall.open(QIODevice::ReadOnly);
-    if(ssinstall.isOpen()){
+    if(ssinstall.isOpen())
+    {
         menu_install->addAction(action_dpkg);
     }
-    QFile deepin("/bin/deepin-deb-installer");
+
+    QFile deepin("/usr/bin/deepin-deb-installer");
     deepin.open(QIODevice::ReadOnly);
-    if(deepin.isOpen()){
+    if(deepin.isOpen())
+    {
         menu_install->addAction(action_deepin);
     }
-
+    QFile gdebi("/usr/bin/gdebi");
+    gdebi.open(QIODevice::ReadOnly);
+    if(gdebi.isOpen())
+    {
+        menu_install->addAction(action_gdebi);
+    }
+    
 }
 
 downloadlist::~downloadlist()
@@ -47,18 +65,19 @@ downloadlist::~downloadlist()
     delete ui;
 }
 
-void downloadlist::setValue(long long value)
+void downloadlist::setValue(qint64 value)
 {
-    ui->progressBar->setValue(int(value));
-    ui->label_2->setText(QString::number(double(value)/100)+"% ("+speed+")");
-    if(ui->label_2->text().left(4)=="100%"){
+    ui->progressBar->setValue(qint32(value));
+    ui->label_2->setText(QString::number(double(value) / 100) + "% (" + speed + ")");
+    if(ui->label_2->text().left(4) == "100%")
+    {
         ui->label_2->setText(tr("Downloaded, waiting to install"));
     }
 }
 
-void downloadlist::setMax(long long max)
+void downloadlist::setMax(qint64 max)
 {
-    ui->progressBar->setMaximum(int(max));
+    ui->progressBar->setMaximum(qint32(max));
 }
 
 void downloadlist::setName(QString name)
@@ -73,26 +92,28 @@ QString downloadlist::getName()
 
 void downloadlist::readyInstall()
 {
-    if(ui->progressBar->value()!= ui->progressBar->maximum() && !close){
+    if(ui->progressBar->value() != ui->progressBar->maximum() && !close)
+    {
         ui->progressBar->hide();
         ui->pushButton_install->show();
         ui->pushButton_2->hide();
         Widget::sendNotification(tr("Failed to download %1").arg(ui->label->text()), 5000,
-                                 "/tmp/spark-store/icon_"+QString::number(num).toUtf8()+".png");
+                                 "/tmp/spark-store/icon_" + QString::number(num).toUtf8() + ".png");
         ui->label_2->setText(tr("Download Failed，Check Your Connection"));
         ui->pushButton_install->setEnabled(false);
-        return;
 
+        return;
     }
-    if(!close){
+
+    if(!close)
+    {
         ui->progressBar->hide();
         ui->pushButton_install->setEnabled(true);
         ui->pushButton_install->show();
         ui->pushButton_2->hide();
         Widget::sendNotification(tr("Finished downloading %1, awaiting to install").arg(ui->label->text()), 5000,
-                                    "/tmp/spark-store/icon_"+QString::number(num).toUtf8()+".png");
+                                 "/tmp/spark-store/icon_" + QString::number(num).toUtf8() + ".png");
     }
-
 }
 
 void downloadlist::setFileName(QString fileName)
@@ -112,79 +133,80 @@ void downloadlist::closeDownload()
 
 void downloadlist::setSpeed(QString s)
 {
-    speed=s;
+    speed = s;
 }
 
 void downloadlist::install(int t)
 {
-    if(!isInstall){
-        isInstall=true;
+    if(!isInstall)
+    {
+        isInstall = true;
         ui->pushButton_install->hide();
         ui->widget_spinner->show();
-        qDebug()<<"/tmp/spark-store/"+ui->label_filename->text().toUtf8();
+        qDebug() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8();
         ui->label_2->setText(tr("Installing"));
-        QtConcurrent::run([=](){
+
+        QtConcurrent::run([=]()
+        {
             QProcess installer;
-            if(!reinstall){
-                switch (t) {
-                case 0:
-                    installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                    break;
-                case 1:
-                    installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                    break;
-                case 2:
-                    installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                    break;
-                }
-            }else {
-                switch (t) {
-                case 0:
-                    installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                    break;
-                case 1:
-                    installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                    break;
-                case 2:
-                    installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                    break;
-                }
+            switch(t)
+            {
+            case 0:
+                installer.start("pkexec", QStringList() << "ssinstall" << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
+                break;
+            case 1:
+                installer.start("deepin-deb-installer", QStringList() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
+                break;
+            case 2:
+                installer.start("pkexec", QStringList() << "gdebi" << "-n" << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
+                break;
             }
-            bool haveError=false;
-            bool notRoot=false;
+
+            bool haveError = false;
+            bool notRoot = false;
             installer.waitForFinished();
-            out=installer.readAllStandardOutput();
-            QStringList everyOut=out.split("\n");
-            for (int i=0;i<everyOut.size();i++) {
-                if(everyOut[i].left(2)=="E:"){
-                    haveError=true;
+            out = installer.readAllStandardOutput();
+
+            QStringList everyOut = out.split("\n");
+            for(int i=0;i<everyOut.size();i++)
+            {
+                if(everyOut[i].left(2) == "E:")
+                {
+                    haveError = true;
                 }
-                if(everyOut[i].right(14)=="Not authorized"){
-                    notRoot=true;
+                if(everyOut[i].right(14) == "Not authorized")
+                {
+                    notRoot = true;
                 }
             }
+
             QProcess isInstall;
-            isInstall.start("dpkg -s "+pkgName);
+            isInstall.start("dpkg -s " + pkgName);
             isInstall.waitForFinished();
-            int error=QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
-            if(error==0){
+            int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
+            if(error == 0)
+            {
                 ui->pushButton_install->hide();
                 ui->label_2->setText(tr("Finish"));
                 ui->pushButton_3->show();
-            }else {
+            }
+            else
+            {
                 ui->pushButton_install->show();
                 ui->pushButton_install->setText(tr("Retry"));
                 ui->label_2->setText(tr("Error happened in dpkg progress , you can try it again"));
                 ui->pushButton_3->show();
             }
-            if(notRoot){
+
+            if(notRoot)
+            {
                 ui->label_2->setText(tr("dpkg progress had been aborted，you can retry installation"));
                 ui->pushButton_install->show();
                 ui->pushButton_3->hide();
             }
-            ui->widget_spinner->hide();
-            downloadlist::isInstall=false;
 
+            ui->widget_spinner->hide();
+            downloadlist::isInstall = false;
         });
 
         qDebug()<<ui->label_filename->text().toUtf8();
@@ -194,7 +216,7 @@ void downloadlist::install(int t)
 
 void downloadlist::on_pushButton_install_clicked()
 {
-    //弹出菜单
+    // 弹出菜单
     menu_install->exec(cursor().pos());
 }
 
@@ -203,17 +225,18 @@ void downloadlist::on_pushButton_2_clicked()
     ui->label_2->setText(tr("Download canceled"));
     ui->pushButton_2->setEnabled(false);
     ui->progressBar->hide();
-    close=true;
+    close = true;
 }
 
 void downloadlist::on_pushButton_3_clicked()
 {
-    output_w.layout()->addWidget(textbrowser);
     textbrowser->setLineWidth(0);
     textbrowser->setText(out);
-    output_w.layout()->setMargin(20);
-    output_w.setTitle(ui->label->text());
-    output_w.setMinimumHeight(600);
-    output_w.setAttribute(Qt::WA_TranslucentBackground);
-    output_w.show();
+
+    output_w->setMinimumHeight(600);
+    output_w->setAttribute(Qt::WA_TranslucentBackground);
+    output_w->setTitle(ui->label->text());
+    output_w->layout()->setMargin(20);
+    output_w->layout()->addWidget(textbrowser);
+    output_w->show();
 }

src/downloadlist.h

@@ -2,11 +2,14 @@
 #define DOWNLOADLIST_H
 
 #include <QWidget>
-#include <DDialog>
 #include <QTextBrowser>
 #include <QMenu>
 #include <QAction>
+
+#include <DDialog>
+
 DWIDGET_USE_NAMESPACE
+
 namespace Ui {
 class downloadlist;
 }
@@ -18,40 +21,45 @@ class downloadlist : public QWidget
 public:
     explicit downloadlist(QWidget *parent = nullptr);
     ~downloadlist();
-    void setValue(long long);
-    void setMax(long long);
+
+    int num;
+    bool free;
+    static bool isInstall;
+    bool reinstall;
+    QString speed;
+    QString out;
+    QString pkgName;
+    bool close;
+
+    void setValue(qint64);
+    void setMax(qint64);
     void setName(QString);
     QString getName();
     void readyInstall();
-    bool free;
+
     void setFileName(QString);
     void seticon(const QPixmap);
     void closeDownload();
     void setSpeed(QString);
-    int num;
-    bool close=false;
-    QString out;
-    DDialog output_w;
-    QTextBrowser *textbrowser=new QTextBrowser;
-    bool reinstall=false;
-    QString pkgName;
-    QMenu *menu_install=new QMenu;
-    QAction *action_gdebi=new QAction;
-    QAction *action_dpkg=new QAction;
-    QAction *action_deepin=new QAction;
+
     void install(int);
-private slots:
-    void on_pushButton_install_clicked();
-//    void on_pushButton_maninst_clicked();
-    void on_pushButton_2_clicked();
-    void on_pushButton_3_clicked();
 
 private:
     Ui::downloadlist *ui;
-    static bool isInstall;
-    QString speed;
 
+    QMenu *menu_install;
+    QAction *action_dpkg;
+    QAction *action_deepin;
+    QAction *action_gdebi;
+
+    DDialog *output_w;
+    QTextBrowser *textbrowser;
+
+private slots:
+    void on_pushButton_install_clicked();
+    void on_pushButton_2_clicked();
+    void on_pushButton_3_clicked();
 
 };
-//bool downloadlist::isInstall=false;
+
 #endif // DOWNLOADLIST_H

src/downloadworker.cpp

@@ -0,0 +1,300 @@
+#include "downloadworker.h"
+
+#include <QEventLoop>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QThread>
+#include <QRegularExpression>
+#include <QFileInfo>
+#include <QDir>
+
+DownloadWorker::DownloadWorker(QObject *parent)
+{
+    Q_UNUSED(parent)
+}
+
+void DownloadWorker::setIdentifier(int identifier)
+{
+    this->identifier = identifier;
+}
+
+void DownloadWorker::setParamter(const QString &url, QPair<qint64, qint64> range, QFile *file)
+{
+    this->url = url;
+    this->startPos = range.first;
+    this->endPos = range.second;
+    this->file = file;
+}
+
+qint64 DownloadWorker::getReceivedPos()
+{
+    return receivedPos;
+}
+
+void DownloadWorker::doWork()
+{
+    mgr = new QNetworkAccessManager(this);
+    QNetworkRequest request;
+    request.setUrl(url);
+    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+    request.setRawHeader("Range", QString("bytes=%1-%2").arg(startPos).arg(endPos).toLocal8Bit());
+    reply = mgr->get(request);
+    qDebug() << "开始下载数据：" << QString(" %1~%2 -> writePos Start %3").arg(startPos).arg(endPos).arg(receivedPos);
+
+    connect(reply, static_cast<void(QNetworkReply::*)(QNetworkReply::NetworkError) > (&QNetworkReply::error),
+            [this](QNetworkReply::NetworkError error)
+    {
+        if(error != QNetworkReply::NoError)
+        {
+            qDebug() << "出错了：" << reply->errorString();
+        }
+    });
+    connect(reply, &QNetworkReply::finished, mgr, &QNetworkAccessManager::deleteLater);
+    connect(reply, &QNetworkReply::readyRead, this, &DownloadWorker::dataReady);
+    connect(reply, &QNetworkReply::finished, this, &DownloadWorker::slotFinish);
+    connect(reply, &QNetworkReply::downloadProgress, this, &DownloadWorker::handleProcess);
+    // connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
+    connect(reply, &QNetworkReply::finished, this, &DownloadWorker::doStop);
+}
+
+void DownloadWorker::doStop()
+{
+    if (reply) {
+        reply->disconnect();
+        reply->aboutToClose();
+        reply->deleteLater();
+        reply = nullptr;
+    }
+}
+
+void DownloadWorker::dataReady()
+{
+    QByteArray data = reply->readAll();
+    file->seek(startPos + receivedPos);
+    file->write(data);
+    receivedPos += data.size();
+}
+
+void DownloadWorker::slotFinish()
+{
+    file->flush();
+    qDebug() << "数据块下载完毕：" << QString(" %1~%2 -> writePos Start %3").arg(startPos).arg(endPos).arg(receivedPos);
+    emit workFinished();
+}
+
+void DownloadWorker::handleProcess(qint64, qint64)
+{
+    emit this->downloadProcess();
+}
+
+
+DownloadController::DownloadController(QObject *parent)
+{
+    Q_UNUSED(parent)
+
+    // 初始化默认域名
+    domains.clear();
+    domains.append("d.store.deepinos.org.cn");
+
+    QFile serverList(QDir::homePath().toUtf8() + "/.config/spark-store/server.list");
+    if(serverList.open(QFile::ReadOnly))
+    {
+        QStringList list = QString(serverList.readAll()).trimmed().split("\n");
+        qDebug() << list << list.size();
+
+        for (int i = 0; i < list.size(); i++) {
+            if (list.at(i).contains("镜像源 Download only") && i + 1 < list.size()) {
+                for (int j = i + 1; j < list.size(); j++) {
+                    domains.append(list.at(j));
+                }
+                break;
+            }
+        }
+    }
+    qDebug() << domains.size();
+
+    /*
+    domains = {
+        "d1.store.deepinos.org.cn",
+        "d2.store.deepinos.org.cn",
+        "d3.store.deepinos.org.cn",
+        "d4.store.deepinos.org.cn",
+        "d5.store.deepinos.org.cn"
+    };
+    */
+    this->threadNum = domains.size();
+}
+
+DownloadController::~DownloadController()
+{
+    if(workers.size() > 0)
+    {
+        for(int i = 0; i < workers.size(); i++)
+        {
+            workers.at(i)->doStop();
+            workers.at(i)->disconnect();
+            workers.at(i)->deleteLater();
+        }
+        workers.clear();
+    }
+}
+
+void DownloadController::setFilename(QString filename)
+{
+    this->filename = filename;
+}
+
+void DownloadController::setThreadNum(int threadNum)
+{
+    this->threadNum = threadNum;
+}
+
+/**
+ * @brief 开始下载
+ */
+void DownloadController::startDownload(const QString &url)
+{
+    finish = 0;
+
+    // 下载任务等分，计算每个线程的下载数据
+    fileSize = getFileSize(url);
+    if(fileSize == 0)
+    {
+        emit errorOccur("文件大小获取失败");
+        return; 
+    }
+
+    qint64 segmentSize = fileSize / threadNum;
+    ranges.resize(threadNum);
+    QVector<qint64> receivedBytes;
+    receivedBytes.resize(threadNum);
+    for(int i = 0; i < threadNum; i++)
+    {
+        ranges[i].first = i * segmentSize;
+        ranges[i].second = i * segmentSize + segmentSize - 1;
+        receivedBytes[i] = 0;
+    }
+    ranges[threadNum - 1].second = fileSize; // 余数部分加入最后一个
+
+    // 打开文件
+    QDir tmpdir("/tmp/spark-store");
+    file = new QFile;
+    file->setFileName(tmpdir.absoluteFilePath(filename));
+
+    if(file->exists())
+    {
+        file->remove();
+    }
+
+    if(!file->open(QIODevice::WriteOnly))
+    {
+        delete file;
+        file = nullptr;
+        emit errorOccur(file->errorString());
+        return;
+    }
+
+    file->resize(fileSize);
+
+    // 创建下载线程
+    workers.clear();
+    for(int i = 0; i < ranges.size(); i++)
+    {
+        qDebug() << QString("第%1个下载请求：%2-%3").arg(i).arg(ranges.at(i).first).arg(ranges.at(i).second);
+        auto worker = new DownloadWorker(this);
+        auto range = ranges.at(i);
+        QString chunkUrl = replaceDomain(url, domains.at(i));
+        worker->setIdentifier(i);
+        worker->setParamter(chunkUrl, range, file);
+        workers.append(worker);
+
+        connect(worker, &DownloadWorker::downloadProcess, this, &DownloadController::handleProcess);
+        connect(worker, &DownloadWorker::workFinished, this, &DownloadController::chunkDownloadFinish);
+
+        worker->doWork();
+    }
+}
+
+/**
+ * @brief 停止下载
+ */
+void DownloadController::stopDownload()
+{
+    for(int i = 0; i < workers.size(); i++)
+    {
+        workers.at(i)->doStop();
+        workers.at(i)->disconnect();
+        workers.at(i)->deleteLater();
+    }
+    workers.clear();
+    qDebug() << "文件下载路径：" << QFileInfo(file->fileName()).absoluteFilePath();
+
+    file->flush();
+    file->close();
+    delete file;
+    file = nullptr;
+}
+
+
+void DownloadController::handleProcess()
+{
+    qint64 bytesReceived = 0;
+    for(int i = 0; i < workers.size(); i++)
+    {
+        bytesReceived += workers.at(i)->getReceivedPos();
+    }
+    qDebug() << QString("下载进度 %1-%2").arg(bytesReceived).arg(fileSize);
+    emit downloadProcess(bytesReceived, fileSize);
+}
+
+void DownloadController::chunkDownloadFinish()
+{
+    finish++;
+    qDebug() << QString("已下载了%1块，共%2块！！！").arg(finish).arg(threadNum);
+    if(finish == threadNum)
+    {
+        stopDownload();
+        emit downloadFinished();
+    }
+}
+
+qint64 DownloadController::getFileSize(const QString& url)
+{
+    QEventLoop event;
+    QNetworkAccessManager requestManager;
+    QNetworkRequest request;
+    request.setUrl(QUrl(url));
+    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+    QNetworkReply *reply = requestManager.head(request);
+    connect(reply, static_cast<void(QNetworkReply::*)(QNetworkReply::NetworkError) > (&QNetworkReply::error),
+            [this, reply](QNetworkReply::NetworkError error)
+    {
+        if(error != QNetworkReply::NoError)
+        {
+            emit errorOccur(reply->errorString());
+        }
+    });
+    connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit);
+    event.exec();
+
+    qint64 fileSize = 0;
+    if(reply->rawHeader("Accept-Ranges") == QByteArrayLiteral("bytes")
+            && reply->hasRawHeader(QString("Content-Length").toLocal8Bit()))
+    {
+        fileSize = reply->header(QNetworkRequest::ContentLengthHeader).toUInt();
+    }
+    qDebug() << "文件大小为：" << fileSize;
+    reply->deleteLater();
+    return fileSize;
+}
+
+QString DownloadController::replaceDomain(const QString& url, const QString domain)
+{
+    QRegularExpression regex(R"((?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9])");
+    if(regex.match(url).hasMatch())
+    {
+        return QString(url).replace(regex.match(url).captured(), domain);
+    }
+    return url;
+}

src/downloadworker.h

@@ -0,0 +1,81 @@
+#ifndef DOWNLOADWORKER_H
+#define DOWNLOADWORKER_H
+
+#include <QObject>
+#include <QList>
+#include <QFile>
+#include <QNetworkReply>
+
+class DownloadWorker : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit DownloadWorker(QObject *parent = nullptr);
+
+    void setIdentifier(int identifier);
+    void setParamter(const QString &url, QPair<qint64, qint64> range, QFile *flle);
+    qint64 getReceivedPos();
+
+public slots:
+    void doWork();
+    void doStop();
+    void dataReady();
+    void slotFinish();
+    void handleProcess(qint64, qint64);
+
+private:
+    int identifier;
+    QString url;
+    qint64 startPos;
+    qint64 endPos;
+    qint64 receivedPos = 0;
+    QNetworkReply *reply;
+    QNetworkAccessManager *mgr;
+    QFile *file;
+
+signals:
+    void resultReady(int identifier, QByteArray data);
+    void testSignals();
+    void workFinished();
+    void downloadProcess();
+
+};
+
+class DownloadController : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit DownloadController(QObject *parent = nullptr);
+    ~DownloadController();
+
+    void setFilename(QString filename);
+    void setThreadNum(int threadNum);
+    void startDownload(const QString &url);
+    void stopDownload();
+    qint64 getFileSize(const QString& url);
+    QString replaceDomain(const QString& url, const QString domain);
+
+private:
+    int threadNum;
+    QString filename;
+    qint64 fileSize;
+    QVector<QPair<qint64, qint64>> ranges;
+    QFile *file;
+    QList<DownloadWorker*> workers;
+    int finish = 0;
+    QVector<QString> domains;
+
+public slots:
+    void handleProcess();
+    void chunkDownloadFinish();
+
+signals:
+    void errorOccur(const QString& msg);
+    void downloadProcess(qint64, qint64);
+    void downloadFinished();
+
+};
+
+#endif // FILEDOWNLOADWORKER_H

src/flowlayout.cpp

@@ -0,0 +1,223 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtWidgets>
+
+#include "flowlayout.h"
+//! [1]
+FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing)
+    : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
+{
+    setContentsMargins(margin, margin, margin, margin);
+}
+
+FlowLayout::FlowLayout(int margin, int hSpacing, int vSpacing)
+    : m_hSpace(hSpacing), m_vSpace(vSpacing)
+{
+    setContentsMargins(margin, margin, margin, margin);
+}
+//! [1]
+
+//! [2]
+FlowLayout::~FlowLayout()
+{
+    QLayoutItem *item;
+    while ((item = takeAt(0)))
+        delete item;
+}
+//! [2]
+
+//! [3]
+void FlowLayout::addItem(QLayoutItem *item)
+{
+    itemList.append(item);
+}
+//! [3]
+
+//! [4]
+int FlowLayout::horizontalSpacing() const
+{
+    if (m_hSpace >= 0) {
+        return m_hSpace;
+    } else {
+        return smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
+    }
+}
+
+int FlowLayout::verticalSpacing() const
+{
+    if (m_vSpace >= 0) {
+        return m_vSpace;
+    } else {
+        return smartSpacing(QStyle::PM_LayoutVerticalSpacing);
+    }
+}
+//! [4]
+
+//! [5]
+int FlowLayout::count() const
+{
+    return itemList.size();
+}
+
+QLayoutItem *FlowLayout::itemAt(int index) const
+{
+    return itemList.value(index);
+}
+
+QLayoutItem *FlowLayout::takeAt(int index)
+{
+    if (index >= 0 && index < itemList.size())
+        return itemList.takeAt(index);
+    else
+        return nullptr;
+}
+//! [5]
+
+//! [6]
+Qt::Orientations FlowLayout::expandingDirections() const
+{
+    return nullptr;
+}
+//! [6]
+
+//! [7]
+bool FlowLayout::hasHeightForWidth() const
+{
+    return true;
+}
+
+int FlowLayout::heightForWidth(int width) const
+{
+    int height = doLayout(QRect(0, 0, width, 0), true);
+    return height;
+}
+//! [7]
+
+//! [8]
+void FlowLayout::setGeometry(const QRect &rect)
+{
+    QLayout::setGeometry(rect);
+    doLayout(rect, false);
+}
+
+QSize FlowLayout::sizeHint() const
+{
+    return minimumSize();
+}
+
+QSize FlowLayout::minimumSize() const
+{
+    QSize size;
+    QLayoutItem *item;
+    foreach (item, itemList)
+        size = size.expandedTo(item->minimumSize());
+
+    size += QSize(2*margin(), 2*margin());
+    return size;
+}
+//! [8]
+
+//! [9]
+int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
+{
+    int left, top, right, bottom;
+    getContentsMargins(&left, &top, &right, &bottom);
+    QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom);
+    int x = effectiveRect.x();
+    int y = effectiveRect.y();
+    int lineHeight = 0;
+//! [9]
+
+//! [10]
+    QLayoutItem *item;
+    foreach (item, itemList) {
+        QWidget *wid = item->widget();
+        int spaceX = horizontalSpacing();
+        if (spaceX == -1)
+            spaceX = wid->style()->layoutSpacing(
+                QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal);
+        int spaceY = verticalSpacing();
+        if (spaceY == -1)
+            spaceY = wid->style()->layoutSpacing(
+                QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
+//! [10]
+//! [11]
+        int nextX = x + item->sizeHint().width() + spaceX;
+        if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) {
+            x = effectiveRect.x();
+            y = y + lineHeight + spaceY;
+            nextX = x + item->sizeHint().width() + spaceX;
+            lineHeight = 0;
+        }
+
+        if (!testOnly)
+            item->setGeometry(QRect(QPoint(x, y), item->sizeHint()));
+
+        x = nextX;
+        lineHeight = qMax(lineHeight, item->sizeHint().height());
+    }
+    return y + lineHeight - rect.y() + bottom;
+}
+//! [11]
+//! [12]
+int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const
+{
+    QObject *parent = this->parent();
+    if (!parent) {
+        return -1;
+    } else if (parent->isWidgetType()) {
+        QWidget *pw = static_cast<QWidget *>(parent);
+        return pw->style()->pixelMetric(pm, nullptr, pw);
+    } else {
+        return static_cast<QLayout *>(parent)->spacing();
+    }
+}
+//! [12]

src/flowlayout.h

@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FLOWLAYOUT_H
+#define FLOWLAYOUT_H
+
+#include <QLayout>
+#include <QRect>
+#include <QStyle>
+//! [0]
+class FlowLayout : public QLayout
+{
+public:
+    explicit FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1);
+    explicit FlowLayout(int margin = -1, int hSpacing = -1, int vSpacing = -1);
+    ~FlowLayout() override;
+
+    void addItem(QLayoutItem *item) override;
+    int horizontalSpacing() const;
+    int verticalSpacing() const;
+    Qt::Orientations expandingDirections() const override;
+    bool hasHeightForWidth() const override;
+    int heightForWidth(int) const override;
+    int count() const override;
+    QLayoutItem *itemAt(int index) const override;
+    QSize minimumSize() const override;
+    void setGeometry(const QRect &rect) override;
+    QSize sizeHint() const override;
+    QLayoutItem *takeAt(int index) override;
+
+private:
+    int doLayout(const QRect &rect, bool testOnly) const;
+    int smartSpacing(QStyle::PixelMetric pm) const;
+
+    QList<QLayoutItem *> itemList;
+    int m_hSpace;
+    int m_vSpace;
+};
+//! [0]
+
+#endif // FLOWLAYOUT_H

src/image_show.cpp

@@ -0,0 +1,51 @@
+#include "image_show.h"
+
+#include <QHBoxLayout>
+#include <QScreen>  // Qt5 不再建议使用 QDesktopWidget
+#include <QGuiApplication>
+
+image_show::image_show(QWidget *parent) :
+    QWidget(parent),
+    m_dialog(new big_image),
+    m_label(new QLabel)
+{
+    QHBoxLayout *layout = new QHBoxLayout;
+    layout->addWidget(m_label);
+    setLayout(layout);
+    m_label->setText("layout");
+}
+
+void image_show::setImage(QPixmap image)
+{
+    QImage screen0;
+    screen0 = image.toImage();
+    QImage re_screen1;
+    QImage re_screen0 = screen0.scaled(QSize(400, 300), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
+    // 获取主屏幕尺寸
+    desktop_w = QGuiApplication::primaryScreen()->geometry().width();
+    desktop_h = QGuiApplication::primaryScreen()->geometry().height();
+
+    if(screen0.width() > (desktop_w - 20) || screen0.height() > (desktop_h - 20))
+    {
+        re_screen1 = screen0.scaled(QSize(desktop_w - 20, desktop_h - 20), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        m_image = QPixmap::fromImage(re_screen1);
+    }
+    else
+    {
+        m_image = image;
+    }
+
+    m_label->setPixmap(QPixmap::fromImage(re_screen0));
+}
+
+void image_show::mousePressEvent(QMouseEvent *)
+{
+    m_dialog->setimage(m_image);
+    m_dialog->showFullScreen();
+
+    // 识别主屏幕尺寸并设置 widget 大小
+    m_dialog->setFixedSize(desktop_w, desktop_h);
+
+    m_dialog->move(0,0);
+}

src/image_show.h

@@ -3,30 +3,30 @@
 
 #include <QWidget>
 #include <QMouseEvent>
-#include <QLabel>
-#include <QPixmap>
-#include <DDialog>
-#include <DBlurEffectWidget>
-#include <big_image.h>
-DWIDGET_USE_NAMESPACE
+
+#include "big_image.h"
+
 class image_show : public QWidget
 {
     Q_OBJECT
+
 public:
     explicit image_show(QWidget *parent = nullptr);
 
-    void setImage(QPixmap);
     int desktop_w;
     int desktop_h;
-private:
-    QLabel *m_label=new QLabel;
-    QPixmap m_image;
-    QLabel image;
-    big_image *m_dialog=new big_image;
-    void mousePressEvent(QMouseEvent *event);
-signals:
 
-public slots:
+    void setImage(QPixmap);
+
+protected:
+    void mousePressEvent(QMouseEvent *event) override;
+
+private:
+    big_image *m_dialog;
+    QLabel *m_label;
+    QLabel image;
+    QPixmap m_image;
+
 };
 
 #endif // IMAGE_SHOW_H

src/main.cpp

@@ -1,17 +1,28 @@
 #include <DApplication>
-#include <DWidgetUtil>  //Dtk::Widget::moveToCenter(&w); 要调用它，就得引用DWidgetUtil
-#include <QDesktopWidget>
-#include <widget.h>
-#include <QTranslator>
-#include <DAboutDialog>
+#include <DApplicationSettings>
+#include <DWidgetUtil>      // Dtk::Widget::moveToCenter(&w); 要调用它，就得引用 DWidgetUtil
+
+#include <QVector>
+#include <QScreen>
+
+#include "widget.h"
+
 DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
-    DApplication::loadDXcbPlugin();  //让bar处在标题栏中
-    DApplication a(argc, argv);
+    //DApplication::loadDXcbPlugin();  // 已废弃
+    DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);    // 开启 Hidpi 支持
+    // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
+    QVector<char*> fakeArgs(argc + 2);
+    fakeArgs[0] = argv[0];
+    fakeArgs[1] = "-platformtheme";
+    fakeArgs[2] = "deepin";
+    for(int i = 1; i < argc; i++) fakeArgs[i + 2] = argv[i];
+    int fakeArgc = argc + 2; // 为啥DApplication的argc要用引用啊？
+    DApplication a(fakeArgc, fakeArgs.data());
 
     a.setAttribute(Qt::AA_UseHighDpiPixmaps);
-    a.loadTranslator();//载入翻译
+    a.loadTranslator();     // 载入翻译
 
     /* Customized DAboutDialog (Can't work on other distro like Ubuntu...)
      *
@@ -19,7 +30,7 @@ int main(int argc, char *argv[])
      * a.setAboutDialog(&dialog);
      * dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
      * dialog.setVersion(DApplication::buildVersion("Version 2.0.2.5"));
-     * dialog.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
+     * dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
      * dialog.setProductName(QLabel::tr("Spark Store"));
      * dialog.setDescription(
      *             QObject::tr(
@@ -39,7 +50,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("spark-union");
     a.setOrganizationDomain("https://www.deepinos.org/");
     a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-    a.setApplicationVersion(DApplication::buildVersion("2.0.2.5"));
+    a.setApplicationVersion(DApplication::buildVersion("3.0.3-11"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(
@@ -50,36 +61,49 @@ int main(int argc, char *argv[])
                     )
                 );
 
+    // 限制单实例运行
+    if(!a.setSingleInstance("spark-store"))
+    {
+        return -1;
+    }
+
+    // 保存窗口主题设置
+    DApplicationSettings settings;
+
     Widget w;
-    QDesktopWidget *s=DApplication::desktop();
-    int d_w=s->width();
-    int d_h=s->height();
-    if(d_w<=1366){
+    QScreen *s = DApplication::primaryScreen();
+    int d_w = s->geometry().width();
+    int d_h = s->geometry().height();
+
+    if(d_w <= 1366)
+    {
         w.setMinimumWidth(925);
         w.resize(925,650);
-    }else if(d_w<=1920){
-        w.setMinimumWidth(1180);
-        w.resize(1180,760);
-    }else {
+    }
+    else
+    {
         w.setMinimumWidth(1180);
         w.resize(1180,760);
     }
-    if(d_h<=768){
+
+    if(d_h <= 768)
+    {
         w.setMinimumHeight(650);
         w.resize(925,650);
-    }else if(d_h<=1080){
-        w.setMinimumHeight(760);
-        w.resize(1180,760);
-    }else {
+    }
+    else
+    {
         w.setMinimumHeight(760);
         w.resize(1180,760);
     }
 
-    QString arg1=argv[1];
-    if(arg1.left(6)=="spk://"){
+    QString arg1 = argv[1];
+    if(arg1.left(6)=="spk://")
+    {
         w.openUrl(QUrl(argv[1]));
     }
-    //让打开时界面显示在正中
+
+    // 让打开时界面显示在正中
     Dtk::Widget::moveToCenter(&w);
 
     w.show();

src/progressload.cpp

@@ -0,0 +1,44 @@
+#include "progressload.h"
+
+#include <DApplicationHelper>
+
+ProgressLoad::ProgressLoad(QWidget *parent) :
+    QWidget(parent),
+    m_progess(new QWidget(this)),
+    timer(new QTimer),
+    value(0)
+{
+    m_progess->move(0,0);
+    m_progess->show();
+
+    timer->setInterval(10);
+    timer->start();
+    connect(timer, &QTimer::timeout, [=]()
+    {
+        m_progess->setFixedWidth(width() / 100 * value);
+        m_progess->setFixedHeight(height());
+    });
+}
+
+void ProgressLoad::setValue(int v)
+{
+    value = v;
+    m_progess->setFixedWidth(width() / 100 * value);
+}
+
+void ProgressLoad::setTheme(bool dark, QColor color)
+{
+    if(dark)
+    {
+        plt.setColor(QPalette::Background, QColor(40, 40, 40));
+        setAutoFillBackground(true);
+        setPalette(plt);
+    }
+    else
+    {
+        plt.setColor(QPalette::Background, QColor(255, 255, 255));
+        setAutoFillBackground(true);
+        setPalette(plt);
+    }
+    m_progess->setStyleSheet("background-color: " + color.name() + ";");
+}

src/progressload.h

@@ -4,21 +4,23 @@
 #include <QWidget>
 #include <QTimer>
 #include <QPalette>
+
 class ProgressLoad : public QWidget
 {
     Q_OBJECT
+
 public:
     explicit ProgressLoad(QWidget *parent = nullptr);
-    void setValue(int v);
-    void setTheme(bool dark,QColor color);
-signals:
 
-public slots:
+    void setValue(int v);
+    void setTheme(bool dark, QColor color);
+
 private:
     QWidget *m_progess;
-    int value;
     QTimer *timer;
+    int value;
     QPalette plt;
+
 };
 
 #endif // PROGRESSLOAD_H

src/spark-dstore-patch/spark-dstore-patch.pro

@@ -0,0 +1,9 @@
+TARGET = spark-dstore-patch
+TEMPLATE += app
+QT +=  widgets
+SOURCES += spark-dstore-tool.cpp
+
+# Default rules for deployment.
+qnx: target.path = /tmp/spark-store/bin
+else: unix:!android: target.path = /opt/durapps/spark-store/bin
+!isEmpty(target.path): INSTALLS += target

src/spark-dstore-patch/spark-dstore-tool.cpp

@@ -0,0 +1,195 @@
+#include <QCoreApplication>
+#include <QDir>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QDebug>
+#include <QDirIterator>
+#include <QProcess>
+
+#include <unistd.h>
+
+QList<QJsonObject> enumAppInfoList()
+{
+    QList<QJsonObject> appInfoList;
+    QDir apps("/opt/apps");
+    auto list = apps.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    for (auto &appID : list) {
+        auto infoPath = apps.absoluteFilePath(appID + "/info");
+        QFile infoFile(infoPath);
+        if (!infoFile.open(QIODevice::ReadOnly)) {
+            continue;
+        }
+        auto doc = QJsonDocument::fromJson(infoFile.readAll());
+        appInfoList.push_back(doc.object());
+    }
+    return appInfoList;
+}
+//这段是去找appid和info，没看懂用来干啥的，在此之后info文件也没再用过
+//可能以后版本的实现会用到，等官方加功能再说
+void linkDir(const QString &source, const QString &target)
+{
+    auto ensureTargetDir = [](const QString &targetFile) {
+        QFileInfo t(targetFile);
+        QDir tDir(t.dir());
+        tDir.mkpath(".");
+    };
+
+    QDir sourceDir(source);
+    QDir targetDir(target);
+    QDirIterator iter(source, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+    while (iter.hasNext()) {
+        auto sourceFile = iter.next();
+        auto targetFile = targetDir.absoluteFilePath(sourceDir.relativeFilePath(sourceFile));
+
+        QFileInfo tfi(targetFile);
+        //        if (tfi.isSymLink() && (tfi.canonicalFilePath() == sourceFile)) {
+	//这里官方应该是写错了，否则会每触发一次就把所有软链接都删了重新创建一次
+        if (tfi.isSymLink() && (tfi.symLinkTarget() == sourceFile)) {
+            continue;
+        } else {
+            QFile::remove(targetFile);
+        }
+
+        ensureTargetDir(targetFile);
+        auto ret = symlink(sourceFile.toStdString().c_str(), targetFile.toStdString().c_str());
+        if (0 != ret) {
+            qDebug() << "link failed" << sourceFile << "=>" << targetFile << ret;
+        }
+    }
+}
+
+//reset Dynamic library rpath
+void setRpath(const QString &file, const QString &path)
+{
+    if (!QFileInfo::exists(path))
+        return;
+    QProcess p;
+    auto cmd = "patchelf " + file + " --set-rpath " + path;
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+}
+
+QString getGlic()
+{
+    //get arch & glibc
+    QProcess p;
+    auto cmd = "gcc -dumpmachine";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+    return p.readAll();
+}
+
+void linkApp(const QJsonObject &app)
+{
+    auto appID = app.value("appid").toString();
+    auto appEntriesDir = QDir("/opt/apps/" + appID + "/entries");
+    auto appLibsDir = QDir("/opt/apps/" + appID + "/files/lib");
+    auto autoStartDir = QDir(appEntriesDir.absoluteFilePath("autostart"));
+
+    bool autoStart = app.value("permissions").toObject().value("autostart").toBool();
+    if (autoStart) {
+        linkDir(appEntriesDir.absoluteFilePath("autostart"), "/etc/xdg/autostart");
+    }
+
+    // link application
+    auto sysShareDir = QDir("/usr/share");
+    linkDir(appEntriesDir.absoluteFilePath("applications"), sysShareDir.absoluteFilePath("applications"));
+    linkDir(appEntriesDir.absoluteFilePath("icons"), sysShareDir.absoluteFilePath("icons"));
+    linkDir(appEntriesDir.absoluteFilePath("mime"), sysShareDir.absoluteFilePath("mime"));
+    linkDir(appEntriesDir.absoluteFilePath("glib-2.0"), sysShareDir.absoluteFilePath("glib-2.0"));
+    linkDir(appEntriesDir.absoluteFilePath("services"), sysShareDir.absoluteFilePath("dbus-1/services"));
+    linkDir(appEntriesDir.absoluteFilePath("GConf"), sysShareDir.absoluteFilePath("GConf"));
+    linkDir(appEntriesDir.absoluteFilePath("help"), sysShareDir.absoluteFilePath("help"));
+    linkDir(appEntriesDir.absoluteFilePath("locale"), sysShareDir.absoluteFilePath("locale"));
+    linkDir(appEntriesDir.absoluteFilePath("fcitx"), sysShareDir.absoluteFilePath("fcitx"));
+    linkDir(appEntriesDir.absoluteFilePath("polkit"), sysShareDir.absoluteFilePath("polkit-1"));
+    linkDir(appEntriesDir.absoluteFilePath("fonts/conf"), "/etc/fonts/conf.d");
+    linkDir(appEntriesDir.absoluteFilePath("fonts/files"), sysShareDir.absoluteFilePath("fonts"));
+
+
+//原来会导致Gtk相关应用翻译缺失，补足了
+
+
+    auto pluginDir = QDir(appEntriesDir.absoluteFilePath("plugins"));
+    if (pluginDir.exists()) {
+        QString arch = getGlic();
+        //        if (pluginDir.exists()) {
+        //            QDirIterator iter(pluginDir.absolutePath(), QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+        //            while (iter.hasNext()) {
+        //                auto sourceFile = iter.next();
+        //                setRpath(sourceFile, appLibsDir.absolutePath()); //set rpath
+        //            }
+        //        }
+
+        linkDir(appEntriesDir.absoluteFilePath("plugins/fcitx"), "/usr/lib/" + arch + "/fcitx");
+        linkDir(appEntriesDir.absoluteFilePath("plugins/browser"), "/usr/lib/mozilla/plugins");
+    }
+}
+
+void cleanLink()
+{
+    auto cleanDirBrokenLink = [](const QString &dir) {
+        QProcess p;
+        auto cmd = "find " + dir + " -xtype l -delete";
+        p.start("bash", QStringList {"-c", cmd});
+        p.waitForFinished();
+    };
+
+    QString arch = getGlic();
+    auto sysShareDir = QDir("/usr/share");
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("applications"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("icons"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("mime/packages"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("glib-2.0"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("dbus-1/services"));
+    cleanDirBrokenLink("/etc/xdg/autostart");
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("fcitx"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("help"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("locale"));
+    cleanDirBrokenLink("/usr/lib/" + arch + "/fcitx");
+    cleanDirBrokenLink("/usr/lib/mozilla/plugins");
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("polkit-1/actions"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("fonts"));
+    cleanDirBrokenLink("/etc/fonts/conf.d");
+}
+
+void update()
+{
+    QProcess p;
+    auto cmd = "glib-compile-schemas /usr/share/glib-2.0/schemas/";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    cmd = "update-icon-caches /usr/share/icons/*";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    cmd = "update-desktop-database -q";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    cmd = "update-mime-database -V /usr/share/mime";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    
+}
+
+
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    cleanLink();
+
+    for (auto &a : enumAppInfoList()) {
+        linkApp(a);
+    }
+    qInfo()<<"Spark dstore patch (c) The Spark Project 2022-Now. Modified from deepin-app-store-tool";
+
+    // trigger
+    update();
+
+    return 0;
+}

src/spark-store.pro

@@ -0,0 +1,88 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2019-06-30T12:53:03
+#
+#-------------------------------------------------
+
+QT       += core gui network concurrent webenginewidgets
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = spark-store
+TEMPLATE = app
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which as been marked as deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+DEFINES += QT_APP_DEBUG
+include(../third-party/QtNetworkService/QtNetworkService.pri)
+
+CONFIG += c++11 link_pkgconfig
+PKGCONFIG += dtkcore dtkgui dtkwidget libnotify
+
+# 禁止输出 qWarning / qDebug 信息
+#CONFIG(release, debug|release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT
+
+SOURCES += \
+    appitem.cpp \
+    big_image.cpp \
+    downloadlist.cpp \
+    downloadworker.cpp \
+    flowlayout.cpp \
+    image_show.cpp \
+    main.cpp \
+    progressload.cpp \
+    widget.cpp \
+    workerthreads.cpp
+
+HEADERS += \
+    appitem.h \
+    big_image.h \
+    downloadlist.h \
+    downloadworker.h \
+    flowlayout.h \
+    image_show.h \
+    progressload.h \
+    widget.h \
+    workerthreads.h
+
+FORMS += \
+    appitem.ui \
+    downloadlist.ui \
+    widget.ui
+
+RESOURCES += \
+    ../assets/icons.qrc
+
+DISTFILES += \
+    ../assets/tags/a2d-small.png \
+    ../assets/tags/a2d.png \
+    ../assets/tags/community-small.png \
+    ../assets/tags/community.png \
+    ../assets/tags/deepin-small.png \
+    ../assets/tags/dtk-small.png \
+    ../assets/tags/ubuntu-small.png \
+    ../assets/tags/ubuntu.png \
+    ../assets/tags/uos-small.png \
+    ../assets/tags/community.svg \
+    ../assets/tags/deepin.svg \
+    ../assets/tags/logo_icon.svg \
+    ../assets/tags/uos.svg
+
+TRANSLATIONS += \
+    ../translations/spark-store_en.ts \
+    ../translations/spark-store_fr.ts \
+    ../translations/spark-store_zh_CN.ts
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target