update tool/ssinstall.

Signed-off-by: shenmo <jifengshenmo@outlook.com>

.gitignore

@@ -27,7 +27,6 @@ ui_*.h
 *.qmlc
 *.jsc
 Makefile*
-*build-*
 
 # Qt unit tests
 target_wrapper.*

BUILD_SCRIPTS.md

@@ -0,0 +1,157 @@
+# Spark Store 编译脚本使用指南
+
+本项目包含 4 个编译脚本，支持 Qt5 和 Qt6 并行编译。
+
+## 脚本文件
+
+### 1. **Qt5 编译脚本** (`build-qt5.sh`)
+**功能**: 仅编译 Qt5 版本
+```bash
+./build-qt5.sh
+```
+**输出**:
+- 编译目录: `build/qt5-Debug/`
+- 可执行文件: `build/qt5-Debug/src/spark-store`
+
+### 2. **Qt5 编译和运行脚本** (`build-run-qt5.sh`)
+**功能**: 编译 Qt5 版本并立即运行
+```bash
+./build-run-qt5.sh
+```
+**流程**: 编译 → 运行应用（前台）
+
+### 3. **Qt6 编译脚本** (`build-qt6.sh`)
+**功能**: 仅编译 Qt6 版本
+```bash
+./build-qt6.sh
+```
+**输出**:
+- 编译目录: `build/qt6-Debug/`
+- 可执行文件: `build/qt6-Debug/src/spark-store`
+
+### 4. **Qt6 编译和运行脚本** (`build-run-qt6.sh`)
+**功能**: 编译 Qt6 版本并立即运行
+```bash
+./build-run-qt6.sh
+```
+**流程**: 编译 → 运行应用（前台）
+
+## 快速开始
+
+### 编译 Qt6 版本
+```bash
+cd /home/momen/Desktop/spark-git/spark-store
+./build-qt6.sh
+```
+
+### 编译并运行 Qt5 版本
+```bash
+cd /home/momen/Desktop/spark-git/spark-store
+./build-run-qt5.sh
+```
+
+### 编译两个版本（共存）
+```bash
+# 先编译 Qt6
+./build-qt6.sh
+
+# 再编译 Qt5
+./build-qt5.sh
+```
+
+## 脚本特性
+
+✓ **自动检测**: 检查 Qt 工具是否安装
+✓ **并行编译**: 使用 `make -j$(nproc)` 利用所有 CPU 核心
+✓ **结果验证**: 编译完成后验证可执行文件
+✓ **错误处理**: 编译失败时立即停止并报错
+✓ **清洁构建**: 每次都从头开始（删除旧构建目录）
+
+## 构建目录结构
+
+```
+spark-store/
+├── build/
+│   ├── qt5-Debug/          # Qt5 构建目录
+│   │   ├── src/
+│   │   │   └── spark-store (可执行文件)
+│   │   └── spark-update-tool/
+│   │       └── spark-update-tool (可执行文件)
+│   └── qt6-Debug/          # Qt6 构建目录
+│       ├── src/
+│       │   └── spark-store (可执行文件)
+│       └── spark-update-tool/
+│           └── spark-update-tool (可执行文件)
+├── build-qt5.sh
+├── build-run-qt5.sh
+├── build-qt6.sh
+└── build-run-qt6.sh
+```
+
+## 环境要求
+
+### Qt5
+- qmake 路径: `/usr/lib/qt5/bin/qmake`
+- Qt 版本: 5.15.15+
+
+### Qt6
+- qmake6 路径: `/usr/lib/qt6/bin/qmake6`
+- Qt 版本: 6.8.2+
+
+### 构建工具
+- GCC/G++ 编译器
+- make 工具
+- pkg-config
+
+## 故障排除
+
+### 问题: 未找到 Qt qmake
+**解决**:
+```bash
+# 检查 Qt 安装
+which qmake                    # 检查 Qt5
+/usr/lib/qt6/bin/qmake6 --version  # 检查 Qt6
+```
+
+### 问题: 编译出错
+**解决**:
+1. 检查所有依赖是否安装
+2. 确保有充足的磁盘空间
+3. 查看完整的错误信息
+4. 尝试清理构建目录
+
+## 高级用法
+
+### 仅运行已编译的应用（不重新编译）
+```bash
+# Qt5
+./build/qt5-Debug/src/spark-store
+
+# Qt6
+./build/qt6-Debug/src/spark-store
+```
+
+### 后台运行应用
+```bash
+# Qt5 后台运行
+./build/qt5-Debug/src/spark-store &
+
+# Qt6 后台运行
+./build/qt6-Debug/src/spark-store &
+```
+
+### 跳过编译直接运行
+```bash
+# 如果已编译，可直接运行
+./build/qt6-Debug/src/spark-store
+```
+
+
+## 脚本维护
+
+这些脚本会在每次运行时：
+1. 检查 Qt 工具可用性
+2. 清理旧的构建目录
+3. 生成新的 Makefile
+4. 编译项目
+5. 验证编译结果

