!214 426

Merge pull request !214 from shenmo/dev

.gitignore

@@ -52,3 +52,4 @@ debian/files
 debian/*.substvars
 debian/spark-store
 
+.vscode/*

.workflow/dtk-build-commit-20220425.yml

@@ -32,7 +32,7 @@ stages:
           - cd ..
           - rm -rf dtk-old-bundle
           - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
-          - dpkg-buildpackage -b -us -uc
+          - dpkg-buildpackage -j2 -b -us -uc
           - cd ..
           - ls -all
           - pwd

.workflow/dtk-build-release-tag-20220425.yml

@@ -33,8 +33,7 @@ stages:
           - rm -rf dtk-old-bundle
           - ''
           - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
-          - ''
-          - dpkg-buildpackage -b -us -uc
+          - dpkg-buildpackage -j2 -b -us -uc
           - cd ..
           - ls -all
           - pwd

.workflow/pipeline-dtk-build-aarch64.yml

@@ -0,0 +1,46 @@
+version: '1.0'
+name: pipeline-dtk-build-aarch64
+displayName: dtk-build-aarch64
+triggers:
+  trigger: manual
+  push:
+    tags:
+      prefix:
+        - ''
+stages:
+  - name: stage-2c12cce1
+    displayName: 编译
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: 基于镜像的脚本执行
+        certificate: ''
+        image: docker.io/debian:buster
+        command:
+          - '# 请在此输入您想执行的脚本'
+          - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+          - apt update
+          - export DEBIAN_FRONTEND=noninteractive
+          - echo "安装wget qemu-user-static"
+          - apt install wget qemu-user-static xz-utils -y
+          - mkdir ../spark-store-git
+          - mv * ../spark-store-git
+          - wget https://code.gitlink.org.cn/shenmo7192/debian-container-aarch64/raw/branch/master/DEBIANARM.tar.xz
+          - tar -xf DEBIANARM.tar.xz
+          - mkdir -p DEBIAN/root/build-spark
+          - mv ../spark-store-git DEBIAN/root/build-spark/spark-store
+          - wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
+          - mv /usr/bin/qemu-aarch64-static DEBIAN/
+          - chroot DEBIAN /qemu-aarch64-static /bin/bash /root/spark-build-aarch64.sh
+          - ''
+          - ''
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - ./DEBIAN/root/build-spark/target
+        notify: []
+        strategy:
+          retry: '0'

DOCS/spk-doc.md

@@ -2,6 +2,8 @@
 
 参数只有一个Url，该url应当遵循这种格式：`spk://<任意合法字符>/web分类/包名`
 
+目前第一字段不进行处理，以后可能会对此识别。在目前阶段，这个字段可以填写任意合法字符
+
 例如:
 
 [spk://abcdefg/games/store.spark-app.hmcl](spk://abcdefg/games/store.spark-app.hmcl)
@@ -11,15 +13,15 @@
 
 | 分类名称 | web分类   　    |
 | -------- | -------------- |
-| 网络应用 | network        |
-| 社交沟通 | chat           |
-| 音乐欣赏 | music          |
-| 视频播放 | video          |
-| 图形图像 | graphics       |
-| 游戏娱乐 | games          |
-| 办公学习 | office         |
-| 阅读翻译 | reading        |
-| 编程开发 | development    |
-| 系统工具 | tools          |
-| 主题美化 | beautify       |
-| 其他应用 | others         |
+| 网络 | network        |
+| 社交 | chat           |
+| 音乐 | music          |
+| 视频 | video          |
+| 图像 | image_graphics       |
+| 游戏 | games          |
+| 办公 | office         |
+| 阅读 | reading        |
+| 开发 | development    |
+| 工具 | tools          |
+| 主题 | themes       |
+| 其他 | others         |

DOCS/write-preview-skeleton.md

@@ -0,0 +1,82 @@
+# 关于编写 "描述主体结构预览说明" 的规范
+
+1. 主体结构预览
+
+    一般以 `tree` 命令进行获取目录结构进行展示所需要描述的预览内容。
+
+2. 对主体结构中的内容单独说明
+    
+    并使用所用语言进行非侵入式独立描述，而不是在代码中填充说明与注释。
+    
+    在单行描述中，尽量不超过您认为最大的字符数量宽度，可以收缩内容的重要性。
+
+    在此种说明文档中，尽量使用您所描述的对象支持的代码注释，而不是以白底黑字进行描述。
+
+    对于规范的全部：主体结构 + 单独内容中进行简单(而不是简少)的说明。
+
+一个简单的例子，例如: 有关项目源代码结构的预览说明
+
+- 项目结构预览
+
+    ```
+    .
+    ├── assets
+    ├── debian
+    ├── DOCS
+    ├── patchs
+    ├── src
+    ├── tool
+    └── translations
+
+    10 directories, 9 files
+    ```
+
+- 来自 debian 目录的说明
+
+    ```shell
+    # 将此项目进行 debian 的标志，基于 debian 系列的发行版可对包含
+    # 此种目录的开源项目进行构建 deb 软件包。
+
+    # 1. 构建软件包(打包)
+    # 执行 dpkg-buildpackage 命令以尝试构建此软件包
+    dpkg-buildpackage
+    # 如果构建将会在上级目录中产生一个 deb，而源代码目录不会有任何变化。
+    
+    # 如果出现以下内容可忽视，仅需要查看是否已成功构建软件包:
+        # gpg: 已跳过 ""： 无效的用户ID 
+        # gpg: ...: clear-sign failed: 无效的用户ID
+        # dpkg-buildpackage: error: failed to sign .dsc file
+    ```
+
+- 来自 patchs 目录的说明
+
+    ```shell
+    # 一种用于可扩展的补丁，主要目的是为项目提供可选的应用方案，而不是直接堆砌到
+    # 当前项目的分支中。您可以认为所有分支都是主线分支。
+    # 例如:
+        # 主线稳定分支: master
+        # 主线开发分支: dev
+        # 主线其它:    ...
+
+    # 注意:
+    #   当您认为您所提交的内容并不会为主线带来 bug fix 之类的内容，请使用补丁。
+    #   当您所提交的内容会带来不可预知的问题的时候，或会改变目前主线的开发模式时，
+    #   此种方式可确保您提交的方案可被任意时间被弃用，而不是由其它维护者耗费精力
+    #   去试图移除您提交的内容，而不是等待由提交者进行新的维护。
+    ```
+
+- 来自其它的内容...可随时由任何人进行补充
+
+
+- 一些在关此种预览描述的文档
+
+    ```shell
+    # 此种描述还将出现在 `src/README.md` 的描述中。
+    # 当然，我预期会由其它维护者进行移动到 `DOCS` 之下。
+    
+    # 另外在 `patchs/zinface-community-cmake-build-system.patch` 补丁文件中，
+    # 也随附过一个简要的文档内容，而它是记录了 `Spark` 为名的构建模式。
+    
+    # 在未应用此补丁时，将不会出现在任何地方。
+    ```
+    

DOCS/内网部署.md

@@ -0,0 +1,7 @@
+需要修改的内容：商店默认源位置，aptss获取apt-fast.conf和sparkstore.list的地址，ssinstall做安装检查的源位置
+
+服务器使用update.sh进行同步。
+
+为方便使用（其实是早期屎山使然），请将仓库放置于 `/home/ftp/spark-store`
+
+仓库管理相关代码请移步 [这里](https://gitee.com/deepin-community-store/repo_auto_update_script)，update.sh请联系 @shenmo 获取

README.en.md

@@ -1,73 +0,0 @@
-#  Spark App Store
-[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers)  [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members)
-
-Spark Store aims to collect Linux apps for the convieniece of Linux new comers
-
-The collecting process needs everyone's help
-
-We set up this APP Store and collect APPs/tools that everyone need widely. Also we pack Windows apps with wine. 
-
-All packages will be shared in our repository for users to get freely. 
-
-Distrobution supported：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future） ; UniontechOS Home 21
-
-*About OpenKylin and deepin 23*
-
-The adaptation work is scheduled after their official release.
-
-You can track our Issue resoving progress here  https://gitee.com/deepin-community-store/spark-store/board
-
-
-We hope people who see here can also join our team，development help or submit applications are welcomed
-
-If you want to submit an APP to share with others，Please [Click here](https://upload.deepinos.org/index)
-
-
-## 🙌 A simple start
-
-If you simply want to install the Spark Store,just enter the  [Release] page, find the version you want and install.
-
-If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip)
-
----
-#### Compile and developement
-
-
-For Deepin V20/UOS 21/ Debian 11
-
-```shell
-sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
-
-```
-
-Ubuntu 22.04
-```shell
-sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
-
-```
-
-Then
-
-```shell
-git clone https://gitee.com/deepin-community-store/spark-store.git
-cd spark-store
-dpkg-buildpackage
-```
-
-
-
-## 🚀 Coorperation
-
-We use Gitee as our code hosting platform. Please click here to contact us. 
-
-https://gitee.com/deepin-community-store/spark-store
-
-### Rocket Chat
-
-https://chat.shenmo.tech/
-
-PWA Client：
-
-spk://store/chat/store.spark-app.feedback
-
-（Copy and paste to search bar or in browser address bar after installing Spark Store）

README.md

@@ -1,68 +1,87 @@
-#  星火应用商店
+#  Spark App Store
 [![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers)  [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members)
 
-众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
+## Branch: Flamescion
 
-生态构建需要的不是某一方的单打独斗，而是人人行动起来，汇聚星火，产生燎原之势
-
-我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
-我们支持：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(将会逐渐停止支持） ; UOS Home 21
-
-## 关于协作：分支相关的文档见 [这里](https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo)
-
-*关于OpenKylin和deepin 23*
-
-支持计划将会在对应系统发布正式版之后开始评估和执行
-
-希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
-
-在这里追踪我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board
-
-如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index)
-
-
-## 🙌 简单的开始
-
-如果想安装 `星火应用商店` ，请打开右侧的 [Release] 页面，找到最新版本，并选择适用于当前系统的安装包下载。
-
-如果你在使用 `Debian 11/Ubuntu 20.04`，你需要额外下载[依赖补充包](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip)
+This branch is the main branch of Spark Store
 
 ---
-#### 编译安装
+## You are informed that the aarch64 support is EXPERIMENTAL and there is NO GUARANTEE that this branch will be supported in the future
+
+Spark Store aims to collect Linux apps for the convieniece of Linux new comers
+
+The collecting process needs everyone's help
+
+We set up this APP Store and collect APPs/tools that everyone need widely. Also we pack Windows apps with wine. 
+
+All packages will be shared in our repository for users to get freely. 
+
+Distrobution supported：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future） ; UniontechOS Home 21
+
+*About OpenKylin and deepin 23*
+
+The adaptation work is scheduled after their official release.
+
+You can track our Issue resoving progress here  https://gitee.com/deepin-community-store/spark-store/board
 
 
-Deepin V20/UOS 21 系统下, 安装依赖
+We hope people who see here can also join our team，development help or submit applications are welcomed
+
+If you want to submit an APP to share with others，Please [Click here](https://upload.deepinos.org/index)
+
+
+## 🙌 A simple start
+
+If you simply want to install the Spark Store,just enter the  [Release] page, find the version you want and install.
+
+If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://zunyun01.store.deepinos.org.cn/spark-store-dependencies-kylin.zip)
+
+---
+#### Compile and developement
+
+
+For Deepin V20/UOS 21/ Debian 11
 
 ```shell
-sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot
+sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin libqt5svg5*
 
 ```
 
-Ubuntu 22.04 系统下, 安装依赖
+Ubuntu 22.04
 ```shell
-sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
+sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev  qtwayland5 qtwayland5-dev-tools libqt5svg5*
 
 ```
 
-然后
+Then
+
 ```shell
 git clone https://gitee.com/deepin-community-store/spark-store.git
 cd spark-store
-dpkg-buildpackage
+dpkg-buildpackage -j
+```
+
+Or:
+```shell
+git clone https://gitee.com/deepin-community-store/spark-store.git
+cd spark-store
+./build_and_install.sh
 ```
 
 
 
-## 🚀 协作
+## 🚀 Coorperation
 
-非常感谢有兴趣的开发者或爱好者参与 `星火应用商店` 项目，分享你的见解与思路。
+We use Gitee as our code hosting platform. Please click here to contact us. 
 
-### 交流平台
+https://gitee.com/deepin-community-store/spark-store
+
+### Rocket Chat
 
 https://chat.shenmo.tech/
 
-客户端PWA：
+PWA Client：
 
 spk://store/chat/store.spark-app.feedback
 
-（安装星火商店后在浏览器打开或复制到搜索栏打开）
+（Copy and paste to search bar or in browser address bar after installing Spark Store）

README.zh.md

@@ -0,0 +1,81 @@
+#  星火应用商店
+[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers)  [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members)
+
+## 分支：火穗
+
+此分支是星火应用商店的主分支
+
+---
+## 请注意，aarch64的支持是实验性的，并未确认持续支持！
+
+众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
+
+生态构建需要的不是某一方的单打独斗，而是人人行动起来，汇聚星火，产生燎原之势
+
+我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
+我们支持：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(将会逐渐停止支持） ; UOS Home 21
+
+## 关于协作：分支相关的文档见 [这里](https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo)
+
+*关于OpenKylin和deepin 23*
+
+支持计划将会在对应系统发布正式版之后开始评估和执行
+
+希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
+
+在这里追踪我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board
+
+如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index)
+
+
+## 🙌 简单的开始
+
+如果想安装 `星火应用商店` ，请打开右侧的 [Release] 页面，找到最新版本，并选择适用于当前系统的安装包下载。
+
+如果你在使用 `Debian 11/Ubuntu 20.04`，你需要额外下载[依赖补充包](https://zunyun01.store.deepinos.org.cn/spark-store-dependencies-kylin.zip)
+
+---
+#### 编译安装
+
+
+Deepin V20/UOS 21 系统下, 安装依赖
+
+```shell
+sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin libqt5svg5*
+
+```
+
+Ubuntu 22.04 系统下, 安装依赖
+```shell
+sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools libqt5svg5*
+
+```
+
+然后
+```shell
+git clone https://gitee.com/deepin-community-store/spark-store.git
+cd spark-store
+dpkg-buildpackage -j
+```
+
+或者： 编译并安装
+```shell
+git clone https://gitee.com/deepin-community-store/spark-store.git
+cd spark-store
+./build_and_install.sh
+```
+
+
+## 🚀 协作
+
+非常感谢有兴趣的开发者或爱好者参与 `星火应用商店` 项目，分享你的见解与思路。
+
+### 交流平台
+
+https://chat.shenmo.tech/
+
+客户端PWA：
+
+spk://store/chat/store.spark-app.feedback
+
+（安装星火商店后在浏览器打开或复制到搜索栏打开）

build_and_install.sh

@@ -0,0 +1,24 @@
+
+# Deepin V20/UOS 21 系统下, 安装依赖
+
+# ```shell
+# sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin
+
+# ```
+
+# Ubuntu 22.04 系统下, 安装依赖
+# ```shell
+# sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools
+
+# ```
+
+echo "Deepin V20/UOS 21 系统下, 安装依赖"
+echo "sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin"
+
+echo "Ubuntu 22.04 系统下, 安装依赖"
+echo "sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools"
+
+dpkg-buildpackage -j$(cat /proc/cpuinfo | grep processor | wc -l)
+sudo apt reinstall ../spark-store_*.deb
+
+rm ../spark-store_*

debian/changelog

@@ -1,43 +1,350 @@
+spark-store (4.2.6) stable; urgency=medium
+  * 修复：截图加载失败时点击闪退
+  
+ -- shenmo <shenmo@spark-app.store> 
+
+
+spark-store (4.2.5.1) stable; urgency=medium
+  * 调整：重写了spark-dstore-patch，速度提升，尤其对机械硬盘下
+  * 调整：优化了aptss源文件同步策略
+  
+ -- shenmo <shenmo@spark-app.store> 
+
+
+spark-store (4.2.5) stable; urgency=medium
+  * 修复：ssinstall在文件不存在时仍然报安装成功
+  * 修复：删除不再需要的依赖：libc6-dev
+  * 在aarch64架构安装时也启用32位支持
+  
+ -- shenmo <shenmo@spark-app.store> 
+
+spark-store (4.2.4) stable; urgency=medium
+  * 修复：ssinstall校验失败的时候仍然提示安装成功
+  * 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败
+  * 修复：在不受支持的平台安装应用时弹出提示不正确
+  
+ -- shenmo <shenmo@spark-app.store> 
+
+spark-store (4.2.3.3) stable; urgency=medium
+  * aptss 不再使用bwrap，去除依赖，支持容器中启动
+  * aptss 支持非root模式启动
+  * aptss 添加transhell支持
+  * 关于界面自动获取分支名称
+  * 现在安装成功则自动删除安装包
+  * 完成 arm 架构大部分功能适配
+  * 修复依赖不完整的问题
+  * 4.3 roadmap 实现，在浏览不支持的应用时会出现提示
+  * 4.3 roadmap 实现，在下载文件夹没有读写权限时会出现提示
+
+ -- shenmo <shenmo@spark-app.store> 
+
+
+spark-store (4.2.3.2~Reason10) stable; urgency=medium
+  * 完成除web外大部分功能适配
+  * 修复依赖不完整的问题
+
+ -- shenmo <shenmo@spark-app.store>  
+
+
+spark-store (4.2.3.2~Reason9) stable; urgency=medium
+  * sender-d.sh
+  * ssinstall和ssaudit的安装测试转到upgrade-worker
+
+ -- shenmo <shenmo@spark-app.store>  
+
+
+spark-store (4.2.3.2~Reason8) stable; urgency=medium
+  * sender-d改用cpp重写，在aarch64上稳定运行
+
+ -- shenmo <shenmo@spark-app.store>  
+
+
+spark-store (4.2.3.2~Reason7) stable; urgency=medium
+  * ssinstall发现无法验证时尝试update而不是ssupdate
+  * 启动每日aptss update
+  * ssinstall在发现无法安装后尝试先进行下aptss update
+  * 修复：安装商店后首次启动无法安装任何软件
+
+ -- shenmo <shenmo@spark-app.store>  
+
+
+spark-store (4.2.3.2~Reason5) stable; urgency=medium
+  * aptss 不再使用bwrap，去除依赖，支持容器中启动
+  * aptss 支持非root模式启动
+  * aptss 添加transhell支持
+  * 关于界面自动获取分支名称
+  * 现在安装成功则自动删除安装包
+
+ -- shenmo <shenmo@spark-app.store>  
+spark-store (4.2.3.2~Reason3) stable; urgency=medium
+  * 现在可在x86上编译，使用同一套代码
+  * 暂时在aarch64上使用旧web----等待柚子
+  * 空间，疾疫，现在是静谧
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.3.2~only-for-test1) stable; urgency=medium
+  * 注意！！！！！！ 此版本仅为启动测试，还需要进一步完善——hardcode需要改善——关于web界面的调用方式需要在柚子做好之后修改成新的
+  * fix: hardcode
+  * fix: sender-d
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (4.2.3.1) stable; urgency=medium
+  * 修复: ssinstall验证签名出错
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (4.2.3) stable; urgency=medium
+  * 修复: 编译依赖不全
+  * 修复： prerm导致的dpkg崩溃
+  * 新增： aptss 检查package配置增加sdu，store
+  * 新增： 一键编译并安装脚本
+  * 新增： 后台安装结束后退出任务栏驻留
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (4.2.3~test4) stable; urgency=medium
+
+  * 修复: aptss 无法安装
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (4.2.3~test3) stable; urgency=medium
+
+  * 调整：打包时从 debian/changelog 自动获取构建版本号并写入关于窗口保证与deb一致
+  * 新增：支持 DTK 5.6.4 关于对话框“版本特性”显示功能。目前只在deepin编译安装时开启
+  * 修复：修复下载列表对话框中，点击某个 item 取消下载按钮后下载列表无法再次显示的问题
+  * 修复：多个应用安装可能会出现某一个应用没有安装
+  * 修复：修复下载按钮点击/双击/拖动时，主窗口动作与下载管理对话框动作同时触发问题 
+  * aptss 获取线路信息 转到从 d. 服务器获取
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (4.2.3~test2) stable; urgency=medium
+
+  * 调整：开启安装包加固
+  * 添加：zh_TW翻译
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.3~test1) stable; urgency=medium
+
+  * 修复：因判断安装状态错误创建多个相同任务的bug
+  * 测试中：尝试修复安装结束的闪退问题 https://gitee.com/deepin-community-store/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
+  * 修复：Deepin 显示开发者模式未开启
+  * 修复：从托盘打开主窗口时透明度动画不流畅
+  * 修复：主窗口关闭后，从托盘打开关于窗口会被主窗口遮挡
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 05 Feb 2023 23:00:00 +0800
+
+
+spark-store (4.2.2) stable; urgency=medium
+
+  * 调整：脚本应用的transhell支持转为source导入
+  * 修复：ssinstall弹窗支持wayland
+  * 新增：应用托盘，下载时候可以放心关闭窗口了
+  * 新增：支持spk://search/内容 格式链接
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.1) stable; urgency=medium
+
+  * 调整：支持在安装前进行测试（ss-do-upgrade-worker）,但是未实装到appinfo
+  * 修复：因依赖不完全导致在LinuxMint下无法下载统计
+  * 新增：脚本系列应用支持英文
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2) stable; urgency=medium
+
+  * 调整：UOS开发者模式提示现在不会那么挤了
+  * 修复：wayland下可正常弹出更新提示
+  * 调整：dwine5标签的文案改为：Wine应用
+  * 新增：更新软件时弹窗会显示正在更新的软件包名
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2~test3) stable; urgency=medium
+
+  * 修复: aptss ssupdates
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2~test2) stable; urgency=medium
+
+  * 修复: 420t1版本中ssinstall有时会重新下载软件包的问题
+  * 新增: 安装前会对软件包安装进行dry run以判断是否能正确安装
+  * 调整: aptss在进行任何操作前均检测是否存在Packages文件，若存在，则不进行ssupdate
+  * 调整: 修改apt-fast源代码以指定conf位置为/tmp/apt-fast,这部分不再使用bwrap模拟
+  * 新增: aptss检测Package文件支持分目录（目前指定为store）
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2~test1) stable; urgency=medium
+
+  * 新增: aptss支持显示报错
+  * 新增: aptss部分提示汉化
+  * 修复: 修复部分情况下ssinstall实际未安装但是错误显示
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.2) stable; urgency=medium
+
+  * feat: 初步的wayland支持
+  * feat: UOS下检测开发者模式是否开启，若未开启则拒绝安装
+  * fix: 首页的捐赠页面在中文环境下显示中文
+  * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。
+  * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit
+  * fix: Ubuntu下下载列表无法关闭
+  * fix: 修复进入详情页时焦点默认在分享链接按钮上的问题
+  * fix: 修复特定情况下的内存泄漏问题
+  * fix: 适配c11代码规范，消除qt编译警告
+  * fix: 默认服务器域名指向cdn域名
+  * fix: 消除内部函数的无用变量，限制作用域
+  * feat: aptss 除ssupdate外的操作时候如果检测到存在源文件存在则不再重复获取
+  * fix: 修复在apt list锁被锁定的时候异常弹出有更新可用
+  * chore: 去除安装依赖:g++
+  * fix: 修复下载列表中进度提示文字显示不完整的问题
+  * feat: ssinstall支持从单独文件夹中校验软件包
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 ，不过shenmo是自由的
+
+
+  * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
+  * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致
+  * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径
+  * chore: 关于对话框设置父对象后，对话框背景色受主窗口样式表影响，移动部分控件样式表设置方式与位置
+  * chore: 去除 .pro 文件中无效的更新翻译文件脚本调用，整理 .pro 文件，添加编译时更新 ts 文件脚本调用
+  * chore: 继续修复偶现关闭客户端时崩溃问题（疑似 aria2c 进程未启动，pid 未初始化为随机值，执行 kill 操作时未判断导致）
+  * chore: 新增编译依赖，测试安装时不会出现报错
+  * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
+  * chore: 更新翻译文件，去除已经不存在的翻译
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.2~test2) stable; urgency=medium
+
+  * feat: ssinstall支持从单独文件夹中校验软件包
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo ，不过shenmo是自由的
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.2~test1) stable; urgency=medium
+
+  * feat: 初步的wayland支持
+  * feat: UOS下检测开发者模式是否开启，若未开启则拒绝安装
+  * fix: 首页的捐赠页面在中文环境下显示中文
+  * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。
+  * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit
+  * fix: Ubuntu下下载列表无法关闭
+  * fix: 修复进入详情页时焦点默认在分享链接按钮上的问题
+  * fix: 修复特定情况下的内存泄漏问题
+  * fix: 适配c11代码规范，消除qt编译警告
+  * fix: 默认服务器域名指向cdn域名
+  * fix: 消除内部函数的无用变量，限制作用域
+  * feat: aptss 除ssupdate外的操作时候如果检测到存在源文件存在则不再重复获取
+  * fix: 修复在apt list锁被锁定的时候异常弹出有更新可用
+  * chore: 去除安装依赖:g++
+  * fix: 修复下载列表中进度提示文字显示不完整的问题
+
+
+  * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
+  * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致
+  * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径
+  * chore: 关于对话框设置父对象后，对话框背景色受主窗口样式表影响，移动部分控件样式表设置方式与位置
+  * chore: 去除 .pro 文件中无效的更新翻译文件脚本调用，整理 .pro 文件，添加编译时更新 ts 文件脚本调用
+  * chore: 继续修复偶现关闭客户端时崩溃问题（疑似 aria2c 进程未启动，pid 未初始化为随机值，执行 kill 操作时未判断导致）
+  * chore: 新增编译依赖，测试安装时不会出现报错
+  * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
+  * chore: 更新翻译文件，去除已经不存在的翻译
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.1) stable; urgency=medium
+
+  * fix:更新失效
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.0) stable; urgency=medium
+
+  * feat: 现在可以支持UOS签名包问题了
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.0.1) stable; urgency=medium
+
+  * feat: 提升Ubuntu下的显示效果
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.0.0) stable; urgency=medium
+
+  * feat: 修复了成吨的bug后开始正式版
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
 spark-store (4.0.0~test2) stable; urgency=medium
 
   * feat: 修复了成吨的bug后开始公测
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (4.0.0~test1) stable; urgency=medium
 
   * feat: 柚子过来补充一下啦
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.4~test1) stable; urgency=medium
 
   * feat: aptss不再尝试安装apt-fast，转而自带
   * chore:  删除password-check模块
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3.3) stable; urgency=medium
 
   * feat: 首页链接调用浏览器打开 
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
-0spark-store (3.3.3~test5) stable; urgency=medium
+
+spark-store (3.3.3~test5) stable; urgency=medium
 
   * 修复可能的内存泄漏问题
   * 修复应用搜索为空但仍显示上一次搜索结果的问题
   * 修复动画加载延后的问题
   * 修复统计下载量卡主渲染线程的问题
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 
 spark-store (3.3.3~test4) stable; urgency=medium
 
   * Enable i386 arch support by default
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3.3~test3) stable; urgency=medium
 
@@ -46,11 +353,13 @@ spark-store (3.3.3~test3) stable; urgency=medium
 
 -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
+
 spark-store (3.3.3~test2) stable; urgency=medium
 
   * bug fix: 更新和检查更新出错时不报错.此更新需要一个推送
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3.3~test1) stable; urgency=medium
 
@@ -58,132 +367,137 @@ spark-store (3.3.3~test1) stable; urgency=medium
   * 图形环境中所有root权限的组件剥离到cli(可用于deepin 23 daily，只保证商店本体正常运作，不处理安装依赖不满足)
   * 文案更改：更新检查-->检查更新
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3.1~test1) stable; urgency=medium
 
   * 安装时不再需要联网
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3.0.4) stable; urgency=medium
 
   * 为减轻服务器压力，不再单独更新某一个应用，而是作为整体更新
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.3.0.3) stable; urgency=medium
 
   * 回滚 更新中行为到进度条而不是实时输出
   * 更新应用时显示正在更新哪个应用
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.3.0.2) stable; urgency=medium
 
   * 修复 pkexec未执行
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.3.0.1) stable; urgency=medium
 
   * 修复 检查更新的更新进程未实际运行
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.3) stable; urgency=medium
 
   * 修复 检查更新 未刷新软件源
   * 把检查更新单独拿出作为左列
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3~test3) stable; urgency=medium
 
   * 把检查更新加入免密码
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3~test2) stable; urgency=medium
 
   * 更新检测功能全部更改到zenity
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.3~test1) stable; urgency=medium
 
   * zenity，选择可更新应用
   * 自动更新检测现在会跳过hold
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.2.4) stable; urgency=medium
 
   * 修改tag相关的文案内容：wine相关环境已可自动配置了
   * 准备发版
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.2.4~test4) stable; urgency=medium
 
   * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/deepin-community-store/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 
-
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
 spark-store (3.2.4~test3) stable; urgency=medium
 
   * 发版，合入到master
   * 翻译完毕
   * 合入先前的各项改动，为：客户端集成投稿器入口和支持，修复：安装依赖时间较长时错误地返回“安装完毕”结果，现在客户端版本更新时不关闭免密码登录，UOS安装进程合并正常aptss中
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
 spark-store (3.2.4~test2) stable; urgency=medium
 
   * 客户端集成投稿器入口和支持
   * 修复：安装依赖时间较长时错误地返回“安装完毕”结果
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
 spark-store (3.2.4~test1) stable; urgency=medium
 
   * 客户端更新时不关闭免密码登录
   * UOS合并正常aptss中
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.2.3) stable; urgency=medium
 
   * 客户端异常退出时仍然占用资源问题修复
   * 降低dtk依赖版本，Debian 11 stable可直接安装
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.2.2) stable; urgency=medium
 
   * aptss will now refresh the system source before doing install,  policy....etc
   * 启动客户端GPU加速支持
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.2.1) stable; urgency=medium
 
   * 更改刷新系统源的功能
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.2) stable; urgency=medium
 
@@ -196,20 +510,22 @@ spark-store (3.2) stable; urgency=medium
   * 修复 在更新检测设置中的是否开启自动更新检测设置项的显示不随开启或关闭状态改变
   * 修复 在检测更新时临时降低优先级到100，防止系统中有且版本一致的包被反复来回更新 
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.1.6) stable; urgency=medium
 
   * 修复部分情况下无法选中正确的镜像源的问题
   * 合入3.1.5以来的各项修改
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.1.5-5) stable; urgency=medium
 
   * 从所有镜像源中选取最快镜像源高速下载
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 
 spark-store (3.1.5-4) stable; urgency=medium
@@ -219,53 +535,54 @@ spark-store (3.1.5-4) stable; urgency=medium
   * 更新检测服务优化：从分体改为一体
   * aptss 支持自动补全
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.1.5-3) stable; urgency=medium
 
   * 包内自带密钥
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.1.5-2) stable; urgency=medium
 
   * 下载软件时跳过获取大小，修复部分软件无法下载的问题
   * 修复 获取key时出错，指定使用http1.1
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.1.5-1) stable; urgency=medium
 
   * 改变更新策略，UOS也下载加速，但是安装不加速
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
 spark-store (3.1.5) stable; urgency=medium
 
   * 改变更新策略，现在支持应用在更新时引入新依赖
   * ss-apt-fast现在默认允许降级，以与apt使用体验一致
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.1.4-2) stable; urgency=medium
 
   * 客户端下载使用metalink来支持bt下载加速
   * 修复使用更新和安装设置更新商店本体时出错
 
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
 spark-store (3.1.4-1) stable; urgency=medium
 
   * 安装脚本和检测更新脚本检查网络时间超时时间延长至5s  
   * 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败 
 
--- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 
 spark-store (3.1.4) stable; urgency=medium
 
@@ -278,6 +595,7 @@ spark-store (3.1.4) stable; urgency=medium
 
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
+
 spark-store (3.1.3-2) stable; urgency=medium
 
   * 调整 现在与系统更新分开，不再导致更新失败
@@ -286,17 +604,17 @@ spark-store (3.1.3-2) stable; urgency=medium
   * 修改ss-apt-fast的策略，现在除了安装，下载和更新都改用apt
   * ssinstall 现在也会在不适用ss-apt-fast的时候模拟源了（针对UOS）
 
-
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
+
 spark-store (3.1.3-1) stable; urgency=medium
 
   * 修复 下载提前退出
   * 移除 下载量显示
 
-
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
+
 spark-store (3.1.3) stable; urgency=medium
 
   * Now uses aria2 to download softwares form all mirrors
@@ -308,6 +626,7 @@ spark-store (3.1.3) stable; urgency=medium
 
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
+
 spark-store (3.1.2) stable; urgency=medium
 
   * Now let apt-fast method support all mirrors
@@ -316,8 +635,6 @@ spark-store (3.1.2) stable; urgency=medium
  -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
 
 
-
-
 spark-store (3.1.1) stable; urgency=medium
 
   * Now will delete the link of policy file after uninstall or upgrade
@@ -326,8 +643,6 @@ spark-store (3.1.1) stable; urgency=medium
  -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
 
 
-
-
 spark-store (3.1.0) stable; urgency=medium
 
   * Add pkexec policy: ssinstall. Only will be enabled after permitted.
@@ -336,7 +651,6 @@ spark-store (3.1.0) stable; urgency=medium
  -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
 
 
-
 spark-store (3.0.3-13) stable; urgency=medium
 
   * Update the ssinstall script. Now support apt-fast and will temporarily increase the spark store source priority to 500 to make depends install correctly
@@ -346,7 +660,6 @@ spark-store (3.0.3-13) stable; urgency=medium
  -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
 
 
-
 spark-store (3.0.3-12) stable; urgency=medium
 
   * Rollback to use DApplication::loadDXcbPlugin() to make titlebar behave normally in ubuntu
@@ -356,8 +669,6 @@ spark-store (3.0.3-12) stable; urgency=medium
  -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
 
 
-
-
 spark-store (3.0.3-11) stable; urgency=medium
 
   * Now support autoupdate
@@ -365,8 +676,6 @@ spark-store (3.0.3-11) stable; urgency=medium
  -- 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
@@ -379,3 +688,4 @@ 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/control

@@ -14,12 +14,16 @@ Build-Depends:
  libdtkcore-dev(>=5.0),
  libdtkgui-dev(>=5.0),
  libdtkwidget-dev(>=5.0),
+ libqt5svg5-dev,
  qttools5-private-dev,
- qtwebengine5-dev
-Standards-Version: 3.0
+ qtwebengine5-dev,
+ qtwayland5,
+ qtwayland5-dev-tools,
+ gcc,
+ g++
+Standards-Version: 4.0.0
 Homepage: https://www.spark-app.store/
 
-
 Package: spark-store
 Architecture: any
 Depends:${shlibs:Depends}, ${misc:Depends},
@@ -28,18 +32,17 @@ Depends:${shlibs:Depends}, ${misc:Depends},
  libqt5widgets5,
  libqt5network5,
  libqt5concurrent5,
+ qtwayland5,
  libdtkcore5,
  libdtkgui5,
  libdtkwidget5,
  curl,
  openssl,
- libssl-dev,
  dde-qt5integration,
- bubblewrap,
  aria2,
- gcc,
- g++,
- zenity
+ gnupg,
+ zenity,
+ policykit-1,
+ libnotify-bin
 Description: Spark Store
  A community powered app store, based on DTK.
-Recommends: apt-fast

debian/rules

@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-export QT_SELECT=5
+export QT_SELECT = qt5
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/default.mk
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DH_AUTO_ARGS = --parallel --buildsystem=qmake
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+#export DH_VERBOSE = 1
 
 %:
 	dh $@ --parallel
@@ -18,13 +19,12 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	mkdir -p $(CURDIR)/build
 
-	dh_auto_configure MAKEFLAGS=-j$(JOBS) -- spark-store-project.pro \
+	qmake BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-store-project.pro \
 	-spec linux-g++ CONFIG+=qtquickcompiler \
 	-o $(CURDIR)/build/
 
-
 override_dh_auto_build:
-	make -C $(CURDIR)/build -j$(JOBS)
+	make MAKEFLAGS="$(MAKEFLAGS)" -C $(CURDIR)/build 
 
 override_dh_auto_install:
 	make -C $(CURDIR)/build install \
@@ -35,3 +35,4 @@ override_dh_auto_install:
 # Qt Mutidedia lib will ref to network libraray.
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0
+

debian/spark-store.postinst

@@ -1,30 +1,36 @@
-#!/bin/sh
+#!/bin/bash
 
 case "$1" in
 	configure)
 
-	# Enable i386 arch
-	echo "Enable i386 arch..."
+		case `arch` in
+   		x86_64)
+		echo "Enabling i386 arch..."
 		dpkg --add-architecture i386
+		;;
+        aarch64)
+        echo "Enabling armhf arch..."
+        dpkg --add-architecture armhf
+        ;;
+ 		*)
+		echo "Unknown architecture, skip enable 32-bit arch"
+		;;
+		esac
+
+		
+		mkdir -p /var/lib/aptss/lists
 
-        # config for aptss
-        mkdir -p /etc/aptss/sources.list.d
-        ln -s -f /etc/apt/sources.list /etc/aptss/sources.list
 
 		#  Remove the sources.list file
-	if [ -e /etc/apt/sources.list.d/sparkstore.list ];then
-	rm /etc/apt/sources.list.d/sparkstore.list
-	fi
-        
+		rm -f /etc/apt/sources.list.d/sparkstore.list
 
 		# 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/ssaudit /usr/local/bin/ssaudit
 		ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch
 		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast
 
@@ -33,9 +39,7 @@ case "$1" in
 		# Create symbol links for SSINSTALL 
 		ln -s -f  /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
 
-		echo "Compiling the Sender module..."
 
-		gcc /opt/durapps/spark-store/bin/ss-feedback/sender-d.sh.c -o /opt/durapps/spark-store/bin/ss-feedback/sender-d
 		
 		# Install key
 		mkdir -p /tmp/spark-store-install/
@@ -43,17 +47,13 @@ case "$1" in
 		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
 		# Now abandoned as aptss now run ssupdate everytime
 		#aptss ssupdate
 
-
 		# Start upgrade detect service
 		systemctl enable spark-update-notifier
-		service spark-update-notifier start
-		
+		systemctl start spark-update-notifier
 
 		# Update certain caches
 		update-icon-caches /usr/share/icons/hicolor || true
@@ -62,12 +62,10 @@ case "$1" in
 		update-mime-database /usr/share/mime || true
 
 		# Send email for statistics
-		# /tmp/spark-store-install/feedback.sh
+		#/tmp/spark-store-install/feedback.sh
 
 		# Remove temp dir
 		rm -rf /tmp/spark-store-install
-
-
 	;;
 
 	triggered)

debian/spark-store.postrm

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Update certain caches
 update-icon-caches /usr/share/icons/hicolor || true

debian/spark-store.prerm

@@ -1,47 +1,51 @@
-#!/bin/sh
+#!/bin/bash
+function notify-send()
+{
+    #Detect the user using such display
+    local user=$(who | awk '{print $1}' | head -n 1)
 
-if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
-# 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
-rm /usr/local/bin/ss-apt-fast
-rm /usr/bin/aptss
+    #Detect the id of the user
+    local uid=$(id -u $user)
 
-rm -rf /etc/aptss/
+    sudo -u $user  DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@"
+}
 
-# Remove Sender module
-rm /opt/durapps/spark-store/bin/ss-feedback/sender-d
+if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then
+	# Remove residual symbol links
+	rm -f /usr/local/bin/spark-store
+	rm -f /usr/local/bin/ssinstall
+	rm -f /usr/local/bin/ssaudit
+	rm -f /usr/local/bin/spark-dstore-patch
+	rm -f /usr/local/bin/ss-apt-fast
+	rm -f /usr/bin/aptss
 
-# Remove residual symbol links to stop upgrade detect if exist
-if [ -e /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
+	rm -rf /etc/aptss/
+	rm -rf /var/lib/aptss/
 
 
 
-# Clean the auto install polkit file if exist
-if [ -f "/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy" ] ; then
-	rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
-fi
+	# Remove residual symbol links to stop upgrade detect
+	rm -f /etc/xdg/autostart/spark-update-notifier.desktop
 
-# 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
+	# Shutdown services
+	systemctl stop spark-update-notifier
+	# Stop update detect service
+	systemctl disable spark-update-notifier
 
-apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
+	# Clean the auto install polkit file if exist
+	rm -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
 
+	# Remove gpg key file
+	rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
+	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
 else
+	echo "非卸载操作，不进行配置清理"
 	
-echo "非卸载操作，不进行配置清理"
-
+	if [ ! -z "`pidof spark-store`" ];then 
+	echo "关闭已有 spark-store.."
+	notify-send "正在升级星火商店" "请在升级结束后重启星火商店" -i spark-store
+	killall spark-store
+	else
+	echo "继续安装 spark-store.."
+	fi
 fi

patchs/README.md

@@ -0,0 +1,44 @@
+# 补丁操作说明
+
+- 克隆与构建本项目
+
+    > 用于 zinface-community-cmake-build-system.patch 补丁化构建方式
+
+    ```shell
+    git clone https://gitee.com/deepin-community-store/spark-store
+    cd spark-store
+    git am < patchs/zinface-community-cmake-build-system.patch
+    make package
+    sudo dpkg -i build/*.deb
+    ```
+
+
+- 在应用补丁时，并对补丁进行的更新操作
+
+    ```shell
+    # 切换到一个新的分支，即可开始进行补丁内的更新提交
+    git checkout -b cmake-build-system
+    
+    # origin/dev 表示本仓库的 dev 开发分支
+    # 在应用过补丁，并产生了新的提交，即可在当前所在补丁更新分支内
+    # 相对基于 origin/dev 为参考，目前所包含的所有最新提交内容将生成为一个补丁文件(其中尾部为增量更新)
+    git format-patch --stdout origin/dev > patchs/zinface-community-cmake-build-system.patch
+
+    # 最后，回到你的原 dev 分支，将被改变的补丁文件进行提交
+    # 在推送完成后，即可放弃你在 cmake-build-system 分支中所有产生的内容(因为都已经进入补丁)
+    ```
+
+- 一些注意事项
+
+    ```shell
+    # 在不了解补丁时，你需要认识一下补丁，但补丁与补丁之间有着不同的用法
+    # 本 patchs/zinface-community-cmake-build-system.patch 补丁为 cmake 化构建
+    
+    # 关于补丁的一些方面
+    # 1. 首先你需要了解 git 是什么，以及简单的使用
+    # 2. 你需要了解补丁是什么，以及简单的使用(应用补丁)
+    # 3. 你需要了解如何创建一个补丁，最基本的就是相对于旧目标分支，将本分区新增的提交进行导出为补丁
+    # 4. 你可能只会将单个提交、或多个提交导出为补丁，但这还不够，你需要具有绝对的对于补丁的理解
+    # 5. 对于不同的目的补丁，应该是多个 patch 文件存在的形式
+    # 6. 最后，不管在什么时候，你在应用补丁前，你应该考虑是否应用到当前分支？为什么不切换到一个新的分支呢？
+    ```

pkg/usr/share/aptss/transhell/aptss_en_US.transhell

@@ -0,0 +1,4 @@
+#!/bin/bash
+TRANSHELL_CONTENT_RUNNING_IN_NOT_ROOT_USER="W:Running in non-root mode! If error occurs, please try to excute me as root."
+TRANSHELL_CONTENT_INFO_SOURCES_LIST_D_IS_EMPTY="INFO：sources.list.d directory is empty，will not try to sync"
+TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST="Getting server and mirror lists..."

pkg/usr/share/aptss/transhell/aptss_zh_CN.transhell

@@ -0,0 +1,4 @@
+#!/bin/bash
+TRANSHELL_CONTENT_RUNNING_IN_NOT_ROOT_USER="警告：正在使用非root权限模式启动！若出现问题，请尝试使用root权限执行指令"
+TRANSHELL_CONTENT_INFO_SOURCES_LIST_D_IS_EMPTY="信息：sources.list.d文件夹是空的，将不会尝试同步"
+TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST="从服务器获取配置和镜像列表..."

pkg/usr/share/bash-completion/completions/aptss

@@ -63,7 +63,7 @@ _aptss()
     # Complete a -t<SPACE><TAB>
     case $prev in
         -t|--target-release)
-            COMPREPLY=( $( compgen -W "$( apt-cache policy -o Dir::Cache="/etc/aptss/" | egrep -o 'a=[^,]*|n=[^,]*' | cut -f2- -d= | sort -u)" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$( apt-cache policy -o Dir::Cache="/var/lib/aptss/" | egrep -o 'a=[^,]*|n=[^,]*' | cut -f2- -d= | sort -u)" -- "$cur" ) )
             return 0
             ;;
     esac
@@ -185,12 +185,12 @@ _aptss()
                 return 0
                 ;;
             show|list|download|changelog|depends|rdepends)
-                    COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/etc/aptss/"  \
+                    COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/"  \
                     2> /dev/null ) )
                 return 0
                 ;;
             install)
-                COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/etc/aptss/"  \
+                COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/"  \
                     2> /dev/null ) )
                 if [[ "$cur" == ./* || "$cur" == /* ]]; then
                     _filedir "deb"
@@ -198,8 +198,8 @@ _aptss()
                 return 0
                 ;;
             source|build-dep|showsrc|policy)
-                COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/etc/aptss/"  \
-                    2> /dev/null ) $(  apt-cache dumpavail -o Dir::Cache="/etc/aptss/"  | \
+                COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/"  \
+                    2> /dev/null ) $(  apt-cache dumpavail -o Dir::Cache="/var/lib/aptss/"  | \
                     command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) )
                 return 0
                 ;;

pkg/usr/share/dsg/org.deepin.dtkwidget.feature-display.json

@@ -0,0 +1,26 @@
+{
+    "magic": "dsg.config.meta",
+    "version": "1.0",
+    "contents": {
+        "featureUpdated": {
+            "value": false,
+            "serial": 0,
+            "flags": [],
+            "name": "Whether the application has new feature updates",
+            "name[zh_CN]": "配置应用的更新状态",
+            "description": "Configure the update status of the application",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "autoDisplayFeature": {
+            "value": false,
+            "serial": 0,
+            "flags": [],
+            "name": "The application automatically display new features once",
+            "name[zh_CN]": "配置应用是否自动展示一次新特性",
+            "description": "The application automatically display updated contents once",
+            "permissions": "readwrite",
+            "visibility": "public"
+        }
+    }
+}

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

@@ -1,6 +1,4 @@
 <?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#"
@@ -10,12 +8,15 @@
    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"
+   inkscape:export-ydpi="127"
+   inkscape:export-xdpi="127"
+   inkscape:export-filename="/home/zhangtianyi/Desktop/deepin-community-store.png"
    width="200mm"
    height="200mm"
    viewBox="0 0 200 200"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0 (4035a4f, 2020-05-01)"
    sodipodi:docname="deepin-community-store.svg">
   <defs
      id="defs2">
@@ -170,17 +171,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="120.33119"
-     inkscape:cy="507.94585"
+     inkscape:zoom="0.7"
+     inkscape:cx="13.97476"
+     inkscape:cy="371.76152"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer2"
      showgrid="false"
      inkscape:window-width="1920"
-     inkscape:window-height="1040"
+     inkscape:window-height="941"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -199,70 +201,54 @@
      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)"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:2.87004;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" />
+       ry="30"
+       transform="matrix(1.0253898,0,0,0.97932001,-4.2824724,3.4808454)" />
   </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"
+       style="fill:#ffc344;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 94.205599,38.155907 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.172409 -3.40543,23.620739 -8.97797,31.494299 -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.771296 8.358796,-6.771296 10.061513,-6.141389 1.702724,0.629897 2.167092,1.574691 3.095852,3.306872 0.928749,1.732187 1.547929,1.417257 2.941089,0.472427 1.39311,-0.944834 1.85748,-2.047138 1.54792,-3.464372 -0.30958,-1.417247 -2.16711,-3.149427 -3.71505,-3.621847 -1.547909,-0.47241 -3.715016,-1.88966 -6.810869,-1.41721 -3.095848,0.47238 -9.132757,2.04711 -14.240906,8.975819 -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.203505 7.12048,-34.64374 C 148.22821,72.642208 137.23793,54.060548 125.00933,47.289265 112.78073,40.517979 103.64797,36.581186 94.205599,38.155907 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"
+       style="fill:#f06767;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 100.67541,101.06311 c 0,0 -3.06474,-2.895088 -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.250551 1.860731,-1.781588 4.597103,-2.561035 6.403105,-2.171298 1.806004,0.38971 2.955282,1.447544 3.393102,2.226958 0.43781,0.779437 1.149279,2.226981 1.532369,2.505371 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"
+       style="fill:#3f62eb;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 132.18114,140.09049 c 0,0 13.13457,-7.6831 19.26404,-19.82016 6.12948,-12.13707 8.7564,-19.93152 7.99021,-31.84589 -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.959364 -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"
+       style="fill:#fce102;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,117.2363 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.012871 2.29855,-15.366212 -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.464656 -4.487646,10.466796 -4.706555,16.702366 -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.250536 4.925468,-23.940057 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.674531 -1.97019,12.137076 -4.81601,16.256986 -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"
+       style="fill:#5ed938;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,117.2363 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.283321 1.97361,-7.519246 1.50922,-9.881306 -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.148323 0.23218,28.659827 -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"
+       style="fill:#8fdbe9;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 86.930353,66.680267 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"
+       style="fill:#fd7aff;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.107699,130.12526 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>

pkg/usr/share/ssinstall/transhell/ssinstall_en_US.transhell

@@ -0,0 +1,6 @@
+#!/bin/bash
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="Failed in checking package hash! \nPossibly reason can be the package is broken, laggy in sync of Spark Store repository, or, there is a malware attempt to attack. \nIf you don't know what happend, please try install again after execute the command below\n sudo aptss update\n\nIf the problem still happen, please click APP Feedback button in the APP information page to feedback to us.\n\n If you are in the Audition Group，Please use ssaudit instead of ssinstall to audit APPs，for ssinstall is used for password-free install now.\nIf you want to install an app that is removed from Spark Store repository，you can also use ssaudit."
+TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="Please run ssinstall as root"
+TRANSHELL_CONTENT_FILE_NOT_EXIST="File not exist"
+TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="No delete after install option given, will not delete the deb"
+TRANSHELL_CONTENT_DEB_IS_DELETED="--delete-after-install option is given and the installation is succeeded, delete the deb file."

pkg/usr/share/ssinstall/transhell/ssinstall_zh_CN.transhell

@@ -0,0 +1,6 @@
+#!/bin/bash
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="软件包校验失败！这不应该发生！\n可能是因为软件包已损坏，星火仓库未同步，或者最坏的情况：恶意软件尝试利用自动安装来入侵系统！\n如果你不清楚发生了什么，请执行 sudo aptss update 后再尝试安装。\n如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！\n\n 如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核工作，因为现在ssinstall已经被用于免密安装。\n如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall"
+TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="请使用root启动ssinstall"
+TRANSHELL_CONTENT_FILE_NOT_EXIST="文件不存在"
+TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="未指定安装后删除或安装出错，不删除deb包"
+TRANSHELL_CONTENT_DEB_IS_DELETED="使用了--delete-after-install选项且安装未出错，删除deb包"

spark-store-project.pro

@@ -7,19 +7,23 @@
 TARGET = spark-store
 TEMPLATE = subdirs
 
-CONFIG += ordered
+#CONFIG += ordered
+CONFIG += wayland-compositor
 
 SUBDIRS += \
-        src/spark-dstore-patch \
         src/spark-store.pro
 
-#TRANSLATIONS += \
-#        translations/spark-store_fr.ts \
-#        translations/spark-store_en.ts \
-#        translations/spark-store_zh_CN.ts
+# https://wiki.debian.org/Hardening
+QMAKE_CFLAGS   *= $(shell dpkg-buildflags --get CFLAGS)
+QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
+QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
+QMAKE_LFLAGS   *= $(shell dpkg-buildflags --get LDFLAGS)
 
 # Update translation files
-CONFIG(release, debug|release): system(bash $${PWD}/translate_generation.sh)
+CONFIG(release, debug | release) {
+    system(bash $${PWD}/translate_update.sh)
+    system(bash $${PWD}/translate_generation.sh)
+}
 
 # Rules for deployment
 tool.files += tool/*
@@ -49,6 +53,12 @@ polkit-1.path = /usr/share/polkit-1/actions/
 icon.files += pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 icon.path = /usr/share/icons/hicolor/scalable/apps
 
+ssinstall-transhell.files += pkg/usr/share/ssinstall/transhell
+ssinstall-transhell.path = /usr/share/ssinstall/
+
+aptss-transhell.files += pkg/usr/share/aptss/transhell
+aptss-transhell.path = /usr/share/aptss/
+
 tmp.files += pkg/tmp/spark-store-install/feedback.sh
 tmp.path = /tmp/spark-store-install
 
@@ -57,7 +67,8 @@ INSTALLS += \
         qm \
         desktop \
         icon \
-#       preferences \
+        ssinstall-transhell \
+	aptss-transhell \
 #       sourceslist \
         tmp \
         service \

src/README.md

@@ -0,0 +1,30 @@
+# 有关 src 下的一些改进预览
+
+> 1. 主体结构预览
+> 2. 主体结构中的内容单独说明
+> 并使用所用语言进行非侵入式独立描述，而不是在代码中填充说明与注释。
+>
+> 这是简单的预览说明规范
+
+- widget/base 结构
+
+    ```
+    src/widgets/base/
+    ├── basewidgetopacity.cpp
+    └── basewidgetopacity.h
+
+    0 directories, 2 files
+    ```
+
+- 来源于 widget/base 的说明 
+
+    ```c++
+    // BaseWidgetOpacity 是一个提供了淡出/淡入动画的基础类:
+    //  1. closeEvent 窗口关闭时进行淡出动画
+        // 此前在 MainWindow 中实现的淡出动画将由 BaseWidgetOpacity 来实现。
+
+    // 此前 MainWindow 原有的 DBlurEffectWidget 父类将移交至 BaseWidgetOpacity 继承。
+    
+    // 注意: 
+    // 如果 MainWindow 在未来重写 closeEvent 事件时将可能丢失 BaseWidgetOpacity 中的淡出效果
+    ```

src/application.cpp

@@ -0,0 +1,218 @@
+#include "application.h"
+#include "mainwindow-dtk.h"
+#include "utils/utils.h"
+
+#include <DPlatformWindowHandle>
+#include <DLog>
+#include <DGuiApplicationHelper>
+#include <DAboutDialog>
+#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
+#include <DFeatureDisplayDialog>
+#endif
+
+#include <QSettings>
+#include <QStandardPaths>
+
+DCORE_USE_NAMESPACE
+
+Application::Application(int &argc, char **argv)
+    : DApplication(argc, argv)
+{
+    // Wayland 环境下使用，防止子控件 Native 化
+    if (!DPlatformWindowHandle::pluginVersion().isEmpty()) {
+        setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
+    }
+    setAttribute(Qt::AA_UseHighDpiPixmaps);
+
+    setQuitOnLastWindowClosed(false); // 启用托盘图标时，关闭窗口程序仍然运行
+
+    loadTranslator(); // 载入翻译
+
+    setOrganizationName("spark-union");
+    setApplicationName("spark-store"); // 影响 ~/.config/spark-union ~/.local/share/spark-union 下文件夹名称
+    setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏)
+    setProductName(QObject::tr("Spark Store"));
+    setProductIcon(QIcon::fromTheme("spark-store"));
+    setApplicationHomePage("https://gitee.com/deepin-community-store");
+    setApplicationDescription(
+        QObject::tr(
+            "<span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/>"
+            "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
+            "<span style=' font-size:12pt;'>Spark developers</span>"));
+    setApplicationLicense(" <a href='https://gitee.com/deepin-community-store/spark-store/blob/Flamescion/LICENSE'>GPLv3</a> ");
+
+    // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
+    checkAppConfigLocation();
+
+    // 初始化日志模块 (默认日志位置 ~/.cache/spark-union/spark-store)
+    DLogManager::registerConsoleAppender();
+    DLogManager::registerFileAppender();
+
+    // 获取版本特性信息
+    m_featuresJsonObj = Utils::parseFeatureJsonFile();
+}
+
+void Application::handleAboutAction()
+{
+    if (aboutDialog() && aboutDialog()->parent() == m_mainWindow) {
+        DApplication::handleAboutAction();
+        return;
+    }
+
+    initAboutDialog();
+#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
+    initFeatureDisplayDialog(); // 初始化版本特性对话框
+#endif
+    DApplication::handleAboutAction();
+}
+
+bool Application::notify(QObject *receiver, QEvent *event)
+{
+    if (m_mainWindow) {
+        m_mainWindow->notify(receiver, event);
+    }
+
+    return DApplication::notify(receiver, event);
+}
+
+void Application::checkAppConfigLocation()
+{
+    QDir dir(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
+    if (!dir.exists()) {
+        qWarning() << "AppConfigLocation not existed, creating...";
+        dir.mkpath(dir.absolutePath());
+    }
+}
+
+void Application::setBuildDateTime(const QString &buildDateTime)
+{
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (config.value("build/version").toString() != QString(APP_VERSION)) {
+        qDebug() << "Spark Store has been updated!";
+
+        config.setValue("build/version", QString(APP_VERSION));
+        config.setValue("build/branch",QString(APP_BRANCH));
+        config.setValue("build/time", buildDateTime);
+        config.sync();
+    }
+
+    setApplicationVersion(DApplication::buildVersion(QString(APP_VERSION) + "-" + QString(APP_BRANCH) + "-" + buildDateTime));
+}
+
+void Application::setMainWindow(MainWindow *window)
+{
+    m_mainWindow = window;
+    if (aboutDialog() == nullptr || aboutDialog()->parent() != m_mainWindow)
+    {
+        initAboutDialog();
+    }
+#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
+    if (featureDisplayDialog() == nullptr || featureDisplayDialog()->parent() != m_mainWindow)
+    {
+        initFeatureDisplayDialog(); // 初始化版本特性对话框
+    }
+#endif
+}
+
+MainWindow *Application::mainWindow()
+{
+    return m_mainWindow;
+}
+
+void Application::initAboutDialog()
+{
+    if (m_mainWindow == nullptr)
+    {
+        return;
+    }
+
+    if (aboutDialog())
+    {
+        aboutDialog()->deleteLater();
+        setAboutDialog(nullptr);
+    }
+
+    // 自定义 DAboutDialog
+    DAboutDialog *dialog = new DAboutDialog(m_mainWindow);
+    dialog->setProductName(productName());
+    dialog->setProductIcon(productIcon());
+    dialog->setVersion(translate("DAboutDialog", "Version: %1").arg(applicationVersion()));
+#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
+    dialog->setVersion(applicationVersion());
+#endif
+    // 根据 shenmo 要求，不显示组织 Logo
+    // dialog->setCompanyLogo(QPixmap(":/icon/Logo-Spark.png"));
+    dialog->setCompanyLogo(QPixmap());
+    dialog->setWebsiteName(QObject::tr("Spark Project"));
+    dialog->setWebsiteLink(applicationHomePage());
+    dialog->setDescription(applicationDescription());
+    dialog->setLicense(translate("DAboutDialog", "%1 is released under %2").arg(productName()).arg(applicationLicense()));
+
+    setAboutDialog(dialog);
+    connect(aboutDialog(), &DAboutDialog::destroyed, this, [=]() {
+        setAboutDialog(nullptr);
+    });
+
+    dialog->hide();
+}
+
+#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
+/**
+ * @brief Application::initFeatureDisplayDialog 初始化版本特性对话框
+ */
+void Application::initFeatureDisplayDialog()
+{
+    if (featureDisplayDialog())
+    {
+        featureDisplayDialog()->deleteLater();
+        setFeatureDisplayDialog(nullptr);
+    }
+
+    // 自定义 DFeatureDisplayDialog
+    DFeatureDisplayDialog *dialog = new DFeatureDisplayDialog(m_mainWindow);
+    // 标题
+    dialog->setTitle(m_featuresJsonObj.value("title").toString());
+    // NOTE: json 文件中支持多语言；考虑到维护性，不放入翻译文件处理
+    if (m_featuresJsonObj.contains(QString("title[%1]").arg(QLocale::system().name())))
+    {
+        dialog->setTitle(m_featuresJsonObj.value(QString("title[%1]").arg(QLocale::system().name())).toString());
+    }
+
+    // 特性项
+    QList<DFeatureItem *> items;
+    foreach (const QJsonValue &jsonValue, m_featuresJsonObj.value("items").toArray())
+    {
+        QJsonObject jsonObj = jsonValue.toObject();
+        QString name = jsonObj.value("name").toString();
+        if (jsonObj.contains(QString("name[%1]").arg(QLocale::system().name())))
+        {
+            name = jsonObj.value(QString("name[%1]").arg(QLocale::system().name())).toString();
+        }
+        QString description = jsonObj.value("description").toString();
+        if (jsonObj.contains(QString("description[%1]").arg(QLocale::system().name())))
+        {
+            description = jsonObj.value(QString("description[%1]").arg(QLocale::system().name())).toString();
+        }
+
+        DFeatureItem *item = new DFeatureItem(QIcon::fromTheme("spark-store"), name, description, dialog);
+        items.append(item);
+    }
+    dialog->addItems(items); // NOTE: 也支持 addItem 依次添加单个 item
+
+    // “了解更多”链接按钮
+    dialog->setLinkUrl(m_featuresJsonObj.value("linkUrl").toString());
+    dialog->setLinkButtonVisible(m_featuresJsonObj.value("linkButtonVisible").toBool());
+
+    setFeatureDisplayDialog(dialog);
+    connect(featureDisplayDialog(), &DFeatureDisplayDialog::destroyed, this, [=]() {
+        setFeatureDisplayDialog(nullptr);
+    });
+#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
+    connect(aboutDialog(), &DAboutDialog::featureActivated, this, [=]() {
+        featureDisplayDialog()->show();
+    });
+#endif
+
+    dialog->hide();
+}
+#endif

src/application.h

@@ -0,0 +1,39 @@
+#ifndef APPLICATION_H
+#define APPLICATION_H
+
+#include <DApplication>
+
+#include <QJsonObject>
+
+DWIDGET_USE_NAMESPACE
+
+class MainWindow;
+class Application : public DApplication
+{
+    Q_OBJECT
+
+public:
+    Application(int &argc, char **argv);
+    void handleAboutAction() override;
+    bool notify(QObject *receiver, QEvent *event) override;
+
+    static void checkAppConfigLocation();
+
+    void setBuildDateTime(const QString &buildDateTime);
+
+    void setMainWindow(MainWindow *window);
+    MainWindow *mainWindow();
+
+private:
+    void initAboutDialog();
+#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
+    void initFeatureDisplayDialog();
+#endif
+
+private:
+    QJsonObject m_featuresJsonObj;
+
+    MainWindow *m_mainWindow = nullptr;
+};
+
+#endif // APPLICATION_H

src/assets/assets.qrc

@@ -1,43 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>icon/logo.svg</file>
-        <file>tags/a2d-small.png</file>
-        <file>tags/a2d.png</file>
-        <file>tags/community-small.png</file>
-        <file>tags/community.png</file>
-        <file>tags/community.svg</file>
-        <file>tags/deepin-small.png</file>
-        <file>tags/deepin.svg</file>
-        <file>tags/dtk-small.png</file>
-        <file>tags/dwine2-small.png</file>
-        <file>tags/dwine5-small.png</file>
-        <file>tags/dwine5.svg</file>
-        <file>tags/logo_icon.svg</file>
-        <file>tags/ubuntu-small.png</file>
-        <file>tags/ubuntu.png</file>
-        <file>tags/uos-authorize.svg</file>
-        <file>tags/uos-small.png</file>
-        <file>tags/uos.svg</file>
-        <file>icon/light/back.svg</file>
-        <file>icon/light/download.svg</file>
-        <file>icon/light/leftbutton_0.svg</file>
-        <file>icon/light/leftbutton_1.svg</file>
-        <file>icon/light/leftbutton_2.svg</file>
-        <file>icon/light/leftbutton_3.svg</file>
-        <file>icon/light/leftbutton_4.svg</file>
-        <file>icon/light/leftbutton_5.svg</file>
-        <file>icon/light/leftbutton_6.svg</file>
-        <file>icon/light/leftbutton_7.svg</file>
-        <file>icon/light/leftbutton_8.svg</file>
-        <file>icon/light/leftbutton_9.svg</file>
-        <file>icon/light/leftbutton_10.svg</file>
-        <file>icon/light/leftbutton_11.svg</file>
-        <file>icon/light/leftbutton_12.svg</file>
-        <file>icon/light/box.svg</file>
-        <file>icon/light/calendar.svg</file>
-        <file>icon/light/globe.svg</file>
-        <file>icon/light/folder.svg</file>
-        <file>icon/light/text.svg</file>
+        <file>icon/Logo-Spark.png</file>
         <file>icon/dark/back.svg</file>
         <file>icon/dark/box.svg</file>
         <file>icon/dark/calendar.svg</file>
@@ -58,7 +21,46 @@
         <file>icon/dark/leftbutton_11.svg</file>
         <file>icon/dark/leftbutton_12.svg</file>
         <file>icon/dark/text.svg</file>
-        <file>icon/light/update.svg</file>
         <file>icon/dark/update.svg</file>
+        <file>icon/light/back.svg</file>
+        <file>icon/light/download.svg</file>
+        <file>icon/light/leftbutton_0.svg</file>
+        <file>icon/light/leftbutton_1.svg</file>
+        <file>icon/light/leftbutton_2.svg</file>
+        <file>icon/light/leftbutton_3.svg</file>
+        <file>icon/light/leftbutton_4.svg</file>
+        <file>icon/light/leftbutton_5.svg</file>
+        <file>icon/light/leftbutton_6.svg</file>
+        <file>icon/light/leftbutton_7.svg</file>
+        <file>icon/light/leftbutton_8.svg</file>
+        <file>icon/light/leftbutton_9.svg</file>
+        <file>icon/light/leftbutton_10.svg</file>
+        <file>icon/light/leftbutton_11.svg</file>
+        <file>icon/light/leftbutton_12.svg</file>
+        <file>icon/light/box.svg</file>
+        <file>icon/light/calendar.svg</file>
+        <file>icon/light/globe.svg</file>
+        <file>icon/light/folder.svg</file>
+        <file>icon/light/text.svg</file>
+        <file>icon/light/update.svg</file>
+        <file>icon/logo.svg</file>
+        <file>json/features.json</file>
+        <file>tags/a2d-small.png</file>
+        <file>tags/a2d.png</file>
+        <file>tags/community-small.png</file>
+        <file>tags/community.png</file>
+        <file>tags/community.svg</file>
+        <file>tags/deepin-small.png</file>
+        <file>tags/deepin.svg</file>
+        <file>tags/dtk-small.png</file>
+        <file>tags/dwine2-small.png</file>
+        <file>tags/dwine5-small.png</file>
+        <file>tags/dwine5.svg</file>
+        <file>tags/logo_icon.svg</file>
+        <file>tags/ubuntu-small.png</file>
+        <file>tags/ubuntu.png</file>
+        <file>tags/uos-authorize.svg</file>
+        <file>tags/uos-small.png</file>
+        <file>tags/uos.svg</file>
     </qresource>
 </RCC>

src/assets/icon/logo.svg

@@ -1,6 +1,4 @@
 <?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#"
@@ -10,12 +8,15 @@
    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"
+   inkscape:export-ydpi="127"
+   inkscape:export-xdpi="127"
+   inkscape:export-filename="/home/zhangtianyi/Desktop/deepin-community-store.png"
    width="200mm"
    height="200mm"
    viewBox="0 0 200 200"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0 (4035a4f, 2020-05-01)"
    sodipodi:docname="deepin-community-store.svg">
   <defs
      id="defs2">
@@ -170,17 +171,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="120.33119"
-     inkscape:cy="507.94585"
+     inkscape:zoom="0.7"
+     inkscape:cx="13.97476"
+     inkscape:cy="371.76152"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer2"
      showgrid="false"
      inkscape:window-width="1920"
-     inkscape:window-height="1040"
+     inkscape:window-height="941"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -199,70 +201,54 @@
      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)"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ebebeb;stroke-width:2.87004;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" />
+       ry="30"
+       transform="matrix(1.0253898,0,0,0.97932001,-4.2824724,3.4808454)" />
   </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"
+       style="fill:#ffc344;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 94.205599,38.155907 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.172409 -3.40543,23.620739 -8.97797,31.494299 -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.771296 8.358796,-6.771296 10.061513,-6.141389 1.702724,0.629897 2.167092,1.574691 3.095852,3.306872 0.928749,1.732187 1.547929,1.417257 2.941089,0.472427 1.39311,-0.944834 1.85748,-2.047138 1.54792,-3.464372 -0.30958,-1.417247 -2.16711,-3.149427 -3.71505,-3.621847 -1.547909,-0.47241 -3.715016,-1.88966 -6.810869,-1.41721 -3.095848,0.47238 -9.132757,2.04711 -14.240906,8.975819 -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.203505 7.12048,-34.64374 C 148.22821,72.642208 137.23793,54.060548 125.00933,47.289265 112.78073,40.517979 103.64797,36.581186 94.205599,38.155907 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"
+       style="fill:#f06767;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 100.67541,101.06311 c 0,0 -3.06474,-2.895088 -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.250551 1.860731,-1.781588 4.597103,-2.561035 6.403105,-2.171298 1.806004,0.38971 2.955282,1.447544 3.393102,2.226958 0.43781,0.779437 1.149279,2.226981 1.532369,2.505371 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"
+       style="fill:#3f62eb;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 132.18114,140.09049 c 0,0 13.13457,-7.6831 19.26404,-19.82016 6.12948,-12.13707 8.7564,-19.93152 7.99021,-31.84589 -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.959364 -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"
+       style="fill:#fce102;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,117.2363 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.012871 2.29855,-15.366212 -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.464656 -4.487646,10.466796 -4.706555,16.702366 -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.250536 4.925468,-23.940057 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.674531 -1.97019,12.137076 -4.81601,16.256986 -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"
+       style="fill:#5ed938;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,117.2363 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.283321 1.97361,-7.519246 1.50922,-9.881306 -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.148323 0.23218,28.659827 -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"
+       style="fill:#8fdbe9;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 86.930353,66.680267 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"
+       style="fill:#fd7aff;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.107699,130.12526 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>

src/assets/icon/logo_old.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>

src/assets/json/features.json

@@ -0,0 +1,25 @@
+{
+    "title": "Features",
+    "title[zh_CN]": "版本特性",
+    "items": [
+        {
+            "icon": "/usr/share/icons/hicolor/scalable/apps/spark-store.svg",
+            "name": "Feature 1",
+            "name[zh_CN]": "特性 1",
+            "description": "Please click the learn more button to check",
+            "description[zh_CN]": "请点击 了解更多 按钮来获取特性"
+        },
+        {
+            "icon": ":/icon/logo.svg",
+            "name": "Feature 2",
+            "description": "Feature 2 detailed description..."
+        },
+        {
+            "icon": "spark-store",
+            "name": "Fix 1",
+            "description": "Fix 1 detailed description..."
+        }
+    ],
+    "linkUrl": "https://gitee.com/deepin-community-store/spark-store/releases/",
+    "linkButtonVisible": true
+}

src/backend/downloadworker.cpp

@@ -1,9 +1,9 @@
 #include "downloadworker.h"
-#include <QEventLoop>
+
 #include <QProcess>
 #include <QRegularExpression>
-#include <QDir>
 #include <QtConcurrent>
+#include <QStandardPaths>
 
 DownloadController::DownloadController(QObject *parent)
 {
@@ -30,7 +30,6 @@ void DownloadController::setFilename(QString filename)
     this->filename = filename;
 }
 