build-deb-both.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Spark Store - 构建 Qt5 和 Qt6 两个版本的 DEB 包
+# Build both Qt5 and Qt6 versions of DEB packages
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$SCRIPT_DIR"
+
+echo "========================================="
+echo "Spark Store - 双版本 DEB 构建"
+echo "========================================="
+echo ""
+echo "项目目录: $PROJECT_ROOT"
+echo ""
+
+# 检查脚本存在
+if [ ! -f "$PROJECT_ROOT/build-deb-qt5.sh" ] || [ ! -f "$PROJECT_ROOT/build-deb-qt6.sh" ]; then
+    echo "错误: 构建脚本不存在"
+    exit 1
+fi
+
+# 检查 debian 目录存在
+if [ ! -d "$PROJECT_ROOT/debian" ]; then
+    echo "错误: debian 目录不存在"
+    exit 1
+fi
+
+# 构建 Qt5
+echo "================================"
+echo "第一步：构建 Qt5 版本..."
+echo "================================"
+cd "$PROJECT_ROOT"
+./build-deb-qt5.sh
+
+# 检查输出
+if ! ls ../*_qt5_amd64.deb 2>/dev/null | grep -q . ; then
+    echo "错误: Qt5 构建失败，未找到输出文件"
+    exit 1
+fi
+
+QT5_DEB=$(ls -t ../*_qt5_amd64.deb 2>/dev/null | head -1)
+echo "✓ Qt5 版本已构建: $QT5_DEB"
+echo ""
+
+# 清理构建文件以进行下一次构建
+echo "清理构建环境..."
+cd "$PROJECT_ROOT"
+rm -rf build-*/spark-update-tool build-*/src build-*/Makefile
+
+# 构建 Qt6
+echo "================================"
+echo "第二步：构建 Qt6 版本..."
+echo "================================"
+cd "$PROJECT_ROOT"
+./build-deb-qt6.sh
+
+# 检查输出
+if ! ls ../*_qt6_amd64.deb 2>/dev/null | grep -q . ; then
+    echo "错误: Qt6 构建失败，未找到输出文件"
+    exit 1
+fi
+
+QT6_DEB=$(ls -t ../*_qt6_amd64.deb 2>/dev/null | head -1)
+echo "✓ Qt6 版本已构建: $QT6_DEB"
+echo ""
+
+# 显示最终结果
+echo "========================================="
+echo "✓ 构建完成！"
+echo "========================================="
+echo ""
+echo "输出文件:"
+ls -lh "$QT5_DEB" "$QT6_DEB" 2>/dev/null
+echo ""
+
+# 显示版本信息
+echo "验证 Qt5 版本:"
+dpkg -I "$QT5_DEB" | grep -E "Description:|Package:" | head -2
+echo ""
+
+echo "验证 Qt6 版本:"
+dpkg -I "$QT6_DEB" | grep -E "Description:|Package:" | head -2
+echo ""
+
+echo "========================================="
+echo "安装选项:"
+echo "  Qt5: sudo apt install $QT5_DEB"
+echo "  Qt6: sudo apt install $QT6_DEB"
+echo "========================================="

build-deb-qt5.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Spark Store - Qt5 DEB Package Builder
+# 构建 Qt5 版本的 DEB 包
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$SCRIPT_DIR"
+
+echo "========================================="
+echo "构建 Spark Store - Qt5 版本"
+echo "========================================="
+echo ""
+
+# 检查 debian 目录是否存在
+if [ ! -d "$PROJECT_ROOT/debian" ]; then
+    echo "错误: $PROJECT_ROOT/debian 目录不存在"
+    exit 1
+fi
+
+# 检查必要的文件
+if [ ! -f "$PROJECT_ROOT/debian/control" ] || [ ! -f "$PROJECT_ROOT/debian/rules" ]; then
+    echo "错误: debian 目录中缺少必要的文件"
+    exit 1
+fi
+
+echo "使用 Qt5 构建..."
+echo "Debian 配置目录: $PROJECT_ROOT/debian"
+echo ""
+
+# 构建 DEB 包，传递 Qt 版本标志
+cd "$PROJECT_ROOT"
+echo "开始构建..."
+QT_VERSION=qt5 dpkg-buildpackage -us -uc -b
+
+BUILD_STATUS=$?
+
+if [ $BUILD_STATUS -eq 0 ]; then
+    echo ""
+    echo "========================================="
+    echo "✓ Qt5 DEB 包构建成功！"
+    echo "========================================="
+    
+    # 重命名 DEB 文件以包含 qt5 标识
+    DEB_FILE=$(find "$PROJECT_ROOT/.." -maxdepth 1 -name "spark-store_*_$(dpkg-architecture -qDEB_BUILD_ARCH).deb" -type f -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2-)
+    if [ -n "$DEB_FILE" ] && [ -f "$DEB_FILE" ]; then
+        DEB_DIR=$(dirname "$DEB_FILE")
+        DEB_BASENAME=$(basename "$DEB_FILE")
+        DEB_NEW_NAME=$(echo "$DEB_BASENAME" | sed 's/_\([^_]*\)\.deb$/_qt5_\1.deb/')
+        DEB_NEW_PATH="$DEB_DIR/$DEB_NEW_NAME"
+        mv "$DEB_FILE" "$DEB_NEW_PATH"
+        echo "DEB 文件已重命名为: $DEB_NEW_NAME"
+    fi
+else
+    echo ""
+    echo "========================================="
+    echo "✗ Qt5 DEB 包构建失败"
+    echo "========================================="
+    exit 1
+fi

build-deb-qt6.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Spark Store - Qt6 DEB Package Builder
+# 构建 Qt6 版本的 DEB 包
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$SCRIPT_DIR"
+
+echo "========================================="
+echo "构建 Spark Store - Qt6 版本"
+echo "========================================="
+echo ""
+
+# 检查 debian 目录是否存在
+if [ ! -d "$PROJECT_ROOT/debian" ]; then
+    echo "错误: $PROJECT_ROOT/debian 目录不存在"
+    exit 1
+fi
+
+# 检查必要的文件
+if [ ! -f "$PROJECT_ROOT/debian/control" ] || [ ! -f "$PROJECT_ROOT/debian/rules" ]; then
+    echo "错误: debian 目录中缺少必要的文件"
+    exit 1
+fi
+
+echo "使用 Qt6 构建..."
+echo "Debian 配置目录: $PROJECT_ROOT/debian"
+echo ""
+
+# 构建 DEB 包，传递 Qt 版本标志
+cd "$PROJECT_ROOT"
+echo "开始构建..."
+QT_VERSION=qt6 dpkg-buildpackage -us -uc -b
+
+BUILD_STATUS=$?
+
+if [ $BUILD_STATUS -eq 0 ]; then
+    echo ""
+    echo "========================================="
+    echo "✓ Qt6 DEB 包构建成功！"
+    echo "========================================="
+    
+    # 重命名 DEB 文件以包含 qt6 标识
+    DEB_FILE=$(find "$PROJECT_ROOT/.." -maxdepth 1 -name "spark-store_*_$(dpkg-architecture -qDEB_BUILD_ARCH).deb" -type f -printf '%T@ %p\n' | sort -rn | head -1 | cut -d' ' -f2-)
+    if [ -n "$DEB_FILE" ] && [ -f "$DEB_FILE" ]; then
+        DEB_DIR=$(dirname "$DEB_FILE")
+        DEB_BASENAME=$(basename "$DEB_FILE")
+        DEB_NEW_NAME=$(echo "$DEB_BASENAME" | sed 's/_\([^_]*\)\.deb$/_qt6_\1.deb/')
+        DEB_NEW_PATH="$DEB_DIR/$DEB_NEW_NAME"
+        mv "$DEB_FILE" "$DEB_NEW_PATH"
+        echo "DEB 文件已重命名为: $DEB_NEW_NAME"
+    fi
+else
+    echo ""
+    echo "========================================="
+    echo "✗ Qt6 DEB 包构建失败"
+    echo "========================================="
+    exit 1
+fi

build-qt5.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# Qt5 编译脚本
+
+set -e
+
+PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BUILD_DIR="${PROJECT_ROOT}/build/qt5-Debug"
+
+echo "================================"
+echo "Qt5 编译脚本"
+echo "================================"
+echo ""
+
+# 检查 Qt5 qmake
+if ! command -v /usr/lib/qt5/bin/qmake &> /dev/null; then
+    echo "错误: 未找到 Qt5 qmake"
+    echo "请确保 Qt5 已安装: /usr/lib/qt5/bin/qmake"
+    exit 1
+fi
+
+echo "Qt5 版本:"
+/usr/lib/qt5/bin/qmake --version
+echo ""
+
+# 创建构建目录
+echo "创建构建目录: ${BUILD_DIR}"
+rm -rf "${BUILD_DIR}"
+mkdir -p "${BUILD_DIR}"
+echo ""
+
+# 生成 Makefile
+echo "生成 Makefile..."
+cd "${BUILD_DIR}"
+/usr/lib/qt5/bin/qmake "${PROJECT_ROOT}/spark-store-project.pro" -r CONFIG+=debug
+echo ""
+
+# 编译
+echo "开始编译..."
+make -j$(nproc)
+echo ""
+
+echo "================================"
+echo "Qt5 编译完成！"
+echo "================================"
+echo ""
+echo "可执行文件位置:"
+echo "  主应用: ${BUILD_DIR}/src/spark-store"
+echo "  更新工具: ${BUILD_DIR}/spark-update-tool/spark-update-tool"
+echo ""
+
+# 验证编译结果
+if [ -f "${BUILD_DIR}/src/spark-store" ]; then
+    echo "✓ 主应用编译成功"
+    ls -lh "${BUILD_DIR}/src/spark-store"
+else
+    echo "✗ 主应用编译失败"
+    exit 1
+fi
+
+if [ -f "${BUILD_DIR}/spark-update-tool/spark-update-tool" ]; then
+    echo "✓ 更新工具编译成功"
+    ls -lh "${BUILD_DIR}/spark-update-tool/spark-update-tool"
+fi
+
+echo ""

build-qt6.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# Qt6 编译脚本
+
+set -e
+
+PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BUILD_DIR="${PROJECT_ROOT}/build/qt6-Debug"
+
+echo "================================"
+echo "Qt6 编译脚本"
+echo "================================"
+echo ""
+
+# 检查 Qt6 qmake
+if ! command -v /usr/lib/qt6/bin/qmake6 &> /dev/null; then
+    echo "错误: 未找到 Qt6 qmake6"
+    echo "请确保 Qt6 已安装: /usr/lib/qt6/bin/qmake6"
+    exit 1
+fi
+
+echo "Qt6 版本:"
+/usr/lib/qt6/bin/qmake6 --version
+echo ""
+
+# 创建构建目录
+echo "创建构建目录: ${BUILD_DIR}"
+rm -rf "${BUILD_DIR}"
+mkdir -p "${BUILD_DIR}"
+echo ""
+
+# 生成 Makefile
+echo "生成 Makefile..."
+cd "${BUILD_DIR}"
+/usr/lib/qt6/bin/qmake6 "${PROJECT_ROOT}/spark-store-project.pro" -r CONFIG+=debug
+echo ""
+
+# 编译
+echo "开始编译..."
+make -j$(nproc)
+echo ""
+
+echo "================================"
+echo "Qt6 编译完成！"
+echo "================================"
+echo ""
+echo "可执行文件位置:"
+echo "  主应用: ${BUILD_DIR}/src/spark-store"
+echo "  更新工具: ${BUILD_DIR}/spark-update-tool/spark-update-tool"
+echo ""
+
+# 验证编译结果
+if [ -f "${BUILD_DIR}/src/spark-store" ]; then
+    echo "✓ 主应用编译成功"
+    ls -lh "${BUILD_DIR}/src/spark-store"
+else
+    echo "✗ 主应用编译失败"
+    exit 1
+fi
+
+if [ -f "${BUILD_DIR}/spark-update-tool/spark-update-tool" ]; then
+    echo "✓ 更新工具编译成功"
+    ls -lh "${BUILD_DIR}/spark-update-tool/spark-update-tool"
+fi
+
+echo ""

build-run-qt5.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+# Qt5 编译和运行脚本
+
+set -e
+
+PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BUILD_DIR="${PROJECT_ROOT}/build/qt5-Debug"
+
+echo "================================"
+echo "Qt5 编译和运行脚本"
+echo "================================"
+echo ""
+
+# 检查 Qt5 qmake
+if ! command -v /usr/lib/qt5/bin/qmake &> /dev/null; then
+    echo "错误: 未找到 Qt5 qmake"
+    echo "请确保 Qt5 已安装: /usr/lib/qt5/bin/qmake"
+    exit 1
+fi
+
+echo "Qt5 版本:"
+/usr/lib/qt5/bin/qmake --version
+echo ""
+
+# 创建构建目录
+echo "创建构建目录: ${BUILD_DIR}"
+rm -rf "${BUILD_DIR}"
+mkdir -p "${BUILD_DIR}"
+echo ""
+
+# 生成 Makefile
+echo "生成 Makefile..."
+cd "${BUILD_DIR}"
+/usr/lib/qt5/bin/qmake "${PROJECT_ROOT}/spark-store-project.pro" -r CONFIG+=debug
+echo ""
+
+# 编译
+echo "开始编译..."
+make -j$(nproc)
+echo ""
+
+echo "✓ 编译完成！"
+echo ""
+
+# 运行应用
+SPARK_STORE="${BUILD_DIR}/src/spark-store"
+
+if [ -f "${SPARK_STORE}" ]; then
+    echo "================================"
+    echo "启动 spark-store（Qt5）"
+    echo "================================"
+    echo ""
+    "${SPARK_STORE}"
+else
+    echo "错误: spark-store 未找到"
+    exit 1
+fi

build-run-qt6.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+# Qt6 编译和运行脚本
+
+set -e
+
+PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BUILD_DIR="${PROJECT_ROOT}/build/qt6-Debug"
+
+echo "================================"
+echo "Qt6 编译和运行脚本"
+echo "================================"
+echo ""
+
+# 检查 Qt6 qmake
+if ! command -v /usr/lib/qt6/bin/qmake6 &> /dev/null; then
+    echo "错误: 未找到 Qt6 qmake6"
+    echo "请确保 Qt6 已安装: /usr/lib/qt6/bin/qmake6"
+    exit 1
+fi
+
+echo "Qt6 版本:"
+/usr/lib/qt6/bin/qmake6 --version
+echo ""
+
+# 创建构建目录
+echo "创建构建目录: ${BUILD_DIR}"
+rm -rf "${BUILD_DIR}"
+mkdir -p "${BUILD_DIR}"
+echo ""
+
+# 生成 Makefile
+echo "生成 Makefile..."
+cd "${BUILD_DIR}"
+/usr/lib/qt6/bin/qmake6 "${PROJECT_ROOT}/spark-store-project.pro" -r CONFIG+=debug
+echo ""
+
+# 编译
+echo "开始编译..."
+make -j$(nproc)
+echo ""
+
+echo "✓ 编译完成！"
+echo ""
+
+# 运行应用
+SPARK_STORE="${BUILD_DIR}/src/spark-store"
+
+if [ -f "${SPARK_STORE}" ]; then
+    echo "================================"
+    echo "启动 spark-store（Qt6）"
+    echo "================================"
+    echo ""
+    "${SPARK_STORE}"
+else
+    echo "错误: spark-store 未找到"
+    exit 1
+fi

debian/changelog

@@ -1,9 +1,18 @@
-spark-store (4.8.2) UNRELEASED; urgency=medium
+spark-store (4.8.4) UNRELEASED; urgency=medium
+
+  * 修复 软件更新器更新无法正确处理忽略的软件包
+  * 修复 在高分屏下 左侧的分类图标模糊问题，感谢 @Blumia
+  * 合并 qt5和qt6分支
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 28 Aug 2025 01:03:08 +0800
+
+spark-store (4.8.3) UNRELEASED; urgency=medium
 
   * 更新软件主图标
   * 软件更新器更新成功后删除软件包
   * 修复：首次安装ACE环境情况下无法正确配置ACE中aptss的问题
   * 修复：使用aptss后在/tmp下留下垃圾的问题
+  * aptss 更新，支持在APM下使用
   
  -- momen <vmomenv@gmail.com>  Tue, 28 Aug 2025 01:03:08 +0800
 

debian/control

@@ -5,14 +5,14 @@ Priority: optional
 Build-Depends:
  debhelper (>= 9),
  pkg-config,
- qtchooser (>= 55-gc9562a1-1~) | qt5-default,
- qtbase5-dev,
- libqt5svg5-dev,
- qttools5-dev-tools,
- qtwebengine5-dev,
- libdtkcore-dev (>= 5.0),
- libdtkgui-dev (>= 5.0),
- libdtkwidget-dev (>= 5.0)
+ qtchooser (>= 55-gc9562a1-1~) | qt5-default | qt6-base-dev,
+ qtbase5-dev | qt6-base-dev,
+ libqt5svg5-dev | libqt6svg6-dev,
+ qttools5-dev-tools | qt6-tools-dev,
+ qtwebengine5-dev | qt6-webengine-dev,
+ libdtkcore-dev (>= 5.0) | libdtk6core-dev (>= 6.0),
+ libdtkgui-dev (>= 5.0) | libdtk6gui-dev (>= 6.0),
+ libdtkwidget-dev (>= 5.0) | libdtk6widget-dev (>= 6.0)
 Standards-Version: 4.1.7
 Homepage: https://www.spark-app.store/
 
@@ -20,17 +20,20 @@ Package: spark-store
 Architecture: any
 Provides: spark-store-console-in-container
 Depends: ${shlibs:Depends}, ${misc:Depends},
- dde-qt5integration,
+ libdtkcore5 (>= 5.0) | libdtk6core (>= 6.0),
+ libdtkgui5 (>= 5.0) | libdtk6gui (>= 6.0),
+ libdtkwidget5 (>= 5.0) | libdtk6widget (>= 6.0),
+ dde-qt5integration | dde-qt6integration,
  curl,
  openssl,
  aria2,
  gnupg,
  zenity,
- policykit-1 | pkexec,
+ policykit-1 | pkexec | polkit,
  libnotify-bin,
- qtwayland5,
+ qtwayland5 | qt6-wayland | qt-5,
  desktop-file-utils,
- dpkg-dev,
  lsb-release,
 Description: Spark Store
  A community powered app store, based on DTK.
+ Supports both Qt5 and Qt6 versions.

debian/debhelper-build-stamp

@@ -0,0 +1 @@
+spark-store

debian/rules

@@ -1,6 +1,18 @@
 #!/usr/bin/make -f
 
-export QT_SELECT = qt5
+# Determine Qt version based on QT_VERSION environment variable
+# Default to Qt5 if not specified
+# Usage: QT_VERSION=qt6 dpkg-buildpackage -us -uc -b
+QT_VERSION ?= qt5
+
+ifeq ($(QT_VERSION),qt6)
+    export QT_SELECT = qt6
+    QMAKE_CMD = qmake6
+else
+    export QT_SELECT = qt5
+    QMAKE_CMD = qmake
+endif
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/default.mk
 
@@ -22,7 +34,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	mkdir -p $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
 
-	qmake BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-store-project.pro \
+	$(QMAKE_CMD) BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-store-project.pro \
 	-spec linux-g++ CONFIG+=force_debug_info \
 	-o $(CURDIR)/build-$(DEB_HOST_MULTIARCH)/
 
@@ -34,8 +46,8 @@ override_dh_auto_install:
 	INSTALL_ROOT=$(CURDIR)/debian/spark-store
 
 # Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
-# Qt Mutidedia lib will ref to network libraray.
+# Qt Multimedia lib will ref to network library.
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0 --exclude=opt/durapps/spark-store/bin/ss-feedback/
 override_dh_strip:
-	dh_strip --exclude=opt/durapps/spark-store/bin/ss-feedback/
+	dh_strip --exclude=opt/durapps/spark-store/bin/ss-feedback/

debian/spark-store.postinst

@@ -26,6 +26,7 @@ case "$1" in
 
 		#  Remove the sources.list file
 		rm -f /etc/apt/sources.list.d/sparkstore.list
+        rm -f /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list
 
 		# Check if /usr/local/bin existed
 		mkdir -p /usr/local/bin
@@ -41,7 +42,7 @@ case "$1" in
 		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast
 
 		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
-		ln -sf /usr/lib/qt5/bin/spark-update-tool /usr/bin/spark-update-tool
+
 
 
 		# Install key

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

@@ -1,5 +1,5 @@
 #!/bin/bash
-TRANSHELL_CONTENT_RUNNING_IN_NOT_ROOT_USER="INFO: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..."
-TRANSHELL_CONTENT_PLEASE_USE_APTSS_INSTEAD_OF_APT="Please note: Although the error message suggests using \"apt\" (such as \"apt install --fix-broken\"), please use \"aptss\" instead of \"apt\" when troubleshooting errors (for example, change to \"aptss install --fix-broken\")."
+TRANSHELL_CONTENT_RUNNING_IN_NOT_ROOT_USER="INFO: Running in non-Root mode! If error occurs, please try running the command with Root privileges."
+TRANSHELL_CONTENT_INFO_SOURCES_LIST_D_IS_EMPTY="INFO: The sources.list.d directory is empty. Synchronization will not be attempted."
+TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST="Fetching configuration and mirror list from the server..."
+TRANSHELL_CONTENT_PLEASE_USE_APTSS_INSTEAD_OF_APT="NOTE: Although the error message may suggest using apt (e.g. apt install --fix-broken) to fix the issue, please use aptss instead when troubleshooting (for example, use: aptss install --fix-broken)."

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

@@ -1,5 +1,5 @@
 #!/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="从服务器获取配置和镜像列表..."
-TRANSHELL_CONTENT_PLEASE_USE_APTSS_INSTEAD_OF_APT="注意：尽管报错信息中提示使用apt（如apt install --fix-broken),请在排查错误的时候使用aptss而不是apt(对于例子，改为使用 aptss install --fix-broken)."
+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="正在从服务器获取配置和镜像列表……"
+TRANSHELL_CONTENT_PLEASE_USE_APTSS_INSTEAD_OF_APT="注意：尽管报错信息提示使用 apt（如 apt install --fix-broken）修复问题，但请在排查错误时使用 aptss 进行替代（对于例子，请改为使用 aptss install --fix-broken）。"

pkg/usr/share/ssinstall-local/transhell/ssinstall-local_en_US.transhell

@@ -1,6 +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."
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="An unexpected error caused the package verification to fail, and the installation process has been terminated.\n\nPossible causes include:\nNetwork or storage issues resulting in a corrupted package; The Spark Store repository has not yet completed synchronization; In extreme cases, malware may be attempting to tamper with the installation package to compromise the system.\n\nFor normal users: please run the following command in the terminal and then try installing again:\nsudo aptss update\n\nIf the problem persists, click 'App Feedback' button in the application information page to submit the issue.\n\nFor auditors: please use ssaudit instead of ssinstall for auditing, as ssinstall is now reserved for password-free installation.\nThe ssaudit command can also be used to attempt installation of applications that have been removed from the Spark Store."
+TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="Please run the ssinstall command with Root privileges."
+TRANSHELL_CONTENT_FILE_NOT_EXIST="The specified file does not exist."
+TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="No --delete-after-install option specified or installation failed. The Deb package will not be deleted."
+TRANSHELL_CONTENT_DEB_IS_DELETED="The --delete-after-install option was used and the installation succeeded. The Deb package has been deleted."

pkg/usr/share/ssinstall-local/transhell/ssinstall-local_zh_CN.transhell

@@ -1,6 +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包"
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="意外错误导致软件包校验失败，安装进程已终止。\n\n可能导致此错误的原因：\n网络或存储问题导致软件包损坏；星火应用商店软件仓库未完成同步；极端情况下，恶意软件尝试篡改安装包进行入侵。\n\n对于普通用户，请在终端执行 sudo aptss update 后再次尝试安装；如仍然遇到此错误，请在应用信息界面点击“应用反馈”提交问题。\n对于审核人员，请使用 ssaudit 替代 ssinstall 执行，现在 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 包。"

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

@@ -1,6 +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."
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="An unexpected error caused the package verification to fail, and the installation process has been terminated.\n\nPossible causes include:\nNetwork or storage issues resulting in a corrupted package; The Spark Store repository has not yet completed synchronization; In extreme cases, malware may be attempting to tamper with the installation package to compromise the system.\n\nFor normal users: please run the following command in the terminal and then try installing again:\nsudo aptss update\n\nIf the problem persists, click 'App Feedback' button in the application information page to submit the issue.\n\nFor auditors: please use ssaudit instead of ssinstall for auditing, as ssinstall is now reserved for password-free installation.\nThe ssaudit command can also be used to attempt installation of applications that have been removed from the Spark Store."
+TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="Please run the ssinstall command with Root privileges."
+TRANSHELL_CONTENT_FILE_NOT_EXIST="The specified file does not exist."
+TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="No --delete-after-install option specified or installation failed. The Deb package will not be deleted."
+TRANSHELL_CONTENT_DEB_IS_DELETED="The --delete-after-install option was used and the installation succeeded. The Deb package has been deleted."

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

@@ -1,6 +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包"
+TRANSHELL_CONTENT_HASH_CHECK_FAILED="意外错误导致软件包校验失败，安装进程已终止。\n\n可能导致此错误的原因：\n网络或存储问题导致软件包损坏；星火应用商店软件仓库未完成同步；极端情况下，恶意软件尝试篡改安装包进行入侵。\n\n对于普通用户，请在终端执行 sudo aptss update 后再次尝试安装；如仍然遇到此错误，请在应用信息界面点击“应用反馈”提交问题。\n对于审核人员，请使用 ssaudit 替代 ssinstall 执行，现在 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

@@ -80,9 +80,9 @@ INSTALLS += \
         polkit-1 
 #   暂时不添加
 
-SUBDIRS += src/spark-update-tool
+SUBDIRS += spark-update-tool
 
-spark-update-tool.subdir = src/spark-update-tool
-spark-update-tool.file = src/spark-update-tool/spark-update-tool.pro
+spark-update-tool.subdir = spark-update-tool
+spark-update-tool.file = spark-update-tool/spark-update-tool.pro
 spark-update-tool.target = spark-update-tool
 spark-update-tool.depends = spark-store

spark-update-tool/CMakeLists.txt

@@ -0,0 +1,99 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(spark-update-tool VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network Concurrent)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network Concurrent)
+
+set(PROJECT_SOURCES
+        src/main.cpp
+        src/mainwindow.cpp
+        src/mainwindow.h
+        src/mainwindow.ui
+        src/aptssupdater.h
+        src/aptssupdater.cpp
+        src/icons.qrc
+        src/appdelegate.h
+        src/appdelegate.cpp
+        src/applistmodel.h
+        src/applistmodel.cpp
+        src/downloadmanager.h
+        src/downloadmanager.cpp
+        src/ignoreconfig.h
+        src/ignoreconfig.cpp
+)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+    qt_add_executable(spark-update-tool
+        MANUAL_FINALIZATION
+        ${PROJECT_SOURCES}
+    )
+# Define target properties for Android with Qt 6 as:
+#    set_property(TARGET spark-update-tool APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
+# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+else()
+    if(ANDROID)
+        add_library(spark-update-tool SHARED
+            ${PROJECT_SOURCES}
+        )
+# Define properties for Android with Qt 5 after find_package() calls as:
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+    else()
+        add_executable(spark-update-tool
+            ${PROJECT_SOURCES}
+        )
+    endif()
+endif()
+
+target_link_libraries(spark-update-tool PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Concurrent)
+
+# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
+# If you are developing for iOS or macOS you should consider setting an
+# explicit, fixed bundle identifier manually though.
+if(${QT_VERSION} VERSION_LESS 6.1.0)
+  set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.spark-update-tool)
+endif()
+set_target_properties(spark-update-tool PROPERTIES
+    ${BUNDLE_ID_OPTION}
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+# 安装配置
+# 对于Linux，安装到/usr/bin目录
+if(UNIX AND NOT APPLE)
+    # 直接指定安装路径为 /usr/bin
+    install(TARGETS spark-update-tool
+        RUNTIME DESTINATION /usr/bin
+    )
+    
+    # 可选：安装桌面文件和应用图标
+    # install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/spark-update-tool.desktop
+    #     DESTINATION /usr/share/applications
+    # )
+    # install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/spark-update-tool.png
+    #     DESTINATION /usr/share/icons/hicolor/256x256/apps
+    # )
+else()
+    # 对于其他系统，使用GNU标准安装路径
+    include(GNUInstallDirs)
+    install(TARGETS spark-update-tool
+        BUNDLE DESTINATION .
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+endif()
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(spark-update-tool)
+endif()

spark-update-tool/README.md

@@ -0,0 +1,15 @@
+### Spark Update Tool
+#### Introduction
+
+Welcome to Spark Software Updater. Use this tool to update applications on your Linux system.
+This version is specifically designed for Linux distributions with Qt6 support.
+Please run under root privileges (recommended: use `sudo`).
+#### Currently Supported Linux Distributions
+- [x] GXDE OS
+- [x] Ubuntu
+- [x] deepin
+- [ ] Kylin
+
+
+#### Contact & Feedback
+momen@momen.world

spark-update-tool/README.zh.md

@@ -1,14 +1,10 @@
 ### 星火软件更新器
-
 #### 简介
 
-欢迎使用星火软件更新器！本工具可帮助您便捷地更新 Linux 计算机上的各类程序。
-
-本版本专为仅包含 Qt5 的 Linux 发行版设计。  
-**请在 root 权限下运行本程序。**
-
+欢迎使用星火软件更新器，您可以使用此更新器更新位于您 Linux 计算机的程序。
+此版本专为有qt6的Linux发行版所使用。
+请在root环境下运行。
 #### 当前支持的 Linux 发行版
-
 - [x] GXDE OS
 - [x] Ubuntu
 - [x] deepin
@@ -26,5 +22,4 @@
 
 如您已安装星火应用商店，则会附带本程序。
 #### 联系与反馈
-
-如有问题或建议，欢迎联系：momen@momen.world
+momen@momen.world

spark-update-tool/debian/changelog

@@ -0,0 +1,27 @@
+spark-update-tool (1.0.4) unstable; urgency=low
+
+  * 修复点击更新全部按钮后，会更新被忽略应用的问题。
+
+spark-update-tool (1.0.3) unstable; urgency=low
+
+  * 修复默认图标加载失败的问题
+  * 修复更新器在安装阶段强制关闭窗口后再次更新无法安装软件包的问题。
+
+ -- momen <vmomenv@gmail.com>  Fri, 17 Oct 2025 00:00:00 +0000
+spark-update-tool (1.0.2) unstable; urgency=low
+
+  * 添加复选框，选择多个包更新
+  * 修复缩放问题
+  * 添加忽略应用功能
+
+ -- momen <vmomenv@gmail.com>  Mon, 29 Sep 2025 00:00:00 +0000
+spark-update-tool (1.0.1) unstable; urgency=low
+
+  * 修复窗口调整大小时的错误
+
+ -- momen <vmomenv@gmail.com>  Wed, 18 Jun 2025 00:00:00 +0000
+spark-update-tool (1.0.0) unstable; urgency=low
+
+  * Initial release.
+
+ -- momen <vmomenv@gmail.com>  Wed, 18 Jun 2025 00:00:00 +0000

spark-update-tool/debian/compat

@@ -0,0 +1 @@
+13

spark-update-tool/debian/rules

@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+# 声明兼容性级别
+export DH_VERBOSE=1
+
+%:
+	dh $@ --buildsystem=cmake
+
+# 确保使用CMake进行配置
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr
+
+# 确保使用CMake进行构建
+override_dh_auto_build:
+	dh_auto_build
+
+# 确保使用CMake进行安装
+override_dh_auto_install:
+	dh_auto_install
+
+# 确保使用CMake进行清理
+override_dh_auto_clean:
+	dh_auto_clean
+
+# 确保使用CMake进行依赖解析
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

spark-update-tool/spark-update-tool.pro

@@ -0,0 +1,54 @@
+QT += core gui widgets network concurrent
+TARGET = spark-update-tool
+TEMPLATE = app
+
+# Set C++ standard to C++17
+CONFIG += c++17
+
+# Enable auto features (uic, moc, rcc)
+CONFIG += qt warn_on release
+
+# Version info
+VERSION = 0.1.0
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+
+# Source files
+SOURCES += \
+    src/main.cpp \
+    src/mainwindow.cpp \
+    src/aptssupdater.cpp \
+    src/appdelegate.cpp \
+    src/applistmodel.cpp \
+    src/downloadmanager.cpp \
+    src/ignoreconfig.cpp
+
+HEADERS += \
+    src/mainwindow.h \
+    src/aptssupdater.h \
+    src/appdelegate.h \
+    src/applistmodel.h \
+    src/downloadmanager.h \
+    src/ignoreconfig.h
+
+FORMS += \
+    src/mainwindow.ui
+
+RESOURCES += \
+    src/icons.qrc
+
+# Linux-specific settings
+unix:!macx {
+    # 安装到 /usr/bin 目录
+    target.path = /usr/bin
+    INSTALLS += target
+    
+    # 如果需要安装其他文件（如桌面文件、图标等），可以添加
+    # desktop.path = /usr/share/applications
+    # desktop.files = spark-update-tool.desktop
+    # INSTALLS += desktop
+    
+    # Additional Linux specific configurations if needed
+    QMAKE_CXXFLAGS += -Wall -Wextra
+}
+
+# Remove Windows and macOS specific sections since we're focusing on Linux

spark-update-tool/src/appdelegate.cpp

@@ -0,0 +1,892 @@
+#include "appdelegate.h"
+#include <QIcon>
+#include <QDebug>
+#include <QApplication>
+#include <QDir>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QFile>
+#include <QEventLoop>
+
+AppDelegate::AppDelegate(QObject *parent)
+    : QStyledItemDelegate(parent), m_downloadManager(new DownloadManager(this)), m_installProcess(nullptr) {
+    connect(m_downloadManager, &DownloadManager::downloadFinished, this,
+
+            [this](const QString &packageName, bool success) {
+        if (m_downloads.contains(packageName)) {
+            m_downloads[packageName].isDownloading = false;
+            // 不要提前设置 isInstalled
+            emit updateDisplay(packageName);
+            qDebug() << (success ? "下载完成:" : "下载失败:") << packageName;
+            if (success) {
+                enqueueInstall(packageName); // 安装完成后再设置 isInstalled
+            } else {
+                // 下载失败，删除已存在的deb包并重新下载
+                QDir tempDir(QDir::tempPath());
+                QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName) << QString("%1*.deb").arg(packageName), QDir::Files);
+                for (const QString &deb : debs) {
+                    QString debPath = tempDir.absoluteFilePath(deb);
+                    if (QFile::exists(debPath)) {
+                        if (QFile::remove(debPath)) {
+                            qDebug() << "已删除下载失败的软件包:" << debPath;
+                        } else {
+                            qWarning() << "删除下载失败的软件包失败:" << debPath;
+                        }
+                    }
+                }
+                
+                // 重新开始下载
+                if (m_model) {
+                    for (int row = 0; row < m_model->rowCount(); ++row) {
+                        QModelIndex index = m_model->index(row, 0);
+                        if (index.data(Qt::UserRole + 1).toString() == packageName) {
+                            QString downloadUrl = index.data(Qt::UserRole + 7).toString();
+                            QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
+                            m_downloads[packageName] = {0, true};
+                            m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
+                            emit updateDisplay(packageName);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    connect(m_downloadManager, &DownloadManager::downloadProgress, this,
+            [this](const QString &packageName, int progress) {
+        if (m_downloads.contains(packageName)) {
+            m_downloads[packageName].progress = progress;
+            qDebug()<<progress;
+            emit updateDisplay(packageName); // 实时刷新进度条
+        }
+    });
+    // m_spinnerTimer.start(); // 移除这行
+
+    // 新增：初始化和连接 QTimer
+    m_spinnerUpdateTimer.setInterval(20); // 刷新间隔，可以调整
+    connect(&m_spinnerUpdateTimer, &QTimer::timeout, this, &AppDelegate::updateSpinner);
+}
+
+AppDelegate::~AppDelegate()
+{
+    // 终止并清理安装进程
+    if (m_installProcess && m_installProcess->state() != QProcess::NotRunning) {
+        m_installProcess->kill();
+        m_installProcess->waitForFinished(3000);
+        m_installProcess->deleteLater();
+        m_installProcess = nullptr;
+    }
+}
+
+void AppDelegate::setModel(QAbstractItemModel *model) {
+    m_model = model;
+}
+
+void AppDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
+    painter->save();
+
+    // 检查是否为忽略状态
+    bool isIgnored = index.data(Qt::UserRole + 8).toBool();
+
+    if (option.state & QStyle::State_Selected)
+        painter->fillRect(option.rect, option.palette.highlight());
+    else
+        painter->fillRect(option.rect, QColor("#F3F4F6"));
+
+    // 绘制复选框
+    QString packageName = index.data(Qt::UserRole + 1).toString();
+    bool isSelected = m_selectedPackages.contains(packageName);
+    
+    QRect checkboxRect(option.rect.left() + 10, option.rect.top() + (option.rect.height() - 20) / 2, 20, 20);
+    
+    // 绘制复选框边框
+    QColor checkboxColor = isIgnored ? QColor("#CCCCCC") : QColor("#888888");
+    painter->setPen(checkboxColor);
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(checkboxRect);
+    
+    // 如果选中，绘制勾选标记
+    if (isSelected && !isIgnored) {
+        painter->setPen(QPen(QColor("#2563EB"), 2));
+        painter->setBrush(QColor("#2563EB"));
+        painter->drawRect(checkboxRect.adjusted(4, 4, -4, -4));
+    }
+
+    QFont boldFont = option.font;
+    boldFont.setBold(true);
+    QFont normalFont = option.font;
+
+    QString name = index.data(Qt::DisplayRole).toString();
+    QString currentVersion = index.data(Qt::UserRole + 2).toString();
+    QString newVersion = index.data(Qt::UserRole + 3).toString();
+    QString iconPath = index.data(Qt::UserRole + 4).toString();
+    QString size = index.data(Qt::UserRole + 5).toString();
+    QString description = index.data(Qt::UserRole + 6).toString();
+    QString source = index.data(Qt::UserRole + 9).toString();
+
+    QRect rect = option.rect;
+    int margin = 10, spacing = 6, iconSize = 40;
+
+    // 调整图标位置，为复选框留出空间
+    QRect iconRect(rect.left() + 40, rect.top() + (rect.height() - iconSize) / 2, iconSize, iconSize);
+    
+    
+    // 如果是忽略状态，绘制灰色图标
+    if (isIgnored) {
+        // 创建灰度效果
+        QPixmap originalPixmap = QIcon(iconPath).pixmap(iconSize, iconSize);
+        QPixmap grayPixmap(originalPixmap.size());
+        grayPixmap.fill(Qt::transparent);
+        QPainter grayPainter(&grayPixmap);
+        grayPainter.setOpacity(0.3); // 设置透明度使其变灰
+        grayPainter.drawPixmap(0, 0, originalPixmap);
+        grayPainter.end();
+        painter->drawPixmap(iconRect, grayPixmap);
+    } else {
+        QIcon(iconPath).paint(painter, iconRect);
+    }
+
+    int textX = iconRect.right() + margin;
+    int textWidth = rect.width() - textX - 100;
+
+    // 绘制应用名称
+    QRect nameRect(textX, rect.top() + margin, textWidth, 20);
+    painter->setFont(boldFont);
+    QColor nameColor = isIgnored ? QColor("#999999") : QColor("#333333");
+    painter->setPen(nameColor);
+    
+    // 计算名称宽度
+    QFontMetrics fontMetrics(boldFont);
+    int nameWidth = fontMetrics.horizontalAdvance(name);
+    
+    // 绘制名称
+    painter->drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter, name);
+    
+    // 绘制来源Tag
+    if (!source.isEmpty()) {
+        int tagX = textX + nameWidth + 10;
+        QString tagText;
+        QColor bgColor;
+        QColor textColor;
+        
+        if (source == "apm") {
+            tagText = "APM";
+            bgColor = QColor("#3B82F6"); // 蓝色
+            textColor = QColor("#FFFFFF");
+        } else {
+            tagText = "传统deb";
+            bgColor = QColor("#F97316"); // 橙色
+            textColor = QColor("#FFFFFF");
+        }
+        
+        int tagWidth = fontMetrics.horizontalAdvance(tagText) + 12;
+        int tagHeight = 18;
+        
+        QRect tagRect(tagX, rect.top() + margin + 1, tagWidth, tagHeight);
+        
+        // 绘制Tag背景
+        painter->setBrush(bgColor);
+        painter->setPen(Qt::NoPen);
+        painter->drawRoundedRect(tagRect, 9, 9);
+        
+        // 绘制Tag文本
+        painter->setFont(normalFont);
+        painter->setPen(textColor);
+        painter->drawText(tagRect, Qt::AlignCenter, tagText);
+    }
+
+    QRect versionRect(textX, nameRect.bottom() + spacing, textWidth, 20);
+    painter->setFont(normalFont);
+    QColor versionColor = isIgnored ? QColor("#AAAAAA") : QColor("#888888");
+    painter->setPen(versionColor);
+    painter->drawText(versionRect, Qt::AlignLeft | Qt::AlignVCenter,
+                      QString("当前版本: %1 → 新版本: %2").arg(currentVersion, newVersion));
+
+    QRect descRect(textX, versionRect.bottom() + spacing, textWidth, 40);
+    painter->setFont(normalFont);
+    QColor descColor = isIgnored ? QColor("#CCCCCC") : QColor("#AAAAAA");
+    painter->setPen(descColor);
+    painter->drawText(descRect, Qt::TextWordWrap,
+                      QString("包大小：%1 MB").arg(QString::number(size.toDouble() / (1024 * 1024), 'f', 2)));
+
+    bool isDownloading = m_downloads.contains(packageName) && m_downloads[packageName].isDownloading;
+    int progress = m_downloads.value(packageName, DownloadInfo{0, false}).progress;
+    bool isInstalled = m_downloads.value(packageName).isInstalled;
+    bool isInstalling = m_downloads.value(packageName).isInstalling;
+
+    // 如果是忽略状态，显示"已忽略"文本和"取消忽略"按钮
+    if (isIgnored) {
+        QRect ignoredTextRect(rect.right() - 170, rect.top() + (rect.height() - 30) / 2, 80, 30);
+        painter->setPen(QColor("#999999"));
+        painter->setFont(option.font);
+        painter->drawText(ignoredTextRect, Qt::AlignCenter, "已忽略");
+        
+        // 绘制取消忽略按钮
+        QRect unignoreButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(QColor("#F3F4F6"));
+        painter->drawRoundedRect(unignoreButtonRect, 4, 4);
+        painter->setPen(QColor("#6B7280"));
+        painter->drawText(unignoreButtonRect, Qt::AlignCenter, "取消忽略");
+    } else if (isDownloading) {
+        // 绘制灰底蓝色进度条
+        QRect progressRect(rect.right() - 270, rect.top() + (rect.height() - 20) / 2, 150, 20);
+        
+        // 绘制背景
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(QColor("#E5E7EB"));
+        painter->drawRoundedRect(progressRect, 10, 10);
+        
+        // 绘制进度
+        int progressWidth = progressRect.width() * progress / 100;
+        QRect progressFillRect(progressRect.left(), progressRect.top(), progressWidth, progressRect.height());
+        painter->setBrush(QColor("#3B82F6"));
+        painter->drawRoundedRect(progressFillRect, 10, 10);
+        
+        // 绘制进度文本
+        painter->setPen(Qt::white);
+        painter->setFont(option.font);
+        painter->drawText(progressRect, Qt::AlignCenter, QString("%1%").arg(progress));
+        
+        QRect cancelButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(QColor("#ff4444"));
+        painter->drawRoundedRect(cancelButtonRect, 4, 4);
+        
+        painter->setPen(Qt::white);
+        painter->setFont(option.font);
+        painter->drawText(cancelButtonRect, Qt::AlignCenter, "取消");
+    } else if (isInstalling) {
+        QRect spinnerRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 30, 30);
+        
+        // 修改：使用 m_spinnerAngle
+        QPen pen(QColor("#2563EB"), 3);
+        painter->setPen(pen);
+        painter->setRenderHint(QPainter::Antialiasing, true);
+        QRectF arcRect = spinnerRect.adjusted(3, 3, -3, -3);
+        painter->drawArc(arcRect, m_spinnerAngle * 16, 120 * 16); // 120度弧
+
+        QRect textRect(option.rect.right() - 120, option.rect.top() + (option.rect.height() - 30) / 2, 110, 30);
+        painter->setPen(QColor("#2563EB"));
+        painter->setFont(option.font);
+        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, "正在安装中");
+    } else {
+        // 绘制忽略按钮
+        QRect ignoreButtonRect(option.rect.right() - 160, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(QColor("#F3F4F6"));
+        painter->drawRoundedRect(ignoreButtonRect, 4, 4);
+        painter->setPen(QColor("#6B7280"));
+        painter->drawText(ignoreButtonRect, Qt::AlignCenter, "忽略");
+
+        // 绘制更新按钮
+        QRect updateButtonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30);
+        painter->setPen(Qt::NoPen);
+        if (isInstalled) {
+            painter->setBrush(QColor("#10B981"));
+            painter->drawRoundedRect(updateButtonRect, 4, 4);
+            painter->setPen(Qt::white);
+            painter->drawText(updateButtonRect, Qt::AlignCenter, "已安装");
+        } else if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) {
+            painter->setBrush(QColor("#10B981"));
+            painter->drawRoundedRect(updateButtonRect, 4, 4);
+            painter->setPen(Qt::white);
+            painter->drawText(updateButtonRect, Qt::AlignCenter, "下载完成");
+        } else {
+            painter->setBrush(QColor("#e9effd"));
+            painter->drawRoundedRect(updateButtonRect, 4, 4);
+            painter->setPen(QColor("#2563EB"));
+            painter->drawText(updateButtonRect, Qt::AlignCenter, "更新");
+        }
+    }
+
+    painter->restore();
+}
+
+QSize AppDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const {
+    return QSize(option.rect.width(), 110);
+}
+
+bool AppDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
+                              const QStyleOptionViewItem &option, const QModelIndex &index) {
+    if (event->type() == QEvent::MouseButtonRelease) {
+        QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
+        QRect rect = option.rect;
+        QString packageName = index.data(Qt::UserRole + 1).toString();
+        
+        // 检查是否为忽略状态，如果是则只允许取消忽略按钮的交互
+        bool isIgnored = index.data(Qt::UserRole + 8).toBool();
+        if (isIgnored) {
+            QRect unignoreButtonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30);
+            if (unignoreButtonRect.contains(mouseEvent->pos())) {
+                // 发送取消忽略信号
+                emit unignoreApp(packageName);
+                return true;
+            }
+            return true; // 消耗其他事件，不允许其他交互
+        }
+
+        // 检查是否点击了复选框
+        QRect checkboxRect(rect.left() + 10, rect.top() + (rect.height() - 20) / 2, 20, 20);
+        if (checkboxRect.contains(mouseEvent->pos())) {
+            if (m_selectedPackages.contains(packageName)) {
+                m_selectedPackages.remove(packageName);
+            } else {
+                m_selectedPackages.insert(packageName);
+            }
+            emit updateDisplay(packageName);
+            return true;
+        }
+
+        if (m_downloads.contains(packageName) && m_downloads[packageName].isDownloading) {
+            QRect cancelButtonRect(rect.right() - 70, rect.top() + (rect.height() - 20) / 2, 60, 20);
+            if (cancelButtonRect.contains(mouseEvent->pos())) {
+                m_downloadManager->cancelDownload(packageName);
+                m_downloads.remove(packageName);
+                
+                // 删除未下载完成的软件包
+                QDir tempDir(QDir::tempPath());
+                QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName) << QString("%1*.deb").arg(packageName), QDir::Files);
+                for (const QString &deb : debs) {
+                    QString debPath = tempDir.absoluteFilePath(deb);
+                    if (QFile::exists(debPath)) {
+                        if (QFile::remove(debPath)) {
+                            qDebug() << "已删除未下载完成的软件包:" << debPath;
+                        } else {
+                            qWarning() << "删除未下载完成的软件包失败:" << debPath;
+                        }
+                    }
+                }
+                
+                emit updateDisplay(packageName);
+                return true;
+            }
+        } else {
+            // 检查是否点击了忽略按钮
+            QRect ignoreButtonRect(rect.right() - 160, rect.top() + (rect.height() - 30) / 2, 70, 30);
+            if (ignoreButtonRect.contains(mouseEvent->pos())) {
+                QString currentVersion = index.data(Qt::UserRole + 2).toString();
+                emit ignoreApp(packageName, currentVersion);
+                return true;
+            }
+
+            // 检查是否点击了更新按钮
+            QRect updateButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30);
+            if (updateButtonRect.contains(mouseEvent->pos())) {
+                if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) {
+                    return false;
+                }
+                
+                // 检查/tmp目录下是否已经存在deb包
+                QDir tempDir(QDir::tempPath());
+                QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files);
+                QString debPath;
+                if (!debs.isEmpty()) {
+                    debPath = tempDir.absoluteFilePath(debs.first());
+                } else {
+                    debs = tempDir.entryList(QStringList() << QString("%1*.deb").arg(packageName), QDir::Files);
+                    if (!debs.isEmpty()) {
+                        debPath = tempDir.absoluteFilePath(debs.first());
+                    }
+                }
+                
+                // 触发下载流程（无论是否存在deb包，都尝试续传）
+                QString downloadUrl = index.data(Qt::UserRole + 7).toString();
+                QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
+
+                m_downloads[packageName] = {0, true};
+                m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
+                emit updateDisplay(packageName);
+                return true;
+            }
+        }
+    }
+
+    return QStyledItemDelegate::editorEvent(event, model, option, index);
+}
+
+void AppDelegate::startDownloadForAll() {
+    if (!m_model) return;
+    for (int row = 0; row < m_model->rowCount(); ++row) {
+        QModelIndex index = m_model->index(row, 0);
+        
+        // 检查应用是否被忽略
+        bool isIgnored = index.data(Qt::UserRole + 8).toBool();
+        if (isIgnored) {
+            qDebug() << "跳过被忽略的应用:" << index.data(Qt::UserRole + 1).toString();
+            continue;
+        }
+        
+        QString packageName = index.data(Qt::UserRole + 1).toString();
+        if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled))
+            continue;
+        QString downloadUrl = index.data(Qt::UserRole + 7).toString();
+        QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
+        m_downloads[packageName] = {0, true, false};
+        m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
+        emit updateDisplay(packageName);
+    }
+}
+
+void AppDelegate::enqueueInstall(const QString &packageName) {
+    m_installQueue.enqueue(packageName);
+    if (!m_isInstalling) {
+        startNextInstall();
+    }
+}
+
+void AppDelegate::startNextInstall() {
+    if (m_installQueue.isEmpty()) {
+        m_isInstalling = false;
+        m_installingPackage.clear();
+        m_spinnerUpdateTimer.stop(); // 新增：停止定时器
+        return;
+    }
+    m_isInstalling = true;
+    QString packageName = m_installQueue.dequeue();
+    m_installingPackage = packageName;
+    m_downloads[packageName].isInstalling = true;
+    m_spinnerUpdateTimer.start(); // 新增：启动定时器
+    emit updateDisplay(packageName);
+
+    QDir tempDir(QDir::tempPath());
+    QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files);
+    QString debPath;
+    if (!debs.isEmpty()) {
+        debPath = tempDir.absoluteFilePath(debs.first());
+    } else {
+        debs = tempDir.entryList(QStringList() << QString("%1*.deb").arg(packageName), QDir::Files);
+        if (!debs.isEmpty()) {
+            debPath = tempDir.absoluteFilePath(debs.first());
+        }
+    }
+
+    if (debPath.isEmpty()) {
+        qWarning() << "未找到deb文件，包名:" << packageName;
+        m_downloads[packageName].isInstalling = false;
+        emit updateDisplay(packageName);
+        m_installingPackage.clear();
+        startNextInstall();
+        return;
+    }
+
+    // 获取包的来源信息
+    QString source = "aptss"; // 默认来源
+    if (m_model) {
+        for (int row = 0; row < m_model->rowCount(); ++row) {
+            QModelIndex index = m_model->index(row, 0);
+            if (index.data(Qt::UserRole + 1).toString() == packageName) {
+                source = index.data(Qt::UserRole + 9).toString();
+                break;
+            }
+        }
+    }
+
+    // 如果是APM包，先检查APM中是否存在对应的包，再卸载APTSS版本
+    if (source == "apm") {
+        // 检查APM中是否存在对应的包
+        QProcess checkProcess;
+        QStringList checkArgs;
+        checkArgs << "list" << packageName;
+        checkProcess.start("apm", checkArgs);
+        checkProcess.waitForFinished(30000); // 30秒超时
+        
+        QString checkOutput = checkProcess.readAllStandardOutput();
+        if (checkOutput.contains(packageName)) {
+            // APM中存在对应的包，卸载APTSS版本
+            QProcess removeProcess;
+            QStringList removeArgs;
+            removeArgs << "remove" << "--purge" << "-y" << packageName;
+            removeProcess.start("aptss", removeArgs);
+            removeProcess.waitForFinished(30000); // 30秒超时
+            qDebug() << "卸载APTSS版本" << packageName << "退出码:" << removeProcess.exitCode();
+        } else {
+            // APM中不存在对应的包，安装失败
+            qWarning() << "APM中不存在对应的包:" << packageName;
+            m_downloads[packageName].isInstalling = false;
+            emit updateDisplay(packageName);
+            m_installingPackage.clear();
+            startNextInstall();
+            return;
+        }
+    }
+
+    m_installProcess = new QProcess(this);
+
+    QString logPath = QString("/tmp/%1_install.log").arg(packageName);
+    QFile *logFile = new QFile(logPath, m_installProcess);
+    if (logFile->open(QIODevice::Append | QIODevice::Text)) {
+        QFile::setPermissions(logPath, QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner |
+                                         QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup |
+                                         QFile::ReadOther | QFile::WriteOther | QFile::ExeOther);
+        connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName, logFile]() {
+            QByteArray out = m_installProcess->readAllStandardOutput();
+            logFile->write(out);
+            logFile->flush();
+            QString text = QString::fromLocal8Bit(out);
+            qDebug().noquote() << text;
+            if (text.contains(QStringLiteral("软件包已安装"))) {
+                m_downloads[packageName].isInstalling = false;
+                m_downloads[packageName].isInstalled = true;
+                emit updateDisplay(packageName);
+            }
+        });
+        connect(m_installProcess, &QProcess::readyReadStandardError, this, [this, logFile]() {
+            QByteArray err = m_installProcess->readAllStandardError();
+            logFile->write(err);
+            logFile->flush();
+            qDebug().noquote() << QString::fromLocal8Bit(err);
+        });
+        connect(m_installProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+                this, [this, packageName, logFile, debPath, source](int exitCode, QProcess::ExitStatus status) {
+            if (logFile) logFile->close();
+            m_downloads[packageName].isInstalling = false;
+            if (exitCode == 0) { 
+                m_downloads[packageName].isInstalled = true;
+                
+                // 安装成功后删除deb包
+                if (QFile::exists(debPath)) {
+                    if (QFile::remove(debPath)) {
+                        qDebug() << "已删除deb包:" << debPath;
+                    } else {
+                        qWarning() << "删除deb包失败:" << debPath;
+                    }
+                }
+            } else {
+                // 安装失败，尝试从APM安装
+                if (source == "aptss") {
+                    qDebug() << "APTSS安装失败，尝试从APM安装:" << packageName;
+                    
+                    // 检查apm命令是否存在
+                    QProcess whichProcess;
+                    whichProcess.start("which", QStringList() << "apm");
+                    whichProcess.waitForFinished(5000);
+                    
+                    if (whichProcess.exitCode() != 0) {
+                        // apm命令不存在，先安装apm
+                        qDebug() << "apm命令不存在，先安装apm";
+                        QProcess installApmProcess;
+                        installApmProcess.start("aptss", QStringList() << "install" << "apm" << "-y");
+                        installApmProcess.waitForFinished(60000); // 60秒超时
+                        
+                        if (installApmProcess.exitCode() != 0) {
+                            qWarning() << "安装apm失败:" << packageName;
+                            emit updateDisplay(packageName);
+                            m_installProcess->deleteLater();
+                            m_installProcess = nullptr;
+                            m_installingPackage.clear();
+                            startNextInstall();
+                            return;
+                        }
+                        qDebug() << "apm安装成功";
+                    }
+                    
+                    // 检查APM中是否存在对应的包
+                    QProcess checkProcess;
+                    QStringList checkArgs;
+                    checkArgs << "list" << packageName;
+                    checkProcess.start("apm", checkArgs);
+                    checkProcess.waitForFinished(30000); // 30秒超时
+                    
+                    QString checkOutput = checkProcess.readAllStandardOutput();
+                    if (checkOutput.contains(packageName)) {
+                        // APM中存在对应的包，卸载当前版本
+                        QProcess removeProcess;
+                        QStringList removeArgs;
+                        removeArgs << "remove" << "--purge" << "-y" << packageName;
+                        removeProcess.start("aptss", removeArgs);
+                        removeProcess.waitForFinished(30000);
+                        
+                        // 从APM获取下载URL，使用与aptssupdater相同的方法
+                        QString downloadUrl;
+                        QProcess process;
+                        QString command = QString("amber-pm-debug /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf download %1 --print-uris").arg(packageName);
+                        
+                        process.start("bash", QStringList() << "-c" << command);
+                        if (process.waitForFinished(30000)) { // 30秒超时
+                            QString output = process.readAllStandardOutput();
+                            // 解析输出格式：'URL' 文件名 大小 SHA512:哈希值
+                            QRegularExpression regex(R"('([^']+)'\s+\S+\s+(\d+)\s+SHA512:([^\s]+))");
+                            QRegularExpressionMatch match = regex.match(output);
+                            
+                            if (match.hasMatch()) {
+                                downloadUrl = match.captured(1);
+                            }
+                        }
+                        
+                        if (!downloadUrl.isEmpty()) {
+                            // 使用更新器的下载功能下载APM包
+                            QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
+                            m_downloads[packageName] = {0, true};
+                            m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
+                            
+                            // 等待下载完成后再安装
+                            QEventLoop loop;
+                            connect(m_downloadManager, &DownloadManager::downloadFinished, &loop, [&loop](const QString &, bool) {
+                                loop.quit();
+                            });
+                            loop.exec();
+                            
+                            // 下载完成后，使用APM安装
+                            QDir tempDir(QDir::tempPath());
+                            QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName) << QString("%1*.deb").arg(packageName), QDir::Files);
+                            if (!debs.isEmpty()) {
+                                QString apmDebPath = tempDir.absoluteFilePath(debs.first());
+                                QProcess apmProcess;
+                                QStringList apmArgs;
+                                apmArgs << "ssaudit" << apmDebPath;
+                                apmProcess.start("apm", apmArgs);
+                                apmProcess.waitForFinished(60000); // 60秒超时
+                                int apmExitCode = apmProcess.exitCode();
+                                qDebug() << "APM安装" << packageName << "退出码:" << apmExitCode;
+                                
+                                // APM安装成功后设置状态
+                                if (apmExitCode == 0) {
+                                    m_downloads[packageName].isInstalling = false;
+                                    m_downloads[packageName].isInstalled = true;
+                                    
+                                    // 安装成功后删除deb包
+                                    if (QFile::exists(apmDebPath)) {
+                                        if (QFile::remove(apmDebPath)) {
+                                            qDebug() << "已删除deb包:" << apmDebPath;
+                                        } else {
+                                            qWarning() << "删除deb包失败:" << apmDebPath;
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            qWarning() << "无法获取APM包的下载URL:" << packageName;
+                        }
+                    } else {
+                        // APM中不存在对应的包，不卸载aptss包
+                        qWarning() << "APM中不存在对应的包，安装失败:" << packageName;
+                    }
+                }
+            }
+            emit updateDisplay(packageName);
+            m_installProcess->deleteLater();
+            m_installProcess = nullptr;
+            m_installingPackage.clear();
+            startNextInstall();
+        });
+    } else {
+        connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName, debPath]() {
+            QByteArray out = m_installProcess->readAllStandardOutput();
+            QString text = QString::fromLocal8Bit(out);
+            qDebug().noquote() << text;
+            if (text.contains(QStringLiteral("软件包已安装"))) {
+                m_downloads[packageName].isInstalling = false;
+                m_downloads[packageName].isInstalled = true;
+                
+                // 安装成功后删除deb包
+                if (QFile::exists(debPath)) {
+                    if (QFile::remove(debPath)) {
+                        qDebug() << "已删除deb包:" << debPath;
+                    } else {
+                        qWarning() << "删除deb包失败:" << debPath;
+                    }
+                }
+                
+                emit updateDisplay(packageName);
+            }
+        });
+        connect(m_installProcess, &QProcess::readyReadStandardError, this, [this]() {
+            QByteArray err = m_installProcess->readAllStandardError();
+            qDebug().noquote() << QString::fromLocal8Bit(err);
+        });
+        connect(m_installProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+                this, [this, packageName, debPath, source](int exitCode, QProcess::ExitStatus /*status*/) {
+            // 如果通过退出码判断安装成功，也删除deb包
+            if (exitCode == 0 && QFile::exists(debPath)) {
+                if (QFile::remove(debPath)) {
+                    qDebug() << "已删除deb包:" << debPath;
+                } else {
+                    qWarning() << "删除deb包失败:" << debPath;
+                }
+            } else {
+                // 安装失败，尝试从APM安装
+                if (source == "aptss") {
+                    qDebug() << "APTSS安装失败，尝试从APM安装:" << packageName;
+                    
+                    // 检查apm命令是否存在
+                    QProcess whichProcess;
+                    whichProcess.start("which", QStringList() << "apm");
+                    whichProcess.waitForFinished(5000);
+                    
+                    if (whichProcess.exitCode() != 0) {
+                        // apm命令不存在，先安装apm
+                        qDebug() << "apm命令不存在，先安装apm";
+                        QProcess installApmProcess;
+                        installApmProcess.start("aptss", QStringList() << "install" << "apm" << "-y");
+                        installApmProcess.waitForFinished(60000); // 60秒超时
+                        
+                        if (installApmProcess.exitCode() != 0) {
+                            qWarning() << "安装apm失败:" << packageName;
+                            emit updateDisplay(packageName);
+                            m_installProcess->deleteLater();
+                            m_installProcess = nullptr;
+                            m_installingPackage.clear();
+                            startNextInstall();
+                            return;
+                        }
+                        qDebug() << "apm安装成功";
+                    }
+                    
+                    // 检查APM中是否存在对应的包
+                    QProcess checkProcess;
+                    QStringList checkArgs;
+                    checkArgs << "list" << packageName;
+                    checkProcess.start("apm", checkArgs);
+                    checkProcess.waitForFinished(30000); // 30秒超时
+                    
+                    QString checkOutput = checkProcess.readAllStandardOutput();
+                    if (checkOutput.contains(packageName)) {
+                        // APM中存在对应的包，卸载当前版本
+                        QProcess removeProcess;
+                        QStringList removeArgs;
+                        removeArgs << "remove" << "--purge" << "-y" << packageName;
+                        removeProcess.start("aptss", removeArgs);
+                        removeProcess.waitForFinished(30000);
+                        
+                        // 从APM获取下载URL，使用与aptssupdater相同的方法
+                        QString downloadUrl;
+                        QProcess process;
+                        QString command = QString("amber-pm-debug /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf download %1 --print-uris").arg(packageName);
+                        
+                        process.start("bash", QStringList() << "-c" << command);
+                        if (process.waitForFinished(30000)) { // 30秒超时
+                            QString output = process.readAllStandardOutput();
+                            // 解析输出格式：'URL' 文件名 大小 SHA512:哈希值
+                            QRegularExpression regex(R"('([^']+)'\s+\S+\s+(\d+)\s+SHA512:([^\s]+))");
+                            QRegularExpressionMatch match = regex.match(output);
+                            
+                            if (match.hasMatch()) {
+                                downloadUrl = match.captured(1);
+                            }
+                        }
+                        
+                        if (!downloadUrl.isEmpty()) {
+                            // 使用更新器的下载功能下载APM包
+                            QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
+                            m_downloads[packageName] = {0, true};
+                            m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
+                            
+                            // 等待下载完成后再安装
+                            QEventLoop loop;
+                            connect(m_downloadManager, &DownloadManager::downloadFinished, &loop, [&loop](const QString &, bool) {
+                                loop.quit();
+                            });
+                            loop.exec();
+                            
+                            // 下载完成后，使用APM安装
+                            QDir tempDir(QDir::tempPath());
+                            QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName) << QString("%1*.deb").arg(packageName), QDir::Files);
+                            if (!debs.isEmpty()) {
+                                QString apmDebPath = tempDir.absoluteFilePath(debs.first());
+                                QProcess apmProcess;
+                                QStringList apmArgs;
+                                apmArgs << "ssaudit" << apmDebPath;
+                                apmProcess.start("apm", apmArgs);
+                                apmProcess.waitForFinished(60000); // 60秒超时
+                                int apmExitCode = apmProcess.exitCode();
+                                qDebug() << "APM安装" << packageName << "退出码:" << apmExitCode;
+                                
+                                // APM安装成功后设置状态
+                                if (apmExitCode == 0) {
+                                    m_downloads[packageName].isInstalling = false;
+                                    m_downloads[packageName].isInstalled = true;
+                                    
+                                    // 安装成功后删除deb包
+                                    if (QFile::exists(apmDebPath)) {
+                                        if (QFile::remove(apmDebPath)) {
+                                            qDebug() << "已删除deb包:" << apmDebPath;
+                                        } else {
+                                            qWarning() << "删除deb包失败:" << apmDebPath;
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            qWarning() << "无法获取APM包的下载URL:" << packageName;
+                        }
+                    } else {
+                        // APM中不存在对应的包，不卸载aptss包
+                        qWarning() << "APM中不存在对应的包，安装失败:" << packageName;
+                    }
+                }
+            }
+            
+            emit updateDisplay(packageName);
+            m_installProcess->deleteLater();
+            m_installProcess = nullptr;
+            m_installingPackage.clear();
+            startNextInstall();
+        });
+    }
+
+    QStringList args;
+    if (source == "apm") {
+        // APM 包使用 apm ssaudit 安装
+        args << "ssaudit" << debPath;
+        m_installProcess->start("apm", args);
+    } else {
+        // APTSS 包使用 ssinstall 安装
+        args << debPath << "--no-create-desktop-entry" << "--delete-after-install" << "--native";
+        m_installProcess->start("/usr/bin/ssinstall", args);
+    }
+}
+
+// 新增槽函数，用于更新旋转角度并触发刷新
+void AppDelegate::updateSpinner() {
+    m_spinnerAngle = (m_spinnerAngle + 10) % 360; // 每次增加10度
+    emit updateDisplay(m_installingPackage); // 仅刷新当前正在安装的项
+}
+
+// 新增：更新选中应用的方法
+void AppDelegate::startDownloadForSelected() {
+    if (!m_model) return;
+    for (int row = 0; row < m_model->rowCount(); ++row) {
+        QModelIndex index = m_model->index(row, 0);
+        QString packageName = index.data(Qt::UserRole + 1).toString();
+        
+        // 检查应用是否被忽略
+        bool isIgnored = index.data(Qt::UserRole + 8).toBool();
+        if (isIgnored) {
+            qDebug() << "跳过被忽略的应用:" << packageName;
+            continue;
+        }
+        
+        // 只下载选中的应用
+        if (m_selectedPackages.contains(packageName)) {
+            if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled))
+                continue;
+            QString downloadUrl = index.data(Qt::UserRole + 7).toString();
+            QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
+            m_downloads[packageName] = {0, true, false};
+            m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
+            emit updateDisplay(packageName);
+        }
+    }
+}
+
+// 复选框相关方法实现
+void AppDelegate::setSelectedPackages(const QSet<QString> &selected) {
+    m_selectedPackages = selected;
+}
+
+QSet<QString> AppDelegate::getSelectedPackages() const {
+    return m_selectedPackages;
+}
+
+void AppDelegate::clearSelection() {
+    m_selectedPackages.clear();
+}
+
+// 实现获取下载状态信息的方法
+const QHash<QString, DownloadInfo>& AppDelegate::getDownloads() const {
+    return m_downloads;
+}

spark-update-tool/src/appdelegate.h

@@ -5,19 +5,23 @@
 #include <QQueue>
 #include <QProcess>
 #include <QElapsedTimer>
+#include <QTimer>
+#include <QSet>
+
 #include "downloadmanager.h"
 
 struct DownloadInfo {
     int progress = 0;
     bool isDownloading = false;
     bool isInstalled = false;
-    bool isInstalling = false; // 新增：标记是否正在安装
+    bool isInstalling = false;
 };
 
 class AppDelegate : public QStyledItemDelegate {
     Q_OBJECT
 public:
     explicit AppDelegate(QObject *parent = nullptr);
+    ~AppDelegate();
 
     void setModel(QAbstractItemModel *model);
 
@@ -26,21 +30,43 @@ public:
     bool editorEvent(QEvent *event, QAbstractItemModel *model,
                      const QStyleOptionViewItem &option, const QModelIndex &index) override;
     void startDownloadForAll();
+    void startDownloadForSelected();
+    
+    // 复选框相关方法
+    void setSelectedPackages(const QSet<QString> &selected);
+    QSet<QString> getSelectedPackages() const;
+    void clearSelection();
+    
+    // 获取下载状态信息
+    const QHash<QString, DownloadInfo>& getDownloads() const;
+
 
 signals:
     void updateDisplay(const QString &packageName);
+    void updateFinished(bool success); //传递是否完成更新
+    void ignoreApp(const QString &packageName, const QString &version); // 新增：忽略应用信号
+    void unignoreApp(const QString &packageName); // 新增：取消忽略应用信号
+
+private slots:
+    void updateSpinner(); // 新增槽函数
 
 private:
     DownloadManager *m_downloadManager;
     QHash<QString, DownloadInfo> m_downloads;
     QAbstractItemModel *m_model = nullptr;
+    
+    // 复选框相关成员变量
+    QSet<QString> m_selectedPackages;
 
     QQueue<QString> m_installQueue;
     bool m_isInstalling = false;
     QProcess *m_installProcess = nullptr;
-    QString m_installingPackage; // 当前正在安装的包名
-    QElapsedTimer m_spinnerTimer; // 用于转圈动画
+    QString m_installingPackage;
+    QElapsedTimer m_spinnerTimer;
+
+    QTimer m_spinnerUpdateTimer; // 新增定时器
+    int m_spinnerAngle = 0; // 新增角度变量
 
     void enqueueInstall(const QString &packageName);
     void startNextInstall();
-};
+};