-
 bool checkMeatlink(QString metaUrl)
 {
     QFile metaStatus("/tmp/spark-store/metaStatus.txt");
@@ -49,7 +48,7 @@ bool checkMeatlink(QString metaUrl)
 
 void gennerateDomain(QVector<QString> &domains)
 {
-    QFile serverList(QDir::homePath().toUtf8() + "/.config/spark-store/server.list");
+    QFile serverList(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list");
     if (serverList.open(QFile::ReadOnly))
     {
         QStringList list = QString(serverList.readAll()).trimmed().split("\n");
@@ -92,10 +91,13 @@ void DownloadController::startDownload(const QString &url)
         QString metaUrl = url + ".metalink";
         qDebug() << "metalink" << metaUrl;
         bool useMetalink = false;
-        if (checkMeatlink(metaUrl)){
+        if (checkMeatlink(metaUrl))
+        {
             useMetalink = true;
             qDebug() << "useMetalink:" << useMetalink;
-        }else{
+        }
+        else
+        {
             gennerateDomain(domains);
             // qDebug() << domains << domains.size();
         }
@@ -112,10 +114,12 @@ void DownloadController::startDownload(const QString &url)
         QString aria2ConnectionMax = "--max-concurrent-downloads=16";
         QString aria2DNSCommand = "--async-dns-server=119.29.29.29,223.5.5.5";
 
-        if (useMetalink){
+        if (useMetalink)
+        {
             command.append(metaUrl.toUtf8());
         }
-        else{
+        else
+        {
             for (int i = 0; i < domains.size(); i++)
             {
                 command.append(replaceDomain(url, domains.at(i)).replace("+","%2B").toUtf8()); //对+进行转译，避免oss出错
@@ -134,22 +138,24 @@ void DownloadController::startDownload(const QString &url)
         command.append(aria2ConnectionPerServer.toUtf8());
         command.append(aria2ConnectionMax.toUtf8());
         command.append(aria2DNSCommand.toUtf8());
-        if (useMetalink){
+        if (useMetalink)
+        {
             command.append(aria2NoSeeds.toUtf8());
         }
         qDebug() << command;
-        auto cmd = new QProcess(this);
-        cmd->setProcessChannelMode(QProcess::MergedChannels);
-        cmd->setProgram("aria2c");
-        cmd->setArguments(command);
-        cmd->start();
-        cmd->waitForStarted(); //等待启动完成
 
-        QObject::connect(cmd, &QProcess::readyReadStandardOutput,
-        [&]()
+        bool downloadSuccess = true;
+        QProcess cmd;
+        cmd.setProcessChannelMode(QProcess::MergedChannels);
+        cmd.setProgram("aria2c");
+        cmd.setArguments(command);
+        cmd.start();
+        cmd.waitForStarted(-1); //等待启动完成
+
+        connect(&cmd, &QProcess::readyReadStandardOutput, [&]()
         {
             //通过读取输出计算下载速度
-            QString message = cmd->readAllStandardOutput().data();
+            QString message = cmd.readAllStandardOutput().data();
             // qDebug() << message;
             message = message.replace(" ", "");
             QStringList list;
@@ -189,18 +195,21 @@ void DownloadController::startDownload(const QString &url)
                 emit downloadProcess(speedInfo, downloadSizeRecord, fileSize);
             }
         });
-        QObject::connect(cmd, &QProcess::readyReadStandardError,
-        [&]()
+        connect(&cmd, &QProcess::readyReadStandardError, [&]()
         {
-            emit errorOccur(cmd->readAllStandardError().data());
-            return;
+            emit errorOccur(cmd.readAllStandardError().data());
+            downloadSuccess = false;
+            cmd.close();
         });
 
-        auto pidNumber = cmd->processId();
-        this->pidNumber = pidNumber;
-        while (cmd->waitForFinished(-1))
+        pidNumber = cmd.processId();
+
+        cmd.waitForFinished(-1);
+        cmd.close();
+
+        if(!downloadSuccess)
         {
-            continue;
+            return;
         }
 
         // 统计下载量
@@ -210,10 +219,10 @@ void DownloadController::startDownload(const QString &url)
         * HD 70642 is a star with an exoplanetary companion in the southern constellation of Puppis. 
         */
         QProcess mailProcess;
-        mailProcess.start(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
+        mailProcess.start(SenderdPath.toUtf8(), QStringList() << metaUrl << "HD70642");
         mailProcess.waitForStarted();
         mailProcess.waitForFinished(3000);
-        mailProcess.deleteLater();
+        mailProcess.close();
 
         emit downloadFinished(); });
 }
@@ -223,15 +232,22 @@ void DownloadController::startDownload(const QString &url)
  */
 void DownloadController::stopDownload()
 {
+    if (pidNumber < 0)
+    {
+        return;
+    }
+
     // 实现下载进程退出
     QString killCmd = QString("kill -9 %1").arg(pidNumber);
     system(killCmd.toUtf8());
     qDebug() << "kill aria2!";
+    pidNumber = -1;
 }
 
 qint64 DownloadController::getFileSize(const QString &url)
 {
     // 已经无需使用 qtnetwork 再获取 filesize，完全交给 aria2 来计算进度。 为保证兼容性，故保留此函数。
+    qDebug() << "Begin download:" << url;
     qint64 fileSize = 10000;
     return fileSize;
 }

src/backend/downloadworker.h

@@ -2,9 +2,7 @@
 #define DOWNLOADWORKER_H
 
 #include <QObject>
-#include <QList>
-#include <QFile>
-#include <QNetworkReply>
+#include <QVector>
 
 class DownloadController : public QObject
 {
@@ -19,23 +17,19 @@ public:
     qint64 getFileSize(const QString& url);
     QString replaceDomain(const QString& url, const QString domain);
 
-private:
-    int threadNum;
-    int pidNumber;
-    QString filename;
-    qint64 fileSize;
-    QVector<QPair<qint64, qint64>> ranges;
-    QFile *file;
-    bool finished = false;
-    QVector<QString> domains;
-
-
-
 signals:
     void errorOccur(const QString& msg);
     void downloadProcess(QString, qint64, qint64);
     void downloadFinished();
 
+private:
+    int threadNum;
+    qint64 pidNumber = -1;
+    QString filename;
+    qint64 fileSize;
+    QVector<QPair<qint64, qint64>> ranges;
+    bool finished = false;
+    QVector<QString> domains;
 };
 
 #endif // FILEDOWNLOADWORKER_H

src/backend/image_show.cpp

@@ -4,8 +4,7 @@
 #include <QScreen> // Qt5 不再建议使用 QDesktopWidget
 #include <QGuiApplication>
 
-image_show::image_show(QWidget *parent) :
-    QWidget(parent),
+image_show::image_show(QWidget *parent) : QWidget(parent),
                                           m_dialog(new big_image),
                                           m_label(new QLabel)
 {
@@ -23,13 +22,13 @@ void image_show::setImage(QPixmap image)
     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();
+    // 获取当前app所在的主屏幕尺寸
+    desktop_w = QGuiApplication::screenAt(QCursor().pos())->geometry().width();
+    desktop_h = QGuiApplication::screenAt(QCursor().pos())->geometry().height();
 
-    if(screen0.width() > (desktop_w - 20) || screen0.height() > (desktop_h - 20))
+    if (screen0.width() > int(desktop_w / 3 * 2) || screen0.height() > int(desktop_h / 3 * 2))
     {
-        re_screen1 = screen0.scaled(QSize(desktop_w - 20, desktop_h - 20), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        re_screen1 = screen0.scaled(QSize(int(desktop_w / 3 * 2), int(desktop_h / 3 * 2)), Qt::KeepAspectRatio, Qt::SmoothTransformation);
         m_image = QPixmap::fromImage(re_screen1);
     }
     else
@@ -43,12 +42,13 @@ void image_show::setImage(QPixmap image)
 void image_show::mousePressEvent(QMouseEvent *)
 {
     m_dialog->setimage(m_image);
-    m_dialog->showFullScreen();
 
     // 识别主屏幕尺寸并设置 widget 大小
-    m_dialog->setFixedSize(desktop_w, desktop_h);
+    m_dialog->setFixedSize(qMin(desktop_w, m_image.width() + int(desktop_h / 16 * m_image.width() / m_image.height())), qMin(desktop_h, m_image.height() + int(desktop_h / 16)));
 
-    m_dialog->move(0,0);
+    m_dialog->move(QGuiApplication::screenAt(QCursor().pos())->geometry().center() - m_dialog->rect().center());
+
+    m_dialog->show();
 }
 image_show::~image_show()
 {

src/backend/sparkapi.cpp

@@ -1,70 +1,97 @@
 #include "sparkapi.h"
 
+#include <QSettings>
+#include <QStandardPaths>
 #include <QDebug>
 
 QString SparkAPI::serverUrl = "";
+#ifdef __x86_64__
+    QString SparkAPI::serverUrlDir = "store";
+#elif __aarch64__
+    QString SparkAPI::serverUrlDir = "aarch64-store";
+#endif
 
 SparkAPI::SparkAPI(QObject *parent) : QObject(parent)
 {
-   SparkAPI::serverUrl = "https://cdn.d.store.deepinos.org.cn/";
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (!config.value("server/choose").toString().isEmpty() && config.value("server/updated").toBool())
+    {
+        SparkAPI::setServerUrl(config.value("server/choose").toString());
+    }
 }
+
 void SparkAPI::get(QUrl url)
 {
     QNetworkRequest request;
-    HttpRequest *httprequest=new HttpRequest;
-    request.setUrl(QUrl(url.toString().replace("+","%2B")));
-    connect(httprequest,&HttpRequest::finished,[=](QString data){
+    HttpRequest *httprequest = new HttpRequest;
+    request.setUrl(QUrl(url.toString().replace("+", "%2B")));
+    connect(httprequest, &HttpRequest::finished, [=](QString data)
+    {
         QByteArray arr = data.toUtf8();
-            //解析Json
+        // 解析 Json
         QJsonParseError error;
         if(QJsonDocument::fromJson(arr,&error).isArray())
         {
             auto doc = QJsonDocument::fromJson(arr,&error).array();
             emit finished(doc);
-            }else {
+        } else {
             auto doc = QJsonDocument::fromJson(arr,&error).object();
             emit finishedObject(doc);
         }
 
         httprequest->deleteLater();
     });
+
     httprequest->getRequest(request);
 }
+
 void SparkAPI::getRAW(QUrl url)
 {
     QNetworkRequest request;
-    HttpRequest *httprequest=new HttpRequest;
-    request.setUrl(QUrl(url.toString().replace("+","%2B")));
-    connect(httprequest,&HttpRequest::finished,[=](QString data){
+    HttpRequest *httprequest = new HttpRequest;
+    request.setUrl(QUrl(url.toString().replace("+", "%2B")));
+    connect(httprequest, &HttpRequest::finished, [=](QString data)
+            {
             emit finishedRAW(data);
-            httprequest->deleteLater();
-    });
+            httprequest->deleteLater(); });
     httprequest->getRequest(request);
 }
+
 void SparkAPI::getAppList(QString type)
 {
-    get(QUrl(getServerUrl()+"store/"+type+"/applist.json"));
+    get(QUrl(getServerUrl() + SparkAPI::serverUrlDir + "/" + type + "/applist.json"));
 }
+
 void SparkAPI::getSearchList(QString keyword)
 {
-    get(QUrl("https://search.deepinos.org.cn/appinfo/search?keyword="+keyword));
+    get(QUrl("https://search.deepinos.org.cn/appinfo/search?keyword=" + keyword));
 }
+
 void SparkAPI::getAppInfo(QUrl spk)
 {
-    get(QUrl(getServerUrl()+"store"+spk.path().replace("+","%2B") + "/app.json"));
+    get(QUrl(getServerUrl() + SparkAPI::serverUrlDir + spk.path().replace("+", "%2B") + "/app.json"));
 }
+
+QString SparkAPI::getArchDir()
+{
+    return SparkAPI::serverUrlDir;
+}
+
 void SparkAPI::getAppDownloadTimes(QUrl spk)
 {
-    getRAW(QUrl(getServerUrl()+"store"+spk.path().replace("+","%2B") + "/download-times.txt"));
+    getRAW(QUrl(getServerUrl() + SparkAPI::serverUrlDir + spk.path().replace("+", "%2B") + "/download-times.txt"));
 }
+
 QString SparkAPI::getServerUrl()
 {
     return SparkAPI::serverUrl;
 }
+
 QString SparkAPI::getImgServerUrl()
 {
     return SparkAPI::serverUrl;
 }
+
 void SparkAPI::setServerUrl(QString url)
 {
     SparkAPI::serverUrl = url;

src/backend/sparkapi.h

@@ -1,15 +1,21 @@
 #ifndef SPARKAPI_H
 #define SPARKAPI_H
+
+#include "utils/httprequest.h"
+
 #include <QObject>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonParseError>
-#include "utils/httprequest.h"
+#include <QDir>
 
 class SparkAPI : public QObject
 {
     Q_OBJECT
+
 public:
+    explicit SparkAPI(QObject *parent = nullptr);
+
     static QString getServerUrl();
     static QString getImgServerUrl();
     static void setServerUrl(QString url);
@@ -19,17 +25,16 @@ public:
     void getRAW(QUrl url);
     void getAppList(QString type);
     void getAppInfo(QUrl spk);
-    explicit SparkAPI(QObject *parent = nullptr);
-
-private:
-    static QString serverUrl;
+    static QString getArchDir();
 
 signals:
     void finished(QJsonArray);
     void finishedRAW(QString);
     void finishedObject(QJsonObject);
 
-public slots:
+private:
+    static QString serverUrl;
+    static QString serverUrlDir;
 };
 
 #endif // SPARKAPI_H

src/dbus/dbussparkstoreservice.cpp

@@ -3,10 +3,9 @@
 DBusSparkStoreService::DBusSparkStoreService(QObject *parent)
     : QDBusAbstractAdaptor(parent)
 {
-
 }
 
-void DBusSparkStoreService::activeWindow(const QString & arg)
+void DBusSparkStoreService::activeWindow(const QString &arg)
 {
     emit sigOpenUrl(arg);
 }

src/main.cpp

@@ -1,120 +1,151 @@
+#include "application.h"
 #include "mainwindow-dtk.h"
+#include "utils/utils.h"
 
-#include <DApplication>
-#include <DLog>
-#include <DPlatformWindowHandle>
+#include <DSysInfo>
 #include <DApplicationSettings>
-#include <DAboutDialog>
-#include <QLabel>
 #include <DWidgetUtil>
+
+#include <QDate>
+#include <QProcessEnvironment>
+#include <QSettings>
+#include <QFile>
+#include <QStandardPaths>
+#include <QSurfaceFormat>
+
 DCORE_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
     // Get build time
-    static const QString version = "Version 4.0.0~test2";
-    static const QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace("  ", " 0"), "MMM dd yyyy");
+    static const QDate buildDate = QLocale(QLocale::English).toDate(QString(__DATE__).replace("  ", " 0"), "MMM dd yyyy");
     static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
+    static const QString buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");
+
+    // NOTE: 提前设置组织名称和应用名称，避免配置文件位置错误
+    DApplication::setOrganizationName("spark-union");
+    DApplication::setApplicationName("spark-store");
+    Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
+
+    // 初始化 config.ini 配置文件
+    Utils::initConfig();
+
+    // Set display backend
+    Utils::setQPAPlatform();
+
+    // 龙芯机器配置,使得 DApplication 能正确加载 QTWEBENGINE
+    qputenv("DTK_FORCE_RASTER_WIDGETS", "FALSE");
+    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
+    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
 
-    //设置桌面环境环境变量
-    if (!QString(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin")) {
-        setenv("XDG_CURRENT_DESKTOP", "Deepin", 1);
-    }
-    DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // 开启 Hidpi 支持
-#ifndef DSTORE_NO_DXCBs
-    DApplication::loadDXcbPlugin(); // 加载 DXCB 插件
-#endif
 
     // 浏览器开启 GPU 支持
-    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
+#ifdef __sw_64__
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
+#elif __aarch64__
+    if (!Utils::isWayland()) {
+        QString env = QString::fromUtf8(qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
+        env = env.trimmed();
+        /**
+         * NOTE: 参考帮助手册代码，对于部分ARM CPU 设备，
+         * --disable-gpu 保证 X11 环境下网页正常显示
+         * --single-process 避免 X11 环境下 QtWebEngine 崩溃（可选）
+         */
+        env += " --disable-gpu";
+        qputenv("QTWEBENGINE_CHROMIUM_FLAGS", env.trimmed().toUtf8());
 
-    //初始化日志模块 (默认日志位置 ~/.cache/deepin/spark-store)
-    DLogManager::registerConsoleAppender();
-    DLogManager::registerFileAppender();
+        QSurfaceFormat format;
+        format.setRenderableType(QSurfaceFormat::OpenGLES);
+        QSurfaceFormat::setDefaultFormat(format);
 
-    DApplication a(argc, argv);
-
-    //Wayland 环境下使用，防止子控件 Native 化
-    if (!DPlatformWindowHandle::pluginVersion().isEmpty()) {
-        a.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
+        /**
+         * NOTE: https://zhuanlan.zhihu.com/p/550285855
+         * 避免 X11 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
+         */
+        qputenv("QMLSCENE_DEVICE", "softwarecontext");
+        DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
     }
-    a.setAttribute(Qt::AA_UseHighDpiPixmaps);
-    a.loadDXcbPlugin();
+#endif
 
-    a.loadTranslator(); // 载入翻译
 
-    QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
 
-    if (readConfig.value("build/version").toString() != version){
-        qDebug() << "Spark Store has been updated!";
-        QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
-        setConfig->setValue("build/version", version);
-        setConfig->setValue("build/time", buildDate.toString("yyyy.MM.dd")+"-"+buildTime.toString());
-        setConfig->deleteLater();
+    /**
+     * FIXME: 对于麒麟 CPU 设备，调用 QtWebEngine 会导致客户端崩溃；
+     * 暂时不对 CPU 进行判断，对 wayland 环境下统一处理
+     */
+    if (Utils::isWayland()) {
+        QString env = QString::fromUtf8(qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
+        env = env.trimmed();
+        /**
+         * NOTE: 参考帮助手册代码，对于麒麟 CPU 设备，
+         * --disable-gpu 保证 wayland 环境下网页正常显示
+         * --single-process 避免 wayland 环境下 QtWebEngine 崩溃（可选）
+         */
+        env += " --disable-gpu";
+        qputenv("QTWEBENGINE_CHROMIUM_FLAGS", env.trimmed().toUtf8());
+
+        /**
+         * NOTE: 参考帮助手册代码，对于麒麟 CPU 设备，
+         * 避免 wayland 环境下 QtWebEngine 崩溃
+         */
+        qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
+        QSurfaceFormat format;
+        format.setRenderableType(QSurfaceFormat::OpenGLES);
+        QSurfaceFormat::setDefaultFormat(format);
+
+        /**
+         * NOTE: https://zhuanlan.zhihu.com/p/550285855
+         * 避免 wayland 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
+         */
+        qputenv("QMLSCENE_DEVICE", "softwarecontext");
+        DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
     }
 
-    //Customized DAboutDialog
-
-     DAboutDialog dialog;
-      a.setAboutDialog(&dialog);
-      dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
-      dialog.setVersion(DApplication::buildVersion(readConfig.value("build/version").toString()+"-"+readConfig.value("build/time").toString()));
-      dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
-      dialog.setProductName(QLabel::tr("Spark Store"));
-      dialog.setDescription(
-                  QObject::tr(
-                      "<span style=' font-size:10pt;font-weight:60;'>An appstore powered by  community</span><br/>"
-                      "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
-                      "<span style=' font-size:12pt;'>Spark developers</span>"
-                      )
-                  );
-
-      dialog.setProductName(QLabel::tr("Spark Store"));
-      dialog.setCompanyLogo(QPixmap(":/spark-store.png"));
-      dialog.setWebsiteName(QObject::tr("The Spark Project"));
-      dialog.setWebsiteLink("https://gitee.com/deepin-community-store");
-
-    a.setOrganizationName("spark-union");
-    a.setProductName(QObject::tr("Spark Store"));
-    a.setApplicationName("Spark Store"); // 不用翻译，影响 ~/.local/share/spark-union 下文件夹名称
-    a.setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏)
-    a.setWindowIcon(QIcon::fromTheme("spark-store"));
-    a.setApplicationDescription(
-                QObject::tr(
-                    "<span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/>"
-                    "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
-                    "<span style='font-size:12pt;'>Spark developers</span><br/><br/>"
-                    "Published under GPL V3"
-                    )
-                );
-    // 限制单实例运行
-    if(!a.setSingleInstance("spark-store"))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     {
-        qDebug() << "The application is already running!";
-        QDBusInterface iface("com.gitee.spark.store",
-                             "/com/gitee/spark/store",
-                             "com.gitee.spark.store",
-                             QDBusConnection::sessionBus());
-
-        QString arg1 = argv[1];
-
-        iface.asyncCall("activeWindow",arg1);
+        // 开启 Hidpi 支持
+        qDebug() << "Enable HiDPI Support.";
+        DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+        DApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+    }
+#endif
 
+    // 强制使用 DTK 平台插件
+    QVector<char *> fakeArgs(argc + 2);
+    fakeArgs[0] = argv[0];
+    fakeArgs[1] = const_cast<char *>("-platformtheme");
+    fakeArgs[2] = const_cast<char *>("deepin");
+    for (int i = 1; i < argc; i++)
+    {
+        fakeArgs[i + 2] = argv[i];
+    }
+    int fakeArgc = argc + 2; // QCoreApplication 的 argc 要用引用，避免 c++ 编译器优化
+    Application a(fakeArgc, fakeArgs.data());
+    // 设置版本和构建时间
+    a.setBuildDateTime(buildDateTime);
 
+    // 限制单实例运行
+    if (!a.setSingleInstance("spark-store"))
+    {
+        qWarning() << "Another instance has already started, activating...";
         return -1;
     }
 
-    DGuiApplicationHelper::instance()->setPaletteType(DGuiApplicationHelper::LightType); //固定主题为浅色主题
     DApplicationSettings settings; // 定义 DApplicationSettings，自动保存主题设置
 
     MainWindow w;
+    a.setMainWindow(&w); // 设置应用程序主窗口，用于初始化关于对话框
     // 让打开时界面显示在正中
     Dtk::Widget::moveToCenter(&w);
 
+    if (argc > 1)
+    {
         QString arg1 = argv[1];
-    if (arg1.startsWith("spk://")) {
-        w.openUrl(QUrl(argv[1]));
+        if (arg1.trimmed().startsWith("spk://"))
+        {
+            w.openUrl(arg1);
+        }
     }
     w.show();
 

src/mainwindow-dtk.cpp

@@ -1,53 +1,209 @@
 #include "mainwindow-dtk.h"
 #include "ui_mainwindow-dtk.h"
+#include "utils/widgetanimation.h"
+#include "widgets/common/progressbutton.h"
+#include "widgets/downloadlistwidget.h"
+#include "widgets/common/downloaditem.h"
+#include "dbus/dbussparkstoreservice.h"
+#include "application.h"
 
+#include <DLabel>
 #include <DWidgetUtil>
 #include <DGuiApplicationHelper>
-#include <QSizePolicy>
+
+#include <QDesktopServices>
+#include <QAbstractButton>
+#include <QtConcurrent>
+#include <unistd.h>
 
 #define AppPageApplist 0
 #define AppPageSearchlist 1
 #define AppPageAppdetail 2
 #define AppPageSettings 3
+#define WaylandSearchCenter 1
+#define OtherSearchCenter 2
+#define RightSearchSpace 1
+#define UploadServerUrl "https://upload.deepinos.org/"
 
 MainWindow::MainWindow(QWidget *parent)
-    : DBlurEffectWidget(parent)
+    : BaseWidgetOpacity(parent)
     , ui(new Ui::MainWindow)
+    , downloadlistwidget(new DownloadListWidget)
+    , trayIcon(new QSystemTrayIcon(QIcon::fromTheme("spark-store"), this))
 {
     ui->setupUi(this);
-    initConfig();
-    moveToCenter(this); //让窗口居中显示
 
-    WidgetAnimation::widgetOpacity(this,true);
+    initUI();
+    initConnections();
+
+    initTmpDir();
 
-    downloadlistwidget = new DownloadListWidget;
-    downloadButton = new ProgressButton(ui->titlebar);
-    backButtom = new QPushButton(ui->titlebar);
     ui->appintopage->setDownloadWidget(downloadlistwidget);
-    ui->stackedWidget->setCurrentIndex(0);
-    ui->titlebar->setBackgroundTransparent(true);
-    //ui->titlebar->setSwitchThemeMenuVisible(false); // 去除 dtk 标题栏主题切换菜单
+
+    emit DGuiApplicationHelper::instance()->themeTypeChanged(DGuiApplicationHelper::instance()->themeType());
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+
+    downloadlistwidget->deleteLater();
+}
+
+void MainWindow::initDbus()
+{
+    DBusSparkStoreService *dbusInter = new DBusSparkStoreService(this);
+
+    QDBusConnection::sessionBus().registerService("com.gitee.spark.store");
+    QDBusConnection::sessionBus().registerObject("/com/gitee/spark/store", "com.gitee.spark.store", this);
+    connect(dbusInter, &DBusSparkStoreService::sigOpenUrl, this, &MainWindow::onGetUrl);
+}
+
+void MainWindow::onGetUrl(const QString &url)
+{
+    if (url.trimmed().startsWith("spk://"))
+    {
+        openUrl(url);
+    }
+
+    showWindowAnimation = false;
+    closeWindowAnimation = false;
+
+    setWindowState(windowState() & Qt::WindowActive);
+    activateWindow();
+    show();
+}
+
+void MainWindow::onNewProcessInstance(qint64 pid, const QStringList &arguments)
+{
+    Q_UNUSED(pid)
+
+    onGetUrl(arguments.value(1, ""));
+}
+
+void MainWindow::openUrl(const QString &url)
+{
+    if (url.startsWith("spk://search/"))
+    {
+        QString keyword = url.mid(13);
+        if (keyword == "%")
+        {
+            qWarning() << "keyword '%' is not valid, which will cause QtWebEngine crash.";
+            return;
+        }
+        ui->applistpage_1->getSearchList(keyword);
+        switchPage(AppPageSearchlist);
+    }
+    else if (url.startsWith("spk://"))
+    {
+        ui->appintopage->openUrl(QUrl::fromUserInput(url));
+        switchPage(AppPageAppdetail);
+    }
+    else
+    {
+        QDesktopServices::openUrl(QUrl::fromUserInput(url));
+    }
+}
+
+bool MainWindow::isCloseWindowAnimation()
+{
+    return closeWindowAnimation;
+}
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    // 判断下载任务数量，如果没有要下载的，就直接退出主程序
+    if(!downloadlistwidget->isDownloadInProcess()){
+        // 已经全部下载完成
+        qApp->quit();
+    }
+
+    BaseWidgetOpacity::closeEvent(event);
+}
+
+void MainWindow::initUI()
+{
+    setWindowTitle(QObject::tr("Spark Store"));
     setMaskAlpha(250);
 
+    initTitleBar();
+    initLeftMenu();
+
+    ui->stackedWidget->setCurrentIndex(0);
     updateUi(0);
 
+    initTrayIcon();
+}
+
+void MainWindow::initTitleBar()
+{
+    ui->titlebar->setIcon(QIcon::fromTheme("spark-store"));
+    ui->titlebar->setBackgroundTransparent(true);
+    // ui->titlebar->setSwitchThemeMenuVisible(false); // 去除 dtk 标题栏主题切换菜单
+
+    // 初始化标题栏控件
+    DLabel *title = new DLabel(ui->titlebar);
+    title->setText(tr("Spark Store"));
+
+    backButton = new DPushButton(ui->titlebar);
+
+    searchEdit = new DSearchEdit(ui->titlebar);
+    searchEdit->setPlaceholderText(tr("Search or enter spk://"));
+
+    downloadButton = new ProgressButton(ui->titlebar);
+    downloadButton->setDownloadListWidget(downloadlistwidget);
+    downloadButton->setFocusPolicy(Qt::FocusPolicy::ClickFocus);
+    downloadlistwidget->setFocusProxy(downloadButton);
+
+    QWidget *w_titlebar = new QWidget(ui->titlebar);
+    QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
+    ly_titlebar->addWidget(title);
+    ly_titlebar->addWidget(backButton);
+    // Check wayland configs
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (!config.value("runtime/isDDE").toBool() && config.value("runtime/useWayland").toBool())
+    {
+        // Wayland 搜索栏居中
+        ly_titlebar->addStretch(WaylandSearchCenter);
+    }
+    else
+    {
+        // dwayland dxcb 搜索栏顶部右侧居中
+        ly_titlebar->addStretch(OtherSearchCenter);
+    }
+    ly_titlebar->addWidget(searchEdit);
+    ly_titlebar->addWidget(downloadButton);
+    ly_titlebar->addStretch(RightSearchSpace);
+    ui->titlebar->setCustomWidget(w_titlebar);
+
+    initTitleBarMenu();
+
+    backButton->hide();
+    downloadlistwidget->hide();
+}
+
+void MainWindow::initTitleBarMenu()
+{
     QAction *actionSubmission = new QAction(tr("Submit App"), this);
     QAction *actionSubmissionWithClient = new QAction(tr("Submit App with client(Recommanded)"), this);
     QAction *setting = new QAction(tr("Settings"));
     QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings"));
-    QMenu *menu = new QMenu;
+    QMenu *menu = new QMenu(ui->titlebar);
     menu->addAction(setting);
     menu->addAction(upgrade);
     menu->addAction(actionSubmission);
     menu->addAction(actionSubmissionWithClient);
 
     ui->titlebar->setMenu(menu);
-    connect(actionSubmission, &QAction::triggered, this, [=]{QDesktopServices::openUrl(QUrl("https://upload.deepinos.org/"));});
-    connect(setting, &QAction::triggered, this, [=]{
+
+    connect(actionSubmission, &QAction::triggered, this, [=]
+            { QDesktopServices::openUrl(QUrl(UploadServerUrl)); });
+    connect(setting, &QAction::triggered, this, [=]
+            {
         switchPage(AppPageSettings);
-        ui->settingspage->updateUI();
-    });
-    connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");});
+        ui->settingspage->updateUI(); });
+    connect(upgrade, &QAction::triggered, this, [=]
+            { QProcess::startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh", QStringList()); });
     // 投稿器
     connect(actionSubmissionWithClient, &QAction::triggered, this, [=]
             {
@@ -56,31 +212,75 @@ MainWindow::MainWindow(QWidget *parent)
                 if (actionSubmissionClientStatus.exists())
                 {
                     qDebug() << "投稿器存在";
-                QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter");
+                    QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter", QStringList());
                 }
-            else{
+                else
+                {
                     qDebug() << "投稿器不存在，跳转页面";
                     openUrl(submitterSpk);
+                } });
+}
+
+void MainWindow::initLeftMenu()
+{
+    // 侧边栏按钮
+    foreach (QAbstractButton *button, ui->buttonGroup->buttons())
+    {
+        button->setStyleSheet("QPushButton{qproperty-icon: url(data/images/userMangaer/teacher.png);}");
+        connect(button, &QPushButton::toggled, [=](bool checked)
+                {
+            if (checked == true) {
+                searchEdit->clearEdit();
+                updateUi(ui->buttonGroup->buttons().indexOf(button));
+            } });
     }
+}
 
-        });
+void MainWindow::initTrayIcon()
+{
+    trayIcon->setToolTip(tr("Spark Store"));
 
+    QMenu *menu = new QMenu(this);
+    QAction *showAction = new QAction(QObject::tr("Show MainWindow"), menu);
+    QAction *aboutAction = new QAction(qApp->translate("TitleBarMenu", "About"), menu);
+    QAction *exitAction = new QAction(qApp->translate("TitleBarMenu", "Exit"), menu);
+    menu->addAction(showAction);
+    menu->addAction(aboutAction);
+    menu->addAction(exitAction);
+    trayIcon->setContextMenu(menu);
 
-    //主题切换
-    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) {
+    connect(showAction, &QAction::triggered, this, [=]()
+            {
+        showWindowAnimation = false;
+        closeWindowAnimation = false;
+
+        setWindowState(windowState() & Qt::WindowActive);
+        activateWindow();
+        show(); });
+    connect(aboutAction, &QAction::triggered, this, [=]()
+            {
+        qobject_cast<Application *>(qApp)->handleAboutAction(); });
+    connect(exitAction, &QAction::triggered, this, [=]()
+            {
+        qobject_cast<Application *>(qApp)->quit(); });
+
+    trayIcon->show();
+}
+
+void MainWindow::initConnections()
+{
+    // 主题切换
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType)
+            {
         if (themeType == DGuiApplicationHelper::DarkType) {
             //深色模式
             setMaskColor(QColor("#2a2b2b"));
-            this->setStyleSheet("#mainpage{background-color: transparent;border-radius:14px;}\
-                                QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color:#FFFFFF}\
-                                ");
-            backButtom->setIcon(QIcon(":/icon/dark/back.svg"));
+            backButton->setIcon(QIcon(":/icon/dark/back.svg"));
             downloadButton->setIcon(":/icon/dark/download.svg");
             downloadButton->setBackgroundColor(QColor("#444444"));
             downloadButton->setColor(QColor("#66CCFF"));
             ui->pushButton_14->setIcon(QIcon(":/icon/dark/update.svg"));
-            int i = 0;
-            while (i < ui->buttonGroup->buttons().size()) {
+            for (int i = 0; i < ui->buttonGroup->buttons().size(); i++) {
                 ui->buttonGroup->buttons()[i]->setIcon(QIcon(":/icon/dark/leftbutton_" + QString::number(i) + ".svg"));
                 if (QLocale::system().name() == "zh_CN") {
                     ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;}\
@@ -91,21 +291,16 @@ MainWindow::MainWindow(QWidget *parent)
                                                                   QPushButton:hover{background-color:#7a7a7a;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}\
                                                                   QPushButton:checked{background-color:#6e6e6e;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}");
                 }
-                i++;
             }
         } else {
             //亮色模式
             setMaskColor(QColor("#f3f7f8"));
-            this->setStyleSheet("#mainpage{background-color: transparent;border-radius:14px;}\
-                                QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color:#000000}\
-                                ");
-            backButtom->setIcon(QIcon(":/icon/light/back.svg"));
+            backButton->setIcon(QIcon(":/icon/light/back.svg"));
             downloadButton->setBackgroundColor(QColor("#e3e4e4"));
             downloadButton->setColor(QColor("#66CCFF"));
             downloadButton->setIcon(":/icon/light/download.svg");
             ui->pushButton_14->setIcon(QIcon(":/icon/light/update.svg"));
-            int i = 0;
-            while (i < ui->buttonGroup->buttons().size()) {
+            for (int i = 0; i < ui->buttonGroup->buttons().size(); i++) {
                 ui->buttonGroup->buttons()[i]->setIcon(QIcon(":/icon/light/leftbutton_" + QString::number(i) + ".svg"));
                 if (QLocale::system().name() == "zh_CN") {
                     ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;}\
@@ -116,169 +311,144 @@ MainWindow::MainWindow(QWidget *parent)
                                                                   QPushButton:hover{background-color:#eAeAeA;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}\
                                                                   QPushButton:checked{background-color:#dddddd;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}");
                 }
-                i++;
             }
         }
         ui->pushButton_14->setStyleSheet(ui->pushButton_4->styleSheet());
         ui->applistpage->setTheme(themeType == DGuiApplicationHelper::DarkType);
         ui->applistpage_1->setTheme(themeType == DGuiApplicationHelper::DarkType);
         ui->appintopage->setTheme(themeType == DGuiApplicationHelper::DarkType);
-        ui->settingspage->setTheme(themeType == DGuiApplicationHelper::DarkType);
+        ui->settingspage->setTheme(themeType == DGuiApplicationHelper::DarkType); });
+
+    // appintopage按下下载按钮时标题栏下载列表按钮抖动
+    connect(ui->appintopage, &AppIntoPage::clickedDownloadBtn, [=]()
+            {
+                WidgetAnimation::widgetShake(downloadButton, 6); // 第一个参数是抖动的控件，第二个参数是抖动范围（像素）
             });
 
-    //初始化标题栏控件
-    connect(downloadButton, &ProgressButton::clicked, [=]() {
-        QPoint pos;
-        pos.setX(downloadButton->mapToGlobal(QPoint(0, 0)).x() + downloadButton->width() / 2 - downloadlistwidget->width() / 2);
-        pos.setY(downloadButton->mapToGlobal(QPoint(0, 0)).y() + downloadButton->height() + 5);
-        downloadlistwidget->m_move(pos.x(), pos.y());
-        downloadlistwidget->show();
-    });
-
-    //appintopage按下下载按钮时标题栏下载列表按钮抖动
-    connect(ui->appintopage, &AppIntoPage::clickedDownloadBtn, [=]() {
-        WidgetAnimation::widgetShake(downloadButton,6);//第一个参数是抖动的控件，第二个参数是抖动范围（像素）
-    });
-
-    connect(backButtom, &QPushButton::clicked, [=]() {
+    connect(backButton, &QPushButton::clicked, [=]()
+            {
         ui->stackedWidget->setCurrentIndex(pageHistory.at(pageHistory.count() - 2));
         pageHistory.removeLast();
         if (pageHistory.count() > 1) {
-            backButtom->show();
+            backButton->show();
         } else {
-            backButtom->hide();
-        }
-    });
-    downloadlistwidget->hide();
-    backButtom->hide();
-    ui->titlebar->setIcon(QIcon::fromTheme(":/icon/logo.svg"));
-    QWidget *w_titlebar = new QWidget(ui->titlebar);
-    QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
-    QLabel *title = new QLabel(this);
-    title->setText(tr("Spark Store"));
-    searchEdit->setPlaceholderText(tr("Search or enter spk://"));
-    ly_titlebar->addWidget(title);
-    ly_titlebar->addWidget(backButtom);
-    ly_titlebar->addStretch(2.5);
-    ly_titlebar->addWidget(searchEdit);
-    ly_titlebar->addWidget(downloadButton);
-    ly_titlebar->addStretch(1);
-    ui->titlebar->setCustomWidget(w_titlebar);
-    //侧边栏按钮
-    int i = 0;
-    while (i < ui->buttonGroup->buttons().size()) {
-        ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{qproperty-icon: url(data/images/userMangaer/teacher.png);}");
-        connect(ui->buttonGroup->buttons()[i], &QPushButton::toggled, [=](bool checked) {
-            if (checked == true) {
-                searchEdit->clearEdit();
-                updateUi(i);
-            }
-        });
-        i++;
-    }
+            backButton->hide();
+        } });
 
     // 搜索事件
-    connect(searchEdit, &DSearchEdit::returnPressed, this, [=]() {
+    connect(searchEdit, &DSearchEdit::returnPressed, this, [=]()
+            {
         QString searchtext = searchEdit->text();
         if (!searchtext.isEmpty()) {
             if (searchtext.startsWith("spk://")) {
-                openUrl(QUrl(searchtext));
+                openUrl(searchtext);
                 searchEdit->clearEdit();
             } else {
+                if (searchtext == "%")
+                {
+                    qWarning() << "keyword '%' matches too many results, which will cause QtWebEngine crash.";
+                }
+                else
+                {
                     ui->applistpage_1->getSearchList(searchtext);
                     switchPage(AppPageSearchlist);
                 }
             }
-        this->setFocus();
-    });
+        }
+        this->setFocus(); });
 
-    connect(downloadlistwidget, &DownloadListWidget::downloadProgress, this, [=](int i) {
-        downloadButton->setProgress(i);
-    });
+    connect(downloadlistwidget, &DownloadListWidget::downloadProgress, this, [=](int i)
+            { downloadButton->setProgress(i); });
     // 列表点击事件
-    connect(ui->applistpage, &AppListPage::clicked, this, [=](QUrl spk) {
-        openUrl(spk);
-    });
-    connect(ui->applistpage_1, &AppListPage::clicked, this, [=](QUrl spk) {
-        openUrl(spk);
-    });
-    connect(ui->settingspage, &SettingsPage::openUrl, this, [=](QUrl spk) {
-        openUrl(spk);
-    });
-    emit DGuiApplicationHelper::instance()->themeTypeChanged(DGuiApplicationHelper::instance()->themeType());
+    connect(ui->applistpage, &AppListPage::clicked, this, [=](QUrl spk)
+            { openUrl(spk.toString()); });
+    connect(ui->applistpage_1, &AppListPage::clicked, this, [=](QUrl spk)
+            { openUrl(spk.toString()); });
+    connect(ui->settingspage, &SettingsPage::openUrl, this, [=](QUrl spk)
+            { openUrl(spk.toString()); });
 
-    initDbus();
-}
-
-MainWindow::~MainWindow()
-{
-    delete searchEdit;
-    delete downloadlistwidget;
-    delete ui;
-}
-
-void MainWindow::initDbus()
-{
-    DBusSparkStoreService *dbusInter = new DBusSparkStoreService(this);
-
-    QDBusConnection::sessionBus().registerService("com.gitee.spark.store");
-    QDBusConnection::sessionBus().registerObject("/com/gitee/spark/store", "com.gitee.spark.store", this);
-    connect(dbusInter,&DBusSparkStoreService::sigOpenUrl,this,&MainWindow::onGetUrl);
-}
-
-void MainWindow::onGetUrl(const QString &url)
-{
-    if(url.left(6)=="spk://")
+    // 托盘图标点击事件
+    connect(trayIcon, &QSystemTrayIcon::activated, this, [=](QSystemTrayIcon::ActivationReason reason)
             {
-        openUrl(QUrl(url));
-    }
+        switch (reason) {
+        case QSystemTrayIcon::Trigger:
+        {
+            showWindowAnimation = false;
+            closeWindowAnimation = false;
+
+            setWindowState(windowState() & Qt::WindowActive);
             activateWindow();
-}
+            show();
 
-void MainWindow::openUrl(QUrl url)
-{
-    if (url.toString().startsWith("spk://")) {
-        ui->appintopage->openUrl(QUrl(url.toString().replace("+","%2B")));
-        switchPage(AppPageAppdetail);
-    } else {
-        QDesktopServices::openUrl(QUrl(url.toString().replace("+","%2B")));
+            Q_FALLTHROUGH();
         }
+        default:
+            break;
+        } });
+
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::newProcessInstance, this, &MainWindow::onNewProcessInstance);
 }
 
-void MainWindow::initConfig()
+void MainWindow::initTmpDir()
 {
     // 新建临时文件夹
     QDir dir;
     dir.mkpath("/tmp/spark-store");
+
+    // 检查写入权限
+    QFileInfo info("/tmp/spark-store");
+
+    if (info.isWritable() == false)
+    {
+        QtConcurrent::run([=]
+                          {
+            sleep(3);
+            auto upgradeP = new QProcess();
+            upgradeP->startDetached("zenity", QStringList() << "--warning"
+                                                            << "--text"
+                                                            << "用户未拥有 /tmp/spark-store 写入权限，星火商店会因此工作异常，请检查！"
+                                                            << "--title"
+                                                            << "权限受限提示"
+                                                            << "--width"
+                                                            << "360"
+                                                            );
+            upgradeP->waitForStarted();
+            upgradeP->waitForFinished(30);
+            upgradeP->deleteLater(); });
+    }
 }
 
-void MainWindow::switchPage(int now) //临时方案，回家后修改
+void MainWindow::switchPage(int now) // 临时方案，回家后修改
 {
     qDebug() << pageHistory.count();
-    if (pageHistory.count() >= 1) {
-        backButtom->show();
-    } else {
-        backButtom->hide();
+    if (pageHistory.count() >= 1)
+    {
+        backButton->show();
+    }
+    else
+    {
+        backButton->hide();
     }
     ui->stackedWidget->setCurrentIndex(now);
+    ui->stackedWidget->currentWidget()->setFocus();
     pageHistory << now;
 }
 
-//刷新界面
+// 刷新界面
 void MainWindow::updateUi(int now)
 {
     pageHistory.clear();
     QStringList itemlist;
     itemlist << ""
              << "network"
-                 << "relations"
-                 << "musicandsound"
-                 << "videos"
-                 << "photos"
+             << "chat"
+             << "music"
+             << "video"
+             << "image_graphics"
              << "games"
              << "office"
              << "reading"
-                 << "programming"
+             << "development"
              << "tools"
              << "themes"
              << "others";
@@ -287,44 +457,69 @@ void MainWindow::updateUi(int now)
     switchPage(AppPageApplist);
 }
 
+void MainWindow::notify(QObject *receiver, QEvent *event)
+{
+    if (!receiver) {
+        return;
+    }
+
+    Dtk::Widget::DStyle *o_ptr = qobject_cast<Dtk::Widget::DStyle *>(receiver);
+    if (o_ptr) {
+        return;
+    }
+
+    if (receiver->inherits("QWidgetWindow")
+        || receiver->inherits("QStyleSheetStyle")) {
+        return;
+    }
+
+    if (event->type() == QEvent::FocusIn) {
+        QList<QObject *> list = downloadButton->findChildren<QObject *>(QString(), Qt::FindChildrenRecursively);
+        list << downloadlistwidget->findChildren<QObject *>(QString(), Qt::FindChildrenRecursively);
+        if (receiver != downloadButton && receiver != downloadlistwidget && !list.contains(receiver)) {
+            downloadlistwidget->hide();
+        }
+    } else if (event->type() == QEvent::FocusOut) {
+        if (!downloadlistwidget->isActiveWindow() && !isActiveWindow()) {
+            downloadlistwidget->hide();
+        }
+    }
+}
+
 void MainWindow::on_pushButton_14_clicked()
 {
-    QFile upgradeStatus("/tmp/spark-store/upgradeStatus.txt");
-    if (!upgradeStatus.exists()){
-        QtConcurrent::run([=]{
+    // Check UOS
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (config.contains("UOS/EnableDeveloperMode") && !config.value("UOS/EnableDeveloperMode").toBool())
+    {
+        qDebug() << "UOS Developer Mode has not been enabled!";
+        QtConcurrent::run([=]
+                          {
             auto upgradeP = new QProcess();
-            upgradeP->startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh");
+            upgradeP->startDetached("zenity", QStringList() << "--info"
+                                                            << "--text"
+                                                            << "UOS开发者模式未开启，相关功能被禁用"
+                                                            << "--title"
+                                                            << "功能禁用提示"
+                                                            << "--width"
+                                                            << "360"
+                                                            );
+            upgradeP->waitForStarted();
+            upgradeP->waitForFinished(30);
+            upgradeP->deleteLater(); });
+    }
+    else
+    {
+        QFile upgradeStatus("/tmp/spark-store/upgradeStatus.txt");
+        if (!upgradeStatus.exists())
+        {
+            QtConcurrent::run([=]
+                              {
+            auto upgradeP = new QProcess();
+            upgradeP->startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh", QStringList());
             upgradeP->waitForStarted();
             upgradeP->waitForFinished(-1);
-        });
-    }
-}
-
-
-/// @brief 窗口关闭事件
-/// @param event 
-void MainWindow::closeEvent(QCloseEvent *event)
-{
-    if (!closeWindowAnimation) {
-        QPropertyAnimation *animation = new QPropertyAnimation(this, "windowOpacity");
-        animation->setEasingCurve(QEasingCurve::OutQuart);
-        animation->setDuration(500);
-        animation->setStartValue(1.0);
-        animation->setEndValue(0.0);
-
-        QObject::connect(animation, &QPropertyAnimation::valueChanged, this, [=](const QVariant &value){
-            this->update();
-            // setWindowTitle(QString("ヾ(⌒∇⌒*)See You♪ - %1%").arg(int(value.toFloat() * 100)));
-        });
-
-        QObject::connect(animation, &QPropertyAnimation::finished, this, [=](){
-            closeWindowAnimation = true;
-            this->close();
-        });
-
-        animation->start();
-        event->ignore();
-    } else {
-        event->accept();
+            upgradeP->deleteLater(); });
+        }
     }
 }

src/mainwindow-dtk.h

@@ -1,21 +1,15 @@
 #ifndef MAINWINDOWDTK_H
 #define MAINWINDOWDTK_H
 
+#include "widgets/base/basewidgetopacity.h"
+
 #include <DMainWindow>
-#include <DBlurEffectWidget>
 #include <DTitlebar>
+#include <DPushButton>
 #include <DSearchEdit>
-#include <QGraphicsDropShadowEffect>
 #include <DGuiApplicationHelper>
 
-#include <QPushButton>
-#include <QDir>
-#include <QDesktopServices>
-
-#include "widgets/downloadlistwidget.h"
-#include "widgets/common/progressbutton.h"
-#include "utils/widgetanimation.h"
-#include "dbus/dbussparkstoreservice.h"
+#include <QSystemTrayIcon>
 
 DWIDGET_USE_NAMESPACE
 
@@ -23,40 +17,55 @@ namespace Ui {
 class MainWindow;
 }
 
-class MainWindow : public DBlurEffectWidget
+class ProgressButton;
+class DownloadListWidget;
+class MainWindow : public BaseWidgetOpacity
 {
     Q_OBJECT
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);
-    ~MainWindow();
+    ~MainWindow() override;
 
-    void openUrl(QUrl);
+    void openUrl(const QString &url);
+
+    bool isCloseWindowAnimation();
+
+protected:
+    void closeEvent(QCloseEvent *event) override;
 
 private:
+    void initUI();
+    void initTitleBar();
+    void initTitleBarMenu();
+    void initLeftMenu();
+    void initTrayIcon();
+    void initConnections();
     void initDbus();
-    void initConfig();
+    void initTmpDir();
     void switchPage(int now);
     void updateUi(int now);
 
-private:
-    QList<int> pageHistory;
-
-    DownloadListWidget *downloadlistwidget;
-    ProgressButton *downloadButton;
-    QPushButton *backButtom;
-    DSearchEdit *searchEdit = new DSearchEdit;
-    Ui::MainWindow *ui;
+public slots:
+    void notify(QObject *receiver, QEvent *event);
 
 private slots:
     //接受来自dbus的url
     void onGetUrl(const QString &url);
+    void onNewProcessInstance(qint64 pid, const QStringList &arguments);
     void on_pushButton_14_clicked();
 
-    // QWidget interface
-protected:
-    bool closeWindowAnimation = false;
-    void closeEvent(QCloseEvent *event) override;
+private:
+    Ui::MainWindow *ui;
+
+    DPushButton *backButton;
+    DSearchEdit *searchEdit;
+    ProgressButton *downloadButton;
+    DownloadListWidget *downloadlistwidget;
+
+    QSystemTrayIcon *trayIcon = nullptr;
+
+    QList<int> pageHistory;
 };
 
 #endif // MAINWINDOWDTK_H

src/mainwindow-dtk.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1190</width>
-    <height>651</height>
+    <height>656</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -34,6 +34,12 @@
      <property name="autoFillBackground">
       <bool>true</bool>
      </property>
+     <property name="styleSheet">
+      <string notr="true">.QWidget#mainpage {
+    background: transparent;
+    border-radius: 14px;
+}</string>
+     </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="leftMargin">
        <number>0</number>

src/pages/appintopage.cpp

@@ -1,84 +1,45 @@
 #include "appintopage.h"
 #include "ui_appintopage.h"
-AppIntoPage::AppIntoPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::AppIntoPage)
+#include "backend/sparkapi.h"
+#include "widgets/downloadlistwidget.h"
+#include "widgets/common/downloaditem.h"
+#include "backend/image_show.h"
+#include "application.h"
+#include "utils/utils.h"
+
+#include <QtConcurrent>
+#include <QClipboard>
+#include <QFile>
+
+#include <DSysInfo>
+
+AppIntoPage::AppIntoPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::AppIntoPage)
+    , api(new SparkAPI(this))
 {
-    ui->setupUi(this);
-    ui->listWidget->setViewMode(QListView::IconMode);
-    ui->listWidget->setMovement(QListView::Static);
-    ui->listWidget->setMaximumHeight(200);
-    ui->listWidget->setFlow(QListView::TopToBottom);
-    api1=new SparkAPI(this);
-    connect(api1,&SparkAPI::finishedRAW,[=](QString download_times){
-        download_times.remove(QRegExp("\\n"));
-        ui->download_times->setText(download_times);
-        qDebug()<<"Download Times:"+download_times;
-    });
-    clear();
+    initUI();
+    initConnections();
 }
 
-void AppIntoPage::clear()
+AppIntoPage::~AppIntoPage()
 {
-    ui->tag_a2d->hide();
-    ui->tag_uos->hide();
-    ui->tag_dtk5->hide();
-    ui->tag_deepin->hide();
-    ui->tag_dwine2->hide();
-    ui->tag_dwine5->hide();
-    ui->tag_ubuntu->hide();
-    ui->tag_community->hide();
-    ui->icon->clear();
-    ui->title->clear();
-    ui->author->clear();
-    ui->label_2->clear();
-    ui->downloadButton->hide();
-    ui->downloadButton->setEnabled(true);
-    ui->pushButton_3->hide();
-    int n=ui->listWidget->count();
-    for(int i=0;i<n;i++)
+    delete ui;
+}
+
+void AppIntoPage::openUrl(const QUrl &url)
+{
+    clear();
+
+    //    qDebug() << url;
+    spk = url;
+
+    SparkAPI *api1 = new SparkAPI(this);
+    connect(api1, &SparkAPI::finishedObject, [=](const QJsonObject &appinfo)
             {
-        QListWidgetItem *item = ui->listWidget->takeItem(0);
-        QWidget *card = ui->listWidget->itemWidget(item);
-        delete card;
-        card  = NULL;
-        delete item;
-        item  = NULL;
-    }
-    ui->listWidget->clear();
-}
-void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
-{
-    dw=w;
-    connect(w, &DownloadListWidget::downloadFinished, [=]() {
-        isDownloading(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString());
-    });
-}
-void AppIntoPage::openUrl(QUrl url)
-{
-    spk=url;
-    SparkAPI *api=new SparkAPI(this);
-    clear();
-    connect(api,&SparkAPI::finishedObject,[=](QJsonObject appinfo){
-
         info = appinfo;
-//        qDebug()<<url;
-        //获取图标
-        QNetworkAccessManager *naManager;
-        QNetworkRequest request;
-        naManager=new QNetworkAccessManager(this);
-        qDebug()<<api->getImgServerUrl()+"store"+url.path().replace("+","%2B") + "/icon.png";
-        request.setUrl(QUrl(api->getImgServerUrl()+"store"+url.path().replace("+","%2B") + "/icon.png"));
-        request.setRawHeader("User-Agent", "Mozilla/5.0");
-        request.setRawHeader("Content-Type", "charset='utf-8'");
-        naManager->get(request);
-        QObject::connect(naManager,&QNetworkAccessManager::finished,[=](QNetworkReply *reply){
-                QByteArray jpegData = reply->readAll();
-                iconpixmap.loadFromData(jpegData);
-                iconpixmap.scaled(210, 200, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-                ui->icon->setPixmap(iconpixmap);
-                ui->icon->setScaledContents(true);
-            });
+
+        // 显示基本信息
         ui->title->setText(info["Name"].toString());
         ui->version->setText(info["Version"].toString());
         ui->author->setText(info["Author"].toString());
@@ -86,31 +47,97 @@ void AppIntoPage::openUrl(QUrl url)
         ui->d_size->setText(info["Size"].toString());
         ui->d_update->setText(info["Update"].toString());
         ui->d_pkgname->setText(info["Pkgname"].toString());
-        ui->d_website->setText("<a href=\""+info["Website"].toString()+"\">"+tr("Click Open"));
+        ui->d_website->setText("<a href=\"" + info["Website"].toString() + "\">" + tr("Click Open"));
         ui->d_contributor->setText(info["Contributor"].toString());
         ui->label_2->setText(info["More"].toString());
 
+        // 显示 tags
+        QStringList taglist = info["Tags"].toString().split(";", QString::SkipEmptyParts);
+        setAppinfoTags(taglist);
+
+        // 获取图标
+        QNetworkRequest request;
+        QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+        QString pkgUrlBase = api->getImgServerUrl() + SparkAPI::getArchDir() + url.path();
+        qDebug() << "Icon URL: " << pkgUrlBase + "/icon.png";
+        request.setUrl(QUrl(pkgUrlBase + "/icon.png"));
+        request.setRawHeader("User-Agent", "Mozilla/5.0");
+        request.setRawHeader("Content-Type", "charset='utf-8'");
+        manager->get(request);
+        QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
+            {
+                QByteArray jpegData = reply->readAll();
+                iconpixmap.loadFromData(jpegData);
+                iconpixmap.scaled(210, 200, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+                ui->icon->setPixmap(iconpixmap);
+                ui->icon->setScaledContents(true);
+
+                manager->deleteLater(); });
+
+        // 获取截图
+
+        for (int i = 0; i < 5 /* 魔法数字，最多五个截图 */; i++)
+        {
+            QString imgUrl = pkgUrlBase + "/screen_" + QString::number(i + 1) + ".png";
+            QNetworkRequest request;
+            QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+            request.setUrl(QUrl(imgUrl));
+            request.setRawHeader("User-Agent", "Mozilla/5.0");
+            request.setRawHeader("Content-Type", "charset='utf-8'");
+            manager->get(request);
+            QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
+                {
+                    QByteArray jpegData = reply->readAll();
+                    QPixmap pixmap;
+                    if (pixmap.loadFromData(jpegData))
+                    {
+                        pixmap.scaled(100, 100, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+                        image_show *img = new image_show(this);
+                        img->setImage(pixmap);
+                        // img->setScaledContents(true);
+                        QListWidgetItem *pItem = new QListWidgetItem();
+                        pItem->setSizeHint(QSize(280, 200));
+                        ui->listWidget->addItem(pItem);
+                        ui->listWidget->setItemWidget(pItem, img);
+                        qDebug() << imgUrl;
+                    }
+
+                    manager->deleteLater(); 
+                });
+        }
+
+        // Check UOS
+        QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+        if (config.contains("UOS/EnableDeveloperMode") && !config.value("UOS/EnableDeveloperMode").toBool()){
+            qDebug() << "UOS Developer Mode has not been enabled!";
+            ui->downloadButton->setText(tr("Developer Mode Disabled"));
+            ui->downloadButton->setEnabled(false);
+            ui->downloadButton->show();
+        }
+        else // 非 UOS 或 UOS 已经开启开发者模式
+        {
             QProcess isInstall;
             bool isInstalled;
             bool isUpdated;
             QString packagename = info["Pkgname"].toString();
-        isInstall.start("dpkg -s " + info["Pkgname"].toString());
-        qDebug()<<info["Pkgname"].toString();
-        isInstall.waitForFinished(180*1000); // 默认超时 3 分钟
+            isInstall.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString());
+            qDebug() << info["Pkgname"].toString();
+            isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
             int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
-        if(error == 0)
+            if (error == 0)
             {
                 isInstalled = true;
 
                 QProcess isUpdate;
-                    isUpdate.start("dpkg-query --showformat='${Version}' --show " + info["Pkgname"].toString());
-                    isUpdate.waitForFinished(180*1000); // 默认超时 3 分钟
+                isUpdate.start("dpkg-query", QStringList() << "--showformat='${Version}'"
+                                                           << "--show" << info["Pkgname"].toString());
+                isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
                 QString localVersion = isUpdate.readAllStandardOutput();
                 localVersion.replace("'", "");
 
-                    isUpdate.start("dpkg --compare-versions " + localVersion + " ge " + info["Version"].toString());
-                    isUpdate.waitForFinished(180*1000); // 默认超时 3 分钟
-                    if(!isUpdate.exitCode())
+                isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
+                isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
+                if (!isUpdate.exitCode())
                 {
                     isUpdated = true;
                 }
@@ -125,9 +152,9 @@ void AppIntoPage::openUrl(QUrl url)
                 isUpdated = false;
             }
 
-        if(isInstalled)
+            if (isInstalled)
             {
-            if(isUpdated)
+                if (isUpdated)
                 {
                     ui->downloadButton->setText(tr("Reinstall"));
                     ui->downloadButton->setEnabled(true);
@@ -145,131 +172,57 @@ void AppIntoPage::openUrl(QUrl url)
             else
             {
                 ui->downloadButton->setText(tr("Download"));
-            isDownloading(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString());
                 ui->downloadButton->setEnabled(true);
                 ui->downloadButton->show();
             }
 
-        QStringList taglist = info["Tags"].toString().split(";");
-        QString tmp=info["img_urls"].toString();
-        qDebug()<<tmp;
-        if(tmp.left(2)=="[\"")
-        {
-            tmp.remove(0,2);
+            isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString());
         }
-        if(tmp.right(2)=="\"]")
-        {
-            tmp.remove(tmp.size()-2,tmp.size());
-        }
-        QStringList imglist = tmp.split("\",\"");
-        qDebug()<<imglist;
-        for(int i=0;i < imglist.size();i++)
-        {
-            QNetworkAccessManager *naManager;
-            QNetworkRequest request;
-            naManager=new QNetworkAccessManager(this);
-            request.setUrl(QUrl(imglist[i].replace("+","%2B")));
-            request.setRawHeader("User-Agent", "Mozilla/5.0");
-            request.setRawHeader("Content-Type", "charset='utf-8'");
-            naManager->get(request);
-            QObject::connect(naManager,&QNetworkAccessManager::finished,[=](QNetworkReply *reply){
-                    QByteArray jpegData = reply->readAll();
-                    QPixmap pixmap;
-                    pixmap.loadFromData(jpegData);
-                    pixmap.scaled(100, 100, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-                    image_show *img=new image_show(this);
-                    img->setImage(pixmap);
-                    //img->setScaledContents(true);
-                    QListWidgetItem* pItem = new QListWidgetItem();
-                    pItem->setSizeHint(QSize(280, 200));
-                    ui->listWidget->addItem(pItem);
-                    ui->listWidget->setItemWidget(pItem, img);
-                });
-        }
-        this->sltAppinfoTags(&taglist);
-        disconnect(api,&SparkAPI::finished,nullptr,nullptr);
-        api->deleteLater();
-    });
-    api->getAppInfo(url);
-    api1->getAppDownloadTimes(url);
+
+        api1->disconnect();
+        api1->deleteLater(); });
+
+    api1->getAppInfo(url);
+
+    api->getAppDownloadTimes(url);
 }
 
-void AppIntoPage::isDownloading(QUrl url)
+void AppIntoPage::clear()
 {
-    if(dw->getUrlList().lastIndexOf(url) == -1)
-    {
-        ui->downloadButton->setEnabled(true);
-        return;
-    }else{
+    ui->tag_a2d->hide();
+    ui->tag_uos->hide();
+    ui->tag_dtk5->hide();
+    ui->tag_deepin->hide();
+    ui->tag_dwine2->hide();
+    ui->tag_dwine5->hide();
+    ui->tag_ubuntu->hide();
+    ui->tag_community->hide();
+    ui->icon->clear();
+    ui->title->clear();
+    ui->version->clear();
+    ui->author->clear();
+    ui->d_author->clear();
+    ui->d_size->clear();
+    ui->d_update->clear();
+    ui->d_pkgname->clear();
+    ui->d_website->clear();
+    ui->d_contributor->clear();
+    ui->label_2->clear();
+    ui->downloadButton->hide();
     ui->downloadButton->setEnabled(false);
-    }
-    if(dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->download == 2)
-    {
-        ui->downloadButton->setEnabled(true);
-        ui->downloadButton->setText(tr("Download"));
-    }
-    if(dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->download == 1)
-    {
-        ui->downloadButton->setEnabled(true);
-        ui->downloadButton->setText(tr("Install"));
-    }
-    if(dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->isInstall)
-    {
-        ui->downloadButton->setEnabled(false);
-        ui->downloadButton->setText(tr("Installing"));
-    }
-    if(dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->download == 3)
-    {
-        ui->downloadButton->setEnabled(true);
-        ui->downloadButton->setText(tr("Reinstall"));
-        ui->downloadButton->show();
-        ui->pushButton_3->show();
-    }
+    ui->pushButton_3->hide();
+
+
+
+    ui->listWidget->clear(); // NOTE: QListWidget::clear() 会析构所有 items
 }
 
-void AppIntoPage::sltAppinfoTags(QStringList *tagList)
-{
-    foreach(const QString &tag, *tagList)
-    {
-        if(tag=="community")
-        {
-            ui->tag_community->show();
-        }
-        else if(tag=="ubuntu")
-        {
-            ui->tag_ubuntu->show();
-        }
-        else if(tag=="deepin")
-        {
-            ui->tag_deepin->show();
-        }
-        else if(tag=="uos")
-        {
-            ui->tag_uos->show();
-        }
-        else if(tag=="dtk5")
-        {
-            ui->tag_dtk5->show();
-        }
-        else if(tag=="dwine2")
-        {
-            ui->tag_dwine2->show();
-        }
-        else if(tag=="dwine5")
-        {
-            ui->tag_dwine5->show();
-        }
-        else if(tag=="a2d")
-        {
-            ui->tag_a2d->show();
-        }
-    }
-}
 void AppIntoPage::setTheme(bool dark)
 {
-    if(dark)
+    if (dark)
     {
-        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4{background-color: #252525;border-radius:14px;border:1px solid rgb(64, 64, 64);}";
+        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4 {background-color: #252525; border-radius: 14px; border: 1px solid rgb(64, 64, 64);}\
+                                  QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color: #FFFFFF}";
         ui->frame->setStyleSheet(frameStyleSheet);
         ui->frame_2->setStyleSheet(frameStyleSheet);
         ui->frame_3->setStyleSheet(frameStyleSheet);
@@ -281,9 +234,12 @@ void AppIntoPage::setTheme(bool dark)
         ui->icon_4->setPixmap(QPixmap(":/icon/dark/text.svg"));
         ui->icon_5->setPixmap(QPixmap(":/icon/dark/folder.svg"));
         ui->icon_6->setPixmap(QPixmap(":/icon/dark/globe.svg"));
-    }else {
+    }
+    else
+    {
         //亮色模式
-        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4{background-color: #fbfbfb;border-radius:14px;border:1px solid rgb(229,229,229);}";
+        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4 {background-color: #fbfbfb; border-radius: 14px; border: 1px solid rgb(229,229,229);}\
+                                  QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color: #000000}";
         ui->frame->setStyleSheet(frameStyleSheet);
         ui->frame_2->setStyleSheet(frameStyleSheet);
         ui->frame_3->setStyleSheet(frameStyleSheet);
@@ -295,30 +251,211 @@ void AppIntoPage::setTheme(bool dark)
         ui->icon_4->setPixmap(QPixmap(":/icon/light/text.svg"));
         ui->icon_5->setPixmap(QPixmap(":/icon/light/folder.svg"));
         ui->icon_6->setPixmap(QPixmap(":/icon/light/globe.svg"));
-
     }
 }
-AppIntoPage::~AppIntoPage()
+
+void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
 {
-    delete ui;
+    if (dw)
+    {
+        dw->deleteLater();
+        dw = nullptr;
+    }
+
+    dw = w;
+    connect(w, &DownloadListWidget::downloadFinished, [=]()
+    { isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); });
+}
+
+void AppIntoPage::initUI()
+{
+    ui->setupUi(this);
+
+    ui->listWidget->setViewMode(QListView::IconMode);
+    ui->listWidget->setFlow(QListView::TopToBottom);
+    ui->listWidget->setMovement(QListView::Static);
+    ui->listWidget->setMaximumHeight(200);
+
+    clear();
+}
+
+void AppIntoPage::initConnections()
+{
+    connect(api, &SparkAPI::finishedRAW, [=](QString download_times)
+            {
+        download_times = download_times.trimmed();
+        qDebug() << "Download Times:" + download_times;
+        ui->download_times->setText(download_times); });
+}
+
+void AppIntoPage::isDownloading(const QUrl &url)
+{
+    int index = dw->getUrlList().lastIndexOf(url);
+    if (index == -1)
+    {
+        ui->downloadButton->setEnabled(true);
+        return;
+    }
+
+    DownloadItem *item = dw->getDIList().at(index);
+    if (item == nullptr)
+    {
+        ui->downloadButton->setEnabled(true);
+        return;
+    }
+
+    ui->downloadButton->setEnabled(false);
+    ui->pushButton_3->hide();
+    if (item->download == 2)
+    {
+        ui->downloadButton->setEnabled(true);
+        ui->downloadButton->setText(tr("Download"));
+    }
+    if (item->download == 1)
+    {
+        ui->downloadButton->setEnabled(true);
+        ui->downloadButton->setText(tr("Install"));
+    }
+    if (item->isInstall)
+    {
+        ui->downloadButton->setEnabled(false);
+        ui->downloadButton->setText(tr("Installing"));
+        return;
+    }
+    if (item->download == 3)
+    {
+        ui->downloadButton->setEnabled(true);
+        ui->downloadButton->setText(tr("Reinstall"));
+        ui->downloadButton->show();
+        ui->pushButton_3->show();
+    }
+}
+
+void AppIntoPage::setAppinfoTags(const QStringList &tagList)
+{
+    bool ubuntuSupport = false;
+    bool deepinSupport = false;
+    bool uosSupport = false;
+    foreach (const QString &tag, tagList)
+    {
+        if (tag == "community")
+        {
+            ui->tag_community->show();
+        }
+        else if (tag == "ubuntu")
+        {
+            ui->tag_ubuntu->show();
+            ubuntuSupport = true;
+        }
+        else if (tag == "deepin")
+        {
+            ui->tag_deepin->show();
+            deepinSupport = true;
+        }
+        else if (tag == "uos")
+        {
+            ui->tag_uos->show();
+            uosSupport = true;
+
+        }
+        else if (tag == "dtk5")
+        {
+            ui->tag_dtk5->show();
+        }
+        else if (tag == "dwine2")
+        {
+            ui->tag_dwine2->show();
+        }
+        else if (tag == "dwine5")
+        {
+            ui->tag_dwine5->show();
+        }
+        else if (tag == "a2d")
+        {
+            ui->tag_a2d->show();
+        }
+    }
+    notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport);
+}
+
+void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport)
+{
+    bool isDeepin = Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Deepin;
+    bool isUOS = Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Uos;
+    bool checkdeepin = (isDeepin && !deepinSupport);
+    bool checkuos = (isUOS && !uosSupport);
+    bool isUbuntu = false;
+    if (!checkdeepin && !checkuos)
+    {
+        // 检查是否为 ubuntu 系统
+        QFile lsb("/etc/lsb-release");
+        if (!lsb.open(QIODevice::ReadOnly))
+        {
+            qDebug() << "打开 /etc/lsb-release 失败";
+        }
+        else if (lsb.readAll().contains("Ubuntu"))
+        {
+            isUbuntu = true;
+            lsb.close();
+        }
+    }
+    bool checkubuntu = (isUbuntu && !ubuntuSupport);
+
+    if (checkdeepin)
+    {
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support deepin, there may be problems"));
+    }
+    else if (checkuos)
+    {
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support UOS, there may be problems"));
+    }
+    else if (checkubuntu)
+    {
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support Ubuntu, there may be problems"));
+    }
+    else if (!isUbuntu && !isDeepin && !isUOS)
+    {
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support current platform, there may be problems"));
+    }
+
+    return;
 }
 
 void AppIntoPage::on_downloadButton_clicked()
 {
-    if(ui->downloadButton->text() == tr("Install"))
+    QString downloadUrl = SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString();
+    if (ui->downloadButton->text() == tr("Install"))
+    {
+        DownloadItem *item = dw->getDIList()[dw->getUrlList().lastIndexOf(downloadUrl)];
+        if (item == nullptr)
         {
-        dw->getDIList()[dw->getUrlList().lastIndexOf(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString())]->install(0);
-        isDownloading(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString());
             return;
         }
+
+        connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+
+        item->install(0);
+        isDownloading(downloadUrl);
+
+        return;
+    }
+
     emit clickedDownloadBtn();
-    dw->addItem(info["Name"].toString(),info["Filename"].toString(),info["Pkgname"].toString(),iconpixmap,SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString());
-    if(ui->downloadButton->text() == tr("Reinstall"))
+
+    DownloadItem *item = dw->addItem(info["Name"].toString(), info["Filename"].toString(), info["Pkgname"].toString(), iconpixmap, downloadUrl);
+    if (item == nullptr)
     {
-        dw->getDIList()[dw->allDownload - 1]->reinstall = true;
+        return;
+    }
+
+    if (ui->downloadButton->text() == tr("Reinstall"))
+    {
+        item->reinstall = true;
     }
     ui->downloadButton->setEnabled(false);
-    isDownloading(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString());
+    connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+
+    isDownloading(downloadUrl);
 }
 
 void AppIntoPage::on_pushButton_3_clicked()
@@ -338,7 +475,7 @@ void AppIntoPage::on_pushButton_3_clicked()
 
         if (check.readAllStandardOutput().isEmpty())
         {
-                                        ui->downloadButton->setText(tr("Install"));
+            ui->downloadButton->setText(tr("Download"));
             ui->pushButton_3->hide();
 
             updatesEnabled();
@@ -353,24 +490,23 @@ void AppIntoPage::on_pushButton_3_clicked()
 void AppIntoPage::on_shareButton_clicked()
 {
     qDebug() << "Share" << spk;
-    Utils::sendNotification("spark-store",tr("Spark Store"),tr("The URL has been copied to the clipboard"));
-    QClipboard *clipboard = QApplication::clipboard();
-    clipboard->setText(spk.toString());
-}
+    Application::clipboard()->setText(spk.toString());
 
+    Utils::sendNotification("spark-store", tr("Spark Store"), tr("The URL has been copied to the clipboard"));
+}
 
 void AppIntoPage::on_updateButton_clicked()
 {
     QString feedbackSpk = "spk://store/chat/store.spark-app.feedback";
-    QFile actionSubmissionClientStatus("/opt/durapps/store.spark-app.feedback");
-    if (actionSubmissionClientStatus.exists())
+    QFileInfo actionSubmissionClientStatus("/opt/durapps/store.spark-app.feedback");
+    if (actionSubmissionClientStatus.exists() && actionSubmissionClientStatus.isDir())
     {
         qDebug() << "反馈器存在";
-        QProcess::startDetached("sh /opt/durapps/store.spark-app.feedback/launch.sh");
+        QProcess::startDetached("sh", QStringList() << "/opt/durapps/store.spark-app.feedback/launch.sh");
     }
-    else{
+    else
+    {
         qDebug() << "反馈器不存在，跳转页面";
         openUrl(feedbackSpk);
     }
 }
-

src/pages/appintopage.h

@@ -2,51 +2,53 @@
 #define APPINTOPAGE_H
 
 #include <QWidget>
+#include <QJsonObject>
 #include <QUrl>
-#include <QString>
-#include <QtConcurrent>
-#include <QClipboard>
-#include "backend/sparkapi.h"
-#include "backend/image_show.h"
-#include "widgets/downloadlistwidget.h"
-#include "utils/utils.h"
+
 namespace Ui {
 class AppIntoPage;
 }
 
+class SparkAPI;
+class DownloadListWidget;
 class AppIntoPage : public QWidget
 {
     Q_OBJECT
 
 public:
-    void clear();
-    void setDownloadWidget(DownloadListWidget *w);
-    void setTheme(bool dark);
-    void openUrl(QUrl url);
     explicit AppIntoPage(QWidget *parent = nullptr);
-    ~AppIntoPage();
+    ~AppIntoPage() override;
 
-private slots:
-    void on_downloadButton_clicked();
-
-    void on_pushButton_3_clicked();
-
-    void on_shareButton_clicked();
-
-    void on_updateButton_clicked();
+    void openUrl(const QUrl &url);
+    void clear();
+    void setTheme(bool dark);
+    void setDownloadWidget(DownloadListWidget *w);
 
 private:
-    SparkAPI *api1;
-    QJsonObject info;
-    QPixmap iconpixmap;
-    QUrl spk;
-    void isDownloading(QUrl url);
-    void sltAppinfoTags(QStringList *tagList);
-    DownloadListWidget *dw;
-    Ui::AppIntoPage *ui;
+    void initUI();
+    void initConnections();
+    void isDownloading(const QUrl &url);
+    void setAppinfoTags(const QStringList &tagList);
+    void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport);
 
 signals:
     void clickedDownloadBtn();
+
+private slots:
+    void on_downloadButton_clicked();
+    void on_pushButton_3_clicked();
+    void on_shareButton_clicked();
+    void on_updateButton_clicked();
+
+private:
+    Ui::AppIntoPage *ui;
+
+    SparkAPI *api;
+    DownloadListWidget *dw = nullptr;
+
+    QJsonObject info;
+    QPixmap iconpixmap;
+    QUrl spk;
 };
 
 #endif // APPINTOPAGE_H

src/pages/appintopage.ui

@@ -426,10 +426,10 @@
               </size>
              </property>
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/ubuntu-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -540,10 +540,10 @@
               </size>
              </property>
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will automatically configure the wine kit for you&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A Wine app.Spark Store will automatically configure the wine kit for you&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will automatically configure the wine kit for you&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A Wine app.Spark Store will automatically configure the wine kit for you&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine5-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -762,7 +762,7 @@
                   </font>
                  </property>
                  <property name="text">
-                  <string>Description</string>
+                  <string>Introduction</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

src/pages/applistpage.cpp

@@ -1,8 +1,9 @@
 #include "applistpage.h"
 #include "ui_applistpage.h"
 
-AppListPage::AppListPage(QWidget *parent) :
-    QWidget(parent),
+
+
+AppListPage::AppListPage(QWidget *parent) : QWidget(parent),
                                             ui(new Ui::AppListPage)
 {
     ui->setupUi(this);
@@ -10,49 +11,83 @@ AppListPage::AppListPage(QWidget *parent) :
 }
 void AppListPage::setTheme(bool dark)
 {
-    isDark=dark;
-    if(dark)
+    isDark = dark;
+    if (dark)
     {
         this->setStyleSheet("#frame{background-color: #252525;border-radius:14px;border:1px solid rgb(64, 64, 64);}");
-    }else {
-        //亮色模式
+    }
+    else
+    {
+        // 亮色模式
         this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}");
     }
-    if(isSearch)
+    if (isSearch)
     {
         getSearchList(nowType);
-    }else{
+    }
+    else
+    {
         getAppList(nowType);
     }
 }
 void AppListPage::getAppList(QString type)
 {
-    isSearch=false;
-    nowType=type;
-    SparkAPI *api=new SparkAPI(this);
+    isSearch = false;
+    nowType = type;
+    SparkAPI *api = new SparkAPI(this);
     QString url;
-    if(isDark)
+    QString theme;
+    if (isDark)
     {
-        url=api->getServerUrl()+"store/#/dark"+type;
-    }else{
-        url=api->getServerUrl()+"store/#/"+type;
+        theme = "theme=dark";
+    #ifdef __aarch64__
+        theme = "dark";
+    #endif
     }
+    else
+    {
+        theme = "theme=light";
+    #ifdef __aarch64__
+        theme = "";
+    #endif
+    }
+    if (type == "")
+    {
+        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme;
+    #ifdef __aarch64__
+        url = api->getServerUrl() + "aarch64-store/#/"+ theme;
+    #endif
+    }
+    else
+    {
+        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme;
+    #ifdef __aarch64__
+        url = api->getServerUrl() + "aarch64-store/#/"+ theme + type;
+    #endif
+    }
+
     ui->webEngineView->setUrl(url);
+    delete api;
 }
 
-void AppListPage::getSearchList(QString keyword)
+void AppListPage::getSearchList(const QString &keyword)
 {
-    isSearch=true;
-    nowType=keyword;
-    SparkAPI *api=new SparkAPI(this);
+    isSearch = true;
+    nowType = keyword;
+    SparkAPI *api = new SparkAPI(this);
     QString url;
-    if(isDark)
+    QString theme;
+    if (isDark)
     {
-        url=api->getServerUrl()+"store/#/darksearch?keywords="+keyword;
-    }else{
-        url=api->getServerUrl()+"store/#/search?keywords="+keyword;
+        theme = "theme=dark";
     }
+    else
+    {
+        theme = "theme=light";
+    }
+    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme;
     ui->webEngineView->setUrl(url);
+    delete api;
 }
 
 AppListPage::~AppListPage()
@@ -62,15 +97,14 @@ AppListPage::~AppListPage()
 
 void AppListPage::on_webEngineView_urlChanged(const QUrl &arg1)
 {
-    if(arg1.path().right(8) == "app.json")
+    if (arg1.path().right(8) == "app.json")
     {
         QString url = arg1.toString();
-            url = url.mid(url.indexOf("/store/"));
-            url = "spk:/"+url;
-            url = url.mid(0,url.indexOf("/app.json"));
+        url = url.mid(url.indexOf("/" + SparkAPI::getArchDir() + "/"));
+        url = "spk:/" + url;
+        url = url.mid(0, url.indexOf("/app.json"));
         qDebug() << "程序跳转链接地址：" << url;
         ui->webEngineView->back();
         emit clicked(url);
     }
 }
-

src/pages/applistpage.h

@@ -14,7 +14,7 @@ class AppListPage : public QWidget
 
 public:
     void setTheme(bool dark);
-    void getSearchList(QString keyword);
+    void getSearchList(const QString &keyword);
     void getAppList(QString type);
     explicit AppListPage(QWidget *parent = nullptr);
     ~AppListPage();

src/pages/settingspage.cpp

@@ -1,21 +1,37 @@
 #include "settingspage.h"
 #include "ui_settingspage.h"
+#include "../backend/sparkapi.h"
+#include "utils/utils.h"
+
+#include <QSettings>
+#include <QtConcurrent>
+#include <QDebug>
+
+#define TMP_PATH "/tmp/spark-store"
+#define DEFAULT_SERVER_URL "https://cdn.d.store.deepinos.org.cn/"
+#define DEFAULT_CHECK_DOMAIN "deepinos"
+
 bool SettingsPage::isdownload = false;
-SettingsPage::SettingsPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::SettingsPage)
+
+SettingsPage::SettingsPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::SettingsPage)
 {
     ui->setupUi(this);
+
+    configCanSave = false;
     initConfig();
 }
 
 void SettingsPage::setTheme(bool dark)
 {
-    if(dark)
+    if (dark)
     {
         this->setStyleSheet("#frame{background-color: #252525;border-radius:14px;border:1px solid rgb(64, 64, 64);}");
-    }else {
-        //亮色模式
+    }
+    else
+    {
+        // 亮色模式
         this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}");
     }
 }
@@ -23,38 +39,44 @@ void SettingsPage::setTheme(bool dark)
 void SettingsPage::readServerList()
 {
     // 读取服务器列表并初始化
-    QFile file(QDir::homePath().toUtf8() + "/.config/spark-store/server.list");
+    QFile file(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list");
 
-    //判断文件是否存在
+    // 判断文件是否存在
     if (!file.exists())
     {
-        ui->comboBox_server->addItem("https://d.store.deepinos.org.cn/");
+        ui->comboBox_server->addItem(DEFAULT_SERVER_URL);
+        return;
     }
 
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
-        qDebug()<<"无法读取server.list";
+        qWarning() << "无法读取 server.list";
+        return;
     }
 
-    //创建QTextStream对象
+    // 创建 QTextStream 对象
     QTextStream textStream(&file);
-
-    QString lineData = textStream.readLine();//读取文件的第一行
+    if (!textStream.readAll().contains(DEFAULT_CHECK_DOMAIN)) // 校验配置文件有效性
+    {
+        return;
+    }
+    textStream.seek(0);                       // 回到开头
+    QString lineData = textStream.readLine(); // 读取文件的第一行
     ui->comboBox_server->addItem(lineData);
-    while(!lineData.isNull())
+    while (!lineData.isNull())
     {
         lineData = textStream.readLine();
         ui->comboBox_server->addItem(lineData);
     }
-    for(int i = 0; i < ui->comboBox_server->count(); i++)
+    for (int i = 0; i < ui->comboBox_server->count(); i++)
     {
-        if(ui->comboBox_server->itemText(i) == "开发者模式 Dev only")
+        if (ui->comboBox_server->itemText(i) == "开发者模式 Dev only")
         {
             ui->comboBox_server->model()->setData(ui->comboBox_server->model()->index(i, 0), QVariant(0), Qt::UserRole - 1);
         }
-        if(ui->comboBox_server->itemText(i) == "镜像源 Download only")
+        if (ui->comboBox_server->itemText(i) == "镜像源 Download only")
         {
-            for(int j = i; j < ui->comboBox_server->count(); j++)
+            for (int j = i; j < ui->comboBox_server->count(); j++)
             {
                 ui->comboBox_server->model()->setData(ui->comboBox_server->model()->index(j, 0), QVariant(0), Qt::UserRole - 1);
             }
@@ -69,13 +91,14 @@ void SettingsPage::initConfig()
     readServerList();
 
     // 读取服务器URL并初始化菜单项的链接
-    QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
-    if(!readConfig.value("server/choose").toString().isEmpty() && readConfig.value("server/updated").toString() == "TRUE")
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (!config.value("server/choose").toString().isEmpty() && config.value("server/updated").toBool())
     {
-        ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString());
-        SparkAPI::setServerUrl(readConfig.value("server/choose").toString());
+        qDebug() << config.value("server/choose").toString();
+        ui->comboBox_server->setCurrentText(config.value("server/choose").toString());
+        SparkAPI::setServerUrl(config.value("server/choose").toString());
     }
-    configCanSave = true;   //　防止触发保存配置信号
+    configCanSave = true; // 　防止触发保存配置信号
 }
 
 SettingsPage::~SettingsPage()
@@ -88,31 +111,40 @@ void SettingsPage::on_pushButton_updateServer_clicked()
     QtConcurrent::run([=]()
                       {
         ui->pushButton_updateServer->setEnabled(false);
-        ui->comboBox_server->clear();
 
-        QFile::remove(QDir::homePath().toUtf8() + "/.config/spark-store/server.list");
-        system("curl -o " + QDir::homePath().toUtf8() + "/.config/spark-store/server.list https://d.store.deepinos.org.cn/store/server-and-mirror.list");
 
+        QFile::remove(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list");
+        auto updateSuccess = system("curl -o " + QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).toUtf8() + "/server.list " /* 注意空格的问题 */ + DEFAULT_SERVER_URL + "store/server-and-mirror.list");
+        qDebug() << "Update serverlist status:" << updateSuccess;
+        if (updateSuccess != 0) // 更新失败不换服务器配置
+        {
+            QFile file(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list");
+            if (file.exists())
+            {
+                file.remove();
+            }
+            // FIXME: 向用户提示更新失败
+            ui->pushButton_updateServer->setEnabled(true);
+            return;
+        }
+        ui->comboBox_server->clear();
         ui->pushButton_updateServer->setEnabled(true);
-        ui->comboBox_server->setCurrentIndex(0);
-
         readServerList();
-    });
+        ui->comboBox_server->setCurrentIndex(0); });
 }
 
-
 void SettingsPage::on_comboBox_server_currentIndexChanged(const QString &arg1)
 {
     SparkAPI::setServerUrl(arg1); // 服务器信息更新
-
-    const QString updatedInfo = "TRUE";
+    qDebug() << arg1;
+    bool updatedInfo = true;
     if(configCanSave)
     {
         // ui->label_setting1->show();
-        QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
-        setConfig->setValue("server/choose", arg1);
-        setConfig->setValue("server/updated", updatedInfo);
-        setConfig->deleteLater();
+        QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+        config.setValue("server/choose", arg1);
+        config.setValue("server/updated", updatedInfo);
+        config.sync();
     }
 }
 
@@ -123,7 +155,7 @@ void SettingsPage::setIsDownload(bool isdownload)
 
 void SettingsPage::updateUI()
 {
-    if(isdownload)
+    if (isdownload)
     {
         ui->pushButton_clear->setEnabled(false);
     }
@@ -134,15 +166,15 @@ void SettingsPage::updateUI()
     // 显示缓存占用空间
     quint64 tmp_size = dirFileSize(QString::fromUtf8(TMP_PATH));
     QString tmp_size_str;
-    if(tmp_size < 1024)
+    if (tmp_size < 1024)
     {
         tmp_size_str = QString::number(tmp_size) + "B";
     }
-    else if(tmp_size < (1024 * 1024))
+    else if (tmp_size < (1024 * 1024))
     {
         tmp_size_str = QString::number(0.01 * int(100 * (tmp_size / 1024))) + "KB";
     }
-    else if(tmp_size<(1024*1024*1024))
+    else if (tmp_size < (1024 * 1024 * 1024))
     {
         tmp_size_str = QString::number(0.01 * int(100 * (tmp_size / (1024 * 1024)))) + "MB";
     }
@@ -159,13 +191,13 @@ quint64 SettingsPage::dirFileSize(const QString &path)
     QDir dir(path);
     quint64 size = 0;
     // dir.entryInfoList(QDir::Files);  // 返回文件信息
-    foreach(QFileInfo fileInfo, dir.entryInfoList(QDir::Files))
+    foreach (QFileInfo fileInfo, dir.entryInfoList(QDir::Files))
     {
         // 计算文件大小
         size += quint64(fileInfo.size());
     }
     // dir.entryList(QDir::Dirs|QDir::NoDotAndDotDot);  // 返回所有子目录，并进行过滤
-    foreach(QString subDir, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
+    foreach (QString subDir, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
     {
         // 若存在子目录，则递归调用 dirFileSize() 函数
         size += dirFileSize(path + QDir::separator() + subDir);
@@ -187,14 +219,13 @@ void SettingsPage::on_pushButton_updateApt_clicked()
     });
 }
 
-
 void SettingsPage::on_pushButton_clear_clicked()
 {
     QtConcurrent::run([=]()
                       {
         ui->pushButton_clear->setEnabled(false);
 
-        QDir tmpdir("/tmp/spark-store");
+        QDir tmpdir(QString::fromUtf8(TMP_PATH));
         tmpdir.setFilter(QDir::Files);
         int quantity = int(tmpdir.count());
         for(int i = 0; i < quantity; i++)
@@ -203,23 +234,21 @@ void SettingsPage::on_pushButton_clear_clicked()
         }
         Utils::sendNotification("spark-store",tr("Spark Store"),tr("Temporary cache was cleaned"));
         ui->pushButton_clear->setEnabled(true);
-        updateUI();
-    });
+        updateUI(); });
 }
 
-
 void SettingsPage::on_pushButton_clearWebCache_clicked()
 {
     QtConcurrent::run([=]()
     {
-        QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
-        qDebug() << dataLocal;
-        QDir dataDir(dataLocal);
+        QString localDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/QtWebEngine";
+        qDebug() << localDataLocation;
+        QDir dataDir(localDataLocation);
         dataDir.removeRecursively();
-        dataLocal = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
-        qDebug() << dataLocal;
-        QDir cacheDir(dataLocal);
+
+        QString cacheLocation = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/QtWebEngine";
+        qDebug() << cacheLocation;
+        QDir cacheDir(cacheLocation);
         cacheDir.removeRecursively();
     });
 }
-

src/pages/settingspage.h

@@ -2,14 +2,7 @@
 #define SETTINGSPAGE_H
 
 #include <QWidget>
-#include <QFile>
-#include <QDir>
-#include <QDebug>
-#include <QSettings>
-#include <QtConcurrent>
-#include "../backend/sparkapi.h"
-#include "utils/utils.h"
-#define TMP_PATH "/tmp/spark-store"
+#include <QUrl>
 
 namespace Ui {
 class SettingsPage;

src/pages/settingspage.ui

@@ -140,7 +140,7 @@
                    </size>
                   </property>
                   <property name="text">
-                   <string>Take effect when restart</string>
+                   <string>Take effect immediately</string>
                   </property>
                  </widget>
                 </item>

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

@@ -1,9 +0,0 @@
-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

@@ -1,195 +0,0 @@
-#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

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui network concurrent webenginewidgets dbus svg
+QT       += core gui concurrent dbus network svg webenginewidgets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -22,75 +22,80 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 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
+# Get build version from qmake
+VERSION = $$BUILD_VERSION
+isEmpty(VERSION): VERSION = 4.0.0
+DEFINES += APP_VERSION=\\\"'$${VERSION}'\\\"
+DEFINES += APP_BRANCH=\\\"'$$system(git symbolic-ref --short -q HEAD)'\\\"
+# Disable qWarning / qDebug output in Release
+#CONFIG(release, debug | release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT
 
 CONFIG += c++11 link_pkgconfig
 PKGCONFIG += dtkcore dtkgui dtkwidget
 
-# Disable qWarning / qDebug output in Release
-CONFIG(release, debug|release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT
+SOURCES += \
+        backend/downloadworker.cpp \
+        backend/image_show.cpp \
+        backend/sparkapi.cpp \
+        dbus/dbussparkstoreservice.cpp \
+        pages/appintopage.cpp \
+        pages/applistpage.cpp \
+        pages/settingspage.cpp \
+        utils/httprequest.cpp \
+        utils/utils.cpp \
+        utils/widgetanimation.cpp \
+        widgets/base/basewidgetopacity.cpp \
+        widgets/common/downloaditem.cpp \
+        widgets/common/progressbutton.cpp \
+        widgets/common/smoothlistwidget.cpp \
+        widgets/common/smoothscrollbar.cpp \
+        widgets/common/webenginepage.cpp \
+        widgets/common/webengineview.cpp \
+        widgets/big_image.cpp \
+        widgets/downloadlistwidget.cpp \
+        application.cpp \
+        main.cpp \
+        mainwindow-dtk.cpp
 
-# Update translation files
-CONFIG(release, debug|release): system(bash $${PWD}/translate_generation.sh)
+HEADERS += \
+        backend/downloadworker.h \
+        backend/image_show.h \
+        backend/sparkapi.h \
+        dbus/dbussparkstoreservice.h \
+        pages/appintopage.h \
+        pages/applistpage.h \
+        pages/settingspage.h \
+        utils/httprequest.h \
+        utils/utils.h \
+        utils/widgetanimation.h \
+        widgets/base/basewidgetopacity.h \
+        widgets/common/downloaditem.h \
+        widgets/common/progressbutton.h \
+        widgets/common/smoothlistwidget.h \
+        widgets/common/smoothscrollbar.h \
+        widgets/common/webenginepage.h \
+        widgets/common/webengineview.h \
+        widgets/big_image.h \
+        widgets/downloadlistwidget.h \
+        application.h \
+        mainwindow-dtk.h
+
+FORMS += \
+        pages/appintopage.ui \
+        pages/applistpage.ui \
+        pages/settingspage.ui \
+        widgets/common/downloaditem.ui \
+        widgets/downloadlistwidget.ui \
+        mainwindow-dtk.ui
+
+RESOURCES += \
+        assets/assets.qrc
 
 TRANSLATIONS += \
         ../translations/spark-store_en.ts \
         ../translations/spark-store_fr.ts \
-    ../translations/spark-store_zh_CN.ts
-
-SOURCES += \
-        dbus/dbussparkstoreservice.cpp \
-        main.cpp \
-        mainwindow-dtk.cpp \
-        backend/sparkapi.cpp \
-        pages/settingspage.cpp \
-        utils/utils.cpp \
-        utils/widgetanimation.cpp \
-        widgets/common/progressbutton.cpp \
-        widgets/common/webenginepage.cpp \
-        widgets/common/webengineview.cpp \
-        widgets/downloadlistwidget.cpp \
-        widgets/common/downloaditem.cpp \
-        widgets/common/smoothlistwidget.cpp \
-        widgets/common/smoothscrollbar.cpp \
-        utils/httprequest.cpp \
-        pages/applistpage.cpp \
-        backend/downloadworker.cpp \
-        pages/appintopage.cpp \
-        widgets/big_image.cpp \
-        backend/image_show.cpp
-
-HEADERS += \
-        dbus/dbussparkstoreservice.h \
-        mainwindow-dtk.h \
-        backend/sparkapi.h \
-        pages/settingspage.h \
-        utils/utils.h \
-        utils/widgetanimation.h \
-        widgets/common/progressbutton.h \
-        widgets/common/webenginepage.h \
-        widgets/common/webengineview.h \
-        widgets/downloadlistwidget.h \
-        widgets/common/downloaditem.h \
-        widgets/common/smoothlistwidget.h \
-        widgets/common/smoothscrollbar.h \
-        utils/httprequest.h \
-        pages/applistpage.h \
-        backend/downloadworker.h \
-        pages/appintopage.h \
-        widgets/big_image.h \
-        backend/image_show.h
-
-FORMS += \
-        mainwindow-dtk.ui \
-        pages/settingspage.ui \
-        widgets/downloadlistwidget.ui \
-        widgets/common/downloaditem.ui \
-        pages/applistpage.ui \
-        pages/appintopage.ui
-
-RESOURCES += \
-        assets/assets.qrc
+        ../translations/spark-store_zh_CN.ts \
+        ../translations/spark-store_zh_TW.ts
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

src/utils/httprequest.cpp

@@ -1,22 +1,19 @@
 #include "httprequest.h"
 
-
-
 HttpRequest::HttpRequest()
 {
-
 }
 
 void HttpRequest::getRequest(QNetworkRequest request)
 {
-    QNetworkAccessManager *naManager=new QNetworkAccessManager(this);
+    QNetworkAccessManager *naManager = new QNetworkAccessManager(this);
 
     request.setRawHeader("User-Agent", "Mozilla/5.0");
     request.setRawHeader("Content-Type", "charset='utf-8'");
     request.setRawHeader("Content-Type", "application/json");
 
     naManager->get(request);
-    QObject::connect(naManager,&QNetworkAccessManager::finished,this,&HttpRequest::readdata_slot);
+    QObject::connect(naManager, &QNetworkAccessManager::finished, this, &HttpRequest::readdata_slot);
 }
 void HttpRequest::readdata_slot(QNetworkReply *reply)
 {
@@ -24,19 +21,19 @@ void HttpRequest::readdata_slot(QNetworkReply *reply)
 }
 QString HttpRequest::postRequest(QString url, QString jsondata)
 {
-    QByteArray array= jsondata.toLatin1();
+    QByteArray array = jsondata.toLatin1();
     QNetworkRequest request;
-    QNetworkAccessManager *naManager=new QNetworkAccessManager(this);
-    QUrl strUrl = url.replace("+","%2B");
+    QNetworkAccessManager *naManager = new QNetworkAccessManager(this);
+    QUrl strUrl = url.replace("+", "%2B");
     request.setUrl(strUrl);
     request.setRawHeader("Content-Type", "charset='utf-8'");
     request.setRawHeader("Content-Type", "application/json");
 
-    QNetworkReply* reply = naManager->post(request, array);
+    QNetworkReply *reply = naManager->post(request, array);
     QEventLoop eventLoop;
-    connect(naManager, SIGNAL(finished(QNetworkReply*)), &eventLoop, SLOT(quit()));
+    connect(naManager, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));
     eventLoop.exec();
-    QTextCodec* codec = QTextCodec::codecForName("utf8");
+    QTextCodec *codec = QTextCodec::codecForName("utf8");
     QString strReply = codec->toUnicode(reply->readAll());
     reply->deleteLater();
     return strReply;

src/utils/utils.cpp

@@ -1,20 +1,33 @@
 #include "utils.h"
+#include "application.h"
 
-Utils::Utils()
+#include <DSysInfo>
+
+#include <QDBusInterface>
+#include <QProcessEnvironment>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QFile>
+#include <QJsonDocument>
+
+#define UOSDeveloperModeFile "/var/lib/deepin/developer-mode/enabled"
+
+/**
+ * @author chatGPT
+ * @brief Utils::sendNotification 发送系统通知
+ * @param icon 图标名称
+ * @param title 通知标题
+ * @param body 通知内容
+ */
+void Utils::sendNotification(const QString &icon, const QString &title, const QString &body)
 {
-
-}
-
-//这个函数是chatGPT写的
-void Utils::sendNotification(QString icon,QString title,QString body)
-{
-    QDBusInterface iface("org.freedesktop.Notifications",
+    QDBusInterface interface("org.freedesktop.Notifications",
                              "/org/freedesktop/Notifications",
                              "org.freedesktop.Notifications");
 
     QVariantList args;
-    args << QCoreApplication::applicationName()  // the name of the application
-         << (uint)0                             // replaces the previous notification with the same ID
+    args << Application::applicationName() // the name of the application
+         << static_cast<quint32>(0)        // replaces the previous notification with the same ID
          << icon                           // the application icon of the notification
          << title                          // the title of the notification
          << body                           // the body of the notification
@@ -22,5 +35,181 @@ void Utils::sendNotification(QString icon,QString title,QString body)
          << QVariantMap()                  // no hints
          << -1;                            // no timeout
 
-    iface.callWithArgumentList(QDBus::AutoDetect, "Notify", args);
+    interface.callWithArgumentList(QDBus::AutoDetect, "Notify", args);
+}
+
+/**
+ * @brief Utils::isDDE 判断是否使用 DDE 桌面环境
+ * @return
+ */
+bool Utils::isDDE()
+{
+    bool isDDE = true;
+    if (!QString::fromUtf8(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin"))
+    {
+        qputenv("XDG_CURRENT_DESKTOP", "Deepin");
+        isDDE = false;
+    }
+
+    return isDDE;
+}
+
+/**
+ * @brief Utils::isWayland 判断是否使用 wayland 显示协议
+ * @return bool true: 使用 wayland 显示协议 false: 使用 x11 显示协议
+ */
+bool Utils::isWayland()
+{
+    bool isWayland = false;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    QString XDG_SESSION_TYPE = env.value(QStringLiteral("XDG_SESSION_TYPE"));
+    QString WAYLAND_DISPLAY = env.value(QStringLiteral("WAYLAND_DISPLAY"));
+    if (XDG_SESSION_TYPE == QLatin1String("wayland") || WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive))
+    {
+        isWayland = true;
+    }
+
+    return isWayland;
+}
+
+/**
+ * @brief Utils::initConfig 初始化 config.ini 配置文件，去除废弃字段
+ */
+void Utils::initConfig()
+{
+    // WARNING: 请在 组织名称 和 应用程序名称 初始化完成后调用
+    bool useWayland = true;
+
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (config.contains("build/useWayland"))
+    {
+        useWayland = config.value("build/useWayland").toBool();
+    }
+    config.remove("build/isDeepinOS");
+    config.remove("build/isWayland");
+    config.remove("build/useWayland");
+
+    config.setValue("runtime/isDDE", isDDE());
+    config.setValue("runtime/isWayland", isWayland());
+    // Check config file, if there is no wayland config, then set it to default, which means use wayland if possible.
+    if (!config.contains("runtime/useWayland"))
+    {
+        config.setValue("runtime/useWayland", useWayland);
+    }
+    config.sync(); // 写入更改至 config.ini，并同步最新内容
+
+    checkUOSDeveloperMode(); // Check UOS developer mode
+}
+
+/**
+ * @brief Utils::isUOS 判断是否为 UOS 操作系统
+ * @return bool true: UOS 操作系统 false: 非 UOS 操作系统
+ */
+bool Utils::isUOS()
+{
+    // WARNING: 请在 组织名称 和 应用程序名称 初始化完成后调用
+    bool isUOS = false;
+
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Uos)
+    {
+        isUOS = true;
+        config.setValue("UOS/isUOS", true);
+    }
+    else
+    {
+        isUOS = false;
+        config.remove("UOS");
+    }
+    config.sync(); // 写入更改至 config.ini，并同步最新内容
+
+    return isUOS;
+}
+
+/**
+ * @brief Utils::setQPAPlatform Set display backend
+ */
+void Utils::setQPAPlatform()
+{
+    // WARNING: 请在 initConfig() 执行后调用
+    bool isDDE = Utils::isDDE(); // WARNING: 只能执行一次，后续执行时环境变量已经被覆盖，导致判断错误
+    bool isWayland = Utils::isWayland();
+
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    bool useWayland = config.value("runtime/useWayland").toBool();
+
+    qDebug() << "System Wayland enabled:" << isWayland << "Spark Wayland enabled:" << useWayland;
+
+    if (isWayland && useWayland && !(Dtk::Core::DSysInfo::isDeepin() || isDDE))
+    {
+        qputenv("QT_QPA_PLATFORM", "wayland");
+    }
+    else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDeepin() && isDDE))
+    {
+        qputenv("QT_QPA_PLATFORM", "dwayland");
+    }
+    else
+    {
+        qputenv("QT_QPA_PLATFORM", "dxcb");
+    }
+}
+
+/**
+ * @brief Utils::checkUOSDeveloperMode Check UOS developer mode
+ */
+void Utils::checkUOSDeveloperMode()
+{
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+
+    QFile file(UOSDeveloperModeFile);
+    if (Utils::isUOS() && file.exists() && file.open(QFile::ReadOnly | QFile::Text))
+    {
+        QString lineData = QString::fromUtf8(file.readLine());
+        bool devmode = lineData.trimmed().toInt();
+        qDebug() << "UOS Developer Mode Status:" << devmode;
+        config.setValue("UOS/EnableDeveloperMode", devmode);
+    }
+    else
+    {
+        /**
+         * NOTE: Utils::isUOS() 中，判断为非 UOS 时已经从 config 中删除 UOS 组，
+         * 此处若包含该字段则一定是 UOS，直接写入开发者模式开关状态即可
+         */
+        if (config.contains("UOS/EnableDeveloperMode"))
+        {
+            config.setValue("UOS/EnableDeveloperMode", false);
+        }
+    }
+    file.close();
+    config.sync(); // 写入更改至 config.ini，并同步最新内容
+}
+
+/**
+ * @brief Utils::parseFeatureJsonFile 解析版本特性 json 文件
+ * @return 返回 QJsonObject
+ */
+QJsonObject Utils::parseFeatureJsonFile()
+{
+    QFile file(":/json/features.json");
+    if (!file.open(QFile::ReadOnly))
+    {
+        qWarning() << Q_FUNC_INFO << "features.json open failed";
+        return QJsonObject();
+    }
+
+    QJsonParseError error;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(file.readAll(), &error);
+    if (error.error != QJsonParseError::NoError || jsonDoc.isNull())
+    {
+        qWarning() << Q_FUNC_INFO << "features.json validate failed:" << error.errorString();
+        return QJsonObject();
+    }
+
+    if (jsonDoc.isEmpty() || !jsonDoc.isObject())
+    {
+        qWarning() << Q_FUNC_INFO << "features jsonDoc parse failed:" << jsonDoc;
+        return QJsonObject();
+    }
+
+    return jsonDoc.object();
 }

src/utils/utils.h

@@ -2,13 +2,19 @@
 #define UTILS_H
 
 #include <QObject>
-#include <QtDBus>
+#include <QJsonObject>
 
 class Utils
 {
 public:
-    Utils();
-    static void sendNotification(QString icon,QString title,QString body);
+    static void sendNotification(const QString &icon, const QString &title, const QString &body);
+    static bool isDDE();
+    static bool isWayland();
+    static void initConfig();
+    static bool isUOS();
+    static void setQPAPlatform();
+    static void checkUOSDeveloperMode();
+    static QJsonObject parseFeatureJsonFile();
 };
 
 #endif // UTILS_H

src/utils/widgetanimation.cpp

@@ -1,47 +1,59 @@
 #include "widgetanimation.h"
-
-WidgetAnimation::WidgetAnimation()
-{
-
-}
+#include "widgets/base/basewidgetopacity.h"
 
 void WidgetAnimation::widgetShake(QWidget *pWidget, int nRange)
 {
     int nX = pWidget->x();
     int nY = pWidget->y();
-    QPropertyAnimation *pAnimation = new QPropertyAnimation(pWidget,"geometry");
+    QPropertyAnimation *pAnimation = new QPropertyAnimation(pWidget, "geometry");
     pAnimation->setEasingCurve(QEasingCurve::InOutSine);
     pAnimation->setDuration(400);
-    pAnimation->setStartValue(QRect(QPoint(nX,nY),pWidget->size()));
+    pAnimation->setStartValue(QRect(QPoint(nX, nY), pWidget->size()));
 
     int nShakeCount = 8;
-    double nStep = 1.0/nShakeCount;
-    for(int i = 1; i < nShakeCount; i++){
-        nRange = i&1 ? -nRange : nRange;
-        pAnimation->setKeyValueAt(nStep*i,QRect(QPoint(nX + nRange,nY),pWidget->size()));
+    double nStep = 1.0 / nShakeCount;
+    for (int i = 1; i < nShakeCount; i++)
+    {
+        nRange = i & 1 ? -nRange : nRange;
+        pAnimation->setKeyValueAt(nStep * i, QRect(QPoint(nX + nRange, nY), pWidget->size()));
     }
 
-    pAnimation->setEndValue(QRect(QPoint(nX,nY),pWidget->size()));
+    pAnimation->setEndValue(QRect(QPoint(nX, nY), pWidget->size()));
     pAnimation->start(QAbstractAnimation::DeleteWhenStopped);
 }
 
+QPropertyAnimation *WidgetAnimation::createWidgetOpacity(QWidget *pWidget, bool isAppear)
+{
+    QPropertyAnimation *animation = new QPropertyAnimation(pWidget, "windowOpacity", pWidget);
+    // 设置动画时间（单位：毫秒）
+    animation->setDuration(500);
+    if (isAppear)
+    {
+        // 设置动画效果
+        animation->setEasingCurve(QEasingCurve::Linear);
+        // 设置动画步长值，以及在该位置时显示的透明度（即动画关键帧）
+        animation->setKeyValueAt(0.0, 0.0);
+        animation->setKeyValueAt(1.0, 1.0);
+    }
+    else
+    {
+        animation->setEasingCurve(QEasingCurve::OutQuart);
+        animation->setKeyValueAt(0.0, 1.0);
+        animation->setKeyValueAt(1.0, 0.0);
+
+        QObject::connect(animation, &QPropertyAnimation::finished, pWidget, [=]() { pWidget->close(); });
+    }
+
+    QObject::connect(animation, &QPropertyAnimation::valueChanged, pWidget, [=]()
+            {
+                pWidget->update(); // NOTE: 保证窗口透明度动画平滑
+            });
+
+    return animation;
+}
+
 void WidgetAnimation::widgetOpacity(QWidget *pWidget, bool isAppear)
 {
-    QPropertyAnimation *animation = new QPropertyAnimation(pWidget, "windowOpacity", pWidget);
-    //设置动画效果
-    animation->setEasingCurve(QEasingCurve::Linear);
-    //设置动画时间（单位：毫秒）
-    animation->setDuration(500);
-    // 设置动画步长值，以及在该位置时显示的透明度
-    if(isAppear)
-    {
-        animation->setKeyValueAt(0, 0);
-        // m_animation->setKeyValueAt(0.5, 0);
-        animation->setKeyValueAt(1, 1);
-    }else{
-        animation->setKeyValueAt(0, 1);
-        animation->setKeyValueAt(1, 0);
-    }
-    // 开始动画
-    animation->start();
+    // 启动/关闭动画
+    createWidgetOpacity(pWidget, isAppear)->start(QPropertyAnimation::DeleteWhenStopped);
 }

src/utils/widgetanimation.h

@@ -1,15 +1,15 @@
 #ifndef WIDGETANIMATION_H
 #define WIDGETANIMATION_H
 
-#include <QObject>
 #include <QWidget>
 #include <QPropertyAnimation>
 
 class WidgetAnimation
 {
 public:
-    WidgetAnimation();
     static void widgetShake(QWidget *pWidget, int nRange);
+
+    static QPropertyAnimation* createWidgetOpacity(QWidget *pWidget, bool isAppear);
     static void widgetOpacity(QWidget *pWidget, bool isAppear);
 };
 

src/widgets/base/basewidgetopacity.cpp

@@ -0,0 +1,61 @@
+#include "basewidgetopacity.h"
+#include "utils/widgetanimation.h"
+#include "utils/utils.h"
+
+#include <QSettings>
+#include <QStandardPaths>
+#include <QPropertyAnimation>
+#include <QCloseEvent>
+
+BaseWidgetOpacity::BaseWidgetOpacity(QWidget *parent) : DBlurEffectWidget(parent)
+{
+}
+
+/**
+ * @brief 窗口显示事件
+ * @param event
+ */
+void BaseWidgetOpacity::showEvent(QShowEvent *event)
+{
+    // FIXME: wayland 不支持直接设置窗口透明度，需要调用 wayland 相关库（考虑抄控制中心“窗口移动时启用透明特效”代码？）
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    bool isWayland = Utils::isWayland();
+    if (!isWayland)
+    {
+        if (!showWindowAnimation)
+        {
+            showWindowAnimation = true;
+            WidgetAnimation::widgetOpacity(this, true);
+        }
+    }
+
+    DBlurEffectWidget::showEvent(event);
+}
+
+/**
+ * @brief 窗口关闭事件
+ * @param event
+ */
+void BaseWidgetOpacity::closeEvent(QCloseEvent *event)
+{
+    // FIXME: wayland 不支持直接设置窗口透明度，需要调用 wayland 相关库（考虑抄控制中心“窗口移动时启用透明特效”代码？）
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    bool isWayland = Utils::isWayland();
+    if (isWayland)
+    {
+        closeWindowAnimation = true;
+        return DBlurEffectWidget::closeEvent(event);
+    }
+
+    if (!closeWindowAnimation)
+    {
+        closeWindowAnimation = true;
+        WidgetAnimation::widgetOpacity(this, false);
+
+        event->ignore();
+    }
+    else
+    {
+        event->accept();
+    }
+}

src/widgets/base/basewidgetopacity.h

@@ -0,0 +1,24 @@
+#ifndef BASEWIDGETOPACITY_H
+#define BASEWIDGETOPACITY_H
+
+#include <DBlurEffectWidget>
+
+DWIDGET_USE_NAMESPACE
+
+class BaseWidgetOpacity : public DBlurEffectWidget
+{
+    Q_OBJECT
+
+public:
+    explicit BaseWidgetOpacity(QWidget *parent = nullptr);
+
+protected:
+    void showEvent(QShowEvent *event) override;
+    void closeEvent(QCloseEvent *event) override;
+
+protected:
+    bool showWindowAnimation = false;
+    bool closeWindowAnimation = false;
+};
+
+#endif // BASEWIDGETOPACITY_H

src/widgets/big_image.cpp

@@ -3,11 +3,10 @@
 #include <QHBoxLayout>
 #include <QtConcurrent>
 
-big_image::big_image(DBlurEffectWidget *parent) :
-    DBlurEffectWidget(parent),
+big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent),
                                                   m_image(new QLabel)
 {
-//    setWindowFlags(this->windowFlags() | Qt::WindowStaysOnTopHint); // 设置图片对话框总在最前
+    //    setWindowFlags(this->windowFlags() | Qt::WindowStaysOnTopHint); // 设置图片对话框总在最前
     setWindowModality(Qt::ApplicationModal); // 以上无效不如直接使用 模态化对话框
     setRadius(0);
     setMaskAlpha(60);

src/widgets/common/downloaditem.cpp

@@ -6,8 +6,7 @@
 
 bool DownloadItem::isInstall = false;
 
-DownloadItem::DownloadItem(QWidget *parent) :
-    QWidget(parent),
+DownloadItem::DownloadItem(QWidget *parent) : QWidget(parent),
                                               reinstall(false),
                                               close(false),
                                               ui(new Ui::DownloadItem),
@@ -23,6 +22,9 @@ DownloadItem::DownloadItem(QWidget *parent) :
     ui->pushButton_3->hide();
     ui->widget_spinner->start();
     ui->widget_spinner->hide();
+
+    ui->label->setElideMode(Qt::TextElideMode::ElideRight);
+    ui->label_2->setElideMode(Qt::TextElideMode::ElideRight);
 }
 
 DownloadItem::~DownloadItem()
@@ -34,10 +36,12 @@ void DownloadItem::setValue(qint64 value)
 {
     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->setToolTip(QString::number(double(value) / 100) + "% (" + speed + ")");
+    if (ui->label_2->text().left(4) == "100%")
     {
         download = 1;
         ui->label_2->setText(tr("Download Complete."));
+        ui->label_2->setToolTip(tr("Download Complete."));
     }
 }
 
@@ -49,6 +53,7 @@ void DownloadItem::setMax(qint64 max)
 void DownloadItem::setName(QString name)
 {
     ui->label->setText(name);
+    ui->label->setToolTip(name);
 }
 
 QString DownloadItem::getName()
@@ -56,16 +61,31 @@ QString DownloadItem::getName()
     return ui->label_filename->text();
 }
 
-void DownloadItem::readyInstall()
+
+/***************************************************************
+  *  @brief     告知界面，准备安装
+  *  @param
+  *  @note      如果正在安装，返回-1
+  *  @Sample usage:     DownloadItem::install(0);
+ **************************************************************/
+int DownloadItem::readyInstall()
 {
-    if(!close)
+    // 检查是否正在安装，如果是返回错误 -1
+    if (isInstall)
+    {
+        return -1;
+    }
+
+    if (!close)
     {
         ui->progressBar->hide();
         ui->pushButton_install->setEnabled(true);
         ui->pushButton_install->show();
         DownloadItem::install(0);
         ui->pushButton_2->hide();
+        return 1;
     }
+    return 0;
 }
 
 void DownloadItem::setFileName(QString fileName)
@@ -88,87 +108,30 @@ void DownloadItem::setSpeed(QString s)
     speed = s;
 }
 
+/***************************************************************
+  *  @brief     安装当前应用
+  *  @param     int t, t为安装方式，可以为 0,1,2
+  *  @note      执行这个函数时，需要已经检查是否可以安装，但该函数仍然会再检测一次！
+  *  @Sample usage:     DownloadItem::install(0);
+ **************************************************************/
 void DownloadItem::install(int t)
 {
-    if(!isInstall)
+    if (!isInstall)
     {
         isInstall = true;
         ui->pushButton_install->hide();
         ui->widget_spinner->show();
         qDebug() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8();
         ui->label_2->setText(tr("Installing"));
+        ui->label_2->setToolTip(tr("Installing"));
 
         QtConcurrent::run([=]()
         {
-            QProcess installer;
-            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;
-            installer.waitForFinished(-1); // 不设置超时
-            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;
-                }
-            }
-
-            QProcess isInstall;
-            isInstall.start("dpkg -s " + pkgName);
-            isInstall.waitForFinished(180*1000); // 默认超时 3 分钟
-            int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
-            if(error == 0)
-            {
-                ui->pushButton_install->hide();
-                Utils::sendNotification("spark-store",tr("Spark Store"),ui->label->text() + " " + tr("Installation complete."));
-                ui->label_2->setText(tr("Finish"));
-                download = 3;
-                ui->pushButton_3->show();
-            }
-            else
-            {
-                ui->pushButton_install->show();
-                ui->pushButton_install->setText(tr("Retry"));
-                download = 1;
-                Utils::sendNotification("spark-store",tr("Spark Store"),tr("Error happened in dpkg progress , you can try it again."));
-                ui->label_2->setText(tr("Error happened in dpkg progress , you can try it again"));
-                ui->pushButton_3->show();
-            }
-
-            if(notRoot)
-            {
-                Utils::sendNotification("spark-store",tr("Spark Store"),tr("dpkg progress had been aborted，you can retry installation."));
-                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();
-            DownloadItem::isInstall = false;
+            slotAsyncInstall(t);
         });
 
-        qDebug()<<ui->label_filename->text().toUtf8();
+        qDebug() << ui->label_filename->text().toUtf8();
     }
-
 }
 
 void DownloadItem::on_pushButton_install_clicked()
@@ -179,6 +142,7 @@ void DownloadItem::on_pushButton_install_clicked()
 void DownloadItem::on_pushButton_2_clicked()
 {
     ui->label_2->setText(tr("Download canceled"));
+    ui->label_2->setToolTip(tr("Download canceled"));
     download = 2;
     ui->pushButton_2->setEnabled(false);
     ui->progressBar->hide();
@@ -198,3 +162,90 @@ void DownloadItem::on_pushButton_3_clicked()
     output_w->layout()->addWidget(textbrowser);
     output_w->show();
 }
+
+/***************************************************************
+  *  @brief     实际安装应用
+  *  @param     int t, t为安装方式，可以为 0,1,2
+  *  @note      备注
+  *  @Sample usage:     slotAsyncInstall(0);
+ **************************************************************/
+void DownloadItem::slotAsyncInstall(int t)
+{
+    QProcess installer;
+    switch (t)
+    {
+    case 0:
+        installer.start("pkexec", QStringList() << "ssinstall"
+                                                << "/tmp/spark-store/" + ui->label_filename->text().toUtf8() << "--delete-after-install");
+        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;
+    installer.waitForFinished(-1); // 不设置超时
+    out = installer.readAllStandardOutput();
+
+    QStringList everyOut = out.split("\n");
+    QString tempOutput;
+    for (int i = 0; i < everyOut.size(); i++)
+    {
+        tempOutput = everyOut[i];
+        if (everyOut[i].left(2) == "E:" || tempOutput.contains("错误") || tempOutput.contains("exit code") || tempOutput.contains("OMG-IT-GOES-WRONG"))
+        {
+            haveError = true;
+        }
+        if (tempOutput.contains("Not authorized"))
+        {
+            notRoot = true;
+        }
+    }
+
+    QProcess isInstall;
+    isInstall.start("dpkg", QStringList() << "-s" << pkgName);
+    isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
+    int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
+    if (error == 0 && !haveError)
+    {
+        ui->pushButton_install->hide();
+        Utils::sendNotification("spark-store", tr("Spark Store"), ui->label->text() + " " + tr("Installation complete."));
+        ui->label_2->setText(tr("Finish"));
+        ui->label_2->setToolTip(tr("Finish"));
+        download = 3;
+        ui->pushButton_3->show();
+    }
+    else
+    {
+        ui->pushButton_install->show();
+        ui->pushButton_install->setText(tr("Retry"));
+        download = 1;
+        Utils::sendNotification("spark-store", tr("Spark Store"), tr("Error happened in dpkg progress , you can try it again."));
+        ui->label_2->setText(tr("Error happened in dpkg progress , you can try it again"));
+        ui->label_2->setToolTip(tr("Error happened in dpkg progress , you can try it again"));
+        ui->pushButton_3->show();
+    }
+
+    if (notRoot)
+    {
+        Utils::sendNotification("spark-store", tr("Spark Store"), tr("dpkg progress had been aborted，you can retry installation."));
+        ui->label_2->setText(tr("dpkg progress had been aborted，you can retry installation"));
+        ui->label_2->setToolTip(tr("dpkg progress had been aborted，you can retry installation"));
+        ui->pushButton_install->show();
+        ui->pushButton_3->hide();
+    }
+
+    ui->widget_spinner->hide();
+    DownloadItem::isInstall = false;
+
+    installer.deleteLater();
+    isInstall.deleteLater();
+
+    emit finished(error == 0 && !haveError && !notRoot);
+}

src/widgets/common/downloaditem.h

@@ -34,7 +34,7 @@ public:
     void setMax(qint64);
     void setName(QString);
     QString getName();
-    void readyInstall();
+    int readyInstall();
 
     void setFileName(QString);
     void seticon(const QPixmap);
@@ -59,8 +59,10 @@ private slots:
     void on_pushButton_2_clicked();
     void on_pushButton_3_clicked();
 
+    void slotAsyncInstall(int t);
+
 signals:
-    void finished();
+    void finished(bool success);
 };
 
 #endif // DOWNLOADITEM_H

src/widgets/common/downloaditem.ui

@@ -7,13 +7,25 @@
     <x>0</x>
     <y>0</y>
     <width>666</width>
-    <height>54</height>
+    <height>56</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>56</height>
+   </size>
+  </property>
   <property name="maximumSize">
    <size>
     <width>16777215</width>
-    <height>54</height>
+    <height>56</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -40,10 +52,22 @@
    </property>
    <item>
     <widget class="QLabel" name="label_3">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>48</width>
+       <height>48</height>
+      </size>
+     </property>
      <property name="maximumSize">
       <size>
        <width>48</width>
-       <height>16777215</height>
+       <height>48</height>
       </size>
      </property>
      <property name="text">
@@ -52,6 +76,9 @@
      <property name="scaledContents">
       <bool>true</bool>
      </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
     </widget>
    </item>
    <item>
@@ -70,6 +97,31 @@
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="DLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>120</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>120</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Name</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QLabel" name="label_filename">
      <property name="maximumSize">
@@ -83,33 +135,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="minimumSize">
-      <size>
-       <width>80</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>13</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>Name</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item>
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
@@ -153,11 +178,14 @@
       <property name="leftMargin">
        <number>0</number>
       </property>
+      <property name="topMargin">
+       <number>8</number>
+      </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>8</number>
       </property>
       <item>
        <widget class="QProgressBar" name="progressBar">
@@ -188,7 +216,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_2">
+       <widget class="DLabel" name="label_2">
         <property name="font">
          <font>
           <pointsize>9</pointsize>
@@ -297,6 +325,11 @@
    <header location="global">dspinner.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>DLabel</class>
+   <extends>QLabel</extends>
+   <header>dlabel.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

src/widgets/common/progressbutton.cpp

@@ -1,112 +1,54 @@
 #include "progressbutton.h"
+#include "widgets/downloadlistwidget.h"
+
 #include <QPainter>
 #include <QPainterPath>
-#include <QRect>
-#include <QConicalGradient>
-#include <QVariantAnimation>
+#include <QMoveEvent>
 #include <QSvgRenderer>
+
 ProgressButton::ProgressButton(QWidget *parent)
     : QWidget{parent}
 {
-    //this->setWindowFlags(Qt::FramelessWindowHint);
-    this->setAttribute(Qt::WA_TranslucentBackground, true);
-    setMinimumWidth(36);
-    setMinimumHeight(36);
-    svgPath="";
-    backColor=Qt::transparent;
-    setMouseTracking(true);
+    // this->setWindowFlags(Qt::FramelessWindowHint);
+    // this->setAttribute(Qt::WA_TranslucentBackground, true);
+    setMinimumSize(36, 36);
 
-    connect(this,&ProgressButton::startProcessing,this,&ProgressButton::operationProcessing,Qt::QueuedConnection);
+    svgPath = "";
+    backColor = Qt::transparent;
+
+    connect(this, &ProgressButton::startProcessing, this, &ProgressButton::operationProcessing, Qt::QueuedConnection);
 }
 
 ProgressButton::~ProgressButton()
 {
 }
 
-void ProgressButton::paintEvent(QPaintEvent *event)
-{
-    QPainter painter(this);
-    painter.setRenderHint(QPainter::Antialiasing,true);
-    auto rect = event->rect();
-
-    if(buttonState == state::normal || buttonState == state::hover)
-    {
-        auto radiu = (rect.height() - 6) / 2;
-        painter.translate(rect.center());
-        painter.setPen(Qt::transparent);
-        painter.setBrush(QColor(buttonState == state::normal ? color : color.darker()));
-        //painter.drawEllipse(QPoint(0,0),radiu,radiu);
-
-        //radiu -= 3;
-        painter.setBrush(backColor);
-        painter.drawEllipse(QPoint(0,0),radiu,radiu);
-
-        QSvgRenderer m_svgRender;
-        m_svgRender.load(svgPath);
-        m_svgRender.render(&painter ,QRectF(-radiu / 2,-radiu / 2,radiu,radiu));
-    }
-    else if(buttonState == state::openProgress)
-    {
-        painter.translate(rect.center());
-        auto radiu = (rect.height() - 6) / 2 -3;
-        painter.setBrush(backColor);
-        painter.setPen(QPen(backColor,3));
-        painter.drawEllipse(QPoint(0,0),radiu,radiu);
-
-        painter.setPen(QPen(backColor,3));
-
-        QSvgRenderer m_svgRender;
-        m_svgRender.load(svgPath);
-        m_svgRender.render(&painter ,QRectF(-radiu / 2,-radiu / 2,radiu,radiu));
-
-        QRect rect = QRect(-radiu, -radiu,
-                           radiu*2, radiu*2);
-
-        painter.setPen(QPen(color.darker(100),3));
-        auto angle = progress * 360 / 100;
-        painter.drawArc(rect.adjusted(-3,-3,3,3),90 * 16,-static_cast<int>(angle * 16));
-    }
-    else if(buttonState == state::closeProgress)
-    {
-        auto radiu = (rect.height() - 6) / 2;
-        painter.translate(rect.center());
-        painter.setPen(Qt::transparent);
-        painter.setBrush(QColor(0, 0, 0, 63));
-        painter.drawEllipse(QPoint(0,0),radiu,radiu);
-
-        radiu -= 3;
-        painter.setBrush(backColor);
-        painter.drawEllipse(QPoint(0,0),radiu,radiu);
-
-        painter.setPen(QPen(color,3,Qt::SolidLine,Qt::RoundCap,Qt::RoundJoin));
-        painter.drawLine(QPoint(-radiu / 3,0),
-                         QPoint(-radiu / 5,radiu / 3));
-        painter.drawLine(QPoint(-radiu / 5,radiu / 3),
-                         QPoint(radiu / 4,-radiu / 4));
-    }
-}
-
 void ProgressButton::setProgress(int progress)
 {
     buttonState = state::openProgress;
     ProgressButton::progress = progress;
-    if(progress == 0)
+    if (progress == 0)
     {
         buttonState = state::normal;
         update();
     }
-    if(progress == 100)
+    if (progress == 100)
     {
         buttonState = state::closeProgress;
         update();
-        auto waterDrop = new WaterDrop();
-        waterDrop->move(this->mapToGlobal(this->rect().center()));
+        WaterDrop *waterDrop = new WaterDrop(parentWidget());
+        waterDrop->move(geometry().center());
         waterDrop->show();
     }
     repaint();
     update();
 }
 
+void ProgressButton::setDownloadListWidget(DownloadListWidget *widget)
+{
+    m_downloadListWidget = widget;
+}
+
 void ProgressButton::setIcon(QString svgPATH)
 {
     svgPath = svgPATH;
@@ -125,9 +67,59 @@ void ProgressButton::setColor(QColor color)
     update();
 }
 
+void ProgressButton::mousePressEvent(QMouseEvent *event)
+{
+    m_mouseMoved = false;
+    m_isDownloadListWidgetVisible = m_downloadListWidget->isVisible();
+    m_downloadListWidget->hide();
+    QWidget::mousePressEvent(event);
+}
+
+void ProgressButton::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (buttonState == state::hover || buttonState == state::normal)
+    {
+        widthChangeValue = (this->width() - 6) / 2;
+        update();
+    }
+    else if (buttonState == state::closeProgress)
+    {
+        update();
+    }
+
+    if (m_mouseMoved) {
+        return QWidget::mouseReleaseEvent(event);
+    }
+
+    if (m_isDownloadListWidgetVisible) {
+        m_downloadListWidget->hide();
+    } else {
+        QPoint pos(this->mapToGlobal(QPoint(0, 0)));
+        pos += QPoint(width() / 2 - m_downloadListWidget->width() / 2, height() + 5);
+        m_downloadListWidget->m_move(pos.x(), pos.y());
+        m_downloadListWidget->setWindowState(windowState() & Qt::WindowState::WindowActive);
+        m_downloadListWidget->activateWindow();
+        m_downloadListWidget->show();
+        m_downloadListWidget->raise();
+    }
+    m_isDownloadListWidgetVisible = m_downloadListWidget->isVisible();
+    QWidget::mouseReleaseEvent(event);
+}
+
+void ProgressButton::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    event->accept();
+}
+
+void ProgressButton::mouseMoveEvent(QMouseEvent *event)
+{
+    m_mouseMoved = true;
+    QWidget::mouseMoveEvent(event);
+}
+
 void ProgressButton::leaveEvent(QEvent *event)
 {
-    if(buttonState == state::hover)
+    if (buttonState == state::hover)
     {
         buttonState = state::normal;
         update();
@@ -135,41 +127,89 @@ void ProgressButton::leaveEvent(QEvent *event)
     QWidget::leaveEvent(event);
 }
 
-void ProgressButton::mousePressEvent(QMouseEvent *event)
+void ProgressButton::paintEvent(QPaintEvent *event)
 {
-    if(buttonState == state::hover || buttonState == state::normal)
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    QRect rect = event->rect();
+
+    if (buttonState == state::normal || buttonState == state::hover)
     {
-        widthChangeValue = (this->width() - 6) / 2;
-        update();
+        int radius = (rect.height() - 6) / 2;
+        painter.translate(rect.center());
+        painter.setPen(Qt::transparent);
+        painter.setBrush(QColor(buttonState == state::normal ? color : color.darker()));
+        // painter.drawEllipse(QPoint(0, 0), radius, radius);
+
+        // radiu -= 3;
+        painter.setBrush(backColor);
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
+
+        QSvgRenderer m_svgRender;
+        m_svgRender.load(svgPath);
+        m_svgRender.render(&painter, QRectF(-radius / 2, -radius / 2, radius, radius));
     }
-    else if(buttonState == state::closeProgress)
+    else if (buttonState == state::openProgress)
     {
-        update();
+        painter.translate(rect.center());
+        int radius = (rect.height() - 6) / 2 - 3;
+        painter.setBrush(backColor);
+        painter.setPen(QPen(backColor, 3));
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
+
+        painter.setPen(QPen(backColor, 3));
+
+        QSvgRenderer m_svgRender;
+        m_svgRender.load(svgPath);
+        m_svgRender.render(&painter, QRectF(-radius / 2, -radius / 2, radius, radius));
+
+        QRect rect = QRect(-radius, -radius,
+                           radius * 2, radius * 2);
+
+        painter.setPen(QPen(color.darker(100), 3));
+        qreal angle = progress * 360 / 100 * 1.0;
+        painter.drawArc(rect.adjusted(-3, -3, 3, 3), 90 * 16, -qIntCast(angle * 16));
     }
-    emit clicked();
-    QWidget::mousePressEvent(event);
+    else if (buttonState == state::closeProgress)
+    {
+        auto radius = (rect.height() - 6) / 2;
+        painter.translate(rect.center());
+        painter.setPen(Qt::transparent);
+        painter.setBrush(QColor(0, 0, 0, 63));
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
+
+        radius -= 3;
+        painter.setBrush(backColor);
+        painter.drawEllipse(QPoint(0, 0), radius, radius);
+
+        painter.setPen(QPen(color, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+        painter.drawLine(QPoint(-radius / 3, 0),
+                         QPoint(-radius / 5, radius / 3));
+        painter.drawLine(QPoint(-radius / 5, radius / 3),
+                         QPoint(radius / 4, -radius / 4));
+    }
+    QWidget::paintEvent(event);
 }
 
 void ProgressButton::operationProcessing()
 {
-
 }
 
 const int RADIUS = 60;
 WaterDrop::WaterDrop(QWidget *parent)
     : QWidget(parent)
-    , m_waterDropAnimation(nullptr)
+    , m_waterDropAnimation(new QVariantAnimation(this))
     , m_animationRadius(0)
 {
     this->setFixedSize(QSize(RADIUS * 2, RADIUS * 2));
-    this->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
-    this->setAttribute(Qt::WA_TranslucentBackground);
-    this->setAttribute(Qt::WA_DeleteOnClose);
-    m_waterDropAnimation = new QVariantAnimation(this);
-//    m_waterDropAnimation->setEasingCurve(QEasingCurve(static_cast<QEasingCurve::Type>(QRandomGenerator::global()->bounded(40))));
+    // this->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
+    // this->setAttribute(Qt::WA_TranslucentBackground);
+    // this->setAttribute(Qt::WA_DeleteOnClose);
+
+    // m_waterDropAnimation->setEasingCurve(QEasingCurve(static_cast<QEasingCurve::Type>(QRandomGenerator::global()->bounded(40))));
 }
 
-//把鼠标点击的点转换为圆心点坐标
+// 把鼠标点击的点转换为圆心点坐标
 void WaterDrop::move(const QPoint &point)
 {
     QPoint translatePoint = point - QPoint(RADIUS, RADIUS);
@@ -182,9 +222,9 @@ void WaterDrop::show()
     m_waterDropAnimation->setEndValue(RADIUS);
     m_waterDropAnimation->setDuration(350);
 
-    connect(m_waterDropAnimation, &QVariantAnimation::valueChanged, this, &WaterDrop::onRaduisChanged);
+    connect(m_waterDropAnimation, &QVariantAnimation::valueChanged, this, &WaterDrop::onRadiusChanged);
     connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::close);
-    m_waterDropAnimation->start();
+    m_waterDropAnimation->start(QVariantAnimation::DeleteWhenStopped);
     QWidget::show();
 }
 
@@ -192,14 +232,15 @@ void WaterDrop::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
-    QPen pen;
-    pen.setColor(QColor(0xffffff80));
+    QPen pen(QBrush(QColor("#ffff80")), 5.0);
     pen.setWidth(5);
     painter.setPen(pen);
-    painter.drawEllipse(event->rect().center(),m_animationRadius, m_animationRadius);
+    painter.drawEllipse(event->rect().center(), m_animationRadius, m_animationRadius);
+
+    QWidget::paintEvent(event);
 }
 
-void WaterDrop::onRaduisChanged(QVariant value)
+void WaterDrop::onRadiusChanged(const QVariant &value)
 {
     m_animationRadius = value.toInt();
     update();

src/widgets/common/progressbutton.h

@@ -1,53 +1,62 @@
 #ifndef PROGRESSBUTTON_H
 #define PROGRESSBUTTON_H
 
-
-#include <QtWidgets/QWidget>
-
-#include <QPaintEvent>
-
+#include <QWidget>
 #include <QTimer>
-#include <QTimerEvent>
-#include<QColor>
-#include <QList>
-#include <QMouseEvent>
-
+#include <QVariantAnimation>
 
+class DownloadListWidget;
 class ProgressButton : public QWidget
 {
     Q_OBJECT
+
 public:
-    ProgressButton(QWidget *parent = nullptr);
+    explicit ProgressButton(QWidget *parent = nullptr);
+    ~ProgressButton() override;
+
     void setIcon(QString svgPATH);
     void setBackgroundColor(QColor color);
     void setColor(QColor color);
     void setProgress(int progress);
-    ~ProgressButton();
+
+    void setDownloadListWidget(DownloadListWidget *widget);
+
+protected:
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseDoubleClickEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void leaveEvent(QEvent *event) override;
+    void paintEvent(QPaintEvent *event) override;
+
 signals:
     void startProcessing();
     void clicked();
 
-protected:
-    void paintEvent(QPaintEvent *event)override;
-    void leaveEvent(QEvent *event)override;
-    void mousePressEvent(QMouseEvent *event)override;
+private slots:
+    void operationProcessing();
 
 private:
-    enum class state
+    enum state
     {
         normal,
         hover,
         openProgress,
         closeProgress,
         recovery
-    }
-    buttonState{state::normal};
+    };
+
+    DownloadListWidget *m_downloadListWidget = nullptr;
+
+    state buttonState{state::normal};
     QColor backColor;
     QColor color;
     QString svgPath;
     int widthChangeValue{0};
-    void operationProcessing();
     int progress{0};//处理百分比
+
+    bool m_mouseMoved = false;
+    bool m_isDownloadListWidgetVisible = true;
 };
 
 class WaterDrop : public QWidget
@@ -55,19 +64,19 @@ class WaterDrop : public QWidget
     Q_OBJECT
 
 public:
-    WaterDrop(QWidget *parent = Q_NULLPTR);
+    explicit WaterDrop(QWidget *parent = nullptr);
     void show();
     void move(const QPoint &point);
 
-private:
+protected:
     void paintEvent(QPaintEvent *event);
-    void onRaduisChanged(QVariant value);
+
+private slots:
+    void onRadiusChanged(const QVariant &value);
 
 private:
-    class QVariantAnimation* m_waterDropAnimation;
+    QVariantAnimation *m_waterDropAnimation = nullptr;
     int m_animationRadius;
 };
 
-
-
 #endif // PROGRESSBUTTON_H

src/widgets/common/smoothlistwidget.cpp

@@ -5,18 +5,17 @@
 #include <QDebug>
 SmoothListWidget::SmoothListWidget(QWidget *parent) : QListWidget(parent)
 {
-    vScrollBar->setOrientation(Qt::Orientation::Vertical); //将滚动条设置为纵向
-    setVerticalScrollBar(vScrollBar); //设置纵向滚动条
+    vScrollBar->setOrientation(Qt::Orientation::Vertical); // 将滚动条设置为纵向
+    setVerticalScrollBar(vScrollBar);                      // 设置纵向滚动条
     connect(vScrollBar, SIGNAL(valueChanged(int)), this, SLOT(onSliderChanged(int)));
 }
 void SmoothListWidget::wheelEvent(QWheelEvent *e)
 {
-    //当捕获到事件后，调用相对滚动的槽函数
+    // 当捕获到事件后，调用相对滚动的槽函数
     vScrollBar->scroll(e->angleDelta().y());
 }
 void SmoothListWidget::onSliderChanged(int p)
 {
-    int startRow = count();
     if (p == vScrollBar->maximum())
     {
         emit reachedBottom(); // 1

src/widgets/common/smoothscrollbar.cpp

@@ -1,56 +1,56 @@
 #include "smoothscrollbar.h"
 #include <QWheelEvent>
 #include <QDebug>
-SmoothScrollBar::SmoothScrollBar(QWidget* parent):QScrollBar(parent)
+SmoothScrollBar::SmoothScrollBar(QWidget *parent) : QScrollBar(parent)
 {
-    m_scrollAni=new QPropertyAnimation(this);
+    m_scrollAni = new QPropertyAnimation(this);
     m_scrollAni->setTargetObject(this);
     m_scrollAni->setPropertyName("value");
-    m_scrollAni->setEasingCurve(QEasingCurve::OutQuint); //设置动画曲线，在Qt文档中有详细的介绍
-    m_scrollAni->setDuration(500); //设置动画时间，数值越小播放越快
-    m_targetValue_v=value(); //将m_targetValue_v初始化
+    m_scrollAni->setEasingCurve(QEasingCurve::OutQuint); // 设置动画曲线，在Qt文档中有详细的介绍
+    m_scrollAni->setDuration(500);                       // 设置动画时间，数值越小播放越快
+    m_targetValue_v = value();                           // 将m_targetValue_v初始化
 }
 
 void SmoothScrollBar::setValue(int value)
 {
-    m_scrollAni->stop();//停止现在的动画，防止出现冲突
-    m_scrollAni->setStartValue(this->value()); //设置动画滚动的初始值为当前位置
-    m_scrollAni->setEndValue(value); //设置动画的结束位置为目标值
-    m_scrollAni->start(); //开始动画
+    m_scrollAni->stop();                       // 停止现在的动画，防止出现冲突
+    m_scrollAni->setStartValue(this->value()); // 设置动画滚动的初始值为当前位置
+    m_scrollAni->setEndValue(value);           // 设置动画的结束位置为目标值
+    m_scrollAni->start();                      // 开始动画
 }
 void SmoothScrollBar::scrollTop()
 {
-    setValue(-m_targetValue_v); //开始动画
-    m_targetValue_v=0;
+    setValue(-m_targetValue_v); // 开始动画
+    m_targetValue_v = 0;
 }
 void SmoothScrollBar::scroll(int value)
 {
-    //这里推荐评论区中大佬优化的写法
-    if(m_targetValue_v-value>=0)
+    // 这里推荐评论区中大佬优化的写法
+    if (m_targetValue_v - value >= 0)
     {
-        m_targetValue_v-=value; //将目标值和相对位置进行运算
-        setValue(m_targetValue_v); //开始动画
+        m_targetValue_v -= value;  // 将目标值和相对位置进行运算
+        setValue(m_targetValue_v); // 开始动画
     }
 }
 
 void SmoothScrollBar::mousePressEvent(QMouseEvent *e)
 {
-    //当使用鼠标操作滚动条时，不会刷新m_targetValue_v的值，因而需要重写事件，对其进行刷新。
+    // 当使用鼠标操作滚动条时，不会刷新m_targetValue_v的值，因而需要重写事件，对其进行刷新。
     m_scrollAni->stop();
     QScrollBar::mousePressEvent(e);
-    m_targetValue_v=value();
+    m_targetValue_v = value();
 }
 
 void SmoothScrollBar::mouseReleaseEvent(QMouseEvent *e)
 {
     m_scrollAni->stop();
     QScrollBar::mouseReleaseEvent(e);
-    m_targetValue_v=value();
+    m_targetValue_v = value();
 }
 
 void SmoothScrollBar::mouseMoveEvent(QMouseEvent *e)
 {
     m_scrollAni->stop();
     QScrollBar::mouseMoveEvent(e);
-    m_targetValue_v=value();
+    m_targetValue_v = value();
 }

src/widgets/common/webenginepage.cpp

@@ -1,10 +1,26 @@
 #include "webenginepage.h"
 
 #include <QDesktopServices>
+#include <QWebEngineSettings>
+#include <QWebEngineProfile>
 
 WebEnginePage::WebEnginePage(QObject *parent)
     : QWebEnginePage(parent)
 {
+    QLocale ql;
+    switch (ql.language())
+    {
+    case QLocale::Chinese:
+    {
+        // 系统语言是中文，获取网页为中文 @momen @uniartisan
+        QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
+        qDebug() << profile->httpAcceptLanguage();
+        profile->setHttpAcceptLanguage("zh-CN,zh;q=0.8,en;q=0.6");
+    }
+    break;
+    default:
+        break;
+    }
 }
 
 WebEnginePage::~WebEnginePage()
@@ -13,7 +29,8 @@ WebEnginePage::~WebEnginePage()
 
 void WebEnginePage::setUrl(const QUrl &url)
 {
-    if (m_currentUrl == url) {
+    if (m_currentUrl == url)
+    {
         return;
     }
 
@@ -32,7 +49,8 @@ QWebEnginePage *WebEnginePage::createWindow(QWebEnginePage::WebWindowType type)
 
 void WebEnginePage::slotUrlChanged(const QUrl &url)
 {
-    if (m_currentUrl == url) {
+    if (m_currentUrl == url)
+    {
         sender()->deleteLater();
         return;
     }

src/widgets/downloadlistwidget.cpp

@@ -1,24 +1,32 @@
 #include "downloadlistwidget.h"
 #include "ui_downloadlistwidget.h"
-#include <QGraphicsOpacityEffect>
-#include <QPropertyAnimation>
+#include "widgets/common/downloaditem.h"
+#include "backend/sparkapi.h"
+#include "backend/downloadworker.h"
+#include "utils/utils.h"
+#include "application.h"
+#include "mainwindow-dtk.h"
+
+#include <QDesktopServices>
+#include <QtConcurrent>
 #include <QDebug>
-DownloadListWidget::DownloadListWidget(QWidget *parent) :
-    DBlurEffectWidget(parent),
+
+DownloadListWidget::DownloadListWidget(QWidget *parent) : DBlurEffectWidget(parent),
                                                           ui(new Ui::DownloadListWidget)
 {
     ui->setupUi(this);
+    setWindowTitle(QObject::tr("Download list"));
     installEventFilter(this);
-    this->setAttribute(Qt::WA_Hover,true);
+    this->setAttribute(Qt::WA_Hover, true);
     setFocus();
-    setFixedSize(500,400);
+    setFixedSize(500, 400);
     setMaskAlpha(250);
     ui->listWidget->hide();
     ui->widget->show();
     // 计算显示下载速度
     download_speed.setInterval(1000);
     download_speed.start();
-    connect(&download_speed,&QTimer::timeout,[=]()
+    connect(&download_speed, &QTimer::timeout, [=]()
             {
         if(isdownload && theSpeed == "")
         {
@@ -47,55 +55,67 @@ DownloadListWidget::DownloadListWidget(QWidget *parent) :
             downloaditemlist[nowDownload - 1]->setSpeed(theSpeed);
         }else{
             emit downloadProgress(0);
-        }
-    });
+        } });
 }
 
 DownloadListWidget::~DownloadListWidget()
 {
+    if (downloadController)
+    {
+        downloadController->disconnect();
         downloadController->stopDownload();
-    delete downloadController;
+        // 这里没有释放 downloadController，使用懒汉式单例
+    }
+
+    clearItem();
     delete ui;
 }
+
+bool DownloadListWidget::isDownloadInProcess()
+{
+    if (toDownload > 0)
+    {
+        return true;
+    }
+    return false;
+}
+
 void DownloadListWidget::clearItem()
 {
-    ui->listWidget->vScrollBar->scrollTop();
-    int n=ui->listWidget->count();
-    for(int i=0;i<n;i++)
-    {
-        QListWidgetItem *item = ui->listWidget->takeItem(0);
-        QWidget *card = ui->listWidget->itemWidget(item);
-        delete card;
-        card  = NULL;
-        delete item;
-        item  = NULL;
-    }
     ui->listWidget->clear();
 }
-void DownloadListWidget::addItem(QString name,QString fileName,QString pkgName,const QPixmap icon,QString downloadurl)
+
+DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl)
 {
-    if(fileName.isEmpty())
+    if (fileName.isEmpty())
     {
-        return;
+        return nullptr;
     }
+
     urList.append(downloadurl);
     allDownload += 1;
-    DownloadItem *di=new DownloadItem(this);
-    dlist<<downloadurl;
-    downloaditemlist<<di;
+    toDownload += 1;
+
+    DownloadItem *di = new DownloadItem;
+    connect(di, &DownloadItem::finished, this, &DownloadListWidget::slotInstallFinished, Qt::QueuedConnection);
+
+    dlist << downloadurl;
+    downloaditemlist << di;
     di->setName(name);
     di->setFileName(fileName);
-    di->pkgName=pkgName;
+    di->pkgName = pkgName;
     di->seticon(icon);
-    QListWidgetItem* pItem = new QListWidgetItem();
-    pItem->setSizeHint(QSize(240, 50));
+    QListWidgetItem *pItem = new QListWidgetItem();
+    pItem->setSizeHint(QSize(240, 56)); // ui 中单个 downloaditem 高度固定 56px（上下 margin 8px，图片固定 48x48）
     ui->listWidget->addItem(pItem);
     ui->listWidget->setItemWidget(pItem, di);
-    if(!isBusy)
+    if (!isBusy)
     {
         nowDownload += 1;
         startRequest(urList.at(nowDownload - 1), fileName); // 进行链接请求
     }
+
+    return di;
 }
 
 QList<DownloadItem *> DownloadListWidget::getDIList()
@@ -116,43 +136,67 @@ void DownloadListWidget::startRequest(QUrl url, QString fileName)
     isdownload = true;
     downloaditemlist[allDownload - 1]->free = false;
 
-    downloadController = new DownloadController(this);  // 并发下载，在点击下载按钮的时候才会初始化
+    // 使用懒汉式单例来存储downloadController
+    if (downloadController == nullptr)
+    {
+        downloadController = new DownloadController; // 并发下载，在第一次点击下载按钮的时候才会初始化
+    }
+    else
+    {
+        downloadController->disconnect();
+        downloadController->stopDownload();
+    }
+
     connect(downloadController, &DownloadController::downloadProcess, this, &DownloadListWidget::updateDataReadProgress);
     connect(downloadController, &DownloadController::downloadFinished, this, &DownloadListWidget::httpFinished);
-    //connect(downloadController, &DownloadController::errorOccur, this, [=](QString msg){this->sendNotification(msg);});
+    // connect(downloadController, &DownloadController::errorOccur, this, [=](QString msg){this->sendNotification(msg);});
     downloadController->setFilename(fileName);
     downloadController->startDownload(url.toString());
 }
 
+/***************************************************************
+  *  @brief     下载列表完成下载的回调函数
+  *  @param     
+  *  @note      如果正在安装，则在新开的线程空间中等待上一个安装完
+  *  @Sample usage:     
+ **************************************************************/
 void DownloadListWidget::httpFinished() // 完成下载
 {
     isdownload = false;
     isBusy = false;
-    downloaditemlist[nowDownload - 1]->readyInstall();
+
+    QtConcurrent::run([=]()
+    {
+        while (downloaditemlist[nowDownload - 1]->readyInstall() == -1) // 安装当前应用，堵塞安装，后面的下载suspend
+        {
+            continue;
+        }
         downloaditemlist[nowDownload - 1]->free = true;
         emit downloadFinished();
-    if(nowDownload < allDownload)
+
+        if (nowDownload < allDownload)
         {
             // 如果有排队则下载下一个
-        qDebug() << "切换下一个下载...";
+            qDebug() << "Download: 切换下一个下载...";
             nowDownload += 1;
-        while(downloaditemlist[nowDownload - 1]->close)
+            while (downloaditemlist[nowDownload - 1]->close)
             {
                 nowDownload += 1;
-            if(nowDownload >= allDownload)
+                if (nowDownload >= allDownload)
                 {
                     nowDownload = allDownload;
                     return;
                 }
             }
             QString fileName = downloaditemlist[nowDownload - 1]->getName();
-        startRequest(urList.at(nowDownload-1), fileName);
+            startRequest(urList.at(nowDownload - 1), fileName);
         }
+    });
 }
 
 void DownloadListWidget::updateDataReadProgress(QString speedInfo, qint64 bytesRead, qint64 totalBytes)
 {
-    if(totalBytes <= 0)
+    if (totalBytes <= 0)
     {
         return;
     }
@@ -161,7 +205,7 @@ void DownloadListWidget::updateDataReadProgress(QString speedInfo, qint64 bytesR
     downloaditemlist[nowDownload - 1]->setValue(int(bytesRead * 100 / totalBytes) * 100); // 当前值
     emit downloadProgress(int(bytesRead * 100 / totalBytes));
     download_size = bytesRead;
-    if(downloaditemlist[nowDownload - 1]->close)
+    if (downloaditemlist[nowDownload - 1]->close)
     {
         // 随时检测下载是否被取消
         downloadController->disconnect();
@@ -171,26 +215,14 @@ void DownloadListWidget::updateDataReadProgress(QString speedInfo, qint64 bytesR
     }
 }
 
-
-void DownloadListWidget::m_move(int x,int y)
+void DownloadListWidget::m_move(int x, int y)
 {
     m_rect.setX(x);
     m_rect.setY(y);
-    move(x,y);
+    move(x, y);
     return;
 }
-bool DownloadListWidget::eventFilter(QObject *watched, QEvent *event)
-{
-    if (Q_NULLPTR == watched) {
-        return false;
-    }
-    if (QEvent::ActivationChange == event->type()) {
-        if(QApplication::activeWindow() != this){
-            this->close();
-        }
-    }
-    return QWidget::eventFilter(watched, event);
-}
+
 void DownloadListWidget::mouseMoveEvent(QMouseEvent *event)
 {
     setGeometry(m_rect);
@@ -200,3 +232,23 @@ void DownloadListWidget::on_pushButton_clicked()
 {
     QDesktopServices::openUrl(QUrl("file:///tmp/spark-store", QUrl::TolerantMode));
 }
+
+void DownloadListWidget::slotInstallFinished(bool success)
+{
+    // NOTE: 仅在安装成功后判断是否需要退出后台
+    if (success) {
+        toDownload -= 1; // 安装完以后减少待安装数目
+        qDebug() << "Download: 还没有下载的数目：" << toDownload;
+
+        if (toDownload == 0)
+        {
+            Application *app = qobject_cast<Application *>(qApp);
+            MainWindow *mainWindow = app->mainWindow();
+            if (mainWindow->isCloseWindowAnimation() == true)
+            {
+                qDebug() << "Download: 后台安装结束，退出程序";
+                qApp->quit();
+            }
+        }
+    }
+}

src/widgets/downloadlistwidget.h

@@ -1,33 +1,38 @@
 #ifndef DOWNLOADLISTWIDGET_H
 #define DOWNLOADLISTWIDGET_H
 
+#include <DBlurEffectWidget>
+
 #include <QWidget>
 #include <QTimer>
-#include <DBlurEffectWidget>
-#include <QNetworkAccessManager>
-#include <QDesktopServices>
-#include "widgets/common/downloaditem.h"
-#include "backend/sparkapi.h"
-#include "backend/downloadworker.h"
-#include "utils/utils.h"
-DWIDGET_USE_NAMESPACE
+
 namespace Ui {
 class DownloadListWidget;
 }
 
+DWIDGET_USE_NAMESPACE
+
+class DownloadItem;
+class DownloadController;
 class DownloadListWidget : public DBlurEffectWidget
 {
     Q_OBJECT
 
 public:
-    void addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl);
+    DownloadItem *addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl);
     int nowDownload = 0;
     int allDownload = 0;
+    int toDownload = 0;
     QList<DownloadItem *> getDIList();
     QList<QUrl> getUrlList();
     void m_move(int x, int y);
     explicit DownloadListWidget(QWidget *parent = nullptr);
-    ~DownloadListWidget();
+    ~DownloadListWidget() override;
+
+    bool isDownloadInProcess();
+
+protected:
+    void mouseMoveEvent(QMouseEvent *event) override;
 
 private:
     int isdownload = false;
@@ -35,7 +40,7 @@ private:
     QStringList dlist;
     QList<QUrl> urList;
     QList<DownloadItem *> downloaditemlist;
-    DownloadController *downloadController;
+    DownloadController *downloadController = nullptr;
     int nowdownload = 0;
     QString theSpeed;
     QTimer download_speed;
@@ -48,13 +53,14 @@ private:
     void clearItem();
     QRect m_rect;
     Ui::DownloadListWidget *ui;
-private slots:
-    bool eventFilter(QObject *, QEvent *);
-    void mouseMoveEvent(QMouseEvent *event);
-    void on_pushButton_clicked();
+
 signals:
     void downloadFinished();
     void downloadProgress(int i);
+
+private slots:
+    void on_pushButton_clicked();
+    void slotInstallFinished(bool success);
 };
 
 #endif // DOWNLOADLISTWIDGET_H

src/widgets/downloadlistwidget.ui

@@ -85,7 +85,7 @@ QListWidget::item::selected
 }</string>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::NoFrame</enum>
      </property>
      <property name="verticalScrollBarPolicy">
       <enum>Qt::ScrollBarAsNeeded</enum>
@@ -99,9 +99,15 @@ QListWidget::item::selected
      <property name="autoScrollMargin">
       <number>10</number>
      </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
      <property name="resizeMode">
       <enum>QListView::Fixed</enum>
      </property>
+     <property name="spacing">
+      <number>4</number>
+     </property>
     </widget>
    </item>
    <item>

tool/apt-fast-conf/apt-fast.conf

@@ -11,8 +11,20 @@
 #
 # Default: apt-get
 #
-_APTMGR=apt
+_APTMGR=apt-get
 
+if [ -x "$(command -v apt)" ]; then
+_APTMGR=apt
+fi
+
+
+if grep -Eqi "linuxmint" /etc/os-release;then
+_APTMGR=apt-get
+fi
+
+if [ -x "$(command -v oyo)" ]; then
+_APTMGR=/usr/bin/apt
+fi
 
 ####
 #
@@ -25,6 +37,8 @@ AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinau
 AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
 
 fi
+##### UOS自动读取账号密码以实现使用aptss来加速下载
+
 # Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download
 # packages directly.
 #
@@ -65,7 +79,7 @@ DOWNLOADBEFORE=true
 #
 # Default: disabled
 #
-MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' )
+MIRRORS=( 'https://d.store.deepinos.org.cn/,https://zunyun01.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d3.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' )
 
 
 # Maximum number of connections
@@ -73,7 +87,7 @@ MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-sto
 #
 # Default: 5
 #
-_MAXNUM=5
+_MAXNUM=16
 
 
 # Maximum number of connections per server

tool/apt-fast-conf/aptss-apt.conf

@@ -0,0 +1,14 @@
+Debug::RunScripts true;
+Dir::Cache::archives "/var/cache/apt/archives";
+Dir::Cache "/var/lib/aptss/";
+Dir::Etc::SourceParts "/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/";
+Dir::State::lists "/var/lib/aptss/lists/";
+
+APT::Get::Fix-Broken true;
+APT::Get::List-Cleanup="0";
+
+#clear APT::Update::Post-Invoke-Success;
+
+#clear DPkg::Post-Invoke;
+
+#clear DPkg::Pre-Install-Pkgs;

tool/apt-fast/ss-apt-fast

@@ -161,7 +161,8 @@ VERBOSE_OUTPUT=
 _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} -i ${DLLIST} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --connect-timeout=600 --timeout=600 -m0'
 
 # Load config file.
-CONFFILE="/etc/apt-fast.conf"
+CONFFILE="/tmp/aptss-conf/apt-fast.conf"
+#### Spark Store apt-fast conf is in /tmp
 if [ -e "$CONFFILE" ]; then
     source "$CONFFILE"
 fi
@@ -207,7 +208,9 @@ fi
 msg_already_running()
 {
   msg "apt-fast already running!" "warning"
+  msg "apt-fast 已经在运行了" "warning"
   msg "Verify that all apt-fast processes are finished then remove $LCK_FILE.lock and try again." "hint"
+  msg "请确认所有的apt-fast进程已经结束，然后删除 $LCK_FILE.lock 后重试." "hint"
 }
 
 # Check if a lock file exists.
@@ -246,6 +249,7 @@ cleanup_dllist()
       if ! rm -f -- "$DLLIST" 2>/dev/null
       then
         msg "Could not clean up download list file." "warning"
+        msg "无法清除下载列表文件." "warning"
         CLEANUP_STATE=1
       fi
     fi
@@ -304,12 +308,14 @@ get_uris(){
     if ! mkdir -p -- "$(dirname "$DLLIST")"
     then
       msg "Could not create download file directory." "warning"
+      msg "无法创建下载文件夹" "warning"
       exit 1
     fi
   elif [ -f "$DLLIST" ]; then
     if ! rm -f -- "$DLLIST" 2>/dev/null && ! touch -- "$DLLIST" 2>/dev/null
     then
-      msg "Unable to write to download file. Try restarting with root permissions or run 'apt-fast clean' first." "warning"
+      msg "Unable to write to download file. Try restarting with root permissions or run 'aptss clean' first." "warning"
+      msg "无法下载文件。尝试使用root权限，或者运行 'aptss clean'" "warning"
       exit 1
     fi
   fi
@@ -318,15 +324,19 @@ get_uris(){
   echo "# apt-fast mirror list: $(date)" > "$DLLIST"
   #NOTE: aptitude doesn't have this functionality, so we use apt-get to get
   #      package URIs.
-  case "$_APTMGR" in
-    apt|apt-get) uri_mgr=$_APTMGR;;
-    *) uri_mgr=apt-get;;
-  esac
+#  case "$_APTMGR" in
+#    apt|apt-get) uri_mgr=$_APTMGR;;
+#    *) uri_mgr=apt-get;;
+#  esac
+  # NOTE:apt可能出现变动，不建议在脚本中使用，因此在此统一改用apt-get
+uri_mgr=apt-get
   uris_full="$("$uri_mgr" "${APT_SCRIPT_WARNING[@]}" -y --print-uris "$@")"
   uris_full_ret="$?"
   if [ "$uris_full_ret" -ne 0 ]
   then
-    msg "Package manager quit with exit code." "warning"
+    msg "Package manager quit with exit code.Here is the log" "warning"
+    msg "包管理器以错误代码退出.日志如下" "warning"
+    msg "${uris_full}"
     exit "$uris_full_ret"
   fi
   while read -r pkg_uri_info
@@ -396,6 +406,7 @@ get_uris(){
           checksum="$(echo "$patch_checksum" | cut -d' ' -f2)"
         else
           msg "Couldn't get supported checksum for $pkg_name ($pkg_version)." "warning"
+	  msg "无法获得 $pkg_name ($pkg_version) 的受支持的散列验证值" "warning"
           REMOVE_WORKING_MESSAGE=
         fi
       fi
@@ -434,6 +445,7 @@ display_downloadfile(){
     done <<<"$(echo -e "$DOWNLOAD_DISPLAY" | sort "${DISPLAY_SORT_OPTIONS[@]}")"
   fi
   msg "Download size: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
+  msg "下载大小: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
 }
 
 # Create and insert a PID number to lockfile.
@@ -477,6 +489,7 @@ if [ "$CMD" == "aria2c" ]; then
   done
   if [ -z "$HASH_SUPPORTED" ]; then
     msg "Couldn't find supported checksum algorithm from aria2c. Checksums disabled." "warning"
+    msg "无法找到aria2c支持的散列验证算法. 散列验证已被禁用." "warning"
   fi
 fi
 
@@ -531,6 +544,7 @@ fi
 if [ "$option" == "install" ]; then
   msg
   msg "Working... this may take a while." "normal"
+  msg "正在工作中，请稍等" "normal"
   REMOVE_WORKING_MESSAGE=y
 
   get_uris "$@"
@@ -598,6 +612,7 @@ elif [ "$option" == "clean" ]; then
 elif [ "$option" == "download" ]; then
   msg
   msg "Working... this may take a while." "normal"
+  msg "正在工作中，请稍等" "normal"
   REMOVE_WORKING_MESSAGE=y
 
   get_uris "$@"
@@ -616,6 +631,7 @@ elif [ "$option" == "download" ]; then
 elif [ "$option" == "source" ]; then
   msg
   msg "Working... this may take a while." "normal"
+  msg "正在工作中，请稍等" "normal"
   REMOVE_WORKING_MESSAGE=y
 
   get_uris "$@"

tool/aptss

@@ -1,88 +1,123 @@
 #!/bin/bash
 
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell
 
+case `arch` in
+   x86_64)
+	STORE_URL="store"
+	STORE_LIST_URL=""
+	;;
+   aarch64)
+	STORE_URL="aarch64-store"
+	STORE_LIST_URL="-aarch64"
+	;;
+esac
+SS_APT_FAST="/opt/durapps/spark-store/bin/apt-fast/ss-apt-fast"
+
+
+is_empty_dir(){ 
+    return `ls -A $1|wc -w`
+}
+
+
+
+if [ "$(id -u)" != "0" ];then
+#############################无root权限时
+echo "${TRANSHELL_CONTENT_RUNNING_IN_NOT_ROOT_USER}"
+
+else
+
+
+ln -sf /etc/apt/sources.list.d/* /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d
+###让这里和系统同步，先链接，然后清除无效链接
+find /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d -xtype l -delete
+
+fi
 
 if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 ###刷新apt-fast配置
 mkdir -p /tmp/aptss-conf/
-echo "从服务器获取配置和镜像列表..."
-echo "Getting server and mirror lists..."
+echo "${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}"
 echo
-curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
+curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://d.store.deepinos.org.cn/apt-fast.conf"
 chmod -R 755 /tmp/aptss-conf
 
 fi
 
 
+if [ ! -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages" ];then
+
+mkdir -p /tmp/aptss-conf/
+echo "${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}"
+echo
+curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "https://d.store.deepinos.org.cn/apt-fast.conf"
+chmod -R 755 /tmp/aptss-conf    
+
+curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://d.store.deepinos.org.cn/sparkstore${STORE_LIST_URL}.list"
+apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
+
+#只更新星火源
+
+
+fi
+
+
+
 
 
 if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then
 
 
-sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 
 ###执行
-bwrap --dev-bind / / \
-                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
-                   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
+
+                ${SS_APT_FAST} "$@" --allow-downgrades -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 
 
 elif [ "$1" = "download" ];then
 
 ###执行
-bwrap --dev-bind / / \
-                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
-                   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
+
+                ${SS_APT_FAST} "$@" --allow-downgrades -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 
 
 elif [ "$1" = "policy" ] || [ "$1" = "search" ];then
-sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+
+
 
 ###执行
-bwrap --dev-bind / / \
-                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
-                   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                apt "$@" --allow-downgrades 
+                apt "$@"  -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 
 elif [ "$1" = "ssupdate" ];then
 
 mkdir -p /tmp/aptss-conf/
-echo "从服务器获取配置和镜像列表..."
-echo "Getting server and mirror lists..."
+echo "${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}"
 echo
-curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
+curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "https://d.store.deepinos.org.cn/apt-fast.conf"
 chmod -R 755 /tmp/aptss-conf    
 
-sudo curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
-sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://d.store.deepinos.org.cn/sparkstore${STORE_LIST_URL}.list"
+
+
+apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list"
 
 #只更新星火源
 
 elif [ "$1" = "update" ];then
-sudo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
+curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://d.store.deepinos.org.cn/sparkstore${STORE_LIST_URL}.list"
 
 
 mkdir -p /tmp/aptss-conf/
-echo "从服务器获取配置和镜像列表..."
-echo "Getting server and mirror lists..."
+echo "${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}"
 echo
-curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
+curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://d.store.deepinos.org.cn/apt-fast.conf"
 chmod -R 755 /tmp/aptss-conf    
 ### 额外一份拿来给aptss自动补全用
-bwrap --dev-bind / / \
-		   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                apt "$@" -o APT::Get::List-Cleanup="0" 
-
-bwrap --dev-bind / / \
-		   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                apt "$@" -o APT::Get::List-Cleanup="0"  -o Dir::Cache="/etc/aptss/" 
+                apt "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 
 else
-	bwrap --dev-bind / / \
-		   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
-                apt "$@"
+                apt "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 fi
 
 

tool/bashimport/transhell.amber

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+##load transhell
+function load_transhell_debug()
+{
+local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+
+echo "-----------------------------------------------------------------------------"
+}
+
+function load_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+
+}
+
+function update_transhell()
+{
+load_transhell $@
+}
+

tool/spark-dstore-patch

@@ -0,0 +1,124 @@
+#!/bin/bash
+
+echo "----------------Running Spark DStore Patch----------------"
+#!/bin/bash
+
+
+enumAppInfoList() {
+    appInfoList=()
+    apps="/opt/apps"
+    list=$(ls $apps)
+    for appID in $list; do
+        appInfoList+=("$appID")
+    done
+    echo "${appInfoList[@]}"
+}
+linkDir() {
+    ensureTargetDir() {
+        targetFile=$1
+        t=$(dirname "$targetFile")
+        mkdir -p "$t"
+    }
+
+    source=$1
+    target=$2
+    sourceDir=$(dirname "$source")
+    targetDir=$(dirname "$target")
+    find "$source" -type f | while read sourceFile; do
+        targetFile="$targetDir/${sourceFile#$sourceDir/}"
+        if [ -L "$targetFile" ] && [ "$(readlink "$targetFile")" = "$sourceFile" ]; then
+            continue
+        else
+            rm -f "$targetFile"
+        fi
+
+        ensureTargetDir "$targetFile"
+        ln -s "$sourceFile" "$targetFile"
+    done
+}
+
+linkApp() {
+    appID=$1
+    appEntriesDir="/opt/apps/$appID/entries"
+    appLibsDir="/opt/apps/$appID/files/lib"
+    autoStartDir="$appEntriesDir/autostart"
+
+    if [ -d "$autoStartDir" ]; then
+        linkDir "$autoStartDir" "/etc/xdg/autostart"
+    fi
+
+    # link application
+    sysShareDir="/usr/share"
+    for folder in "$appEntriesDir/applications" "$appEntriesDir/icons" "$appEntriesDir/mime" "$appEntriesDir/glib-2.0" "$appEntriesDir/services" "$appEntriesDir/GConf" "$appEntriesDir/help" "$appEntriesDir/locale" "$appEntriesDir/fcitx"; do
+        if [ ! -d "$folder" ]; then
+            continue
+        fi
+        if [ "$folder" = "$appEntriesDir/polkit" ]; then
+            linkDir "$folder" "/usr/share/polkit-1"
+        elif [ "$folder" = "$appEntriesDir/fonts/conf" ]; then
+            linkDir "$folder" "/etc/fonts/conf.d"
+        else
+            linkDir "$folder" "$sysShareDir/${folder##*/}"
+        fi
+    done
+}
+
+
+# execute linkApp function for each app and print output
+for app in $(enumAppInfoList); do
+    linkApp "$app" &
+
+    if [ "$1" = "--debug" ]; then
+        echo "Linking for $app"
+    fi
+# remove broken links in /usr/share
+done
+wait
+
+if [ "$1" = "--debug" ]; then
+    echo "Cleaning links and updating databases and caches..."
+fi
+
+
+if [ "$1" = "--debug" ]; then
+    find /usr/share/applications -xtype l -delete &
+    find /usr/share/icons -xtype l -delete &
+    find /usr/share/mime/packages -xtype l -delete &
+    find /usr/share/glib-2.0 -xtype l -delete &
+    find /usr/share/dbus-1/services -xtype l -delete &
+    find /usr/share/fcitx -xtype l -delete &
+    find /usr/share/help -xtype l -delete &
+    find /usr/share/locale -xtype l -delete &
+    find /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/fcitx -xtype l -delete &
+    find /usr/lib/mozilla/plugins -xtype l -delete &
+    find /usr/share/polkit-1/actions -xtype l -delete &
+    find /usr/share/fonts -xtype l -delete &
+    find /etc/fonts/conf.d -xtype l -delete &
+    update-icon-caches /usr/share/icons/* &
+    update-desktop-database -q &
+    update-mime-database -V /usr/share/mime &
+    glib-compile-schemas /usr/share/glib-2.0/schemas/ &
+    wait
+else
+    find /usr/share/applications -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/icons -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/mime/packages -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/glib-2.0 -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/dbus-1/services -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/fcitx -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/help -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/locale -xtype l -delete > /dev/null 2>&1 &
+    find /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/fcitx -xtype l -delete > /dev/null 2>&1 &
+    find /usr/lib/mozilla/plugins -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/polkit-1/actions -xtype l -delete > /dev/null 2>&1 &
+    find /usr/share/fonts -xtype l -delete > /dev/null 2>&1 &
+    find /etc/fonts/conf.d -xtype l -delete > /dev/null 2>&1 &
+    update-icon-caches /usr/share/icons/* > /dev/null 2>&1 &
+    update-desktop-database -q > /dev/null 2>&1 &
+    update-mime-database -V /usr/share/mime > /dev/null 2>&1 &
+    glib-compile-schemas /usr/share/glib-2.0/schemas/ > /dev/null 2>&1 &
+fi
+
+
+
+echo "----------------Finished----------------"

tool/ss-feedback/README.md

@@ -1,2 +0,0 @@
-# Feadback 反馈脚本
-使用 shc 加密, 需要使用 cc、gcc 编译。

tool/ss-feedback/sender-d

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+#用法：sender.sh 下载链接 HD70642
+
+case `arch` in
+   x86_64)
+	STORE_URL="store"
+	;;
+   aarch64)
+	STORE_URL="aarch64-store"
+	;;
+esac
+
+if [ -z $1 ] || [ "$2" != "HD70642" ];then
+echo "Segment fault"
+# 假的段错误
+exit -1
+fi
+
+mkdir -p /tmp/spark-store/mail-send-content
+cd /tmp/spark-store/mail-send-content
+
+APP_LOCATION=${1#*/$STORE_URL/}
+APP_LOCATION=${APP_LOCATION%/*}
+echo $APP_LOCATION
+
+APP_METALINK_FILE_NAME=${1##*/}
+#echo $APP_METALINK_FILE_NAME
+
+
+PIDS=$(pidof "spark-store")
+# 检查 metalink以防止未下载时刷分
+
+if [ ! -f /tmp/spark-store/$APP_METALINK_FILE_NAME ] || [ "$PIDS" = "" ];then
+sleep 1
+echo "发送！成功"
+exit
+# 其实是发送不成功的意思lolol
+fi
+
+
+
+
+MAIL_INFO_0=sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY
+MAIL_INFO_1=ss_feedback@163.com:NIXEBFOBQHLOFVKX
+MAIL_INFO_2=spark_store_good@163.com:FIGNKXCLBGCYUDUF
+MAIL_INFO_3=wudibaolongzsoy@163.com:IOGHUIEDXXMGWJTI
+MAIL_INFO_4=suasnjaksf@163.com:KWUBIOYTGYIPVALZ
+# 
+MAIL_INFO_5=asdasdasdasd0827@163.com:TSSLXXCEAAATCZJJ
+MAIL_INFO_6=hjkhuiasndkj@163.com:XJZDDLHZYACGJVWM
+MAIL_INFO_7=xncniasudhqi@163.com:CULXTHBHSENNMPWG
+MAIL_INFO_8=ajhdiahiudqahwui@163.com:HFAJCJOCWIDZHGIG
+MAIL_INFO_9=xcvuyefbewr@163.com:VYBRUVGLHPSHQRSM
+
+
+MAIL_INFO_RANDOM=MAIL_INFO_$(($RANDOM % 10)) 
+
+MAIL_INFO_RANDOM=`echo ${!MAIL_INFO_RANDOM}`
+# 把对应变量赋值过来
+
+MAIL_ADDRESS_FROM_INFO_RANDOM=`echo $MAIL_INFO_RANDOM | sed "{s/:.*//}" `
+
+
+
+cat  << EOF > ./data.txt
+------------------------------------
+From:$MAIL_ADDRESS_FROM_INFO_RANDOM
+To:$MAIL_ADDRESS_FROM_INFO_RANDOM
+Subject: Download count command
+check=i love amber forever
+command:download_count
+APP_LOCATION=$STORE_URL/$APP_LOCATION
+------------------------------------
+
+EOF
+
+curl -s --url "smtp://smtp.163.com" --mail-from "$MAIL_ADDRESS_FROM_INFO_RANDOM" --mail-rcpt "$MAIL_ADDRESS_FROM_INFO_RANDOM" --upload-file  ./data.txt --user "$MAIL_INFO_RANDOM"
+
+rm /tmp/spark-store/mail-send-content/data.txt
+
+echo "Finished"

tool/ss-feedback/sender-d.sh.c

@@ -1,817 +0,0 @@
-#if 0
-	shc Version 4.0.3, Generic Shell Script Compiler
-	GNU GPL Version 3 Md Jahidul Hamid <jahidulhamid@yahoo.com>
-
-	shc -v -r -f sender-d.sh 
-#endif
-
-static  char data [] = 
-#define      pswd_z	256
-#define      pswd	((&data[15]))
-	"\073\237\114\151\003\324\064\061\057\100\342\310\062\343\346\075"
-	"\105\011\036\257\154\107\223\050\237\060\137\020\063\015\377\156"
-	"\162\230\321\117\026\333\267\322\335\062\077\075\261\355\172\366"
-	"\367\231\246\144\341\071\215\201\151\354\221\234\371\221\013\153"
-	"\052\334\273\101\267\162\023\224\244\123\322\125\100\115\114\067"
-	"\347\362\233\310\053\050\111\225\025\333\061\016\154\075\172\227"
-	"\031\065\330\320\250\354\145\114\077\067\242\200\204\357\267\154"
-	"\341\123\064\015\174\176\242\221\131\324\240\306\021\032\136\053"
-	"\117\066\373\367\043\141\104\142\230\347\342\035\326\232\212\270"
-	"\356\276\306\152\075\151\374\227\076\234\135\120\266\273\173\006"
-	"\362\167\376\025\330\103\170\161\052\133\217\001\366\031\272\344"
-	"\330\201\116\025\352\113\254\051\347\012\171\236\305\365\245\270"
-	"\154\243\316\105\346\106\267\021\242\106\023\230\137\316\174\067"
-	"\117\313\115\072\026\371\143\376\003\334\234\311\322\101\202\076"
-	"\345\120\204\313\227\073\335\071\202\360\321\341\276\116\031\016"
-	"\031\146\110\057\140\253\056\144\210\312\056\132\014\260\231\361"
-	"\000\036\275\230\131\232\321\333\213\243\275\112\361\327\130\360"
-	"\173\100\213\115\034\027\361\331\141\342\261\272\356\360\133\051"
-	"\217\247\222\222\173\307\304\253\007\247\163\072\212\132\052\005"
-	"\232\266\123\266\315\104\220"
-#define      date_z	1
-#define      date	((&data[311]))
-	"\375"
-#define      tst2_z	19
-#define      tst2	((&data[312]))
-	"\031\242\273\246\041\336\076\145\246\300\036\051\047\366\106\356"
-	"\220\064\226"
-#define      shll_z	10
-#define      shll	((&data[331]))
-	"\142\312\022\213\061\052\357\062\161\266\353\321"
-#define      inlo_z	3
-#define      inlo	((&data[343]))
-	"\216\314\250"
-#define      msg1_z	65
-#define      msg1	((&data[347]))
-	"\300\115\164\240\306\270\356\211\346\362\207\042\205\377\337\231"
-	"\113\016\267\021\330\324\374\242\242\336\361\041\143\054\223\355"
-	"\361\326\220\125\016\336\260\031\012\341\025\102\124\131\005\244"
-	"\234\133\315\262\013\375\340\025\227\352\060\034\236\222\347\136"
-	"\160\356\206\333\112\340\006\120\173\274\243\061"
-#define      chk1_z	22
-#define      chk1	((&data[427]))
-	"\270\017\004\242\044\277\223\036\316\135\273\047\172\354\056\123"
-	"\141\200\041\375\363\101\127\122\242\373\336\067\346\143\370"
-#define      text_z	1869
-#define      text	((&data[549]))
-	"\071\315\146\114\156\047\322\111\162\262\117\303\055\014\146\137"
-	"\226\117\042\116\136\046\360\203\135\327\346\126\251\033\243\342"
-	"\351\012\056\127\062\000\240\244\263\360\147\341\374\316\101\222"
-	"\035\143\341\174\212\322\377\350\251\345\076\122\001\342\065\352"
-	"\355\143\101\037\144\342\304\030\323\053\372\320\372\073\142\030"
-	"\237\104\224\051\026\223\022\300\171\121\023\172\064\110\144\041"
-	"\131\377\367\164\123\316\261\141\353\367\301\016\274\016\120\047"
-	"\114\046\100\031\034\140\073\010\260\305\236\267\340\334\172\305"
-	"\021\246\221\332\021\311\021\154\112\347\316\242\317\135\332\301"
-	"\336\151\126\072\217\354\230\133\220\107\301\140\001\353\360\166"
-	"\213\363\372\027\233\047\323\276\201\201\216\023\154\320\161\313"
-	"\320\152\257\025\322\272\025\153\247\235\321\160\071\321\067\253"
-	"\241\156\046\022\220\271\031\066\331\215\206\354\323\250\277\275"
-	"\253\021\137\373\037\247\054\101\371\345\374\104\113\056\231\313"
-	"\256\361\253\230\051\271\176\340\337\333\050\341\362\056\167\255"
-	"\110\043\213\146\047\300\122\142\314\236\021\040\074\377\243\374"
-	"\373\242\311\017\027\025\325\213\232\031\105\104\013\052\212\072"
-	"\030\104\271\142\045\220\026\110\122\375\151\376\117\030\367\246"
-	"\217\256\245\325\077\346\276\327\045\113\166\374\164\175\046\022"
-	"\327\265\135\221\047\346\332\276\260\240\227\230\211\165\023\170"
-	"\316\154\240\317\001\217\073\173\212\106\115\070\141\315\324\116"
-	"\204\026\326\026\254\252\257\044\333\310\024\223\327\026\336\312"
-	"\151\363\273\204\220\242\016\226\317\314\156\124\240\122\232\124"
-	"\110\055\240\223\016\373\000\136\102\135\122\057\222\070\210\130"
-	"\012\234\324\361\047\201\232\126\155\021\270\134\303\377\110\250"
-	"\220\352\314\011\276\260\131\175\233\367\254\266\366\263\014\102"
-	"\237\066\305\270\257\117\034\316\147\136\133\373\051\333\006\077"
-	"\242\225\073\276\155\106\311\232\247\112\341\143\016\103\013\062"
-	"\214\247\315\302\241\024\076\037\135\126\145\227\342\323\061\230"
-	"\016\246\203\251\033\223\105\251\131\001\060\306\305\034\005\133"
-	"\161\366\173\132\343\314\135\205\273\260\170\145\370\262\153\321"
-	"\253\345\131\260\346\020\367\016\127\056\307\040\112\052\012\264"
-	"\247\057\273\157\016\275\270\226\173\033\071\042\072\142\170\134"
-	"\045\016\163\251\362\073\214\166\354\103\017\330\122\073\211\204"
-	"\200\004\003\176\324\343\275\017\056\341\055\071\173\175\144\147"
-	"\365\115\274\012\253\277\036\370\220\115\307\120\131\037\206\063"
-	"\355\032\324\265\064\114\014\217\113\302\125\301\033\100\357\042"
-	"\334\212\202\353\262\040\130\240\027\110\343\271\356\171\001\325"
-	"\167\062\056\061\210\316\075\142\261\005\116\142\230\367\343\135"
-	"\174\302\375\047\075\334\222\326\253\073\174\173\360\260\021\344"
-	"\331\315\146\233\057\007\314\231\256\113\221\021\126\173\045\315"
-	"\247\126\162\253\375\041\043\263\232\274\171\132\320\020\070\152"
-	"\013\224\371\045\350\270\077\251\145\063\357\171\036\245\125\315"
-	"\020\206\333\111\062\331\054\144\346\173\132\113\374\043\022\371"
-	"\311\101\043\300\337\334\367\145\030\023\207\043\253\042\227\302"
-	"\350\037\067\332\350\253\117\124\243\341\046\211\061\007\303\154"
-	"\022\210\064\112\311\170\123\071\332\266\205\151\265\300\343\237"
-	"\147\001\024\013\173\265\330\375\070\111\044\246\204\155\146\067"
-	"\036\060\065\251\005\354\200\115\136\076\034\040\335\033\043\221"
-	"\374\211\170\061\251\321\372\116\023\167\330\007\310\060\175\076"
-	"\064\242\253\131\116\074\275\022\133\016\203\214\254\115\002\325"
-	"\046\213\073\107\241\341\273\110\300\236\005\231\275\325\012\175"
-	"\365\056\370\275\132\330\041\035\166\130\240\013\162\041\163\140"
-	"\377\225\075\315\115\106\270\277\233\113\106\305\270\240\026\106"
-	"\317\325\264\324\126\337\214\155\366\331\372\200\306\272\163\333"
-	"\266\343\246\100\016\002\242\070\231\262\005\137\323\257\343\047"
-	"\301\206\266\341\302\046\266\167\227\276\125\165\027\044\353\035"
-	"\043\036\300\137\140\244\156\205\364\361\067\016\324\110\142\167"
-	"\125\216\360\003\023\161\060\263\356\073\050\173\151\371\005\027"
-	"\027\273\363\163\017\044\064\055\267\345\052\320\370\132\374\123"
-	"\020\263\163\176\037\145\346\003\275\377\154\040\166\363\224\240"
-	"\214\304\332\367\057\146\070\165\101\026\125\361\100\357\001\031"
-	"\305\363\242\164\125\067\077\063\134\271\250\242\243\022\031\114"
-	"\225\006\352\203\137\376\201\147\225\372\053\217\331\003\156\143"
-	"\332\361\315\167\027\232\307\331\314\071\025\271\047\031\126\310"
-	"\254\200\324\257\022\351\244\007\335\036\150\036\362\072\021\007"
-	"\140\155\073\242\063\071\162\205\121\257\302\056\155\071\306\057"
-	"\236\364\027\143\074\375\254\324\117\176\242\267\247\215\374\137"
-	"\003\123\113\247\064\347\123\321\123\044\211\351\253\045\226\324"
-	"\034\147\117\066\000\370\074\041\242\137\270\361\106\154\113\045"
-	"\275\172\101\331\157\137\222\202\136\241\075\132\267\033\325\113"
-	"\042\352\305\133\274\252\111\213\330\215\261\145\322\246\174\031"
-	"\267\347\275\247\251\030\255\106\116\362\117\277\024\135\356\172"
-	"\033\066\346\252\205\144\302\147\131\076\122\021\152\225\313\235"
-	"\202\066\043\300\027\147\263\001\201\341\121\051\310\140\317\333"
-	"\131\254\112\104\337\014\320\143\375\231\252\220\064\143\234\000"
-	"\017\304\317\113\131\055\324\177\367\224\230\264\132\311\261\152"
-	"\034\137\223\225\365\314\014\076\377\025\023\040\222\043\022\047"
-	"\332\363\144\102\015\314\010\256\206\065\310\103\337\001\326\206"
-	"\024\354\074\045\337\107\003\225\137\032\055\332\056\347\073\055"
-	"\267\115\315\204\061\310\304\007\065\267\107\176\066\216\011\014"
-	"\066\215\236\247\176\327\164\113\353\215\343\313\302\106\302\250"
-	"\077\220\165\207\015\144\336\311\065\351\311\163\104\104\267\262"
-	"\307\057\106\061\110\271\053\136\133\263\066\177\103\212\234\166"
-	"\271\130\043\076\352\006\066\017\220\207\275\024\235\356\377\344"
-	"\005\257\200\002\253\123\052\015\326\342\225\116\137\256\213\354"
-	"\251\026\237\347\166\014\121\075\306\022\247\276\265\017\375\161"
-	"\174\113\273\017\227\064\057\217\376\326\311\140\354\074\160\121"
-	"\346\370\327\255\277\376\062\301\033\111\042\016\233\162\101\303"
-	"\161\123\210\042\157\270\114\252\372\315\352\335\221\115\300\252"
-	"\163\344\140\324\157\261\256\232\173\171\024\250\006\342\320\340"
-	"\365\137\167\336\216\320\337\345\265\346\363\133\023\076\121\117"
-	"\002\021\237\112\206\043\012\370\033\045\133\151\303\330\001\222"
-	"\073\174\074\320\054\005\127\000\210\240\347\131\256\126\253\007"
-	"\342\137\135\162\075\344\340\210\333\057\141\042\223\055\006\174"
-	"\000\005\225\117\203\320\143\136\130\037\333\217\136\371\221\220"
-	"\052\071\173\374\261\213\235\241\071\260\057\226\360\212\211\346"
-	"\333\062\135\157\357\316\156\022\111\201\010\151\065\111\364\364"
-	"\137\005\161\265\354\014\003\204\117\112\075\042\357\165\042\354"
-	"\263\304\343\323\045\127\244\326\160\216\335\042\353\173\135\061"
-	"\354\306\013\252\265\013\046\173\100\050\146\372\303\210\171\200"
-	"\160\377\013\300\245\265\307\146\355\047\052\007\011\214\060\367"
-	"\177\327\043\302\111\263\123\276\107\220\316\207\024\142\070\325"
-	"\004\262\276\355\075\175\146\163\370\345\135\214\322\041\105\047"
-	"\371\073\016\023\064\231\203\005\246\204\203\306\340\002\160\365"
-	"\315\022\302\170\340\356\151\323\344\242\134\046\134\162\227\117"
-	"\262\240\062\234\324\135\326\242\341\066\232\314\200\331\124\077"
-	"\201\245\227\252\073\356\252\367\277\232\331\005\324\350\032\261"
-	"\035\246\325\177\334\121\146\316\041\043\352\253\373\043\035\234"
-	"\231\321\046\171\221\105\216\272\025\321\042\222\007\351\363\232"
-	"\006\016\231\137\124\215\132\071\166\042\065\127\337\253\307\021"
-	"\337\364\070\261\112\201\310\242\335\104\353\055\277\322\232\240"
-	"\007\374\034\322\312\373\031\130\204\036\362\373\142\043\273\315"
-	"\216\373\273\260\310\111\070\031\207\101\325\157\110\142\216\357"
-	"\172\023\345\067\105\007\375\023\053\256\121\163\255\323\257\132"
-	"\164\360\307\234\106\130\275\217\211\327\300\322\261\206\364\326"
-	"\021\255\077\302\202\027\207\370\263\313\333\070\010\115\377\271"
-	"\173\302\243\224\126\201\255\356\261\176\213\135\216\054\237\371"
-	"\040\174\342\367\323\053\341\031\333\211\214\042\343\254\122\252"
-	"\325\326\263\326\325\063\065\362\114\161\314\151\116\237\160\073"
-	"\321\025\336\117\020\055\371\021\371\104\001\072\204\064\227\333"
-	"\034\374\123\265\343\026\372\207\264\033\065\316\147\211\142\366"
-	"\371\257\120\162\107\234\134\010\035\212\241\132\317\254\246\101"
-	"\020\211\005\051\134\061\043\054\054\137\217\104\376\323\330\050"
-	"\352\154\072\253\345\214\276\137\300\006\304\341\262\152\043\303"
-	"\364\051\354\120\132\017\175\207\156\014\313\155\337\244\225\312"
-	"\020\320\165\366\134\063\126\034\072\032\376\355\205\041\260\171"
-	"\113\234\312\245\254\107\055\033\123\370\210\063\235\036\375\256"
-	"\356\163\245\113\247\373\150\341\025\146\316\233\210\177\024\323"
-	"\034\336\171\310\046\246\343\171\237\153\255\075\211\252\353\170"
-	"\036\220\304\305\214\054\246\242\222\165\075\033\365\122\357\021"
-	"\061\150\331\127\017\275\321\257\051\176"
-#define      chk2_z	19
-#define      chk2	((&data[2562]))
-	"\330\053\107\261\150\156\021\060\277\165\015\167\176\171\251\302"
-	"\276\160\207\325\012\334"
-#define      lsto_z	1
-#define      lsto	((&data[2581]))
-	"\010"
-#define      xecc_z	15
-#define      xecc	((&data[2582]))
-	"\005\040\327\254\114\361\156\300\024\244\110\337\050\143\126\227"
-	"\257"
-#define      tst1_z	22
-#define      tst1	((&data[2603]))
-	"\036\047\271\057\207\076\001\326\201\264\356\151\036\164\071\111"
-	"\027\304\031\244\017\252\223\354\153\051\130\042\011\260"
-#define      msg2_z	19
-#define      msg2	((&data[2632]))
-	"\341\357\377\335\143\002\251\076\361\005\267\075\204\313\320\034"
-	"\012\023\243\361\261\374\315\242"
-#define      rlax_z	1
-#define      rlax	((&data[2653]))
-	"\121"
-#define      opts_z	1
-#define      opts	((&data[2654]))
-	"\241"/* End of data[] */;
-#define      hide_z	4096
-#define SETUID 0	/* Define as 1 to call setuid(0) at start of script */
-#define DEBUGEXEC	0	/* Define as 1 to debug execvp calls */
-#define TRACEABLE	1	/* Define as 1 to enable ptrace the executable */
-#define HARDENING	0	/* Define as 1 to disable ptrace/dump the executable */
-#define BUSYBOXON	0	/* Define as 1 to enable work with busybox */
-
-#if HARDENING
-static const char * shc_x[] = {
-"/*",
-" * Copyright 2019 - Intika <intika@librefox.org>",
-" * Replace ******** with secret read from fd 21",
-" * Also change arguments location of sub commands (sh script commands)",
-" * gcc -Wall -fpic -shared -o shc_secret.so shc_secret.c -ldl",
-" */",
-"",
-"#define _GNU_SOURCE /* needed to get RTLD_NEXT defined in dlfcn.h */",
-"#define PLACEHOLDER \"********\"",
-"#include <dlfcn.h>",
-"#include <stdlib.h>",
-"#include <string.h>",
-"#include <unistd.h>",
-"#include <stdio.h>",
-"#include <signal.h>",
-"",
-"static char secret[128000]; //max size",
-"typedef int (*pfi)(int, char **, char **);",
-"static pfi real_main;",
-"",
-"// copy argv to new location",
-"char **copyargs(int argc, char** argv){",
-"    char **newargv = malloc((argc+1)*sizeof(*argv));",
-"    char *from,*to;",
-"    int i,len;",
-"",
-"    for(i = 0; i<argc; i++){",
-"        from = argv[i];",
-"        len = strlen(from)+1;",
-"        to = malloc(len);",
-"        memcpy(to,from,len);",
-"        // zap old argv space",
-"        memset(from,'\\0',len);",
-"        newargv[i] = to;",
-"        argv[i] = 0;",
-"    }",
-"    newargv[argc] = 0;",
-"    return newargv;",
-"}",
-"",
-"static int mymain(int argc, char** argv, char** env) {",
-"    //fprintf(stderr, \"Inject main argc = %d\\n\", argc);",
-"    return real_main(argc, copyargs(argc,argv), env);",
-"}",
-"",
-"int __libc_start_main(int (*main) (int, char**, char**),",
-"                      int argc,",
-"                      char **argv,",
-"                      void (*init) (void),",
-"                      void (*fini)(void),",
-"                      void (*rtld_fini)(void),",
-"                      void (*stack_end)){",
-"    static int (*real___libc_start_main)() = NULL;",
-"    int n;",
-"",
-"    if (!real___libc_start_main) {",
-"        real___libc_start_main = dlsym(RTLD_NEXT, \"__libc_start_main\");",
-"        if (!real___libc_start_main) abort();",
-"    }",
-"",
-"    n = read(21, secret, sizeof(secret));",
-"    if (n > 0) {",
-"      int i;",
-"",
-"    if (secret[n - 1] == '\\n') secret[--n] = '\\0';",
-"    for (i = 1; i < argc; i++)",
-"        if (strcmp(argv[i], PLACEHOLDER) == 0)",
-"          argv[i] = secret;",
-"    }",
-"",
-"    real_main = main;",
-"",
-"    return real___libc_start_main(mymain, argc, argv, init, fini, rtld_fini, stack_end);",
-"}",
-"",
-0};
-#endif /* HARDENING */
-
-/* rtc.c */
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-/* 'Alleged RC4' */
-
-static unsigned char stte[256], indx, jndx, kndx;
-
-/*
- * Reset arc4 stte. 
- */
-void stte_0(void)
-{
-	indx = jndx = kndx = 0;
-	do {
-		stte[indx] = indx;
-	} while (++indx);
-}
-
-/*
- * Set key. Can be used more than once. 
- */
-void key(void * str, int len)
-{
-	unsigned char tmp, * ptr = (unsigned char *)str;
-	while (len > 0) {
-		do {
-			tmp = stte[indx];
-			kndx += tmp;
-			kndx += ptr[(int)indx % len];
-			stte[indx] = stte[kndx];
-			stte[kndx] = tmp;
-		} while (++indx);
-		ptr += 256;
-		len -= 256;
-	}
-}
-
-/*
- * Crypt data. 
- */
-void arc4(void * str, int len)
-{
-	unsigned char tmp, * ptr = (unsigned char *)str;
-	while (len > 0) {
-		indx++;
-		tmp = stte[indx];
-		jndx += tmp;
-		stte[indx] = stte[jndx];
-		stte[jndx] = tmp;
-		tmp += stte[indx];
-		*ptr ^= stte[tmp];
-		ptr++;
-		len--;
-	}
-}
-
-/* End of ARC4 */
-
-#if HARDENING
-
-#include <sys/ptrace.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <sys/prctl.h>
-#define PR_SET_PTRACER 0x59616d61
-
-/* Seccomp Sandboxing Init */
-#include <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/prctl.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-
-#include <linux/filter.h>
-#include <linux/seccomp.h>
-#include <linux/audit.h>
-
-#define ArchField offsetof(struct seccomp_data, arch)
-
-#define Allow(syscall) \
-    BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_##syscall, 0, 1), \
-    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
-
-struct sock_filter filter[] = {
-    /* validate arch */
-    BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ArchField),
-    BPF_JUMP( BPF_JMP+BPF_JEQ+BPF_K, AUDIT_ARCH_X86_64, 1, 0),
-    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
-
-    /* load syscall */
-    BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
-
-    /* list of allowed syscalls */
-    Allow(exit_group),  /* exits a process */
-    Allow(brk),         /* for malloc(), inside libc */
-    Allow(mmap),        /* also for malloc() */
-    Allow(munmap),      /* for free(), inside libc */
-
-    /* and if we don't match above, die */
-    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
-};
-struct sock_fprog filterprog = {
-    .len = sizeof(filter)/sizeof(filter[0]),
-    .filter = filter
-};
-
-/* Seccomp Sandboxing - Set up the restricted environment */
-void seccomp_hardening() {
-    if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
-        perror("Could not start seccomp:");
-        exit(1);
-    }
-    if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &filterprog) == -1) {
-        perror("Could not start seccomp:");
-        exit(1);
-    }
-} 
-/* End Seccomp Sandboxing Init */
-
-void shc_x_file() {
-    FILE *fp;
-    int line = 0;
-
-    if ((fp = fopen("/tmp/shc_x.c", "w")) == NULL ) {exit(1); exit(1);}
-    for (line = 0; shc_x[line]; line++)	fprintf(fp, "%s\n", shc_x[line]);
-    fflush(fp);fclose(fp);
-}
-
-int make() {
-	char * cc, * cflags, * ldflags;
-    char cmd[4096];
-
-	cc = getenv("CC");
-	if (!cc) cc = "cc";
-
-	sprintf(cmd, "%s %s -o %s %s", cc, "-Wall -fpic -shared", "/tmp/shc_x.so", "/tmp/shc_x.c -ldl");
-	if (system(cmd)) {remove("/tmp/shc_x.c"); return -1;}
-	remove("/tmp/shc_x.c"); return 0;
-}
-
-void arc4_hardrun(void * str, int len) {
-    //Decode locally
-    char tmp2[len];
-    char tmp3[len+1024];
-    memcpy(tmp2, str, len);
-
-	unsigned char tmp, * ptr = (unsigned char *)tmp2;
-    int lentmp = len;
-    int pid, status;
-    pid = fork();
-
-    shc_x_file();
-    if (make()) {exit(1);}
-
-    setenv("LD_PRELOAD","/tmp/shc_x.so",1);
-
-    if(pid==0) {
-
-        //Start tracing to protect from dump & trace
-        if (ptrace(PTRACE_TRACEME, 0, 0, 0) < 0) {
-            kill(getpid(), SIGKILL);
-            _exit(1);
-        }
-
-        //Decode Bash
-        while (len > 0) {
-            indx++;
-            tmp = stte[indx];
-            jndx += tmp;
-            stte[indx] = stte[jndx];
-            stte[jndx] = tmp;
-            tmp += stte[indx];
-            *ptr ^= stte[tmp];
-            ptr++;
-            len--;
-        }
-
-        //Do the magic
-        sprintf(tmp3, "%s %s", "'********' 21<<<", tmp2);
-
-        //Exec bash script //fork execl with 'sh -c'
-        system(tmp2);
-
-        //Empty script variable
-        memcpy(tmp2, str, lentmp);
-
-        //Clean temp
-        remove("/tmp/shc_x.so");
-
-        //Sinal to detach ptrace
-        ptrace(PTRACE_DETACH, 0, 0, 0);
-        exit(0);
-    }
-    else {wait(&status);}
-
-    /* Seccomp Sandboxing - Start */
-    seccomp_hardening();
-
-    exit(0);
-}
-#endif /* HARDENING */
-
-/*
- * Key with file invariants. 
- */
-int key_with_file(char * file)
-{
-	struct stat statf[1];
-	struct stat control[1];
-
-	if (stat(file, statf) < 0)
-		return -1;
-
-	/* Turn on stable fields */
-	memset(control, 0, sizeof(control));
-	control->st_ino = statf->st_ino;
-	control->st_dev = statf->st_dev;
-	control->st_rdev = statf->st_rdev;
-	control->st_uid = statf->st_uid;
-	control->st_gid = statf->st_gid;
-	control->st_size = statf->st_size;
-	control->st_mtime = statf->st_mtime;
-	control->st_ctime = statf->st_ctime;
-	key(control, sizeof(control));
-	return 0;
-}
-
-#if DEBUGEXEC
-void debugexec(char * sh11, int argc, char ** argv)
-{
-	int i;
-	fprintf(stderr, "shll=%s\n", sh11 ? sh11 : "<null>");
-	fprintf(stderr, "argc=%d\n", argc);
-	if (!argv) {
-		fprintf(stderr, "argv=<null>\n");
-	} else { 
-		for (i = 0; i <= argc ; i++)
-			fprintf(stderr, "argv[%d]=%.60s\n", i, argv[i] ? argv[i] : "<null>");
-	}
-}
-#endif /* DEBUGEXEC */
-
-void rmarg(char ** argv, char * arg)
-{
-	for (; argv && *argv && *argv != arg; argv++);
-	for (; argv && *argv; argv++)
-		*argv = argv[1];
-}
-
-void chkenv_end(void);
-
-int chkenv(int argc)
-{
-	char buff[512];
-	unsigned long mask, m;
-	int l, a, c;
-	char * string;
-	extern char ** environ;
-
-	mask = (unsigned long)getpid();
-	stte_0();
-	 key(&chkenv, (void*)&chkenv_end - (void*)&chkenv);
-	 key(&data, sizeof(data));
-	 key(&mask, sizeof(mask));
-	arc4(&mask, sizeof(mask));
-	sprintf(buff, "x%lx", mask);
-	string = getenv(buff);
-#if DEBUGEXEC
-	fprintf(stderr, "getenv(%s)=%s\n", buff, string ? string : "<null>");
-#endif
-	l = strlen(buff);
-	if (!string) {
-		/* 1st */
-		sprintf(&buff[l], "=%lu %d", mask, argc);
-		putenv(strdup(buff));
-		return 0;
-	}
-	c = sscanf(string, "%lu %d%c", &m, &a, buff);
-	if (c == 2 && m == mask) {
-		/* 3rd */
-		rmarg(environ, &string[-l - 1]);
-		return 1 + (argc - a);
-	}
-	return -1;
-}
-
-void chkenv_end(void){}
-
-#if HARDENING
-
-static void gets_process_name(const pid_t pid, char * name) {
-	char procfile[BUFSIZ];
-	sprintf(procfile, "/proc/%d/cmdline", pid);
-	FILE* f = fopen(procfile, "r");
-	if (f) {
-		size_t size;
-		size = fread(name, sizeof (char), sizeof (procfile), f);
-		if (size > 0) {
-			if ('\n' == name[size - 1])
-				name[size - 1] = '\0';
-		}
-		fclose(f);
-	}
-}
-
-void hardening() {
-    prctl(PR_SET_DUMPABLE, 0);
-    prctl(PR_SET_PTRACER, -1);
-
-    int pid = getppid();
-    char name[256] = {0};
-    gets_process_name(pid, name);
-
-    if (   (strcmp(name, "bash") != 0) 
-        && (strcmp(name, "/bin/bash") != 0) 
-        && (strcmp(name, "sh") != 0) 
-        && (strcmp(name, "/bin/sh") != 0) 
-        && (strcmp(name, "sudo") != 0) 
-        && (strcmp(name, "/bin/sudo") != 0) 
-        && (strcmp(name, "/usr/bin/sudo") != 0)
-        && (strcmp(name, "gksudo") != 0) 
-        && (strcmp(name, "/bin/gksudo") != 0) 
-        && (strcmp(name, "/usr/bin/gksudo") != 0) 
-        && (strcmp(name, "kdesu") != 0) 
-        && (strcmp(name, "/bin/kdesu") != 0) 
-        && (strcmp(name, "/usr/bin/kdesu") != 0) 
-       )
-    {
-        printf("Operation not permitted\n");
-        kill(getpid(), SIGKILL);
-        exit(1);
-    }
-}
-
-#endif /* HARDENING */
-
-#if !TRACEABLE
-
-#define _LINUX_SOURCE_COMPAT
-#include <sys/ptrace.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#if !defined(PT_ATTACHEXC) /* New replacement for PT_ATTACH */
-   #if !defined(PTRACE_ATTACH) && defined(PT_ATTACH)
-       #define PT_ATTACHEXC	PT_ATTACH
-   #elif defined(PTRACE_ATTACH)
-       #define PT_ATTACHEXC PTRACE_ATTACH
-   #endif
-#endif
-
-void untraceable(char * argv0)
-{
-	char proc[80];
-	int pid, mine;
-
-	switch(pid = fork()) {
-	case  0:
-		pid = getppid();
-		/* For problematic SunOS ptrace */
-#if defined(__FreeBSD__)
-		sprintf(proc, "/proc/%d/mem", (int)pid);
-#else
-		sprintf(proc, "/proc/%d/as",  (int)pid);
-#endif
-		close(0);
-		mine = !open(proc, O_RDWR|O_EXCL);
-		if (!mine && errno != EBUSY)
-			mine = !ptrace(PT_ATTACHEXC, pid, 0, 0);
-		if (mine) {
-			kill(pid, SIGCONT);
-		} else {
-			perror(argv0);
-			kill(pid, SIGKILL);
-		}
-		_exit(mine);
-	case -1:
-		break;
-	default:
-		if (pid == waitpid(pid, 0, 0))
-			return;
-	}
-	perror(argv0);
-	_exit(1);
-}
-#endif /* !TRACEABLE */
-
-char * xsh(int argc, char ** argv)
-{
-	char * scrpt;
-	int ret, i, j;
-	char ** varg;
-	char * me = argv[0];
-	if (me == NULL) { me = getenv("_"); }
-	if (me == 0) { fprintf(stderr, "E: neither argv[0] nor $_ works."); exit(1); }
-
-	ret = chkenv(argc);
-	stte_0();
-	 key(pswd, pswd_z);
-	arc4(msg1, msg1_z);
-	arc4(date, date_z);
-	if (date[0] && (atoll(date)<time(NULL)))
-		return msg1;
-	arc4(shll, shll_z);
-	arc4(inlo, inlo_z);
-	arc4(xecc, xecc_z);
-	arc4(lsto, lsto_z);
-	arc4(tst1, tst1_z);
-	 key(tst1, tst1_z);
-	arc4(chk1, chk1_z);
-	if ((chk1_z != tst1_z) || memcmp(tst1, chk1, tst1_z))
-		return tst1;
-	arc4(msg2, msg2_z);
-	if (ret < 0)
-		return msg2;
-	varg = (char **)calloc(argc + 10, sizeof(char *));
-	if (!varg)
-		return 0;
-	if (ret) {
-		arc4(rlax, rlax_z);
-		if (!rlax[0] && key_with_file(shll))
-			return shll;
-		arc4(opts, opts_z);
-#if HARDENING
-	    arc4_hardrun(text, text_z);
-	    exit(0);
-       /* Seccomp Sandboxing - Start */
-       seccomp_hardening();
-#endif
-		arc4(text, text_z);
-		arc4(tst2, tst2_z);
-		 key(tst2, tst2_z);
-		arc4(chk2, chk2_z);
-		if ((chk2_z != tst2_z) || memcmp(tst2, chk2, tst2_z))
-			return tst2;
-		/* Prepend hide_z spaces to script text to hide it. */
-		scrpt = malloc(hide_z + text_z);
-		if (!scrpt)
-			return 0;
-		memset(scrpt, (int) ' ', hide_z);
-		memcpy(&scrpt[hide_z], text, text_z);
-	} else {			/* Reexecute */
-		if (*xecc) {
-			scrpt = malloc(512);
-			if (!scrpt)
-				return 0;
-			sprintf(scrpt, xecc, me);
-		} else {
-			scrpt = me;
-		}
-	}
-	j = 0;
-#if BUSYBOXON
-	varg[j++] = "busybox";
-	varg[j++] = "sh";
-#else
-	varg[j++] = argv[0];		/* My own name at execution */
-#endif
-	if (ret && *opts)
-		varg[j++] = opts;	/* Options on 1st line of code */
-	if (*inlo)
-		varg[j++] = inlo;	/* Option introducing inline code */
-	varg[j++] = scrpt;		/* The script itself */
-	if (*lsto)
-		varg[j++] = lsto;	/* Option meaning last option */
-	i = (ret > 1) ? ret : 0;	/* Args numbering correction */
-	while (i < argc)
-		varg[j++] = argv[i++];	/* Main run-time arguments */
-	varg[j] = 0;			/* NULL terminated array */
-#if DEBUGEXEC
-	debugexec(shll, j, varg);
-#endif
-	execvp(shll, varg);
-	return shll;
-}
-
-int main(int argc, char ** argv)
-{
-#if SETUID
-   setuid(0);
-#endif
-#if DEBUGEXEC
-	debugexec("main", argc, argv);
-#endif
-#if HARDENING
-	hardening();
-#endif
-#if !TRACEABLE
-	untraceable(argv[0]);
-#endif
-	argv[1] = xsh(argc, argv);
-	fprintf(stderr, "%s%s%s: %s\n", argv[0],
-		errno ? ": " : "",
-		errno ? strerror(errno) : "",
-		argv[1] ? argv[1] : "<null>"
-	);
-	return 1;
-}

tool/ssaudit

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+echo "Spark Store Audit script.星火商店审核脚本"
+
+
+#################检测文件是否存在
+if [ $# -eq 0 ];then
+echo "没有接收到参数，退出"
+echo "用法：$0 deb路径"
+exit
+fi
+
+if [ ! -f "$1" ]
+then
+	echo "文件不存在"
+	exit 1
+fi
+
+if [ "$(id -u)" != "0" ];then
+#############################无root权限时
+echo "请使用root启动ssaudit"
+exit 1
+fi
+
+###
+
+
+DEBPATH=`realpath $1`
+echo ------------------------------------------------------------
+try_run_output=$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh test-install-app "$DEBPATH")
+try_run_ret="$?"
+
+  if [ "$try_run_ret" -ne 0 ]
+  then
+    echo "OMG-IT-GOES-WRONG"
+    echo -e "${try_run_output}"
+    exit "$try_run_ret"
+  fi
+
+
+dpkg -i  "$DEBPATH"  || aptss install -yf 
+install_ret="$?"
+
+
+  if [ "$install_ret" -ne 0 ]
+  then
+    echo "OMG-IT-GOES-WRONG"
+    exit "$install_ret"
+  fi

tool/ssinstall

@@ -1,49 +1,96 @@
 #!/bin/bash
 
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
+
+case `arch` in
+   x86_64)
+	STORE_URL="store"
+	;;
+   aarch64)
+	STORE_URL="aarch64-store"
+	;;
+esac
+
+
+
+
 echo "Spark Store Install script.星火商店安装脚本"
 
 function pkexec_as_current_user() {
-    #Detect the name of the display in use
-    local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
-
-    #Detect the user using such display
-    local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1)
 
     #Detect the id of the user
     local uid=$(id -u $user)
 