spark-update-tool/src/applistmodel.cpp

@@ -1,5 +1,4 @@
 #include "applistmodel.h"
-#include <QDebug>
 
 AppListModel::AppListModel(QObject *parent) : QAbstractListModel(parent) {}
 
@@ -33,6 +32,10 @@ QVariant AppListModel::data(const QModelIndex &index, int role) const
         return map.value("description");
     case Qt::UserRole + 7: // 下载 URL
         return map.value("download_url"); // 返回下载 URL
+    case Qt::UserRole + 8: // 忽略状态
+        return map.value("ignored");
+    case Qt::UserRole + 9: // 包来源
+        return map.value("source");
     default:
         return QVariant();
     }
@@ -53,11 +56,22 @@ void AppListModel::setUpdateData(const QJsonArray &updateInfo)
         map["icon"] = obj["icon"].toString();
         map["size"] = obj["size"].toString();
         map["download_url"] = obj["download_url"].toString(); // 确保设置下载 URL
+        map["ignored"] = obj["ignored"].toBool(); // 设置忽略状态
+        map["source"] = obj["source"].toString(); // 设置包来源
         m_data.append(map); // 添加到 QList<QVariantMap>
 
-        qDebug() << "设置到模型的包名:" << map["package"].toString();
+        qDebug() << "设置到模型的包名:" << map["package"].toString() << "忽略状态:" << map["ignored"].toBool() << "来源:" << map["source"].toString();
         qDebug() << "设置到模型的下载 URL:" << map["download_url"].toString(); // 检查设置的数据
     }
 
     endResetModel();
 }
+
+bool AppListModel::isAppIgnored(const QModelIndex &index) const
+{
+    if (!index.isValid() || index.row() >= m_data.size())
+        return false;
+    
+    const QVariantMap &map = m_data.at(index.row());
+    return map.value("ignored").toBool();
+}

spark-update-tool/src/applistmodel.h

@@ -5,7 +5,7 @@
 #include <QJsonArray>
 // 添加 QJsonObject 头文件
 #include <QJsonObject>
-
+#include <QDebug>
 class AppListModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -18,9 +18,12 @@ public:
 
     // 设置更新数据
     void setUpdateData(const QJsonArray &data);
+    
+    // 获取忽略状态
+    bool isAppIgnored(const QModelIndex &index) const;
 
 private:
     QList<QVariantMap> m_data; // 修改类型为 QList<QVariantMap>
 };
 
-#endif // APPLISTMODEL_H
+#endif // APPLISTMODEL_H

spark-update-tool/src/aptssupdater.cpp

@@ -3,28 +3,36 @@
 #include <QTextStream>
 #include <QRegularExpression>
 #include <QFile>
+#include <QDir>
 #include <qdebug.h>
 
 aptssUpdater::aptssUpdater(QWidget *parent)
     : QWidget(parent)
 {
     packageName = getUpdateablePackages();
+    apmPackageName = getApmUpdateablePackages();
 }
 
 QStringList aptssUpdater::getUpdateablePackages()
 {
     QStringList packageDetails;
     QProcess process;
-    QString command = R"(env LANGUAGE=en_US /usr/bin/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')";
+    QString command = R"(env LANGUAGE=en_US /usr/bin/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/aptss.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk 'NR>1')";
     
     process.start("bash", QStringList() << "-c" << command);
-    if (!process.waitForFinished()) {
-        qWarning() << "Process failed to finish.";
+    if (!process.waitForFinished(30000)) { // 30秒超时
+        qWarning() << "Process failed to finish within 30 seconds.";
+        process.kill();
         return packageDetails;
     }
 
     QString output = process.readAllStandardOutput();
-    QStringList lines = output.split('\n', QString::SkipEmptyParts);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        QStringList lines = output.split('\n', Qt::SkipEmptyParts);
+#else
+        QStringList lines = output.split('\n', QString::SkipEmptyParts);
+#endif
+
 
     // 创建临时文件
     QTemporaryFile tempFile;
@@ -68,7 +76,6 @@ QStringList aptssUpdater::getUpdateablePackages()
 QStringList aptssUpdater::getPackageSizes()
 {
     QStringList packageDetails;
-    QProcess process;
 
     // 获取可更新包名列表
     QStringList updateablePackages;
@@ -77,14 +84,17 @@ QStringList aptssUpdater::getPackageSizes()
     }
 
     foreach (const QString &packageName, updateablePackages) {
+        QProcess process;  // 在循环内部创建新的QProcess实例
+        
         // 构建新命令（包含包名参数）
         QString command = QString("/usr/bin/apt download %1 --print-uris -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf "
-                                  "-o Dir::Etc::sourcelist=\"/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list\" "
+                                  "-o Dir::Etc::sourcelist=\"/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/aptss.list\" "
                                   "-o Dir::Etc::sourceparts=\"/dev/null\"").arg(packageName);
 
         process.start("bash", QStringList() << "-c" << command);
-        if (!process.waitForFinished()) {
-            qWarning() << "获取包信息失败：" << packageName;
+        if (!process.waitForFinished(30000)) { // 30秒超时
+            qWarning() << "获取包信息失败：" << packageName << "（超时）";
+            process.kill();
             continue;
         }
 
@@ -116,7 +126,6 @@ QStringList aptssUpdater::getPackageSizes()
 QStringList aptssUpdater::getDesktopAppNames()
 {
     QStringList appNames;
-    QProcess dpkgProcess;
     
     // 获取当前系统语言环境
     QString lang = QLocale().name().replace("_", "-");
@@ -125,13 +134,27 @@ QStringList aptssUpdater::getDesktopAppNames()
     QStringList packages = packageName;
     
     foreach (const QString &package, packages) {
+        QProcess dpkgProcess;  // 在循环内部创建新的QProcess实例
+        
         QString packageName = package.split(":")[0];
         QString finalName = packageName; // 默认使用包名
         
         // 获取包文件列表
         dpkgProcess.start("dpkg", QStringList() << "-L" << packageName);
-        dpkgProcess.waitForFinished();
-        QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts);
+        if (!dpkgProcess.waitForFinished(30000)) { // 30秒超时
+            qWarning() << "获取包文件列表失败：" << packageName << "（超时）";
+            dpkgProcess.kill();
+            continue;
+        }
+        
+        // 修复：添加这行代码来获取进程输出
+        QString output = dpkgProcess.readAllStandardOutput();
+        
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        QStringList files = output.split('\n', Qt::SkipEmptyParts);
+#else
+        QStringList files = output.split('\n', QString::SkipEmptyParts);
+#endif
 
         // 先检查常规应用目录
         QStringList regularDesktopFiles = files.filter("/usr/share/applications/");
@@ -162,6 +185,8 @@ QStringList aptssUpdater::getDesktopAppNames()
 }
 
 
+
+
 bool aptssUpdater::checkDesktopFiles(const QStringList &desktopFiles, QString &appName, const QString &lang, const QString &packageName)
 {
     QString lastValidName; 
@@ -225,19 +250,30 @@ bool aptssUpdater::checkDesktopFiles(const QStringList &desktopFiles, QString &a
 QStringList aptssUpdater::getPackageIcons()
 {
     QStringList packageIcons;
-    QProcess dpkgProcess;
     
     // 遍历所有可更新包
     QStringList packages = packageName;
     
     foreach (const QString &package, packages) {
+        QProcess dpkgProcess;  // 在循环内部创建新的QProcess实例
+        
         QString packageName = package.split(":")[0];
-        QString iconPath = ":/resources/default_icon.svg"; // 默认图标
+        QString iconPath = ":/resources/default_icon.png"; // 默认图标
         
         // 获取包文件列表
         dpkgProcess.start("dpkg", QStringList() << "-L" << packageName);
-        dpkgProcess.waitForFinished();
+        if (!dpkgProcess.waitForFinished(30000)) { // 30秒超时
+            qWarning() << "获取包文件列表失败：" << packageName << "（超时）";
+            dpkgProcess.kill();
+            packageIcons << QString("%1: %2").arg(packageName, iconPath);
+            continue;
+        }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts);
+#else
         QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts);
+#endif
+        
         
         // 查找.desktop文件
         QStringList desktopFiles = files.filter(QRegularExpression("/(usr/share|opt/apps)/.*\\.desktop$"));
@@ -265,6 +301,7 @@ QStringList aptssUpdater::getPackageIcons()
                             foreach (const QString &path, iconPaths) {
                                 if (QFile::exists(path)) {
                                     iconPath = path;
+                                    qDebug() << "找到图标文件:" << path;
                                     break;
                                 }
                             }
@@ -272,6 +309,7 @@ QStringList aptssUpdater::getPackageIcons()
                             // 已经是绝对路径
                             if (QFile::exists(iconName)) {
                                 iconPath = iconName;
+                                qDebug() << "使用绝对路径图标文件:" << iconName;
                             }
                         }
                         break;
@@ -282,10 +320,14 @@ QStringList aptssUpdater::getPackageIcons()
         }
         
         // 如果.desktop中没有找到图标，尝试直接查找包中的图标文件
-        if (iconPath == ":/resources/default_icon.svg") {
+        if (iconPath == ":/resources/default_icon.png") {
+            qDebug() << "未在.desktop文件中找到图标，尝试直接查找包中的图标文件";
             QStringList iconFiles = files.filter(QRegularExpression("/(usr/share/pixmaps|usr/share/icons|opt/apps/.*/entries/icons)/.*\\.(png|svg)$"));
             if (!iconFiles.isEmpty()) {
                 iconPath = iconFiles.first();
+                qDebug() << "从包中找到图标文件:" << iconPath;
+            } else {
+                qDebug() << "未在包中找到图标文件，使用默认图标";
             }
         }
         
@@ -395,4 +437,218 @@ QJsonArray aptssUpdater::getUpdateInfoAsJson()
     return jsonArray;
 }
 
+QStringList aptssUpdater::getApmUpdateablePackages()
+{
+    QStringList packageDetails;
+    
+    // 检查apm命令是否存在
+    QProcess checkProcess;
+    checkProcess.start("which", QStringList() << "apm");
+    if (!checkProcess.waitForFinished(5000) || checkProcess.exitCode() != 0) {
+        qDebug() << "apm命令不存在，跳过APM更新检查";
+        return packageDetails;
+    }
+    
+    QProcess process;
+    QString command = R"(env LANGUAGE=en_US /usr/bin/apm list --upgradable | awk 'NR>1')";
+    
+    process.start("bash", QStringList() << "-c" << command);
+    if (!process.waitForFinished(30000)) { // 30秒超时
+        qWarning() << "APM process failed to finish within 30 seconds.";
+        process.kill();
+        return packageDetails;
+    }
 
+    QString output = process.readAllStandardOutput();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        QStringList lines = output.split('\n', Qt::SkipEmptyParts);
+#else
+        QStringList lines = output.split('\n', QString::SkipEmptyParts);
+#endif
+
+    for (const QString &line : lines) {
+        QRegularExpression regex(R"(([\w\-\+\.]+)/\S+\s+([^\s]+)\s+\S+\s+\[upgradable from: ([^\]]+)\])");
+        QRegularExpressionMatch match = regex.match(line);
+        if (match.hasMatch()) {
+            QString name = match.captured(1);
+            QString newVersion = match.captured(2);
+            QString oldVersion = match.captured(3);
+            
+            // 检查版本是否相同，相同则跳过
+            if (newVersion == oldVersion) {
+                qDebug() << "跳过版本相同的APM包:" << name << "(" << oldVersion << "→" << newVersion << ")";
+                continue;
+            }
+            
+            // 写入内存列表
+            packageDetails << QString("%1: %2 → %3").arg(name, oldVersion, newVersion);
+        }
+    }
+
+    return packageDetails;
+}
+
+QJsonArray aptssUpdater::getApmUpdateInfoAsJson()
+{
+    QJsonArray jsonArray;
+    
+    // 解析APM包版本信息
+    QHash<QString, QHash<QString, QString>> packageInfo;
+    for (const QString &pkg : apmPackageName) {
+        QStringList parts = pkg.split(": ");
+        if (parts.size() >= 2) {
+            QString packageName = parts[0];
+            QStringList versions = parts[1].split(" → ");
+            if (versions.size() == 2) {
+                packageInfo[packageName]["current_version"] = versions[0];
+                packageInfo[packageName]["new_version"] = versions[1];
+                packageInfo[packageName]["source"] = "apm";
+            }
+        }
+    }
+    
+    // 构建JSON数组
+    for (const QString &packageName : packageInfo.keys()) {
+        QJsonObject jsonObj;
+        jsonObj["package"] = packageName;
+        
+        // 从APM桌面文件中解析应用名称和图标
+        QString displayName = packageName; // 默认使用包名
+        QString iconPath = ":/resources/default_icon.png"; // 默认图标
+        
+        // APM应用的desktop文件路径
+        QString apmDesktopPath = QString("/var/lib/apm/apm/files/ace-env/var/lib/apm/%1/entries/applications").arg(packageName);
+        QDir desktopDir(apmDesktopPath);
+        if (desktopDir.exists()) {
+            // 查找desktop文件
+            QStringList desktopFiles = desktopDir.entryList(QStringList() << "*.desktop", QDir::Files);
+            if (!desktopFiles.isEmpty()) {
+                QString desktopFile = desktopDir.absoluteFilePath(desktopFiles.first());
+                QFile file(desktopFile);
+                if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                    QTextStream in(&file);
+                    while (!in.atEnd()) {
+                        QString line = in.readLine().trimmed();
+                        if (line.startsWith("Name=")) {
+                            displayName = line.mid(5).trimmed();
+                        } else if (line.startsWith("Icon=")) {
+                            QString iconName = line.mid(5).trimmed();
+                            // 处理图标路径
+                            if (!iconName.contains('/')) {
+                                // 查找APM包中的图标
+                                QString apmIconPath = QString("/var/lib/apm/apm/files/ace-env/var/lib/apm/%1/entries/icons/hicolor/48x48/apps/%2.png").arg(packageName, iconName);
+                                if (QFile::exists(apmIconPath)) {
+                                    iconPath = apmIconPath;
+                                }
+                            } else {
+                                // 已经是绝对路径
+                                if (QFile::exists(iconName)) {
+                                    iconPath = iconName;
+                                }
+                            }
+                        }
+                    }
+                    file.close();
+                }
+            }
+        }
+        
+        // 获取APM包大小和下载信息
+        QString size = "0";
+        QString url = "";
+        QString sha512 = "";
+        
+        QProcess process;
+        QString command = QString("amber-pm-debug /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf download %1 --print-uris").arg(packageName);
+        
+        process.start("bash", QStringList() << "-c" << command);
+        if (process.waitForFinished(30000)) { // 30秒超时
+            QString output = process.readAllStandardOutput();
+            // 解析输出格式：'URL' 文件名 大小 SHA512:哈希值
+            QRegularExpression regex(R"('([^']+)'\s+\S+\s+(\d+)\s+SHA512:([^\s]+))");
+            QRegularExpressionMatch match = regex.match(output);
+            
+            if (match.hasMatch()) {
+                url = match.captured(1);
+                size = match.captured(2);
+                sha512 = match.captured(3);
+            }
+        }
+        
+        jsonObj["name"] = displayName;
+        jsonObj["current_version"] = packageInfo[packageName]["current_version"];
+        jsonObj["new_version"] = packageInfo[packageName]["new_version"];
+        jsonObj["icon"] = iconPath;
+        jsonObj["ignored"] = false; // 默认不忽略
+        jsonObj["source"] = "apm";
+        jsonObj["size"] = size;
+        jsonObj["download_url"] = url;
+        jsonObj["sha512"] = sha512;
+        jsonArray.append(jsonObj);
+    }
+    qDebug()<<"APM更新信息:"<<jsonArray;
+    return jsonArray;
+}
+
+QJsonArray aptssUpdater::mergeUpdateInfo()
+{
+    QJsonArray aptssInfo = getUpdateInfoAsJson();
+    QJsonArray apmInfo = getApmUpdateInfoAsJson();
+    
+    // 创建包名到更新信息的映射
+    QHash<QString, QJsonObject> aptssMap;
+    for (const QJsonValue &value : aptssInfo) {
+        QJsonObject obj = value.toObject();
+        QString packageName = obj["package"].toString();
+        obj["source"] = "aptss";
+        aptssMap[packageName] = obj;
+    }
+    
+    QHash<QString, QJsonObject> apmMap;
+    for (const QJsonValue &value : apmInfo) {
+        QJsonObject obj = value.toObject();
+        QString packageName = obj["package"].toString();
+        obj["source"] = "apm";
+        apmMap[packageName] = obj;
+    }
+    
+    QJsonArray mergedArray;
+    
+    // 处理只在aptss中存在的包
+    for (const QString &packageName : aptssMap.keys()) {
+        if (!apmMap.contains(packageName)) {
+            mergedArray.append(aptssMap[packageName]);
+        }
+    }
+    
+    // 处理只在apm中存在的包
+    for (const QString &packageName : apmMap.keys()) {
+        if (!aptssMap.contains(packageName)) {
+            mergedArray.append(apmMap[packageName]);
+        }
+    }
+    
+    // 处理在两者中都存在的包
+    for (const QString &packageName : aptssMap.keys()) {
+        if (apmMap.contains(packageName)) {
+            QJsonObject aptssObj = aptssMap[packageName];
+            QJsonObject apmObj = apmMap[packageName];
+            
+            // 比较版本
+            QString aptssVersion = aptssObj["new_version"].toString();
+            QString apmVersion = apmObj["new_version"].toString();
+            
+            // 这里简化处理，实际应该使用版本比较函数
+            if (apmVersion > aptssVersion) {
+                // APM版本更高，使用APM版本
+                mergedArray.append(apmObj);
+            } else {
+                // APTSS版本更高或相同，不展示该包
+                qDebug() << "APTSS版本更高，不展示APM包:" << packageName;
+            }
+        }
+    }
+    
+    qDebug()<<"合并后的更新信息:"<<mergedArray;
+    return mergedArray;
+}

spark-update-tool/src/aptssupdater.h

@@ -19,10 +19,17 @@ public:
     QStringList getPackageIcons();    // 获取包图标列表
     QJsonArray getUpdateInfoAsJson(); // 获取更新信息的 JSON 格式
     QString m_tempFilePath;
+    
+    // APM 相关方法
+    QStringList getApmUpdateablePackages(); // 查询 APM 可更新包列表及更新内容
+    QJsonArray getApmUpdateInfoAsJson(); // 获取 APM 更新信息的 JSON 格式
+    QJsonArray mergeUpdateInfo(); // 合并 APTSS 和 APM 的更新信息
+
 signals:
 private:
     bool checkDesktopFiles(const QStringList &desktopFiles, QString &appName, const QString &lang, const QString &packageName);
     QStringList packageName;
+    QStringList apmPackageName; // APM 包列表
 };
 
 #endif // APTSSUPDATER_H

spark-update-tool/src/downloadmanager.cpp

@@ -10,6 +10,20 @@ DownloadManager::DownloadManager(QObject *parent) : QObject(parent)
     cleanupTempFiles();
 }
 
+DownloadManager::~DownloadManager()
+{
+    // 终止并清理所有正在运行的下载进程
+    for (auto it = m_processes.begin(); it != m_processes.end(); ) {
+        QProcess *process = it.value();
+        if (process->state() != QProcess::NotRunning) {
+            process->kill(); // 立即终止进程
+            process->waitForFinished(3000); // 最多等待3秒
+        }
+        process->deleteLater();
+        it = m_processes.erase(it);
+    }
+}
+
 void DownloadManager::startDownload(const QString &packageName, const QString &url, const QString &outputPath)
 {
     if (m_processes.contains(packageName)) {
@@ -25,6 +39,8 @@ void DownloadManager::startDownload(const QString &packageName, const QString &u
         "--console-log-level=warn",
         "--summary-interval=1",
         "--allow-overwrite=true",
+        "--connect-timeout=30",
+        "--max-tries=3",
         "--dir=" + fileInfo.absolutePath(),
         "--out=" + fileInfo.fileName(),
         metalinkUrl
@@ -114,4 +130,4 @@ void DownloadManager::cleanupTempFiles()
     for (const QString &f : leftovers) {
         tempDir.remove(f);
     }
-}
+}

spark-update-tool/src/downloadmanager.h

@@ -10,6 +10,7 @@ class DownloadManager : public QObject
     Q_OBJECT
 public:
     explicit DownloadManager(QObject *parent = nullptr);
+    ~DownloadManager();
     void startDownload(const QString &packageName, const QString &url, const QString &outputPath);
     void cancelDownload(const QString &packageName);
     bool isDownloading(const QString &packageName) const;
@@ -25,4 +26,4 @@ private:
     QMap<QString, QProcess*> m_processes;
 };
 
-#endif // DOWNLOADMANAGER_H
+#endif // DOWNLOADMANAGER_H

spark-update-tool/src/icons.qrc

@@ -4,5 +4,6 @@
         <file>../resources/default_icon.svg</file>
         <file>../resources/spark-update-tool.svg</file>
         <file>../resources/128*128/spark-update-tool.png</file>
+        <file>../resources/default_icon.png</file>
     </qresource>
 </RCC>

spark-update-tool/src/ignoreconfig.cpp

@@ -0,0 +1,148 @@
+#include "ignoreconfig.h"
+#include <QStandardPaths>
+#include <QDir>
+#include <QFile>
+#include <QTextStream>
+#include <QDebug>
+#include <unistd.h>  // for geteuid
+
+IgnoreConfig::IgnoreConfig(QObject *parent)
+    : QObject(parent)
+{
+    // 设置配置文件路径
+    QString configDir;
+    
+    // // 检查是否以 root 权限运行
+    // if (geteuid() == 0) {
+    //     // 首先检查是否有 SUDO_USER_HOME 环境变量（表示是通过 pkexec 提权的普通用户）
+    //     QByteArray sudoUserHomeEnv = qgetenv("SUDO_USER_HOME");
+    //     if (!sudoUserHomeEnv.isEmpty()) {
+    //         // 通过 pkexec 提权的普通用户，使用原用户的配置目录
+    //         QString sudoUserHomePath = QString::fromLocal8Bit(sudoUserHomeEnv);
+    //         configDir = sudoUserHomePath + "/.config";
+    //     } else {
+    //         // 获取实际的 HOME 目录来判断是真正的 root 用户还是其他方式提权的用户
+    //         QByteArray homeEnv = qgetenv("HOME");
+    //         QString homePath = QString::fromLocal8Bit(homeEnv);
+            
+    //         if (homePath == "/root") {
+    //             // 真正的 root 用户，使用 /root/.config
+    //             configDir = "/root/.config";
+    //         } else {
+    //             // 其他方式提权的用户，使用 HOME 目录下的配置
+    //             configDir = homePath + "/.config";
+    //         }
+    //     }
+    // } else {
+    //     // 普通用户，使用标准配置目录
+    //     configDir = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
+    // }
+    configDir = "/etc/";
+    QDir dir(configDir);
+    if (!dir.exists()) {
+        dir.mkpath(".");
+    }
+    m_configFilePath = dir.filePath("spark-store/ignored_apps.conf");
+    
+    // 确保目录存在
+    QFileInfo fileInfo(m_configFilePath);
+    QDir configDirPath = fileInfo.dir();
+    if (!configDirPath.exists()) {
+        configDirPath.mkpath(".");
+    }
+    
+    // 加载现有配置
+    loadConfig();
+    
+    // 输出忽略列表到 qDebug
+    printIgnoredApps();
+}
+
+void IgnoreConfig::addIgnoredApp(const QString &packageName, const QString &version)
+{
+    m_ignoredApps.insert(qMakePair(packageName, version));
+    saveConfig();
+}
+
+void IgnoreConfig::removeIgnoredApp(const QString &packageName)
+{
+    // 移除所有该包名的版本
+    auto it = m_ignoredApps.begin();
+    while (it != m_ignoredApps.end()) {
+        if (it->first == packageName) {
+            it = m_ignoredApps.erase(it);
+        } else {
+            ++it;
+        }
+    }
+    saveConfig();
+}
+
+bool IgnoreConfig::isAppIgnored(const QString &packageName, const QString &version) const
+{
+    return m_ignoredApps.contains(qMakePair(packageName, version));
+}
+
+QSet<QPair<QString, QString>> IgnoreConfig::getIgnoredApps() const
+{
+    return m_ignoredApps;
+}
+
+void IgnoreConfig::printIgnoredApps() const
+{
+    qDebug() << "=== 忽略的应用列表 ===";
+    qDebug() << "配置文件路径:" << m_configFilePath;
+    
+    if (m_ignoredApps.isEmpty()) {
+        qDebug() << "没有忽略的应用";
+    } else {
+        for (const auto &app : m_ignoredApps) {
+            qDebug() << "忽略的应用:" << app.first << "版本:" << app.second;
+        }
+    }
+    qDebug() << "====================";
+}
+
+bool IgnoreConfig::saveConfig()
+{
+    QFile file(m_configFilePath);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        qDebug() << "无法打开配置文件进行写入:" << m_configFilePath;
+        return false;
+    }
+
+    QTextStream out(&file);
+    for (const auto &app : m_ignoredApps) {
+        out << app.first << "|" << app.second << "\n";
+    }
+    file.close();
+    return true;
+}
+
+bool IgnoreConfig::loadConfig()
+{
+    QFile file(m_configFilePath);
+    if (!file.exists()) {
+        // 配置文件不存在，这是正常的，返回true表示没有错误
+        return true;
+    }
+    
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qDebug() << "无法打开配置文件进行读取:" << m_configFilePath;
+        return false;
+    }
+
+    m_ignoredApps.clear();
+    QTextStream in(&file);
+    while (!in.atEnd()) {
+        QString line = in.readLine().trimmed();
+        if (!line.isEmpty()) {
+            QStringList parts = line.split('|');
+            if (parts.size() == 2) {
+                m_ignoredApps.insert(qMakePair(parts[0], parts[1]));
+            }
+        }
+    }
+    file.close();
+    return true;
+}

spark-update-tool/src/ignoreconfig.h

@@ -0,0 +1,42 @@
+#ifndef IGNORECONFIG_H
+#define IGNORECONFIG_H
+
+#include <QObject>
+#include <QSet>
+#include <QString>
+#include <QPair>
+
+class IgnoreConfig : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit IgnoreConfig(QObject *parent = nullptr);
+
+    // 添加忽略的应用（包名和版本号）
+    void addIgnoredApp(const QString &packageName, const QString &version);
+    
+    // 移除忽略的应用
+    void removeIgnoredApp(const QString &packageName);
+    
+    // 检查应用是否被忽略
+    bool isAppIgnored(const QString &packageName, const QString &version) const;
+    
+    // 获取所有被忽略的应用
+    QSet<QPair<QString, QString>> getIgnoredApps() const;
+    
+    // 输出所有被忽略的应用到 qDebug
+    void printIgnoredApps() const;
+    
+    // 保存配置到文件
+    bool saveConfig();
+    
+    // 从文件加载配置
+    bool loadConfig();
+
+private:
+    QSet<QPair<QString, QString>> m_ignoredApps;
+    QString m_configFilePath;
+};
+
+#endif // IGNORECONFIG_H

spark-update-tool/src/main.cpp

@@ -16,11 +16,13 @@ bool elevateToRoot() {
 
     QByteArray display = qgetenv("DISPLAY");
     QByteArray xauthority = qgetenv("XAUTHORITY");
+    QByteArray home = qgetenv("HOME");  // 获取原始用户的 HOME 目境变量
 
     QStringList args;
     args << "env"
          << "DISPLAY=" + display
          << "XAUTHORITY=" + xauthority
+         << "SUDO_USER_HOME=" + home  // 传递原始用户的 HOME 路径
          << program;
 
     QProcess process;

spark-update-tool/src/mainwindow.cpp

@@ -7,11 +7,13 @@
 #include <QFutureWatcher> // 新增
 #include <QIcon>
 #include <qicon.h>
+#include <unistd.h>     // for geteuid
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
     , m_model(new AppListModel(this))
     , m_delegate(new AppDelegate(this))
+    , m_ignoreConfig(new IgnoreConfig(this))
 {
     QIcon icon(":/resources/128*128/spark-update-tool.png");
     setWindowIcon(icon);
@@ -53,11 +55,26 @@ MainWindow::MainWindow(QWidget *parent)
             }
         });
 
+        // 连接应用委托的信号
+    connect(m_delegate, &AppDelegate::ignoreApp, this, &MainWindow::onIgnoreApp);
+    connect(m_delegate, &AppDelegate::unignoreApp, this, &MainWindow::onUnignoreApp);
+
         // 新增：点击“更新全部”按钮批量下载
         connect(ui->updatePushButton, &QPushButton::clicked, this, [=](){
-            qDebug()<<"更新全部按钮被点击";
-            m_delegate->startDownloadForAll();
+            qDebug()<<"更新按钮被点击";
+            if (m_delegate->getSelectedPackages().isEmpty()) {
+                // 没有选中任何应用，更新全部
+                m_delegate->startDownloadForAll();
+            } else {
+                // 有选中应用，更新选中
+                m_delegate->startDownloadForSelected();
+                m_delegate->clearSelection();
+                updateButtonText();
+            }
         });
+        
+        // 新增：监听选择变化
+        connect(m_delegate, &AppDelegate::updateDisplay, this, &MainWindow::handleSelectionChanged);
 
         checkUpdates();
         // 新增：监听搜索框文本变化
@@ -75,6 +92,12 @@ MainWindow::MainWindow(QWidget *parent)
     watcher->setFuture(QtConcurrent::run([this](){
         runAptssUpgrade();
     }));
+    QScreen *screen = QGuiApplication::screenAt(QCursor::pos());
+    if (!screen) screen = QGuiApplication::primaryScreen();
+    QRect screenGeometry = screen->geometry();
+    int x = screenGeometry.x() + (screenGeometry.width() - this->width()) / 2;
+    int y = screenGeometry.y() + (screenGeometry.height() - this->height()) / 2;
+    this->move(x, y);
 }
 //初始化控件样式
 void MainWindow::initStyle()
@@ -206,13 +229,43 @@ void MainWindow::initStyle()
 void MainWindow::checkUpdates()
 {
     aptssUpdater updater;
-    QJsonArray updateInfo = updater.getUpdateInfoAsJson();
-    m_allApps = updateInfo; // 保存所有应用数据
-    m_model->setUpdateData(updateInfo);
-
+    QJsonArray updateInfo = updater.mergeUpdateInfo();
+    
+    // 分离正常应用和忽略应用
+    QJsonArray normalApps;
+    QJsonArray ignoredApps;
+    
     for (const auto &item : updateInfo) {
         QJsonObject obj = item.toObject();
-        qDebug() << "模型设置的包名:" << obj["package"].toString();
+        QString packageName = obj["package"].toString();
+        QString currentVersion = obj["current_version"].toString();
+        
+        // 检查应用是否被忽略
+        if (m_ignoreConfig->isAppIgnored(packageName, currentVersion)) {
+            // 标记为忽略状态
+            obj["ignored"] = true;
+            ignoredApps.append(obj);
+        } else {
+            obj["ignored"] = false;
+            normalApps.append(obj);
+        }
+    }
+    
+    // 合并数组：正常应用在前，忽略应用在后
+    QJsonArray finalApps;
+    for (const auto &item : normalApps) {
+        finalApps.append(item);
+    }
+    for (const auto &item : ignoredApps) {
+        finalApps.append(item);
+    }
+    
+    m_allApps = finalApps; // 保存所有应用数据
+    m_model->setUpdateData(finalApps);
+
+    for (const auto &item : finalApps) {
+        QJsonObject obj = item.toObject();
+        qDebug() << "模型设置的包名:" << obj["package"].toString() << "忽略状态:" << obj["ignored"].toBool() << "来源:" << obj["source"].toString();
         qDebug() << "模型设置的下载 URL:" << obj["download_url"].toString(); // 检查模型数据
     }
 }
@@ -224,7 +277,11 @@ void MainWindow::filterAppsByKeyword(const QString &keyword)
         m_model->setUpdateData(m_allApps);
         return;
     }
-    QJsonArray filtered;
+    
+    // 分离正常应用和忽略应用
+    QJsonArray normalApps;
+    QJsonArray ignoredApps;
+    
     for (const auto &item : m_allApps) {
         QJsonObject obj = item.toObject();
         // 可根据需要匹配更多字段
@@ -232,31 +289,157 @@ void MainWindow::filterAppsByKeyword(const QString &keyword)
         QString package = obj.value("package").toString();
         if (name.contains(keyword, Qt::CaseInsensitive) ||
             package.contains(keyword, Qt::CaseInsensitive)) {
-            filtered.append(item);
+            
+            // 检查是否为忽略状态
+            if (obj.value("ignored").toBool()) {
+                ignoredApps.append(item);
+            } else {
+                normalApps.append(item);
+            }
         }
     }
+    
+    // 合并数组：正常应用在前，忽略应用在后
+    QJsonArray filtered;
+    for (const auto &item : normalApps) {
+        filtered.append(item);
+    }
+    for (const auto &item : ignoredApps) {
+        filtered.append(item);
+    }
+    
     m_model->setUpdateData(filtered);
 }
 
 void MainWindow::runAptssUpgrade()
 {
     QProcess process;
-    QStringList args;
-    args << "sudo" <<"aptss" << "ssupdate";
-    process.start("sudo", args);
+    
+    // 检查是否已经是root用户，如果是则直接执行命令，否则使用sudo
+    if (geteuid() == 0) {
+        // root用户直接执行
+        process.start("aptss", QStringList() << "ssupdate");
+    } else {
+        // 非root用户使用sudo
+        process.start("sudo", QStringList() << "aptss" << "ssupdate");
+    }
+    
     if (!process.waitForStarted(5000)) {
-        QMessageBox::warning(this, "升级失败", "无法启动 sudo aptss ssupdate");
+        QMessageBox::warning(this, "升级失败", "无法启动 aptss ssupdate");
         return;
     }
     process.write("n\n");
     process.closeWriteChannel();
-    process.waitForFinished(-1);
-    if (process.exitCode() != 0) {
-        QMessageBox::warning(this, "升级失败", "执行 sudo aptss ssupdate 失败，请检查系统环境。");
+    
+    // 设置超时时间，避免无限等待
+    if (!process.waitForFinished(30000)) { // 30秒超时
+        qDebug() << "aptss ssupdate 执行超时";
+        process.kill(); // 强制终止进程
+        return;
     }
+    
+    if (process.exitCode() != 0) {
+        QMessageBox::warning(this, "升级失败", "执行 aptss ssupdate 失败，请检查系统环境或稍后再试。");
+    }
+}
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    // 检查是否正在进行更新
+    bool isUpdating = false;
+    
+    // 通过AppDelegate检查是否有正在下载或安装的应用
+    const QHash<QString, DownloadInfo>& downloads = m_delegate->getDownloads();
+    for (auto it = downloads.constBegin(); it != downloads.constEnd(); ++it) {
+        if (it.value().isDownloading || it.value().isInstalling) {
+            isUpdating = true;
+            break;
+        }
+    }
+    
+    // 如果正在更新，才显示确认对话框
+    if (isUpdating) {
+        QMessageBox::StandardButton reply = QMessageBox::question(this, "确认关闭", "正在更新，是否确认关闭窗口？", QMessageBox::Yes | QMessageBox::No);
+        
+        if (reply == QMessageBox::Yes) {
+            event->accept();
+        } else {
+            event->ignore();
+        }
+    } else {
+        // 如果没有更新，直接关闭窗口
+        event->accept();
+    }
+}
+void MainWindow::handleUpdateFinished(bool success)
+{
+    if (success) {
+        // 更新成功时的处理逻辑
+        QMessageBox::information(this, "更新完成", "软件更新已成功完成！");
+    } else {
+        // 更新失败时的处理逻辑
+        QMessageBox::warning(this, "更新失败", "软件更新过程中出现错误，请稍后再试。");
+    }
+    
+    // 刷新应用列表
+    checkUpdates();
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
 }
+
+// 新增：更新按钮文本
+void MainWindow::updateButtonText() {
+    int selectedCount = m_delegate->getSelectedPackages().size();
+    if (selectedCount > 0) {
+        ui->updatePushButton->setText(QString("更新选中(%1)").arg(selectedCount));
+    } else {
+        ui->updatePushButton->setText("更新全部");
+    }
+}
+
+// 新增：处理选择变化
+void MainWindow::handleSelectionChanged() {
+    updateButtonText();
+}
+
+// 新增：处理忽略应用的槽函数
+void MainWindow::onIgnoreApp(const QString &packageName, const QString &version) {
+    // 将应用添加到忽略配置中
+    m_ignoreConfig->addIgnoredApp(packageName, version);
+    
+    // 更新模型中应用的状态，而不是移除
+    QJsonArray updatedApps;
+    for (const auto &item : m_allApps) {
+        QJsonObject obj = item.toObject();
+        if (obj["package"].toString() == packageName) {
+            obj["ignored"] = true; // 标记为忽略状态
+        }
+        updatedApps.append(obj);
+    }
+    m_allApps = updatedApps;
+    
+    // 重新排序：正常应用在前，忽略应用在后
+    checkUpdates();
+}
+
+// 新增：处理取消忽略应用的槽函数
+void MainWindow::onUnignoreApp(const QString &packageName) {
+    // 从忽略配置中移除应用
+    m_ignoreConfig->removeIgnoredApp(packageName);
+    
+    // 更新模型中应用的状态
+    QJsonArray updatedApps;
+    for (const auto &item : m_allApps) {
+        QJsonObject obj = item.toObject();
+        if (obj["package"].toString() == packageName) {
+            obj["ignored"] = false; // 标记为非忽略状态
+        }
+        updatedApps.append(obj);
+    }
+    m_allApps = updatedApps;
+    
+    // 重新排序：正常应用在前，忽略应用在后
+    checkUpdates();
+}

spark-update-tool/src/mainwindow.h

@@ -5,9 +5,10 @@
 #include "aptssupdater.h"
 #include "applistmodel.h"
 #include "appdelegate.h"
+#include "ignoreconfig.h"
 #include <QListView>
 #include <QJsonArray> // 添加头文件
-
+#include <QScreen>
 QT_BEGIN_NAMESPACE
 namespace Ui {
 class MainWindow;
@@ -22,6 +23,9 @@ public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
+protected:
+    void closeEvent(QCloseEvent *event) override;  
+
 private:
     Ui::MainWindow *ui;
     void checkUpdates();
@@ -29,8 +33,16 @@ private:
     void runAptssUpgrade();
     AppListModel *m_model;
     AppDelegate *m_delegate;
+    IgnoreConfig *m_ignoreConfig; // 新增：忽略配置管理
     QListView *listView; // 声明 QListView 指针
     QJsonArray m_allApps; // 新增：保存所有应用数据
     void filterAppsByKeyword(const QString &keyword); // 新增：搜索过滤函数声明
+    void updateButtonText(); // 新增：更新按钮文本
+    
+private slots:
+    void handleUpdateFinished(bool success); // 新增：处理更新完成的槽函数
+    void handleSelectionChanged(); // 新增：处理选择变化的槽函数
+    void onIgnoreApp(const QString &packageName, const QString &version); // 新增：处理忽略应用的槽函数
+    void onUnignoreApp(const QString &packageName); // 新增：处理取消忽略应用
 };
-#endif // MAINWINDOW_H
+#endif // MAINWINDOW_H

spark-update-tool/src/mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1440</width>
-    <height>858</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -253,4 +253,4 @@
  </widget>
  <resources/>
  <connections/>
-</ui>
+</ui>

src/application.cpp

@@ -25,7 +25,6 @@ Application::Application(int &argc, char **argv)
     if (!DPlatformWindowHandle::pluginVersion().isEmpty()) {
         setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
     }
-    setAttribute(Qt::AA_UseHighDpiPixmaps);
 
     setQuitOnLastWindowClosed(false); // 启用托盘图标时，关闭窗口程序仍然运行
 
@@ -89,12 +88,25 @@ void Application::checkAppConfigLocation()
 void Application::setBuildDateTime(const QString &buildDateTime)
 {
     QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    
+    // 确保 UUID 存在
+    if (!config.contains("info/uuid")) {
+        QUuid uuid = QUuid::createUuid();
+        config.setValue("info/uuid", uuid.toString());
+    }
+    
+    QString currentUuid = config.value("info/uuid").toString();
+
     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);
+        
+        // 恢复原有的 UUID
+        config.setValue("info/uuid", currentUuid);
+        
         config.sync();
     }
 
@@ -164,7 +176,10 @@ void Application::loadTranslator()
 
     if (QLocale::system().language() == QLocale::Chinese) {
         QTranslator *webengineTranslator = new QTranslator(this);
-        webengineTranslator->load(QLocale(QLocale::Chinese), "qtwebengine", "_", ":/translations");
+        bool loaded = webengineTranslator->load(QLocale(QLocale::Chinese), "qtwebengine", "_", ":/translations");
+        if (!loaded) {
+            qWarning() << "Failed to load webengine translator";
+        }
         installTranslator(webengineTranslator);
     }
 }

src/backend/DataCollectorAndUploader.cpp

@@ -10,6 +10,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QTextStream>
+#include <QCoreApplication>
 
 DataCollectorAndUploader::DataCollectorAndUploader(QObject *parent) : QObject(parent)
 {
@@ -27,11 +28,17 @@ void DataCollectorAndUploader::collectData()
     QString architecture;
 
     QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    QString version = config.value("build/version").toString();
+    QString version = QString(APP_VERSION); // 使用编译时定义的版本号
     QString uuid = config.value("info/uuid").toString();
 
-    // Read /etc/os-release file
-    QFile osReleaseFile("/etc/os-release");
+    // 根据环境变量选择 os-release 文件路径
+    QString osReleasePath = "/etc/os-release";
+    if (qEnvironmentVariableIsSet("IS_ACE_ENV") && qgetenv("IS_ACE_ENV") == "1") {
+        osReleasePath = "/host/etc/os-release";
+    }
+
+    // Read os-release file
+    QFile osReleaseFile(osReleasePath);
     if (osReleaseFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QTextStream in(&osReleaseFile);
         while (!in.atEnd()) {
@@ -44,7 +51,7 @@ void DataCollectorAndUploader::collectData()
         }
         osReleaseFile.close();
     } else {
-        qWarning() << "Could not open /etc/os-release file";
+        qWarning() << "Could not open os-release file:" << osReleasePath;
     }
 
     // Execute uname -m to get the architecture
@@ -83,4 +90,4 @@ void DataCollectorAndUploader::collectData()
         }
         reply->deleteLater();
     });
-}
+}

src/backend/downloadworker.cpp

@@ -41,7 +41,7 @@ bool checkMeatlink(QString metaUrl)
         metaStatus.remove();
     }
     QString cmd = QString("curl -I -s --connect-timeout 5 %1 -w  %{http_code}  |tail -n1 > /tmp/spark-store/metaStatus.txt").arg(metaUrl);
-    system(cmd.toUtf8().data());
+    [[maybe_unused]] int ret = system(cmd.toUtf8().data());//不这样写就会-Wunused-variable 警告导致无法打包
     if (metaStatus.open(QFile::ReadOnly) && QString(metaStatus.readAll()).toUtf8() == "200")
     {
         metaStatus.remove();
@@ -94,7 +94,7 @@ void DownloadController::startDownload(const QString &url)
         return;
     }
 