-    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus pkexec "$@"
+    sudo -u $user  DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus pkexec "$@"
 }
 
-function zenity() {
-    #Detect the name of the display in use
-    local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
+function zenity()
+{
+
 
     #Detect the user using such display
-    local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1)
+    local user=$(who  | awk '{print $1}' | head -n 1)
 
     #Detect the id of the user
     local uid=$(id -u $user)
 
-    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus zenity "$@"
+
+    sudo -u $user  DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus zenity "$@"
 }
 
+function hash_check()
+{
+if [ ! -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ] && [ ! -e "/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages" ];then
+echo "接收星火仓库软件信息中..."
+aptss ssupdate
+fi
+
+### 选择包信息位置
+
+if [ -e "/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages" ];then
+PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.spark-app.store_${STORE_URL}_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是星火域名单目录仓库配置"
+elif [ -e "/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages" ];then
+PACKAGES_DATA_PATH="/var/lib/aptss/lists/d.store.deepinos.org.cn_${STORE_URL}_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是星火域名单目录仓库配置"
+else
+PACKAGES_DATA_PATH="/var/lib/aptss/lists/mirrors.sdu.edu.cn_spark-store-repository_${STORE_URL}_Packages"
+echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是SDU镜像仓库配置"
+fi
+
+
+
+echo "正在计算hash并与星火仓库匹配..."
+
+DEB_MD5SUM=`md5sum "$1" | cut -c -32`
+
+IS_MD5SUM_CHECKD=`cat $PACKAGES_DATA_PATH | grep $DEB_MD5SUM`
+
+
+}
+
+##########################################################################
+
 #################检测文件是否存在
 if [ $# -eq 0 ];then
 echo "没有接收到参数，退出"
 echo "用法：$0 deb路径"
+echo "OMG-IT-GOES-WRONG"
 exit
 fi
 
 if [ ! -f "$1" ]
 then
-	echo "文件不存在"
+	echo "${TRANSHELL_CONTENT_FILE_NOT_EXIST}"
+    echo "OMG-IT-GOES-WRONG"
 	exit 1
 fi
 
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
-echo "请使用root启动ssinstall"
+echo "${TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT}"
+echo "OMG-IT-GOES-WRONG"
 exit 1
 fi
 
@@ -52,28 +99,46 @@ fi
 
 DEBPATH=`realpath $1`
 
-if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then
-echo "接收星火仓库软件信息中..."
+hash_check "$DEBPATH"
+
+if [ -z "$IS_MD5SUM_CHECKD" ];then
+echo "尝试更新仓库信息重新校验"
 aptss ssupdate
+hash_check "$DEBPATH"
 fi
 
-echo "正在计算hash并与星火仓库匹配..."
-
-DEB_MD5SUM=`md5sum "$DEBPATH" | cut -c -32`
-
-IS_MD5SUM_CHECKD=`cat /var/lib/apt/lists/d.store.deepinos.org.cn_Packages | grep $DEB_MD5SUM`
 if [  ! -z "$IS_MD5SUM_CHECKD" ];then
 
 echo "校验成功，开始安装"
 echo  ----------------------------------------------------------------------------------
+
+try_run_output=$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh test-install-app "$DEBPATH")
+try_run_ret="$?"
+
+  if [ "$try_run_ret" -ne 0 ]
+  then
+    echo "OMG-IT-GOES-WRONG"
+    echo -e "${try_run_output}"
+    exit "$try_run_ret"
+  fi
+
+
 dpkg -i  "$DEBPATH"  || aptss install -yf 
 