-    QtConcurrent::run([=]()
+    auto future = QtConcurrent::run([=]()
     {
         QString metaUrl = url + ".metalink";
         qDebug() << "metalink" << metaUrl;
@@ -272,7 +272,7 @@ void DownloadController::stopDownload()
 
     // 实现下载进程退出
     QString killCmd = QString("kill -9 %1").arg(pidNumber);
-    system(killCmd.toUtf8());
+    [[maybe_unused]] int ret = system(killCmd.toUtf8());
     qDebug() << "kill aria2!";
     pidNumber = -1;
 }

src/backend/sparkapi.cpp

@@ -28,7 +28,6 @@ void SparkAPI::get(QUrl url)
     QNetworkRequest request;
     HttpRequest *httprequest = new HttpRequest;
     request.setUrl(QUrl(url.toString().replace("+", "%2B")));
-    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
     connect(httprequest, &HttpRequest::finished, [=](QString data)
     {
         QByteArray arr = data.toUtf8();
@@ -54,7 +53,6 @@ void SparkAPI::getRAW(QUrl url)
     QNetworkRequest request;
     HttpRequest *httprequest = new HttpRequest;
     request.setUrl(QUrl(url.toString().replace("+", "%2B")));
-    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
     connect(httprequest, &HttpRequest::finished, [=](QString data)
             {
             emit finishedRAW(data);

src/main.cpp

@@ -12,7 +12,6 @@
 #include <execinfo.h>
 
 #include <DSysInfo>
-#include <DApplicationSettings>
 
 #include <QDate>
 #include <QProcessEnvironment>
@@ -109,17 +108,18 @@ int main(int argc, char *argv[])
 {
     // 崩溃处理
     signal(SIGSEGV, crashHandler);  // 注册SIGSEGV处理函数
+    
+    // 初始化日志系统
+    Utils::initLogger();
+    Utils::writeLog("INFO", "Application starting...");
 
-
-    // Get build time
-    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");
-    buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");
-
-
-    // NOTE: 提前设置组织名称和应用名称，避免配置文件位置错误
-    DApplication::setOrganizationName("spark-union");
-    DApplication::setApplicationName("spark-store");
+     // Get build time
+     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");
+     buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");
+    
+    //在cmakelist.txt中设置 buildDateTime
+//    QString buildDateTime = QString("%1-%2").arg(QString(BUILD_DATE)).arg(QString(BUILD_TIME));
     Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
 
     // 初始化 config.ini 配置文件
@@ -129,9 +129,11 @@ int main(int argc, char *argv[])
     DataCollectorAndUploader uploader;
     QObject::connect(&uploader, &DataCollectorAndUploader::uploadSuccessful, [](){
         qDebug() << "Data uploaded successfully";
+        Utils::writeLog("INFO", "Data uploaded successfully");
     });
     QObject::connect(&uploader, &DataCollectorAndUploader::uploadFailed, [](QString error){
         qDebug() << "Upload failed with error: " << error;
+        Utils::writeLog("ERROR", QString("Upload failed with error: %1").arg(error));
     });
 
     uploader.collectAndUploadData();
@@ -152,6 +154,10 @@ int main(int argc, char *argv[])
 #if defined __sw_64__ || __loongarch__
     chromium_flags.append("--no-sandbox");
 #endif
+    // 如果配置文件中设置了关闭沙箱，则添加no-sandbox标志
+    if (Utils::shouldDisableWebEngineSandbox()) {
+        chromium_flags.append("--no-sandbox");
+    }
     qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromium_flags.join(" ").toUtf8());
 
     /**
@@ -163,13 +169,6 @@ int main(int argc, char *argv[])
         DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
     }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    // 开启 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];
@@ -181,6 +180,9 @@ int main(int argc, char *argv[])
     }
     int fakeArgc = argc + 2; // QCoreApplication 的 argc 要用引用，避免 c++ 编译器优化
     Application a(fakeArgc, fakeArgs.data());
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    a.setAttribute(Qt::ApplicationAttribute::AA_UseHighDpiPixmaps);
+#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     // 设置版本和构建时间
     a.setBuildDateTime(buildDateTime);
 
@@ -191,8 +193,6 @@ int main(int argc, char *argv[])
         return -1;
     }
 
-    DApplicationSettings settings; // 定义 DApplicationSettings，自动保存主题设置
-
     MainWindow w;
     a.setMainWindow(&w); // 设置应用程序主窗口，用于初始化关于对话框
 
@@ -206,5 +206,10 @@ int main(int argc, char *argv[])
     }
     w.show();
 
+    // 在程序结束前关闭日志文件 - 修复变量名并移到return前
+    QObject::connect(&a, &QApplication::aboutToQuit, []() {
+        Utils::writeLog("INFO", "Application shutting down");
+    });
+    
     return a.exec();
 }

src/mainwindow-dtk.cpp

@@ -14,6 +14,9 @@
 #include <QDesktopServices>
 #include <QAbstractButton>
 #include <QtConcurrent>
+#include <qlogging.h>
+#include <qprocess.h>
+#include <system_error>
 #include <unistd.h>
 
 #include <backend/ThemeChecker.h>
@@ -345,7 +348,7 @@ void MainWindow::refreshTheme(bool isDarkMode)
     ui->applistpage->setTheme(isDarkMode);
     ui->applistpage_1->setTheme(isDarkMode);
     ui->appintopage->setTheme(isDarkMode);
-    ui->settingspage->setTheme(isDarkMode);
+    ui->settingspage->setTheme(isDarkMode); 
 }
 
 void MainWindow::initConnections()
@@ -434,7 +437,7 @@ void MainWindow::initTmpDir()
 
     if (info.isWritable() == false)
     {
-        QtConcurrent::run([=]
+        auto future = QtConcurrent::run([=]
                           {
             sleep(3);
             auto upgradeP = new QProcess();
@@ -522,72 +525,36 @@ void MainWindow::notify(QObject *receiver, QEvent *event)
 
 void MainWindow::on_pushButton_14_clicked()
 {
-    /**
-     * NOTE: No need to judget developmode status
-     */
-    // Check UOS
-    // QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    // if (config.contains("UOS/EnableDeveloperMode") && !config.value("UOS/EnableDeveloperMode").toBool())
-    if (false)
-    {
-        qDebug() << "UOS Developer Mode has not been enabled!";
-        QtConcurrent::run([=]
-                          {
-            auto upgradeP = new QProcess();
-            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())
-        {
-                QString appPath;
+    QString appPath;
+    // #ifdef QT_DEBUG
+    //     appPath = QCoreApplication::applicationDirPath() ;
+    //     QDir dir(appPath);
+    //     dir.cdUp();
+    //     appPath = dir.absolutePath()+"/spark-update-tool/spark-update-tool";
+    //     qDebug() << "Spark Update Tool Path: " << appPath;
+    //     if(appPath.isEmpty())
+    //     {
+    //         qWarning() << "Spark Update Tool not found!";
+    //         return;
+    //     }
+    //     QProcess *process = new QProcess(this);
+    //     QStringList arguments;
+    //     arguments << appPath <<"--silent";
+    //     process->start(appPath, {"--silent"});
+    // #else
+    //     appPath = QStandardPaths::findExecutable("spark-update-tool");
+    //     QString program = "pkexec";
+    //     QStringList arguments;
+    //     arguments << appPath;
+    //     QProcess *process = new QProcess(this);
+    //     process->start(program, arguments);
+    // #endif
+        appPath = QStandardPaths::findExecutable("spark-update-tool");
+        qDebug() << "Spark Update Tool Path: " << appPath;
+        QString program = "pkexec";
+        QStringList arguments;
+        arguments << appPath;
+        QProcess *process = new QProcess(this);
+        process->start(program, arguments);
 
-    // 判断路径：开发环境 vs 安装后
-        #ifdef QT_DEBUG
-            appPath = QCoreApplication::applicationDirPath() +
-                    "/spark-update-tool/spark-update-tool";
-        #else
-            appPath = QStandardPaths::findExecutable("spark-update-tool");
-        #endif
-
-            if (appPath.isEmpty()) {
-                qWarning() << "spark-update-tool not found!";
-                return;
-            }
-
-            QProcess *process = new QProcess(this);
-
-        #ifdef QT_DEBUG
-            // 开发模式：直接运行本地构建的更新器
-            process->start(appPath, {"--silent"});
-        #else
-            // 安装模式：使用 pkexec 提权运行系统路径下的 spark-update-tool
-            QString program = "pkexec";
-            QStringList arguments;
-            arguments << appPath << "--silent";
-            process->start(program, arguments);
-        #endif
-
-            QObject::connect(process, QOverload<int>::of(&QProcess::finished),
-                [process](int exitCode) {
-                    if (exitCode == 0) {
-                        qDebug() << "Update check successful";
-                    } else {
-                        qWarning() << "Update check failed with exit code:" << exitCode;
-                    }
-                    process->deleteLater();
-                });
-                }
-            }
-}
+}

src/pages/appintopage.cpp

@@ -73,7 +73,9 @@ void AppIntoPage::openUrl(const QUrl &url)
         iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png"));
         iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
         iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 
         iconManager->get(iconRequest);
         QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
@@ -96,8 +98,10 @@ void AppIntoPage::openUrl(const QUrl &url)
             QNetworkAccessManager *manager = new QNetworkAccessManager(this);
             request.setUrl(QUrl(imgUrl));
             request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
-            request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
             manager->get(request);
             QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
                 {
@@ -617,7 +621,7 @@ void AppIntoPage::on_downloadButton_clicked()
 
 void AppIntoPage::on_pushButton_3_clicked()
 {
-    QtConcurrent::run([=]()
+    auto future = QtConcurrent::run([=]()
     {
         ui->downloadButton->setEnabled(false);
         ui->pushButton_3->setEnabled(false);
@@ -659,3 +663,4 @@ void AppIntoPage::on_updateButton_clicked()
     QString feedbackURL = "https://bbs.spark-app.store/";
     QProcess::startDetached("xdg-open", QStringList{feedbackURL});
 }
+

src/pages/settingspage.cpp

@@ -6,6 +6,7 @@
 #include <QSettings>
 #include <QtConcurrent>
 #include <QDebug>
+#include <QMessageBox>
 
 #define TMP_PATH "/tmp/spark-store"
 #define DEFAULT_SERVER_URL "https://cdn-d.spark-app.store/"
@@ -22,6 +23,9 @@ SettingsPage::SettingsPage(QWidget *parent)
 
     configCanSave = false;
     initConfig();
+    
+    // 移除了手动连接导出日志按钮的点击信号
+    // connect(ui->pushButton_exportLog, &QPushButton::clicked, this, &SettingsPage::on_pushButton_exportLog_clicked);
 }
 
 void SettingsPage::setTheme(bool dark)
@@ -32,7 +36,7 @@ void SettingsPage::setTheme(bool dark)
     }
     else
     {
-        // 亮色模式
+        // ���色模式
         this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}");
     }
 }
@@ -98,8 +102,14 @@ void SettingsPage::initConfig()
     }
     configCanSave = true; // 　防止触发保存配置信号
 
+    // 在现有代码后添加初始化checkBox_disableSandbox的状态
     needUncompatibleNotification = config.value("other/uncompatibleNotification", needUncompatibleNotification).toBool();
     ui->checkBox->setChecked(needUncompatibleNotification);
+
+    // 新增：从config.ini读取webengine/noSandbox配置并设置复选框状态
+    bool disableSandbox = config.value("webengine/noSandbox", false).toBool();
+    ui->checkBox_disableSandbox->setChecked(disableSandbox);
+
 }
 
 SettingsPage::~SettingsPage()
@@ -109,7 +119,7 @@ SettingsPage::~SettingsPage()
 
 void SettingsPage::on_pushButton_updateServer_clicked()
 {
-    QtConcurrent::run([=]()
+    auto future = QtConcurrent::run([=]()
                       {
         ui->pushButton_updateServer->setEnabled(false);
 
@@ -134,7 +144,7 @@ void SettingsPage::on_pushButton_updateServer_clicked()
         ui->comboBox_server->setCurrentIndex(0); });
 }
 
-void SettingsPage::on_comboBox_server_currentIndexChanged(const QString &arg1)
+void SettingsPage::on_comboBox_server_currentTextChanged(const QString &arg1)
 {
     SparkAPI::setServerUrl(arg1); // 服务器信息更新
     qDebug() << arg1;
@@ -208,7 +218,7 @@ quint64 SettingsPage::dirFileSize(const QString &path)
 
 void SettingsPage::on_pushButton_updateApt_clicked()
 {
-    QtConcurrent::run([=]()
+    auto future = QtConcurrent::run([=]()
                       {
         ui->pushButton_updateApt->setEnabled(false);
         ui->label_aptserver->setText(tr("Updating, please wait..."));
@@ -222,7 +232,7 @@ void SettingsPage::on_pushButton_updateApt_clicked()
 
 void SettingsPage::on_pushButton_clear_clicked()
 {
-    QtConcurrent::run([=]()
+    auto future = QtConcurrent::run([=]()
                       {
         ui->pushButton_clear->setEnabled(false);
 
@@ -240,7 +250,7 @@ void SettingsPage::on_pushButton_clear_clicked()
 
 void SettingsPage::on_pushButton_clearWebCache_clicked()
 {
-    QtConcurrent::run([=]()
+    auto future = QtConcurrent::run([=]()
     {
         QString localDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/QtWebEngine";
         qDebug() << localDataLocation;
@@ -261,3 +271,37 @@ void SettingsPage::on_checkBox_clicked(bool checked)
     config.setValue("other/uncompatibleNotification", needUncompatibleNotification);
     config.sync();
 }
+
+// 添加checkBox_disableSandbox的点击事件处理函数
+void SettingsPage::on_checkBox_disableSandbox_clicked(bool checked)
+{
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    config.setValue("webengine/noSandbox", checked);
+    config.sync();
+}
+
+// 修改导出日志按钮的点击事件处理函数
+void SettingsPage::on_pushButton_exportLog_clicked()
+{
+    // 禁用按钮防止重复点击
+    ui->pushButton_exportLog->setEnabled(false);
+    
+    QString targetPath = QString::fromUtf8(TMP_PATH);
+    bool success = Utils::exportLogs(targetPath);
+    
+    // 显示导出结果通知
+    QString message;
+    if (success) {
+        message = tr("Logs exported successfully to: %1").arg(targetPath);
+        Utils::writeLog("INFO", "User exported logs via settings page");
+    } else {
+        message = tr("Failed to export logs");
+        Utils::writeLog("ERROR", "User failed to export logs via settings page");
+    }
+    
+    // 只发送一次系统通知
+    Utils::sendNotification("spark-store", tr("Export Logs"), message);
+    
+    // 重新启用按钮
+    ui->pushButton_exportLog->setEnabled(true);
+}

src/pages/settingspage.h

@@ -22,7 +22,7 @@ public:
 private slots:
     void on_pushButton_updateServer_clicked();
 
-    void on_comboBox_server_currentIndexChanged(const QString &arg1);
+    void on_comboBox_server_currentTextChanged(const QString &arg1);
 
     void on_pushButton_updateApt_clicked();
 
@@ -32,6 +32,11 @@ private slots:
 
     void on_checkBox_clicked(bool checked);
 
+    void on_checkBox_disableSandbox_clicked(bool checked);
+    
+    // 添加导出日志按钮的槽函数声明
+    void on_pushButton_exportLog_clicked();
+
 public:
     static bool needUncompatibleNotification;
 
@@ -47,4 +52,4 @@ signals:
     void openUrl(QUrl spk);
 };
 
-#endif // SETTINGSPAGE_H
+#endif // SETTINGSPAGE_H

src/pages/settingspage.ui

@@ -32,10 +32,10 @@
    <item row="0" column="0">
     <widget class="QFrame" name="frame">
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Shape::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Shadow::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <property name="spacing">
@@ -59,7 +59,7 @@
          <string notr="true"/>
         </property>
         <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
+         <enum>QFrame::Shape::NoFrame</enum>
         </property>
         <property name="lineWidth">
          <number>0</number>
@@ -71,9 +71,9 @@
          <property name="geometry">
           <rect>
            <x>0</x>
-           <y>0</y>
-           <width>688</width>
-           <height>940</height>
+           <y>-434</y>
+           <width>666</width>
+           <height>1270</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -147,7 +147,7 @@
                 <item>
                  <spacer name="horizontalSpacer">
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -166,7 +166,7 @@
                 <item row="0" column="3">
                  <spacer name="horizontalSpacer_2">
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -295,7 +295,7 @@
                 <item row="0" column="4">
                  <spacer name="horizontalSpacer_3">
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -338,6 +338,109 @@
             </layout>
            </widget>
           </item>
+          <item>
+           <widget class="QWidget" name="widget_9" native="true">
+            <layout class="QGridLayout" name="gridLayout_2">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_12">
+               <property name="font">
+                <font>
+                 <pointsize>18</pointsize>
+                 <bold>false</bold>
+                </font>
+               </property>
+               <property name="text">
+                <string>Log</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QWidget" name="widget_10" native="true">
+               <layout class="QHBoxLayout" name="horizontalLayout_2">
+                <item>
+                 <widget class="QLabel" name="label_13">
+                  <property name="text">
+                   <string>Export Logs:/tmp/spark-store</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="pushButton_exportLog">
+                  <property name="text">
+                   <string>Export</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_4">
+                  <property name="orientation">
+                   <enum>Qt::Orientation::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>351</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QWidget" name="widget_11" native="true">
+            <layout class="QVBoxLayout" name="verticalLayout_3">
+             <item>
+              <widget class="QLabel" name="label_14">
+               <property name="font">
+                <font>
+                 <pointsize>18</pointsize>
+                </font>
+               </property>
+               <property name="text">
+                <string>Disable Safe Mode</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QWidget" name="widget_12" native="true">
+               <layout class="QHBoxLayout" name="horizontalLayout_4">
+                <item>
+                 <widget class="QLabel" name="label_15">
+                  <property name="text">
+                   <string>Disable the webEngine sandbox feature.</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="checkBox_disableSandbox">
+                  <property name="text">
+                   <string>Disable</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_5">
+                  <property name="orientation">
+                   <enum>Qt::Orientation::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>424</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
           <item>
            <widget class="QWidget" name="widget_6" native="true">
             <layout class="QVBoxLayout" name="verticalLayout_25">
@@ -372,7 +475,7 @@
           <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
-             <enum>Qt::Vertical</enum>
+             <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>

src/spark-store.pro

@@ -27,11 +27,12 @@ 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
+# Enable all log outputs in both Debug and Release modes
+# We want to capture all logs (INFO, DEBUG, WARNING, ERROR) for export to /tmp/spark-store
 
 CONFIG += c++11 link_pkgconfig
-PKGCONFIG += dtkcore dtkgui dtkwidget
+equals(QT_MAJOR_VERSION, 6): PKGCONFIG += dtk6core dtk6gui dtk6widget
+equals(QT_MAJOR_VERSION, 5): PKGCONFIG += dtkcore dtkgui dtkwidget
 
 SOURCES += \
         backend/DataCollectorAndUploader.cpp \
@@ -47,13 +48,13 @@ SOURCES += \
         utils/utils.cpp \
         utils/widgetanimation.cpp \
         widgets/base/basewidgetopacity.cpp \
-        widgets/common/customlabel.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/common/customlabel.cpp \
         widgets/big_image.cpp \
         widgets/downloadlistwidget.cpp \
         application.cpp \
@@ -74,13 +75,13 @@ HEADERS += \
         utils/utils.h \
         utils/widgetanimation.h \
         widgets/base/basewidgetopacity.h \
-        widgets/common/customlabel.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/common/customlabel.h \
         widgets/big_image.h \
         widgets/downloadlistwidget.h \
         application.h \
@@ -109,4 +110,4 @@ qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
-DISTFILES +=
+DISTFILES +=

src/spark-update-tool/CMakeLists.txt

@@ -1,58 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-
-project(spark-update-tool VERSION 0.1 LANGUAGES CXX)
-
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-
-find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent)
-
-
-find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent Core Gui)
-
-# 定义所有项目源文件，现在无需条件判断
-set(PROJECT_SOURCES
-    src/main.cpp
-    src/mainwindow.cpp
-    src/mainwindow.h
-    src/mainwindow.ui
-    src/aptssupdater.h src/aptssupdater.cpp
-    src/icons.qrc
-    src/appdelegate.h src/appdelegate.cpp
-    src/applistmodel.h src/applistmodel.cpp
-    src/downloadmanager.h src/downloadmanager.cpp
-)
-
-
-add_executable(spark-update-tool
-    ${PROJECT_SOURCES}
-)
-
-target_link_libraries(spark-update-tool PRIVATE
-    Qt5::Widgets
-    Qt5::Network
-    Qt5::Concurrent
-    Qt5::Core
-    Qt5::Gui
-)
-
-
-set_target_properties(spark-update-tool PROPERTIES
-    # ${BUNDLE_ID_OPTION} # 如果上面取消注释，这里也取消注释
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-
-)
-
-include(GNUInstallDirs)
-install(TARGETS spark-update-tool
-    BUNDLE DESTINATION .
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-

src/spark-update-tool/README.md

@@ -1,21 +0,0 @@
-### Spark Software Updater
-
-#### Introduction
-
-Welcome to Spark Software Updater! This tool helps you conveniently update various applications on your Linux system.
-
-This version is specifically designed for Linux distributions with Qt5 support.  
-**Please run with root privileges (recommended to use `sudo`).**
-
-#### Currently Supported Linux Distributions
-
-- [x] GXDE OS
-- [x] Ubuntu
-- [x] deepin
-- [ ] Kylin
-
-// ... existing Chinese feature table ...
-
-#### Contact & Feedback
-
-For any issues or suggestions, please contact: momen@momen.world

src/spark-update-tool/debian/changelog

@@ -1,5 +0,0 @@
-spark-update-tool (1.0.0) unstable; urgency=low
-
-  * Initial release.
-
- -- momen <vmomenv@gmail.com>  Wed, 18 Jun 2025 00:00:00 +0000

src/spark-update-tool/debian/compat

@@ -1 +0,0 @@
-9

src/spark-update-tool/debian/rules

@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr

src/spark-update-tool/spark-update-tool.pro

@@ -1,48 +0,0 @@
-# spark-update-tool.pro
-QT       += core gui widgets network concurrent
-TARGET = spark-update-tool
-TEMPLATE = app
-
-# Set C++ standard to C++17
-CONFIG += c++17
-
-# Enable auto features (uic, moc, rcc)
-CONFIG += qt warn_on release
-QT_CONFIG += no-pkg-config
-
-# Version info (replace with your actual version)
-VERSION = 0.1.0
-DEFINES += APP_VERSION=\\\"$$VERSION\\\"
-
-# Source files
-SOURCES += \
-    src/main.cpp \
-    src/mainwindow.cpp \
-    src/aptssupdater.cpp \
-    src/appdelegate.cpp \
-    src/applistmodel.cpp \
-    src/downloadmanager.cpp
-
-HEADERS += \
-    src/mainwindow.h \
-    src/aptssupdater.h \
-    src/appdelegate.h \
-    src/applistmodel.h \
-    src/downloadmanager.h
-
-FORMS += \
-    src/mainwindow.ui
-
-RESOURCES += \
-    src/icons.qrc
-
-# macOS bundle properties (optional)
-macx {
-    QMAKE_INFO_PLIST = Info.plist
-    ICON = resources/spark-update-tool.icns
-    BUNDLE_IDENTIFIER = org.spark.store.update-tool
-}
-
-# Installation paths (matches CMake install)
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target

src/spark-update-tool/src/appdelegate.cpp

@@ -1,322 +0,0 @@
-#include "appdelegate.h"
-#include <QIcon>
-#include <QDebug>
-#include <QApplication>
-#include <QDir>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QPainter>
-#include <QMouseEvent>
-
-AppDelegate::AppDelegate(QObject *parent)
-    : QStyledItemDelegate(parent), m_downloadManager(new DownloadManager(this)), m_installProcess(nullptr) {
-    connect(m_downloadManager, &DownloadManager::downloadFinished, this,
-            [this](const QString &packageName, bool success) {
-                if (m_downloads.contains(packageName)) {
-                    m_downloads[packageName].isDownloading = false;
-                    emit updateDisplay(packageName);
-                    qDebug() << (success ? "下载完成:" : "下载失败:") << packageName;
-                    if (success) {
-                        enqueueInstall(packageName); 
-                    }
-                }
-    });
-
-    connect(m_downloadManager, &DownloadManager::downloadProgress, this,
-            [this](const QString &packageName, int progress) {
-        if (m_downloads.contains(packageName)) {
-            m_downloads[packageName].progress = progress;
-            qDebug()<<progress;
-            emit updateDisplay(packageName); // 实时刷新进度条
-        }
-    });
-    m_spinnerTimer.start();
-}
-
-void AppDelegate::setModel(QAbstractItemModel *model) {
-    m_model = model;
-}
-
-void AppDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
-    painter->save();
-
-    if (option.state & QStyle::State_Selected)
-        painter->fillRect(option.rect, option.palette.highlight());
-    else
-        painter->fillRect(option.rect, QColor("#F3F4F6"));
-
-    QFont boldFont = option.font;
-    boldFont.setBold(true);
-    QFont normalFont = option.font;
-
-    QString name = index.data(Qt::DisplayRole).toString();
-    QString currentVersion = index.data(Qt::UserRole + 2).toString();
-    QString newVersion = index.data(Qt::UserRole + 3).toString();
-    QString iconPath = index.data(Qt::UserRole + 4).toString();
-    QString size = index.data(Qt::UserRole + 5).toString();
-    QString description = index.data(Qt::UserRole + 6).toString();
-
-    QRect rect = option.rect;
-    int margin = 10, spacing = 6, iconSize = 40;
-
-    QRect iconRect(rect.left() + margin, rect.top() + (rect.height() - iconSize) / 2, iconSize, iconSize);
-    QIcon(iconPath).paint(painter, iconRect);
-
-    int textX = iconRect.right() + margin;
-    int textWidth = rect.width() - textX - 100;
-
-    QRect nameRect(textX, rect.top() + margin, textWidth, 20);
-    painter->setFont(boldFont);
-    painter->setPen(QColor("#333333"));
-    painter->drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter, name);
-
-    QRect versionRect(textX, nameRect.bottom() + spacing, textWidth, 20);
-    painter->setFont(normalFont);
-    painter->setPen(QColor("#888888"));
-    painter->drawText(versionRect, Qt::AlignLeft | Qt::AlignVCenter,
-                      QString("当前版本: %1 → 新版本: %2").arg(currentVersion, newVersion));
-
-    QRect descRect(textX, versionRect.bottom() + spacing, textWidth, 40);
-    painter->setFont(normalFont);
-    painter->setPen(QColor("#AAAAAA"));
-    painter->drawText(descRect, Qt::TextWordWrap,
-                      QString("包大小：%1 MB").arg(QString::number(size.toDouble() / (1024 * 1024), 'f', 2)));
-
-    QString packageName = index.data(Qt::UserRole + 1).toString();
-    bool isDownloading = m_downloads.contains(packageName) && m_downloads[packageName].isDownloading;
-    int progress = m_downloads.value(packageName, DownloadInfo{0, false}).progress;
-    bool isInstalled = m_downloads.value(packageName).isInstalled;
-    bool isInstalling = m_downloads.value(packageName).isInstalling;
-
-    if (isDownloading) {
-        QRect progressRect(rect.right() - 270, rect.top() + (rect.height() - 20) / 2, 150, 20);
-        QStyleOptionProgressBar progressBarOption;
-        progressBarOption.rect = progressRect;
-        progressBarOption.minimum = 0;
-        progressBarOption.maximum = 100;
-        progressBarOption.progress = progress;
-        progressBarOption.text = QString("%1%").arg(progress);
-        progressBarOption.textVisible = true;
-        QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
-        
-        // 修改后的取消按钮绘制代码
-        QRect buttonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30);
-        painter->setPen(Qt::NoPen);
-        painter->setBrush(QColor("#ff4444"));  // 红色背景
-        painter->drawRoundedRect(buttonRect, 4, 4);  // 圆角矩形
-        
-        painter->setPen(Qt::white);  // 白色文字
-        painter->setFont(option.font);
-        painter->drawText(buttonRect, Qt::AlignCenter, "取消");
-    } else if (isInstalling) {
-        // 安装中：显示转圈和文字
-        QRect spinnerRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 30, 30);
-        int angle = (m_spinnerTimer.elapsed() / 10) % 360;
-        QPen pen(QColor("#2563EB"), 3);
-        painter->setPen(pen);
-        painter->setRenderHint(QPainter::Antialiasing, true);
-        QRectF arcRect = spinnerRect.adjusted(3, 3, -3, -3);
-        painter->drawArc(arcRect, angle * 16, 120 * 16); // 120度弧
-
-        QRect textRect(option.rect.right() - 120, option.rect.top() + (option.rect.height() - 30) / 2, 110, 30);
-        painter->setPen(QColor("#2563EB"));
-        painter->setFont(option.font);
-        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, "正在安装中");
-    } else {
-        QRect buttonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30);
-        painter->setPen(Qt::NoPen);
-        if (isInstalled) {
-            painter->setBrush(QColor("#10B981"));
-            painter->drawRoundedRect(buttonRect, 4, 4);
-            painter->setPen(Qt::white);
-            painter->drawText(buttonRect, Qt::AlignCenter, "已安装");
-        } else if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) {
-            // 下载完成，按钮绿色，样式不变
-            painter->setBrush(QColor("#10B981"));
-            painter->drawRoundedRect(buttonRect, 4, 4);
-            painter->setPen(Qt::white);
-            painter->drawText(buttonRect, Qt::AlignCenter, "下载完成");
-            // 不需要特殊处理样式，交互在 editorEvent 控制
-        } else {
-            painter->setBrush(QColor("#e9effd"));
-            painter->drawRoundedRect(buttonRect, 4, 4);
-            painter->setPen(QColor("#2563EB"));
-            painter->drawText(buttonRect, Qt::AlignCenter, "更新");
-        }
-    }
-
-    painter->restore();
-}
-
-QSize AppDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const {
-    return QSize(option.rect.width(), 110);
-}
-
-bool AppDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
-                              const QStyleOptionViewItem &option, const QModelIndex &index) {
-    if (event->type() == QEvent::MouseButtonRelease) {
-        QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
-        QRect rect = option.rect;
-        QString packageName = index.data(Qt::UserRole + 1).toString();
-
-        if (m_downloads.contains(packageName) && m_downloads[packageName].isDownloading) {
-            QRect cancelButtonRect(rect.right() - 70, rect.top() + (rect.height() - 20) / 2, 60, 20);
-            if (cancelButtonRect.contains(mouseEvent->pos())) {
-                m_downloadManager->cancelDownload(packageName);
-                m_downloads.remove(packageName);
-                emit updateDisplay(packageName);
-                return true;
-            }
-        } else {
-            QRect buttonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30);
-            if (buttonRect.contains(mouseEvent->pos())) {
-                // 判断是否为“下载完成”状态，如果是则不响应点击
-                if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) {
-                    // “下载完成”状态，按钮失效，点击无效
-                    return false;
-                }
-                QString downloadUrl = index.data(Qt::UserRole + 7).toString();
-                QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
-
-                m_downloads[packageName] = {0, true};
-                m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
-                emit updateDisplay(packageName);
-                return true;
-            }
-        }
-    }
-
-    return QStyledItemDelegate::editorEvent(event, model, option, index);
-}
-
-void AppDelegate::startDownloadForAll() {
-    if (!m_model) return;
-    for (int row = 0; row < m_model->rowCount(); ++row) {
-        QModelIndex index = m_model->index(row, 0);
-        QString packageName = index.data(Qt::UserRole + 1).toString();
-        if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled))
-            continue; // 跳过正在下载或已安装的
-        QString downloadUrl = index.data(Qt::UserRole + 7).toString();
-        QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName);
-        m_downloads[packageName] = {0, true, false};
-        m_downloadManager->startDownload(packageName, downloadUrl, outputPath);
-        emit updateDisplay(packageName);
-    }
-}
-
-// 新增：安装队列相关实现
-void AppDelegate::enqueueInstall(const QString &packageName) {
-    m_installQueue.enqueue(packageName);
-    if (!m_isInstalling) {
-        startNextInstall();
-    }
-}
-
-void AppDelegate::startNextInstall() {
-    if (m_installQueue.isEmpty()) {
-        m_isInstalling = false;
-        m_installingPackage.clear();
-        return;
-    }
-    m_isInstalling = true;
-    QString packageName = m_installQueue.dequeue();
-    m_installingPackage = packageName;
-    m_downloads[packageName].isInstalling = true;
-    emit updateDisplay(packageName);
-
-    // 查找 /tmp 下以包名开头的 .deb 文件
-    QDir tempDir(QDir::tempPath());
-    QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files);
-    QString debPath;
-    if (!debs.isEmpty()) {
-        debPath = tempDir.absoluteFilePath(debs.first());
-    } else {
-        debs = tempDir.entryList(QStringList() << QString("%1*.deb").arg(packageName), QDir::Files);
-        if (!debs.isEmpty()) {
-            debPath = tempDir.absoluteFilePath(debs.first());
-        }
-    }
-
-    if (debPath.isEmpty()) {
-        qWarning() << "未找到deb文件，包名:" << packageName;
-        m_downloads[packageName].isInstalling = false;
-        emit updateDisplay(packageName);
-        m_installingPackage.clear();
-        startNextInstall();
-        return;
-    }
-
-    m_installProcess = new QProcess(this);
-
-    // 新增：准备安装日志文件
-    QString logPath = QString("/tmp/%1_install.log").arg(packageName);
-    QFile *logFile = new QFile(logPath, m_installProcess);
-    if (logFile->open(QIODevice::Append | QIODevice::Text)) {
-        // 设置权限为777
-        QFile::setPermissions(logPath, QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner |
-                                         QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup |
-                                         QFile::ReadOther | QFile::WriteOther | QFile::ExeOther);
-        connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName, logFile]() {
-            QByteArray out = m_installProcess->readAllStandardOutput();
-            logFile->write(out);
-            logFile->flush();
-            QString text = QString::fromLocal8Bit(out);
-            qDebug().noquote() << text;
-            // 检查“软件包已安装”关键字
-            if (text.contains(QStringLiteral("软件包已安装"))) {
-                m_downloads[packageName].isInstalling = false;
-                m_downloads[packageName].isInstalled = true;
-                emit updateDisplay(packageName);
-            }
-        });
-        connect(m_installProcess, &QProcess::readyReadStandardError, this, [this, logFile]() {
-            QByteArray err = m_installProcess->readAllStandardError();
-            logFile->write(err);
-            logFile->flush();
-            qDebug().noquote() << QString::fromLocal8Bit(err);
-        });
-        connect(m_installProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-                this, [this, packageName, logFile](int exitCode, QProcess::ExitStatus status) {
-                    if (logFile) logFile->close();
-                    m_downloads[packageName].isInstalling = false;
-                    if (exitCode == 0) {
-                        m_downloads[packageName].isInstalled = true;  // 安装成功
-                    }
-                    emit updateDisplay(packageName);
-                    m_installProcess->deleteLater();
-                    m_installProcess = nullptr;
-                    m_installingPackage.clear();
-                    startNextInstall();
-                });
-
-    } else {
-        // 日志文件无法打开时，仍然要连接原有信号
-        connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName]() {
-            QByteArray out = m_installProcess->readAllStandardOutput();
-            QString text = QString::fromLocal8Bit(out);
-            qDebug().noquote() << text;
-            if (text.contains(QStringLiteral("软件包已安装"))) {
-                m_downloads[packageName].isInstalling = false;
-                m_downloads[packageName].isInstalled = true;
-                emit updateDisplay(packageName);
-            }
-        });
-        connect(m_installProcess, &QProcess::readyReadStandardError, this, [this]() {
-            QByteArray err = m_installProcess->readAllStandardError();
-            qDebug().noquote() << QString::fromLocal8Bit(err);
-        });
-        connect(m_installProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-                this, [this, packageName](int /*exitCode*/, QProcess::ExitStatus /*status*/) {
-            emit updateDisplay(packageName);
-            m_installProcess->deleteLater();
-            m_installProcess = nullptr;
-            m_installingPackage.clear();
-            startNextInstall();
-        });
-    }
-
-    // 注意参数顺序：deb路径在前，--no-create-desktop-entry在后
-    QStringList args;
-    args << debPath << "--no-create-desktop-entry" << "--delete-after-install";
-    m_installProcess->start("ssinstall", args);
-}

src/utils/httprequest.cpp

@@ -41,8 +41,7 @@ QString HttpRequest::postRequest(QString url, QString jsondata)
     QEventLoop eventLoop;
     connect(naManager, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit()));
     eventLoop.exec();
-    QTextCodec *codec = QTextCodec::codecForName("utf8");
-    QString strReply = codec->toUnicode(reply->readAll());
+    QString strReply(reply->readAll());
     reply->deleteLater();
     return strReply;
 }

src/utils/httprequest.h

@@ -6,7 +6,6 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QEventLoop>
-#include <QTextCodec>
 class HttpRequest : public QObject
 {
     Q_OBJECT

src/utils/utils.cpp

@@ -10,6 +10,10 @@
 #include <QFile>
 #include <QUuid>
 #include <QJsonDocument>
+#include <QDateTime>
+#include <QDir>
+#include <QFile>
+#include <QTextStream>
 
 #define UOSDeveloperModeFile "/var/lib/deepin/developer-mode/enabled"
 
@@ -261,3 +265,183 @@ QJsonObject Utils::parseFeatureJsonFile()
 
     return jsonDoc.object();
 }
+
+/**
+ * @brief Utils::shouldDisableWebEngineSandbox 检查是否应关闭webengine沙箱
+ * @return bool true: 配置文件中设置了关闭沙箱 false: 未设置或设置为false
+ */
+bool Utils::shouldDisableWebEngineSandbox()
+{
+    // WARNING: 请在 组织名称 和 应用程序名称 初始化完成后调用
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    
+    // 检查配置文件中[webengine]部分的noSandbox配置项
+    // 如果配置存在且值为true，则返回true；否则返回false
+    qDebug()<<"sandbox is set to"<<config.value("webengine/noSandbox", false).toBool();
+    return config.value("webengine/noSandbox", false).toBool();
+}
+
+// 日志相关静态变量
+static QFile *logFile = nullptr;
+static QString logFilePath;
+
+// 自定义消息处理器，捕获所有Qt日志输出
+void customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    QByteArray localMsg = msg.toLocal8Bit();
+    QString level;
+    
+    switch (type) {
+    case QtDebugMsg:
+        level = "DEBUG";
+        fprintf(stderr, "DEBUG: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtInfoMsg:
+        level = "INFO";
+        fprintf(stderr, "INFO: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtWarningMsg:
+        level = "WARNING";
+        fprintf(stderr, "WARNING: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtCriticalMsg:
+        level = "ERROR";
+        fprintf(stderr, "ERROR: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtFatalMsg:
+        level = "FATAL";
+        fprintf(stderr, "FATAL: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        abort();
+    }
+    
+    // 写入到日志文件
+    Utils::writeLog(level, msg);
+}
+
+// 初始化日志系统
+void Utils::initLogger()
+{
+    // 确保日志目录存在
+    QString logDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+    QDir dir;
+    if (!dir.exists(logDir)) {
+        dir.mkpath(logDir);
+    }
+    
+    // 设置日志文件路径
+    QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss");
+    logFilePath = logDir + QString("/spark-store_%1.log").arg(timestamp);
+    
+    // 打开日志文件
+    logFile = new QFile(logFilePath);
+    if (!logFile->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) {
+        qWarning() << "Failed to open log file:" << logFilePath;
+        delete logFile;
+        logFile = nullptr;
+        return;
+    }
+    
+    // 安装自定义消息处理器，捕获所有Qt日志输出
+    qInstallMessageHandler(customMessageHandler);
+    
+    // 写入日志头信息
+    writeLog("INFO", "Logger initialized");
+    writeLog("INFO", QString("Application started at %1").arg(
+             QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")));
+}
+
+// 写入日志
+void Utils::writeLog(const QString &level, const QString &message)
+{
+    if (!logFile || !logFile->isOpen()) {
+        return;
+    }
+    
+    QString timestamp = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz");
+    QString logEntry = QString("[%1] [%2] %3\n").arg(timestamp).arg(level).arg(message);
+    
+    QTextStream out(logFile);
+    out << logEntry;
+    logFile->flush();
+    
+    // 同时输出到控制台，便于调试
+    if (level == "ERROR") {
+        qCritical() << logEntry.trimmed();
+    } else if (level == "WARNING") {
+        qWarning() << logEntry.trimmed();
+    } else {
+        qDebug() << logEntry.trimmed();
+    }
+}
+
+// 导出日志
+bool Utils::exportLogs(const QString &targetPath)
+{
+    QString exportPath = targetPath;
+    if (exportPath.isEmpty()) {
+        exportPath = "/tmp/spark-store";
+    }
+    
+    // 确保目标目录存在
+    QDir dir;
+    if (!dir.exists(exportPath)) {
+        if (!dir.mkpath(exportPath)) {
+            writeLog("ERROR", QString("Failed to create target directory: %1").arg(exportPath));
+            return false;
+        }
+    }
+    
+    // 关闭当前日志文件，便于复制
+    if (logFile && logFile->isOpen()) {
+        logFile->close();
+    }
+    
+    // 复制日志文件到目标位置
+    QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss");
+    QString targetLogPath = exportPath + QString("/spark-store_full_log_%1.log").arg(timestamp);
+    
+    bool success = QFile::copy(logFilePath, targetLogPath);
+    
+    // 额外检查：即使QFile::copy返回false，也要检查目标文件是否实际存在且大小合理
+    if (!success) {
+        QFileInfo targetFileInfo(targetLogPath);
+        if (targetFileInfo.exists() && targetFileInfo.size() > 0) {
+            success = true;
+        }
+    }
+    
+    if (success) {
+        writeLog("INFO", QString("All logs (INFO, DEBUG, WARNING, ERROR) exported to: %1").arg(targetLogPath));
+        
+        // 同时创建一个简单的导出报告
+        QString reportPath = exportPath + QString("/export_report_%1.txt").arg(timestamp);
+        QFile reportFile(reportPath);
+        if (reportFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            QTextStream out(&reportFile);
+            out << "Spark Store Log Export Report\n";
+            out << "================================\n";
+            out << "Export Time: " << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") << "\n";
+            out << "Target Directory: " << exportPath << "\n";
+            out << "Log File: " << targetLogPath << "\n";
+            out << "Original Log: " << logFilePath << "\n";
+            out << "Log Levels: INFO, DEBUG, WARNING, ERROR, FATAL\n";
+            out << "Status: SUCCESS\n";
+            reportFile.close();
+        }
+    } else {
+        writeLog("ERROR", QString("Failed to export logs to: %1").arg(targetLogPath));
+    }
+    
+    // 重新打开日志文件继续记录
+    if (logFile && !logFile->isOpen()) {
+        logFile->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text);
+    }
+    
+    return success;
+}
+
+// 获取日志文件路径
+QString Utils::getLogFilePath()
+{
+    return logFilePath;
+}

src/utils/utils.h

@@ -3,6 +3,9 @@
 
 #include <QObject>
 #include <QJsonObject>
+#include <QString>
+#include <QMessageLogContext>
+#include <QtGlobal>
 
 class Utils
 {
@@ -18,6 +21,13 @@ public:
     static void setQPAPlatform();
     static void checkUOSDeveloperMode();
     static QJsonObject parseFeatureJsonFile();
+    static bool shouldDisableWebEngineSandbox(); // 新增函数声明
+    
+    // 日志相关函数
+    static void initLogger(); // 初始化日志系统
+    static void writeLog(const QString &level, const QString &message); // 写入日志
+    static bool exportLogs(const QString &targetPath = "/tmp/spark-store"); // 导出日志
+    static QString getLogFilePath(); // 获取日志文件路径
 };
 
-#endif // UTILS_H
+#endif // UTILS_H

src/widgets/big_image.cpp

@@ -17,7 +17,7 @@ big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent),
     QHBoxLayout *layout = new QHBoxLayout;
     setLayout(layout);
     layout->addWidget(m_image);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     // Make sure the image has a parent so that it will be freed.
     m_image->setParent(this);

src/widgets/common/customlabel.cpp

@@ -1,15 +1,20 @@
 #include "customlabel.h"
+
 #include <QGuiApplication>
 
-CustomLabel::CustomLabel(QWidget *parent, Qt::WindowFlags f)
+CustomLabel::CustomLabel(QWidget *parent,
+                         Qt::WindowFlags f)
     : QLabel(parent, f)
 {
 }
 
 QPixmap CustomLabel::pixmap() const
 {
-    const QPixmap *p = QLabel::pixmap();
-    return p ? *p : QPixmap();
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    return *QLabel::pixmap();
+#else
+    return QLabel::pixmap();
+#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 }
 
 void CustomLabel::setPixmap(const QPixmap &pixmap)

src/widgets/common/downloaditem.cpp

@@ -125,7 +125,7 @@ void DownloadItem::install(int t)
         ui->label_2->setText(tr("Installing"));
         ui->label_2->setToolTip(tr("Installing"));
 
-        QtConcurrent::run([=]()
+        auto future = QtConcurrent::run([=]()
         {
             slotAsyncInstall(t);
         });
@@ -158,7 +158,7 @@ void DownloadItem::on_pushButton_3_clicked()
     output_w->setMinimumHeight(600);
     output_w->setAttribute(Qt::WA_TranslucentBackground);
     output_w->setTitle(ui->label->text());
-    output_w->layout()->setMargin(20);
+    output_w->layout()->setContentsMargins(20, 20, 20, 20);
     output_w->layout()->addWidget(textbrowser);
     output_w->show();
 }
@@ -216,7 +216,7 @@ void DownloadItem::slotAsyncInstall(int t)
         }
     }
 
-    // QProcess isInstall;
+    QProcess isInstall;
     // isInstall.start("dpkg", QStringList() << "-s" << pkgName);
     // isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
     // int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();

src/widgets/downloadlistwidget.cpp

@@ -168,7 +168,7 @@ void DownloadListWidget::httpFinished() // 完成下载
     isdownload = false;
     isBusy = false;
 
-    QtConcurrent::run([=]()
+    auto future = QtConcurrent::run([=]()
     {
         while (downloaditemlist[nowDownload - 1]->readyInstall() == -1) // 安装当前应用，堵塞安装，后面的下载suspend
         {

tool/apt-fast/ss-apt-fast

@@ -120,8 +120,11 @@ _create_lock()
 # unlock and remove the lock file
 _remove_lock()
 {
-    flock -u "$LCK_FD" 2>/dev/null
-    rm -f "$LCK_FILE.lock"
+    # Only unlock if lock file exists (was created by _create_lock)
+    if [ -f "$LCK_FILE.lock" ]; then
+        flock -u "$LCK_FD" 2>/dev/null
+        rm -f "$LCK_FILE.lock"
+    fi
 }
 
 # Search for known options and decide if root privileges are needed.
@@ -458,7 +461,17 @@ get_uris(){
     msg "Failed to create tmp dir" "warning"
     msg "无法创建临时目录" "warning"
     exit 1
+
+  
   }
+
+cleanup_tmpdir() {
+  if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then
+    rm -rf "$tmpdir"
+  fi
+}
+trap cleanup_tmpdir EXIT
+  
   ## --print-uris format is:
   # 'fileurl' filename filesize checksum_hint:filechecksum
   # 修改：process_package函数增加第二个参数表示当前线程的临时输出文件
@@ -580,7 +593,6 @@ get_uris(){
       rm -f "$thread_file"
     fi
   done
-
   # 合并显示信息
   if [ -f "$tmpdir/display" ]; then
     DOWNLOAD_DISPLAY+="\n$(cat "$tmpdir/display")"
@@ -812,6 +824,9 @@ elif [ "$option" == "download" ]; then
     "${_APTMGR}" "$@"
   fi
 
+  # Clean up temporary directory for download command
+  cleanup_aptfast
+
 elif [ "$option" == "source" ]; then
   msg
   msg "Working... this may take a while." "normal"
@@ -838,6 +853,9 @@ elif [ "$option" == "source" ]; then
   #  dpkg-source -x "$(basename "$srcfile")"
   #done < "$DLLIST"
 
+  # Clean up temporary directory for source command
+  cleanup_aptfast
+
 # Execute package manager directly if unknown options are passed.
 else
   "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@"

tool/aptss

@@ -2,11 +2,19 @@
 
 SPARK_DOWNLOAD_SERVER_URL="https://d.spark-app.store/"
 SPARK_DOWNLOAD_SERVER_URL_NO_PROTOCOL="d.spark-app.store"
+
+if [[ "$IS_APM_ENV" = "" ]] ;then
+UPSTREAM_CATOGARY="sparkstore"
+else
+UPSTREAM_CATOGARY="apm"
+fi
+
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
 source /opt/durapps/spark-store/bin/bashimport/log.amber
 load_transhell
 
-case `arch` in
+if [[ "$IS_APM_ENV" = "" ]] ;then
+case $(arch) in
    x86_64 | i686 | i386)
 	STORE_URL="store"
 	STORE_LIST_URL=""
@@ -24,6 +32,28 @@ case `arch` in
    	STORE_LIST_URL="-riscv64"
    	;;
 esac
+else
+case $(arch) in
+   x86_64 | i686 | i386)
+	STORE_URL="amd64-apm"
+	STORE_LIST_URL="-amd64"
+	;;
+   aarch64)
+	STORE_URL="arm64-apm"
+	STORE_LIST_URL="-arm64"
+	;;
+   loongarch64)
+   	STORE_URL="loong64-apm"
+   	STORE_LIST_URL="-loong64"
+   	;;
+   riscv64)
+   	STORE_URL="riscv64-apm"
+   	STORE_LIST_URL="-riscv64"
+   	;;
+esac
+fi
+
+
 SS_APT_FAST="/opt/durapps/spark-store/bin/apt-fast/ss-apt-fast"
 
 
@@ -32,8 +62,8 @@ is_empty_dir(){
 }
 
 function update_list(){
-curl --progress-bar -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
-log.info "sparkstore${STORE_LIST_URL}.list update done"  
+curl --progress-bar -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/aptss.list "${SPARK_DOWNLOAD_SERVER_URL}/${UPSTREAM_CATOGARY}${STORE_LIST_URL}.list"
+log.info "${UPSTREAM_CATOGARY}${STORE_LIST_URL}.list update done"  
 }
 
 function update_conf(){
@@ -84,7 +114,7 @@ fi
 
 
 
-if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "dist-upgrade" ]; then
+if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "reinstall" ] || [ "$1" = "dist-upgrade" ]; then
 
 
 
@@ -110,7 +140,7 @@ echo
 update_list
 update_conf
  
-/usr/bin/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"
+/usr/bin/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/aptss.list"
 
 #只更新星火源
 

tool/spark-dstore-patch

@@ -30,7 +30,7 @@ linkDir() {
 
         ensureTargetDir "$targetFile"
 	sourceFile=$(realpath --relative-to="$(dirname $targetFile)" "$sourceFile" )
-	if [  ! -e ${targetFile} ];then
+	if [  ! -e "${targetFile}" ];then
         ln -sv "$sourceFile" "$targetFile"
         fi
     done
@@ -88,7 +88,7 @@ done
 }
 
 function exec_link_clean(){
-# remove broken links in /usr/share
+    # remove broken links in /usr/share
 
     find /usr/share/applications -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/icons -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
@@ -98,13 +98,32 @@ function exec_link_clean(){
     find /usr/share/fcitx -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/help -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/locale -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
-    find /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/fcitx -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
+
+    # 根据 uname -m 确定 multiarch 目录名
+    arch=$(uname -m)
+    case $arch in
+        x86_64)
+            multiarch="x86_64-linux-gnu"
+            ;;
+        aarch64)
+            multiarch="aarch64-linux-gnu"
+            ;;
+        loongarch64|loong64)
+            multiarch="loongarch64-linux-gnu"
+            ;;
+        *)
+            multiarch=""
+            ;;
+    esac
+
+    if [ -n "$multiarch" ]; then
+        find "/usr/lib/$multiarch/fcitx" -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
+    fi
+
     find /usr/lib/mozilla/plugins -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/polkit-1/actions -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/fonts -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /etc/fonts/conf.d -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