+#### --delete
+if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ];then
+rm "$DEBPATH"
+echo "${TRANSHELL_CONTENT_DEB_IS_DELETED}"
+else
+echo "${TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB}"
+fi
+
 else
 
 
-zenity --info --icon-name=spark-store --height 270 --width 500 --text "软件包校验失败！这不应该发生！\n可能是因为软件包已损坏，星火仓库未同步，或者最坏的情况：恶意软件尝试利用自动安装来入侵系统！\n如果你不清楚发生了什么，请在接下来的认证窗口中选择取消认证\n执行 sudo aptss ssupdate 后再尝试安装。\n如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！\n\n如果你是审核人员，这是正常现象，在审核通过前星火仓库不会保存相关信息。请在接下来的弹窗中进行认证即可"
+zenity --info --icon-name=spark-store --height 270 --width 500 --text "${TRANSHELL_CONTENT_HASH_CHECK_FAILED}"
 
-
-pkexec_as_current_user bash -c "dpkg -i "$DEBPATH" || aptss install -yf "
+echo -e ${TRANSHELL_CONTENT_HASH_CHECK_FAILED}
+echo "OMG-IT-GOES-WRONG"
 
 fi

tool/update-upgrade/ss-do-upgrade-worker.sh

@@ -1,24 +1,66 @@
 #!/bin/bash