-
-
 }
 function exec_uos_package_update(){
     update-icon-caches /usr/share/icons/* > /dev/null 2>&1 &

tool/ssaudit

@@ -59,14 +59,48 @@ FORCE_CREATE_DESKTOP="0"
 load_transhell_debug
 export DEBIAN_FRONTEND=noninteractive
 # 根据架构设置仓库URL
+if [[ "$IS_APM_ENV" = "" ]] ;then
 case $(arch) in
-    x86_64) STORE_URL="store" ;;
-    aarch64) STORE_URL="aarch64-store" ;;
-    loongarch64) STORE_URL="loong64-store" ;;
+  x86_64 | i686 | i386)
+	STORE_URL="store"
+	STORE_LIST_URL=""
+	;;
+   aarch64)
+	STORE_URL="aarch64-store"
+	STORE_LIST_URL="-aarch64"
+	;;
+   loongarch64)
+   	STORE_URL="loong64-store"
+   	STORE_LIST_URL="-loong64"
+   	;;
+   riscv64)
+   	STORE_URL="riscv64-store"
+   	STORE_LIST_URL="-riscv64"
+   	;;
 esac
+else
+case $(arch) in
+   x86_64 | i686 | i386)
+	STORE_URL="amd64-apm"
+	STORE_LIST_URL=""
+	;;
+   aarch64)
+	STORE_URL="aarch64-apm"
+	STORE_LIST_URL="-aarch64"
+	;;
+   loongarch64)
+   	STORE_URL="loong64-apm"
+   	STORE_LIST_URL="-loong64"
+   	;;
+   riscv64)
+   	STORE_URL="riscv64-apm"
+   	STORE_LIST_URL="-riscv64"
+   	;;
+esac
+fi
 # 帮助函数
 function show_help() {
-    echo "Spark Store Anstall script. 星火商店审核脚本"
+    echo "Spark Store Audit script. 星火商店审核脚本"
     echo "用法: $0 [选项] <deb路径>"
     echo "选项:"
     echo "  -h, --help                   显示帮助信息"
@@ -257,16 +291,42 @@ function create_desktop_file() {
 export CURRENT_USER_DIR_DESKTOP=$(sudo -u "$user" xdg-user-dir DESKTOP)
 function exec_create_desktop_file() {
     local desktop_files=()
+    local package_name_lower=$(echo "$package_name" | tr '[:upper:]' '[:lower:]')
     
-    # 收集所有桌面文件
-    desktop_files+=($(dpkg -L "$package_name" | grep '/usr/share/applications/.*\.desktop$'))
-    desktop_files+=($(dpkg -L "$package_name" | grep '/opt/apps/'"$package_name"'/entries/applications/.*\.desktop$'))
+    # 只收集指定路径下的桌面文件
+    # 1. /usr/share/applications/ 目录下的 .desktop 文件
+    desktop_files+=($(dpkg -L "$package_name" 2>/dev/null | grep '^/usr/share/applications/.*\.desktop$' || true))
+    
+    # 2. /opt/apps/包名/entries/applications/ 目录下的 .desktop 文件
+    # 先尝试精确匹配包名路径
+    desktop_files+=($(dpkg -L "$package_name" 2>/dev/null | grep "^/opt/apps/$package_name/entries/applications/.*\.desktop$" || true))
+    
+    # 再尝试小写包名路径（有些包可能使用小写路径）
+    desktop_files+=($(dpkg -L "$package_name" 2>/dev/null | grep "^/opt/apps/$package_name_lower/entries/applications/.*\.desktop$" || true))
+    
+    # 如果没有找到任何符合条件的桌面文件，则直接返回
+    if [ ${#desktop_files[@]} -eq 0 ]; then
+        echo "未找到符合条件的桌面快捷方式文件（/usr/share/applications/ 或 /opt/apps/$package_name/entries/applications/）"
+        return 0
+    fi
+    
+    echo "找到 ${#desktop_files[@]} 个桌面快捷方式文件："
+    printf '%s\n' "${desktop_files[@]}"
     
     for desktop_file_path in "${desktop_files[@]}"; do
-        if [ "$FORCE_CREATE_DESKTOP" -eq 1 ] || [ -z "$(grep 'NoDisplay=true' "$desktop_file_path")" ]; then
-            echo "$desktop_file_path is checked and will be installed to desktop"
+        # 检查文件是否存在
+        if [ ! -f "$desktop_file_path" ]; then
+            echo "文件不存在，跳过: $desktop_file_path"
+            continue
+        fi
+        
+        # 检查是否是 NoDisplay=true 的桌面文件
+        if [ -z "$(grep -i 'NoDisplay=true' "$desktop_file_path")" ]; then
+            echo "安装桌面快捷方式: $desktop_file_path"
             chmod +x "$desktop_file_path"
-            sudo -u "$user" cp "$desktop_file_path" "${CURRENT_USER_DIR_DESKTOP}"
+            sudo -u "$user" cp "$desktop_file_path" "${CURRENT_USER_DIR_DESKTOP}/"
+        else
+            echo "跳过 NoDisplay=true 的桌面文件: $desktop_file_path"
         fi
     done
 }

tool/ssinstall

@@ -59,11 +59,45 @@ FORCE_CREATE_DESKTOP="0"
 load_transhell_debug
 export DEBIAN_FRONTEND=noninteractive
 # 根据架构设置仓库URL
+if [[ "$IS_APM_ENV" = "" ]] ;then
 case $(arch) in
-    x86_64) STORE_URL="store" ;;
-    aarch64) STORE_URL="aarch64-store" ;;
-    loongarch64) STORE_URL="loong64-store" ;;
+  x86_64 | i686 | i386)
+	STORE_URL="store"
+	STORE_LIST_URL=""
+	;;
+   aarch64)
+	STORE_URL="aarch64-store"
+	STORE_LIST_URL="-aarch64"
+	;;
+   loongarch64)
+   	STORE_URL="loong64-store"
+   	STORE_LIST_URL="-loong64"
+   	;;
+   riscv64)
+   	STORE_URL="riscv64-store"
+   	STORE_LIST_URL="-riscv64"
+   	;;
 esac
+else
+case $(arch) in
+   x86_64 | i686 | i386)
+	STORE_URL="amd64-apm"
+	STORE_LIST_URL=""
+	;;
+   aarch64)
+	STORE_URL="arm64-apm"
+	STORE_LIST_URL="-arm64"
+	;;
+   loongarch64)
+   	STORE_URL="loong64-apm"
+   	STORE_LIST_URL="-loong64"
+   	;;
+   riscv64)
+   	STORE_URL="riscv64-apm"
+   	STORE_LIST_URL="-riscv64"
+   	;;
+esac
+fi
 # 帮助函数
 function show_help() {
     echo "Spark Store Install script. 星火商店安装脚本"
@@ -257,19 +291,46 @@ function create_desktop_file() {
 export CURRENT_USER_DIR_DESKTOP=$(sudo -u "$user" xdg-user-dir DESKTOP)
 function exec_create_desktop_file() {
     local desktop_files=()
+    local package_name_lower=$(echo "$package_name" | tr '[:upper:]' '[:lower:]')
     
-    # 收集所有桌面文件
-    desktop_files+=($(dpkg -L "$package_name" | grep '/usr/share/applications/.*\.desktop$'))
-    desktop_files+=($(dpkg -L "$package_name" | grep '/opt/apps/'"$package_name"'/entries/applications/.*\.desktop$'))
+    # 只收集指定路径下的桌面文件
+    # 1. /usr/share/applications/ 目录下的 .desktop 文件
+    desktop_files+=($(dpkg -L "$package_name" 2>/dev/null | grep '^/usr/share/applications/.*\.desktop$' || true))
+    
+    # 2. /opt/apps/包名/entries/applications/ 目录下的 .desktop 文件
+    # 先尝试精确匹配包名路径
+    desktop_files+=($(dpkg -L "$package_name" 2>/dev/null | grep "^/opt/apps/$package_name/entries/applications/.*\.desktop$" || true))
+    
+    # 再尝试小写包名路径（有些包可能使用小写路径）
+    desktop_files+=($(dpkg -L "$package_name" 2>/dev/null | grep "^/opt/apps/$package_name_lower/entries/applications/.*\.desktop$" || true))
+    
+    # 如果没有找到任何符合条件的桌面文件，则直接返回
+    if [ ${#desktop_files[@]} -eq 0 ]; then
+        echo "未找到符合条件的桌面快捷方式文件（/usr/share/applications/ 或 /opt/apps/$package_name/entries/applications/）"
+        return 0
+    fi
+    
+    echo "找到 ${#desktop_files[@]} 个桌面快捷方式文件："
+    printf '%s\n' "${desktop_files[@]}"
     
     for desktop_file_path in "${desktop_files[@]}"; do
-        if [ "$FORCE_CREATE_DESKTOP" -eq 1 ] || [ -z "$(grep 'NoDisplay=true' "$desktop_file_path")" ]; then
-            echo "$desktop_file_path is checked and will be installed to desktop"
+        # 检查文件是否存在
+        if [ ! -f "$desktop_file_path" ]; then
+            echo "文件不存在，跳过: $desktop_file_path"
+            continue
+        fi
+        
+        # 检查是否是 NoDisplay=true 的桌面文件
+        if [ -z "$(grep -i 'NoDisplay=true' "$desktop_file_path")" ]; then
+            echo "安装桌面快捷方式: $desktop_file_path"
             chmod +x "$desktop_file_path"
-            sudo -u "$user" cp "$desktop_file_path" "${CURRENT_USER_DIR_DESKTOP}"
+            sudo -u "$user" cp "$desktop_file_path" "${CURRENT_USER_DIR_DESKTOP}/"
+        else
+            echo "跳过 NoDisplay=true 的桌面文件: $desktop_file_path"
         fi
     done
 }
+
 export -f exec_create_desktop_file
 
 # 在ACE环境中创建桌面快捷方式
@@ -284,7 +345,7 @@ function create_desktop_in_ace() {
     fi
     
     # 如果是强制创建，或者没有配置禁止创建
-    if [ "$FORCE_CREATE_DESKTOP" -eq 1 ] || ! $ace_cmd "[ -e ~/.config/spark-union/spark-store/ssshell-config-do-not-create-desktop ]"; then
+    if [ "$FORCE_CREATE_DESKTOP" -eq 1 ] || !  [ -e ~/.config/spark-union/spark-store/ssshell-config-do-not-create-desktop ]; then
         echo "在ACE环境中创建桌面快捷方式..."
         export -f exec_create_desktop_file 
         export package_name
@@ -315,10 +376,10 @@ function install_in_ace_env() {
         $ace_cmd "ensure_aptss_exist"
 
     # 首先尝试dry-run测试
-    if ! $ace_cmd "aptss install --dry-run '$deb_path'"; then
+    if ! $ace_cmd aptss install --dry-run "$deb_path"; then
         echo "初始dry-run测试失败，尝试更新后重试..."
-        $ace_cmd "aptss update"
-        if ! $ace_cmd "aptss install --dry-run '$deb_path'"; then
+        $ace_cmd aptss update
+        if ! $ace_cmd aptss install --dry-run "$deb_path"; then
             echo "dry-run测试仍然失败，放弃安装"
             echo "OMG_IT_GOES_WRONG"
             return 1
@@ -326,8 +387,8 @@ function install_in_ace_env() {
     fi
     
     # dry-run成功后执行实际安装
-    $ace_cmd "aptss install store.spark-app.app-runtime-base --no-install-recommends -yfq"
-    if $ace_cmd "dpkg -i '$deb_path' || aptss install '$deb_path' -yfq"; then
+    $ace_cmd aptss install store.spark-app.app-runtime-base --no-install-recommends -yfq
+    if $ace_cmd  dpkg -i "$deb_path" || $ace_cmd aptss install "$deb_path" -yfq; then
         return 0
     else
         return 1

tool/store-helper/check-is-installed

@@ -5,41 +5,39 @@ readonly ACE_ENVIRONMENTS=(
     "deepin23-run:amber-ce-deepin23"
     "sid-run:amber-ce-sid"
 )
-dpkg -s "$1" > /dev/null
+dpkg -s '$1' 2>/dev/null | grep -q 'Status: install ok installed' > /dev/null 2>&1
 RET="$?"
-if [[ "$RET" != "0" ]] &&[[ "$IS_ACE_ENV" == "" ]];then ## 如果未在ACE环境中
+if [[ "$RET" != "0" ]] && [[ "$IS_ACE_ENV" == "" ]];then ## 如果未在ACE环境中
 
-
-
-for ace_entry in "${ACE_ENVIRONMENTS[@]}"; do
-            ace_cmd=${ace_entry%%:*}
-            if command -v "$ace_cmd" >/dev/null 2>&1; then
+    for ace_entry in "${ACE_ENVIRONMENTS[@]}"; do
+        ace_cmd=${ace_entry%%:*}
+        if command -v "$ace_cmd" >/dev/null 2>&1; then
+            echo "----------------------------------------"
+            echo "正在检查 $ace_cmd 环境的安装..."
+            echo "----------------------------------------"
+            
+            # 在ACE环境中使用dpkg -s检查安装状态
+            # 使用dpkg -s并检查输出中是否包含"Status: install ok installed"
+            $ace_cmd dpkg -s "$1" 2>/dev/null | grep -q 'Status: install ok installed'
+            try_run_ret="$?"
+            
+            # 最终检测结果处理
+            if [ "$try_run_ret" -eq 0 ]; then
                 echo "----------------------------------------"
-                echo "正在检查 $ace_cmd 环境的安装..."
+                echo "在 $ace_cmd 环境中找到了安装"
+                echo "----------------------------------------"
+                exit $try_run_ret
+            else
+                echo "----------------------------------------"
+                echo "在 $ace_cmd 环境中未能找到安装，继续查找"
                 echo "----------------------------------------"
-                
-                # 在ACE环境中执行安装检测
-                $ace_cmd dpkg -l | grep "^ii  $1 " > /dev/null
-                try_run_ret="$?"
-                
-
-                # 最终检测结果处理
-                if [ "$try_run_ret" -eq 0 ]; then
-                    echo "----------------------------------------"
-                    echo "在 $ace_cmd 环境中找到了安装"
-                    echo "----------------------------------------"
-                    exit $try_run_ret
-                else
-                    echo "----------------------------------------"
-                    echo "在 $ace_cmd 环境中未能找到安装，继续查找"
-                    echo "----------------------------------------"
-                fi
             fi
-        done
-                    echo "----------------------------------------"
-                    echo "所有已安装的 ACE 环境中未能找到安装，退出"
-                    echo "----------------------------------------"
-                    exit "$RET"
-     fi
+        fi
+    done
+    echo "----------------------------------------"
+    echo "所有已安装的 ACE 环境中未能找到安装，退出"
+    echo "----------------------------------------"
+    exit "$RET"
+fi
 ## 如果在ACE环境中或者未出错
-exit "$RET"
+exit "$RET"

tool/store-helper/pass-auth.sh

@@ -1,6 +1,3 @@
-#!/bin/bash
-# We use sudo twice to avoid ACE bug here 
-# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
 
 #!/bin/bash
 # We use sudo twice to avoid ACE bug here 
@@ -14,6 +11,12 @@ function zenity_prompt() {
     fi
 }
 
+if [ "${IS_ACE_ENV}" = "" ]; then
+echo "检测为非ACE环境，直接提权"
+pkexec "$@"
+exit $?
+fi
+
 # 检查sudo是否需要密码
 if sudo -n true 2>/dev/null; then
     echo "sudo 无需密码，继续执行"

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

@@ -15,7 +15,7 @@ fi
 	;;
 
 	upgradable-list)
-		output=$(env LANGUAGE=en_US /usr/bin/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)
+		output=$(env LANGUAGE=en_US /usr/bin/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/aptss.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk NR\>1)
 
 		IFS_OLD="$IFS"
 		IFS=$'\n'

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

@@ -74,12 +74,24 @@ until ! echo $updatetext | grep -q "E:"; do
     retry_count=$((retry_count + 1))
 done
 
-update_app_number=$(env LANGUAGE=en_US /usr/bin/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" 2>/dev/null | grep -c upgradable)
+update_app_number=$(env LANGUAGE=en_US /usr/bin/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/aptss.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" 2>/dev/null | grep -c upgradable)
 
 if [ "$update_app_number" -le 0 ]; then
     exit 0
 fi
 
+# 读取忽略列表到数组
+declare -A ignored_apps
+if [ -f "/etc/spark-store/ignored_apps.conf" ]; then
+    while IFS='|' read -r pkg_name pkg_version || [ -n "$pkg_name" ]; do
+        # 去除前后空白字符
+        pkg_name=$(echo "$pkg_name" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+        if [ -n "$pkg_name" ]; then
+            ignored_apps["$pkg_name"]=1
+        fi
+    done < "/etc/spark-store/ignored_apps.conf"
+fi
+
 # 获取用户选择的要更新的应用
 PKG_LIST="$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)"
 # 指定分隔符为 \n
@@ -102,6 +114,13 @@ for line in $PKG_LIST; do
     PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME)
     if [ "$PKG_STA" = "hold" ]; then
         let update_app_number=$update_app_number-1
+        continue
+    fi
+
+    # 检测是否在忽略列表中
+    if [ -n "${ignored_apps[$PKG_NAME]}" ]; then
+        let update_app_number=$update_app_number-1
+        continue
     fi
 done
 

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

@@ -1,18 +1,18 @@
 #!/bin/bash
-TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT="Checking for update, please wait..."
-TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="Spark Store APP Upgrade module"
-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."
-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_APP_NAME="APP name"
+TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT="Checking for updates, please wait..."
+TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="Spark Store Update Module"
+TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="An error occurred during the update check process. Click Confirm to view the error log, which can be used for issue reporting."
+TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="I have copied the log in this text box and will attach it when submitting feedback. The feedback option can be found in the Settings menu at the top-right corner of the main interface."
+TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="The feedback option can be found in the Settings menu at the top-right corner of the main interface."
+TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="All packages are already up to date."
+TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="Unable to update: the current package status is marked as Hold."
+TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="Please select the application you want to update."
+TRANSHELL_CONTENT_CHOOSE="Select"
+TRANSHELL_CONTENT_APP_NAME="Application Name"
 TRANSHELL_CONTENT_PKG_NAME="Package Name"
-TRANSHELL_CONTENT_NEW_VERSION="New version"
-TRANSHELL_CONTENT_UPGRADE_FROM="Upgrade from"
-TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="No app is chosen"
-TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="Upgrading $APP_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)"
+TRANSHELL_CONTENT_NEW_VERSION="New Version"
+TRANSHELL_CONTENT_UPGRADE_FROM="Updating from this version"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="You have not selected any application."
+TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="Updating $APP_UPGRADE, please wait..."
+TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="The selected application has been successfully updated."
+TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="An error occurred during the update process. Click Confirm to view the error log, which can be used for issue reporting."

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

@@ -1,18 +1,18 @@
 #!/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="没有软件需要更新"
-TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）"
-TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用"
+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="所有软件包版本已是最新。"
+TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="无法更新：当前软件包状态已被标记为“保留”。"
+TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="请选择您需要更新的软件。"
 TRANSHELL_CONTENT_CHOOSE="选择"
 TRANSHELL_CONTENT_APP_NAME="应用名"
-TRANSHELL_CONTENT_PKG_NAME="包名"
+TRANSHELL_CONTENT_PKG_NAME="软件包名"
 TRANSHELL_CONTENT_NEW_VERSION="新版本"
-TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新"
-TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何软件"
-TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_UPGRADE ，请稍候..."
-TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的软件已经更新完毕"
-TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈"
+TRANSHELL_CONTENT_UPGRADE_FROM="将从该版本更新"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="您没有选中任何软件。"
+TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_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

@@ -1,18 +1,18 @@
 #!/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="沒有軟體需要更新"
-TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）"
-TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用"
-TRANSHELL_CONTENT_CHOOSE="选择"
-TRANSHELL_CONTENT_APP_NAME="应用名"
-TRANSHELL_CONTENT_PKG_NAME="包名"
+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="所有軟體包版本已是最新。"
+TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="無法更新：當前軟體包狀態已被標記為「保留」。"
+TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="請選擇您需要更新的軟體。"
+TRANSHELL_CONTENT_CHOOSE="選擇"
+TRANSHELL_CONTENT_APP_NAME="應用名稱"
+TRANSHELL_CONTENT_PKG_NAME="軟體包名稱"
 TRANSHELL_CONTENT_NEW_VERSION="新版本"
-TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新"
-TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何軟體"
-TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_UPGRADE ，请稍候..."
-TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的軟體已经更新完毕"
-TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈"
+TRANSHELL_CONTENT_UPGRADE_FROM="將從該版本更新"
+TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="您沒有選中任何軟體。"
+TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_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_en_US.transhell

@@ -1,14 +1,14 @@
 #!/bin/bash
 TRANSHELL_CONTENT_CLOSE="Disable"
 TRANSHELL_CONTENT_OPEN="Enable"
-TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="Welcome to Spark Store APP Upgrade Settings\nPlease choose one option to run"
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="Welcome to the Spark App Store update and installation settings tool. Please choose one of the following options to continue."
 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_OPEN_OR_CLOSE_UPGRADE_CHECK="$text_update_open Spark Store Update Check Tool (When enabled, this tool will automatically check for updates after system startup and display a notification if updates are available)"
+TRANSHELL_CONTENT_CHECK_FOR_UPDATE="View the list of upgradable packages"
 TRANSHELL_CONTENT_EXIT="Exit"
-TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="Please authorize to close APP upgrade check"
+TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="Please authorize to disable automatic update check."
 TRANSHELL_CONTENT_CLOSED="Disabled"
-TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="Please authorize to open APP upgrade check"
+TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="Please authorize to enable automatic update check."
 TRANSHELL_CONTENT_OPENED="Enabled"
-TRANSHELL_CONTENT_CLOSE_CREATE_DESKTOP="Disable auto create desktop shortcut"
-TRANSHELL_CONTENT_OPEN_CREATE_DESKTOP="Enable auto create desktop shortcut"
+TRANSHELL_CONTENT_CLOSE_CREATE_DESKTOP="Disable automatic creation of desktop launcher"
+TRANSHELL_CONTENT_OPEN_CREATE_DESKTOP="Enable automatic creation of desktop launcher"

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

@@ -1,14 +1,14 @@
 #!/bin/bash
 TRANSHELL_CONTENT_CLOSE="关闭"
 TRANSHELL_CONTENT_OPEN="开启"
-TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~"
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火应用商店更新与安装设置工具，请在以下选项中选择一个以继续。"
 TRANSHELL_CONTENT_OPTIONS="操作选项"
-TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK="$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
+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_CLOSING_UPGRADE_CHECK="执行“关闭自动更新检测”，请授权。"
 TRANSHELL_CONTENT_CLOSED="已关闭"
-TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="执行启动自动更新检测，请授权"
+TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="执行“开启自动更新检测”，请授权。"
 TRANSHELL_CONTENT_OPENED="已开启"
 TRANSHELL_CONTENT_CLOSE_CREATE_DESKTOP="关闭自动创建桌面启动器"
 TRANSHELL_CONTENT_OPEN_CREATE_DESKTOP="开启自动创建桌面启动器"

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

@@ -1,14 +1,14 @@
 #!/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_CLOSE="關閉"
+TRANSHELL_CONTENT_OPEN="開啟"
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="歡迎使用星火應用商店更新與安裝設定工具，請在以下選項中選擇一個以繼續。"
+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="已开启"
-TRANSHELL_CONTENT_CLOSE_CREATE_DESKTOP="关闭自动创建桌面启动器"
-TRANSHELL_CONTENT_OPEN_CREATE_DESKTOP="开启自动创建桌面启动器"
+TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="執行「關閉自動更新檢測」，請授權。"
+TRANSHELL_CONTENT_CLOSED="已關閉"
+TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="執行「開啟自動更新檢測」，請授權。"
+TRANSHELL_CONTENT_OPENED="已開啟"
+TRANSHELL_CONTENT_CLOSE_CREATE_DESKTOP="關閉自動建立桌面啟動器"
+TRANSHELL_CONTENT_OPEN_CREATE_DESKTOP="開啟自動建立桌面啟動器"