-if [ "$(id -u)" != "0" ];then
-pkexec "$0" "$@"
-exit
+if [ "$(id -u)" != "0" ] ; then
+	pkexec "$0" "$@"
+	exit
 fi
 
-
 case $1 in 
 	ssupdate)
 		aptss ssupdate 2>&1 | tee /tmp/spark-store-app-ssupdate-log.txt
 		IS_SSUPDATE_ERROR=`cat /tmp/spark-store-app-ssupdate-log.txt | grep "E: "`
 		echo "$IS_SSUPDATE_ERROR" > /tmp/spark-store-app-ssupdate-status.txt
 	;;
+
 	upgradable-list)
-	bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1
+		output=$(env LANGUAGE=en_US apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk NR\>1)
+
+		IFS_OLD="$IFS"
+		IFS=$'\n'
+
+		for line in $output ; do
+			PKG_NAME=$(echo $line | awk -F '/' '{print $1}')
+			PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
+			PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $6}' | awk -F ']' '{print $1}')
+			echo "${PKG_NAME} ${PKG_NEW_VER} ${PKG_CUR_VER}"
+		done
+
+		IFS="$IFS_OLD"
 	;;
+
 	upgrade-app)
 		aptss install "${@:2}" --only-upgrade  2>&1 | tee /tmp/spark-store-app-upgrade-log.txt
 		IS_UPGRADE_ERROR=`cat /tmp/spark-store-app-upgrade-log.txt | grep "Package manager quit with exit code."`
 		echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt
 	;;
+	test-install-app)
+
+try_run_output=$(aptss --dry-run install $2)
+try_run_ret="$?"
+
+if [ "$try_run_ret" -ne 0 ]
+  then
+    echo "Package manager quit with exit code.Here is the log" 
+    echo "包管理器以错误代码退出.日志如下" 
+    echo
+    echo -e "${try_run_output}"
+    echo "Will try after run aptss update"
+    echo "将会在aptss update之后再次尝试"
+    aptss update
+    echo ----------------------------------------------------------------------------
+	try_run_output=$(aptss --dry-run install $2)
+	try_run_ret="$?"
+  		if [ "$try_run_ret" -ne 0 ]
+  		then
+  		  echo "Package manager quit with exit code.Here is the log" 
+   		 echo "包管理器以错误代码退出.日志如下" 
+   		 echo
+    		echo -e "${try_run_output}"
+    		exit "$try_run_ret"
+ 		 fi
+
+fi
+	exit 0
+	;;
 	
 	clean-log)
 		rm -f /tmp/spark-store-app-ssupdate-status.txt /tmp/spark-store-app-ssupdate-log.txt /tmp/spark-store-app-upgrade-log.txt /tmp/spark-store-app-upgrade-status.txt

tool/update-upgrade/ss-do-upgrade.sh

@@ -1,58 +1,87 @@
 #!/bin/bash
 
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
+
+
 touch /tmp/spark-store/upgradeStatus.txt
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel  --text="正在检查更新，请稍候..." --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 
-if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` != "0" ];then
-echo "无错误"
+# 执行 apt update
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel --text="${TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+
+if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` ] ; then
+	pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
 else
-zenity --error  --text "检查更新进程出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-zenity --text-info --filename=/tmp/spark-store-app-ssupdate-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
-exit 
+	zenity --error --text "${TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	zenity --text-info --filename=/tmp/spark-store-app-ssupdate-log.txt --checkbox="${TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK}" --title="${TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
+    rm -f /tmp/spark-store/upgradeStatus.txt
+	exit
 fi
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
 
+# 获取可更新应用列表
 PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)"
-####如果没更新，就弹出不需要更新
-if [ -z "$PKG_LIST" ];then
-zenity --info  --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+## 如果没更新，就弹出不需要更新
+if [ -z "$PKG_LIST" ] ; then
+	zenity --info --text "${TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 else
-PKG_UPGRADE_LIST=`for PKG_NAME in $PKG_LIST;
-do
-#### 检测是否是hold状态
-	if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" = "" ];then
+	## 获取用户选择的要更新的应用
+	### 指定分隔符为 \n
+	IFS_OLD="$IFS"
+	IFS=$'\n'
+
+	PKG_UPGRADE_LIST=`for line in $PKG_LIST ; do
+	PKG_NAME=$(echo $line | awk -F ' ' '{print $1}')
+	PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
+	PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $3}')
+
+	dpkg --compare-versions $PKG_NEW_VER le $PKG_CUR_VER
+	if [ $? -eq 0 ] ; then
+		continue
+	fi
+	#### 检测是否是 hold 状态
+	PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME)
+	if [ "$PKG_STA" != "hold" ] ; then
 		echo "true"
 		echo "$PKG_NAME"
-       echo "$PKG_NAME"
+		echo "$PKG_NEW_VER"
+		echo "$PKG_CUR_VER"
 	else
 		echo "false"
-	echo "$PKG_NAME（无法更新：已被标记为保留）"
-	echo "$PKG_NAME"
+		echo "$PKG_NAME${TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD}"
+		echo "$PKG_NEW_VER"
+		echo "$PKG_CUR_VER"
 	fi
-done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --column="真的应用包名" --separator=" " --checklist --print-column=3 --multiple --height 350 --width 550 --hide-column=3 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg` 
+done`
 
-#### 如果没有选择，则直接退出
+	### 还原分隔符
+	IFS="$IFS_OLD"
 
-if [ "$PKG_UPGRADE_LIST" = "" ];then
-zenity --info  --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-else
-
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE_LIST -y | zenity --progress --auto-close --no-cancel --pulsate --text=正在更新已选中的应用，请稍候... --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-
-if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`"  ];then
-
-zenity --info  --text "选中的软件已经更新完毕" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-else
-zenity --error  --text "更新出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
-zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里往下拉" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	## 如果没有应用需要更新，则直接退出
+	if [ -z "$PKG_UPGRADE_LIST" ] ; then
+		zenity --info --text "${TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	else
+		PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="${TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE}" --column="${TRANSHELL_CONTENT_CHOOSE}" --column="${TRANSHELL_CONTENT_PKG_NAME}" --column="${TRANSHELL_CONTENT_NEW_VERSION}" --column="${TRANSHELL_CONTENT_UPGRADE_FROM}" --separator=" " --checklist --multiple --print-column=2 --height 350 --width 550 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg)
+		## 如果没有选择，则直接退出
+		if [ -z "$PKG_UPGRADE_LIST" ] ; then
+			zenity --info --text "${TRANSHELL_CONTENT_NO_APP_IS_CHOSEN}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+		else
+			### 更新用户选择的应用
+	for PKG_UPGRADE in $PKG_UPGRADE_LIST;do
+			update_transhell
+			pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -y | zenity --progress --auto-close --no-cancel --pulsate --text="${TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+	done
+			#### 更新成功
+			if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`" ] ; then
+				zenity --info --text "${TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+			else
+			#### 更新异常
+				zenity --error --text "${TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+				zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="${TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK}" --title="${TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+			fi
+		fi
+	fi
 fi
 
-
-
-fi
-
-fi
-
-rm -f touch /tmp/spark-store/upgradeStatus.txt
-####从最开头
+rm -f  /tmp/spark-store/upgradeStatus.txt
+# 从最开头

tool/update-upgrade/ss-update-controler.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
 
 endloop=0
 
@@ -7,38 +9,35 @@ endloop=0
 while [ $endloop -eq 0 ] ;do
 
 if [  -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then 
-text_update_open="关闭"
+text_update_open="${TRANSHELL_CONTENT_CLOSE}"
 #已经开启了就显示关闭
 else
-text_update_open="开启"
+text_update_open="${TRANSHELL_CONTENT_OPEN}"
 fi
 
+update_transhell
 
-
-option=`zenity --list --text="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" --column 数字 --column=操作选项  --print-column=2  --height 350 --width 760 0 "查看自动更新相关功能使用前须知（重要）" 1 "$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" 2 查看可更新软件包列表并决定是否更新  4 退出脚本 --hide-column=1 --print-column=1` 
+option=`zenity --list --text="${TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN}" --column 数字 --column=${TRANSHELL_CONTENT_OPTIONS}  --print-column=2  --height 350 --width 760  0 "${TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK}" 1 "${TRANSHELL_CONTENT_CHECK_FOR_UPDATE}"  2 "${TRANSHELL_CONTENT_EXIT}" --hide-column=1 --print-column=1` 
 
 case $option in 
 	0)
-	zenity --info --icon-name=spark-store --height 450 --width 500 --text "此须知适用于自动更新功能\n\n此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装；在安装更新过程中请不要直接点击关闭本页面，以免发生错误\n\n此脚本使用apt update/apt list --upgrade/apt upgrade来更新软件源、列出更新列表和操作更新\n\n该脚本不对其使用效果有任何明示或暗示的担保，在使用前请您确保您清楚地知道您在干什么。您应当清楚，星火商店的软件包并不是适配所有发行版的；尽管绝大多数的软件更新是无害的，您仍然应该仔细检查显示出来的更新内容，以确保不会对您的依赖环境造成破坏，尤其是那些看起来和系统依赖相关的软件包。在查看过更新列表之后，确认更新之前，您仍有取消更新的机会。\n\n本脚本的开发者不对使用该脚本可能造成的后果负责"
-	;;
-	1)
 	if [  -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then 
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text "检测到已经启动了自动更新检测，执行关闭" --timeout=2 
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK}" --timeout=2 
 	pkexec systemctl disable spark-update-notifier
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text "已关闭" --timeout=2
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_CLOSED}" --timeout=2
 	else
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text  "未检测到自动更新检测，执行启动" --timeout=2 
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text  "${TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK}" --timeout=2 
 	pkexec systemctl enable spark-update-notifier
 	pkexec service spark-update-notifier start
-	zenity --info --icon-name=spark-store --height 150 --width 200 --text "已启动" --timeout=2
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_OPENED}" --timeout=2
 	fi
 	;;
 
-	2)
+	1)
 	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
 	;;
 
-	4)
+	2)
 	exit 0
 	;;
 	*) 

tool/update-upgrade/ss-update-notifier.sh

@@ -1,96 +1,109 @@
 #!/bin/bash
-set -e
-LANG=en.US
+LANGUAGE=en_US
 
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
+
+#############################################################
+
+
+# 发送通知
 function notify-send() {
-    #Detect the name of the display in use
-    local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
 
-    #Detect the user using such display
-    local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1)
 
-    #Detect the id of the user
+    # Detect user using the display
+    local user=$(who | awk '{print $1}' | head -n 1)
+
+    # Detect uid of the user
     local uid=$(id -u $user)
 
-    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@"
+    sudo -u $user  DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus notify-send "$@"
 }
 
-#检测网络链接畅通
-function network()
+# 检测网络链接畅通
+function network-check()
 {
-    #超时时间
+    # 超时时间
     local timeout=15
 
-    #目标网站
+    # 目标网站
     local target=www.baidu.com
 
-    #获取响应状态码
+    # 获取响应状态码
     local ret_code=`curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1`
 
-    if [ "x$ret_code" = "x200" ]; then
-        #网络畅通
+    if [ "x$ret_code" = "x200" ] ; then
+        # 网络畅通
         return 0
     else
-        #网络不畅通
+        # 网络不畅通
         return 1
     fi
-
-    return 0
 }
 
-network
-if [ $? -eq 1 ];then
-	echo "Network fail. Stop to avoid bother dpkg"
+network-check
+if [ $? -ne 0 ] ; then
+    echo "$TRANSHELL_CONTENT_NETWORK_FAIL"
     exit -1
 fi
 
-#The code above is modified from https://blog.csdn.net/yaxuan88521/article/details/120516298
+# The code above is modified from https://blog.csdn.net/yaxuan88521/article/details/120516298
 
-curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
 # 每日更新星火源文件
-mkdir -p /etc/apt/preferences.d
-touch /etc/apt/preferences.d/sparkstore
-cat << EOF >/etc/apt/preferences.d/sparkstore
-Package: *
-Pin: origin *.deepinos.org.cn
-Pin-Priority: 100
 
-EOF
+aptss update
 
-updatetext=`aptss ssupdate`
+updatetext=`aptss ssupdate 2>&1`
 
-rm /etc/apt/preferences.d/sparkstore
+until [ "`echo $updatetext | grep E: `" = "" ];do
+echo "${TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC}"
+sleep 15
+updatetext=`aptss ssupdate 2>&1`
 
 
+
+done
+
 isupdate=`echo ${updatetext: -5}`
-if [ "$isupdate" = "date." ];then
-exit 0 
+if [ "$isupdate" = "date." ] ; then
+    exit 0
 fi
-#### 从这里开始，只有检测到了更新才会进行
 
+## 从这里开始，只有检测到了更新才会进行
 update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
 update_app_number=`echo ${update_app_number##*information...}`
 
+# 获取用户选择的要更新的应用
+PKG_LIST="$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)"
+# 指定分隔符为 \n
+IFS_OLD="$IFS"
+IFS=$'\n'
 
-PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)" 
+for line in $PKG_LIST ; do
+    PKG_NAME=$(echo $line | awk -F ' ' '{print $1}')
+    PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}')
+    PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $3}')
 
+    dpkg --compare-versions $PKG_NEW_VER le $PKG_CUR_VER
 
-
-for PKG_NAME in $PKG_LIST;do
-if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" != "" ];then
+    if [ $? -eq 0 ] ; then
         let update_app_number=$update_app_number-1
-	echo $update_app_number
-	echo $PKG_NAME 
-fi
+        continue
+    fi
+
+    ## 检测是否是 hold 状态
+    PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME)
+    if [ "$PKG_STA" = "hold" ] ; then
+        let update_app_number=$update_app_number-1
+    fi
 done
 
-
-
-if [ $update_app_number -lt 1 ];then
-exit
+# 还原分隔符
+IFS="$IFS_OLD"
+if [ $update_app_number -le 0 ] ; then
+    exit 0
 fi
-#### 如果都是hold的那就直接退出，否则把剩余的给提醒了
-
-notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
-
+update_transhell
 
+## 如果都是hold或者版本一致的那就直接退出，否则把剩余的给提醒了
+notify-send -a spark-store "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY}" "${TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE}"

tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell

@@ -0,0 +1,17 @@
+#!/bin/bash
+TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT="Checking for update, please wait..."
+TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="Spark Store APP Upgrade model"
+TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="Error occured in checking for update! Press Confirm to get the error log (Can be useful when feedback)"
+TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="I already copied the log in the text box and I will attach it when feeding back. You can find feedback entry in the settings which is located in the top right of the store."
+TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="Feedback entry in the settings which is located in the top right of the store"
+TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="All APPs are up to date.\nBut you are not standing at the top of the world"
+TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（Unable to upgrade: Being marked as hold）"
+TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="Choose the app you want to upgrade"
+TRANSHELL_CONTENT_CHOOSE="Choose"
+TRANSHELL_CONTENT_PKG_NAME="Pkg name"
+TRANSHELL_CONTENT_NEW_VERSION="New version"
+TRANSHELL_CONTENT_UPGRADE_FROM="Upgrade from"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="No app is chosen\nBut you are not standing at the top of the world"
+TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="Upgrading $PKG_UPGRADE , please wait..."
+TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="The chosen app is upgraded"
+TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="Error occured when upgrading! Press Confirm to get the error log (Can be useful when feedback)"

tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell

@@ -0,0 +1,17 @@
+#!/bin/bash
+TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT="正在检查更新，请稍候..."
+TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="星火商店更新模块"
+TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="检查更新进程出现错误！按确定查看报错，可用于反馈"
+TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="我已复制了此文本框中的日志，且将会在反馈时附上。反馈渠道可以在右上角菜单的设置中找到"
+TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="反馈渠道在商店右上角的设置里"
+TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="没有软件需要更新\n但是你并没有站在世界之巅"
+TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）"
+TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用"
+TRANSHELL_CONTENT_CHOOSE="选择"
+TRANSHELL_CONTENT_PKG_NAME="包名"
+TRANSHELL_CONTENT_NEW_VERSION="新版本"
+TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何软件\n但是你并没有站在世界之巅"
+TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $PKG_UPGRADE ，请稍候..."
+TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的软件已经更新完毕"
+TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈"

tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell

@@ -0,0 +1,17 @@
+#!/bin/bash
+TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT="正在檢查更新，請稍候…"
+TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="星火商店更新模塊"
+TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="檢查更新行程出現錯誤！ 按確定查看報錯，可用於回報"
+TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="我已複製了此文字方塊中的日誌，且將會在回報時附上。 迴響通路可以在右上角選單的設定中找到 "
+TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="回報入口在商店右上角的設定裏"
+TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="沒有軟體需要更新\n但是你並沒有站在世界之巔"
+TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）"
+TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用"
+TRANSHELL_CONTENT_CHOOSE="选择"
+TRANSHELL_CONTENT_PKG_NAME="包名"
+TRANSHELL_CONTENT_NEW_VERSION="新版本"
+TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何軟體\n但是你並沒有站在世界之巔"
+TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $PKG_UPGRADE ，请稍候..."
+TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的軟體已经更新完毕"
+TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈"

tool/update-upgrade/transhell/ss-update-controler.sh.zh_TW.transhell

@@ -0,0 +1,12 @@
+#!/bin/bash
+TRANSHELL_CONTENT_CLOSE="关闭"
+TRANSHELL_CONTENT_OPEN="开启"
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~"
+TRANSHELL_CONTENT_OPTIONS="操作选项"
+TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK="$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
+TRANSHELL_CONTENT_CHECK_FOR_UPDATE="查看可更新软件包列表"
+TRANSHELL_CONTENT_EXIT="退出"
+TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="执行关闭自动更新检测，请授权"
+TRANSHELL_CONTENT_CLOSED="已关闭"
+TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="执行启动自动更新检测，请授权"
+TRANSHELL_CONTENT_OPENED="已开启"

tool/update-upgrade/transhell/ss-update-controler.sh_en_US.transhell

@@ -0,0 +1,12 @@
+#!/bin/bash
+TRANSHELL_CONTENT_CLOSE="Close"
+TRANSHELL_CONTENT_OPEN="Open"
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="Welcome to Spark Store APP Upgrade Settings\nPlease choose one option to run"
+TRANSHELL_CONTENT_OPTIONS="Options"
+TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK="$text_update_open Spark Store APP upgrade check. (Will notify APP upgrade at start up if opened.)"
+TRANSHELL_CONTENT_CHECK_FOR_UPDATE="Check Upgradable app list."
+TRANSHELL_CONTENT_EXIT="Exit"
+TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="Please authorize to close APP upgrade check"
+TRANSHELL_CONTENT_CLOSED="Closed"
+TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="Please authorize to open APP upgrade check"
+TRANSHELL_CONTENT_OPENED="Opened"

tool/update-upgrade/transhell/ss-update-controler.sh_zh_CN.transhell

@@ -0,0 +1,12 @@
+#!/bin/bash
+TRANSHELL_CONTENT_CLOSE="关闭"
+TRANSHELL_CONTENT_OPEN="开启"
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~"
+TRANSHELL_CONTENT_OPTIONS="操作选项"
+TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK="$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
+TRANSHELL_CONTENT_CHECK_FOR_UPDATE="查看可更新软件包列表"
+TRANSHELL_CONTENT_EXIT="退出"
+TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="执行关闭自动更新检测，请授权"
+TRANSHELL_CONTENT_CLOSED="已关闭"
+TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="执行启动自动更新检测，请授权"
+TRANSHELL_CONTENT_OPENED="已开启"

tool/update-upgrade/transhell/ss-update-notifier.sh_en_US.transhell

@@ -0,0 +1,5 @@
+#!/bin/bash
+TRANSHELL_CONTENT_NETWORK_FAIL="Network fail. Stop to avoid bother dpkg"
+TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC="Update error! Wait for 15 seconds..."
+TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY="Spark Store Upgrade Notifier"
+TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE="There are ${update_app_number} APPs available to upgrade! Please go to Spark Store to upgrade."

tool/update-upgrade/transhell/ss-update-notifier.sh_zh_CN.transhell

@@ -0,0 +1,5 @@
+#!/bin/bash
+TRANSHELL_CONTENT_NETWORK_FAIL="网络错误！为防止阻塞dpkg,停止"
+TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC="更新出现异常状况，等待十五秒"
+TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY="星火更新提醒"
+TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE="星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"

tool/update-upgrade/transhell/ss-update-notifier.sh_zh_TW.transhell

@@ -0,0 +1,5 @@
+#!/bin/bash
+TRANSHELL_CONTENT_NETWORK_FAIL="网络错误！为防止阻塞dpkg,停止"
+TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC="更新出现异常状况，等待十五秒"
+TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY="星火更新提醒"
+TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE="星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"

translate_generation.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 # this file is used to auto-generate .qm file from .ts file.
 
-ts_list=(`ls ./translations/*.ts`)
+cd $(dirname $0)
 
-for ts in "${ts_list[@]}"
-do
-    printf "\nprocess ${ts}\n"
-    lrelease "${ts}"
-done
+lrelease ./src/spark-store.pro