Add files via upload

.github/workflows/dotnet-desktop.yml

@@ -1,115 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow will build, test, sign and package a WPF or Windows Forms desktop application
-# built on .NET Core.
-# To learn how to migrate your existing application to .NET Core,
-# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework
-#
-# To configure this workflow:
-#
-# 1. Configure environment variables
-# GitHub sets default environment variables for every workflow run.
-# Replace the variables relative to your project in the "env" section below.
-#
-# 2. Signing
-# Generate a signing certificate in the Windows Application
-# Packaging Project or add an existing signing certificate to the project.
-# Next, use PowerShell to encode the .pfx file using Base64 encoding
-# by running the following Powershell script to generate the output string:
-#
-# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte
-# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt'
-#
-# Open the output file, SigningCertificate_Encoded.txt, and copy the
-# string inside. Then, add the string to the repo as a GitHub secret
-# and name it "Base64_Encoded_Pfx."
-# For more information on how to configure your signing certificate for
-# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing
-#
-# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key".
-# See "Build the Windows Application Packaging project" below to see how the secret is used.
-#
-# For more information on GitHub Actions, refer to https://github.com/features/actions
-# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
-# refer to https://github.com/microsoft/github-actions-for-desktop-apps
-
-name: .NET Core Desktop
-
-on:
-  push:
-分支: [ "main" ]
-  pull_request:
-分支: [ "main" ]
-
-jobs:
-
-  build:
-
-    strategy:
-      matrix:
-        configuration: [Debug, Release]
-
-    runs-on: windows-latest  # For a list of available runner types, refer to
-                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
-
-    env:
-      Solution_Name: your-solution-name                         # Replace with your solution name, i.e. MyWpfApp.sln.
-      Test_Project_Path: your-test-project-path                 # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj.
-      Wap_Project_Directory: your-wap-project-directory-name    # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package.
-      Wap_Project_Path: your-wap-project-path                   # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj.
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    # Install the .NET Core workload
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
-
-    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-    - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v2
-
-    # Execute all unit tests in the solution
-    - name: Execute unit tests
-      run: dotnet test
-
-    # Restore the application to populate the obj folder with RuntimeIdentifiers
-    - name: Restore the application
-      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
-      env:
-        Configuration: ${{ matrix.configuration }}
-
-    # Decode the base 64 encoded pfx and save the Signing_Certificate
-    - name: Decode the pfx
-      run: |
-        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
-        $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx
-        [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
-
-    # Create the app package by building and packaging the Windows Application Packaging project
-    - name: Create the app package
-      run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
-      env:
-        Appx_Bundle: Always
-        Appx_Bundle_Platforms: x86|x64
-        Appx_Package_Build_Mode: StoreUpload
-        Configuration: ${{ matrix.configuration }}
-
-    # Remove the pfx
-    - name: Remove the pfx
-      run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx
-
-    # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: MSIX Package
-        path: ${{ env.Wap_Project_Directory }}\AppPackages

.github/workflows/dotnet.yml

@@ -1,28 +0,0 @@
-# This workflow will build a .NET project
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
-
-name: .NET
-
-on:
-  push:
-分支: [ "main" ]
-  pull_request:
-分支: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --verbosity normal

AboutForm.cs

@@ -51,7 +51,7 @@ namespace AppStore
 
             // 初始化并添加应用信息
             infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 1.3.9\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
+            infoLabel.Text = "kortapp-z\n版本: 1.1.1\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
             infoLabel.Font = new Font("Microsoft YaHei", 12);
             infoLabel.AutoSize = false;
             infoLabel.Width = 300;
@@ -125,7 +125,7 @@ namespace AppStore
         }
     }
 
-    // 保留原AboutForm作为容器
+    // 保留原AboutForm作为容器(可选)
     public class AboutForm : Form
     {
         public AboutForm()

AppCard.cs

@@ -15,7 +15,6 @@ namespace AppStore
         private Label nameLabel;
         private Panel namePanel;
         private Button downloadBtn;
-        private ToolTip? toolTip;
         private Color borderColor = SystemColors.ControlDark;
         private static readonly ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath> PathCache = 
             new ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath>();
@@ -23,7 +22,6 @@ namespace AppStore
         public string AppName { get; set; } = string.Empty;
         public Image AppIcon { get; set; } = SystemIcons.Application.ToBitmap();
         public string DownloadUrl { get; set; } = string.Empty;
-        public string Description { get; set; } = string.Empty;
         public bool ShowDownloadButton { get; set; } = true;
 
         public AppCard()
@@ -50,72 +48,33 @@ namespace AppStore
             this.Padding = new Padding(10);
             
             // 异步初始化卡片路径和边框
-            // 预加载边框路径
             Task.Run(() => {
                 InitializeCardPath();
                 InitializeBorder();
-                
-                // 确保在主线程注册事件
-                this.Invoke((MethodInvoker)(() => {
-                    this.Paint += (sender, e) => {
-                        if (BorderCache.IsEmpty) 
-                        {
-                            Task.Run(() => {
-                                InitializeBorder();
-                                this.Invoke((MethodInvoker)(() => this.Invalidate()));
-                            });
-                        }
-                    };
-                }));
             });
 
-            // 应用图标 - 添加null检查
-            if (iconBox != null && this != null && this.Controls != null)
-            {
-                iconBox.Size = new Size(80, 80);
-                iconBox.Location = new Point((Width - 80) / 2, 15);
-                iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
-                this.Controls.Add(iconBox);
-            }
-            else
-            {
-                Logger.LogWarning("iconBox或Controls为null");
-            }
+            // 应用图标
+            iconBox = new PictureBox();
+            iconBox.Size = new Size(80, 80);
+            iconBox.Location = new Point((Width - 80) / 2, 15);
+            iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
+            this.Controls.Add(iconBox);
 
             // 应用名称 - 使用Panel包裹Label实现边框颜色
-            if (namePanel != null)
-            {
-                namePanel.Size = new Size(Width - 20, 40);
-                namePanel.Location = new Point(10, 100);
-                namePanel.Paint += (sender, e) => {
-                    try
-                    {
-                        if (e != null && e.Graphics != null && namePanel != null)
-                        {
-                            var rect = namePanel.ClientRectangle;
-                            if (rect.Width > 0 && rect.Height > 0)
-                            {
-                                ControlPaint.DrawBorder(e.Graphics, rect, 
-                                    borderColor, ButtonBorderStyle.Solid);
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogWarning($"绘制namePanel边框失败: {ex.Message}");
-                    }
-                };
-            }
+            // namePanel已在构造函数中初始化
+            namePanel.Size = new Size(Width - 20, 40);
+            namePanel.Location = new Point(10, 100);
+            namePanel.Paint += (sender, e) => {
+                ControlPaint.DrawBorder(e.Graphics, namePanel.ClientRectangle, 
+                    borderColor, ButtonBorderStyle.Solid);
+            };
             
             nameLabel = new Label();
             nameLabel.Dock = DockStyle.Fill;
             nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
             nameLabel.TextAlign = ContentAlignment.MiddleCenter;
             
-            if (namePanel != null && nameLabel != null)
-            {
-                namePanel.Controls.Add(nameLabel);
-            }
+            namePanel.Controls.Add(nameLabel);
             
             // 初始主题设置
             UpdateLabelTheme();
@@ -123,54 +82,32 @@ namespace AppStore
             // 订阅主题变化事件
             ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
             
-            if (this != null && this.Controls != null && namePanel != null)
-            {
-                this.Controls.Add(namePanel);
-            }
+            this.Controls.Add(namePanel);
 
-            // 初始化ToolTip控件
-            toolTip = new ToolTip();
-            toolTip.AutoPopDelay = 5000;
-            toolTip.InitialDelay = 500;
-            toolTip.ReshowDelay = 500;
-            toolTip.ShowAlways = true;
+            // 下载按钮
+            downloadBtn = new Button();
+            downloadBtn.Text = "下载";
+            downloadBtn.Size = new Size(100, 32);
+            downloadBtn.Location = new Point((Width - 100) / 2, 150);
+            downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
+            downloadBtn.ForeColor = Color.White;
+            downloadBtn.FlatStyle = FlatStyle.Flat;
+            downloadBtn.FlatAppearance.BorderSize = 0;
+            downloadBtn.Cursor = Cursors.Hand;
+            downloadBtn.Font = new Font("Microsoft YaHei", 9);
             
-            // 下载按钮 - 添加null检查
-            if (downloadBtn != null)
-            {
-                downloadBtn.Text = "下载";
-                downloadBtn.Size = new Size(100, 32);
-                downloadBtn.Location = new Point((Width - 100) / 2, 150);
+            // 按钮悬停效果
+            downloadBtn.MouseEnter += (s, e) => {
+                downloadBtn.BackColor = Color.FromArgb(0, 150, 255);
+            };
+            
+            downloadBtn.MouseLeave += (s, e) => {
                 downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-                downloadBtn.ForeColor = Color.White;
-                downloadBtn.FlatStyle = FlatStyle.Flat;
-                downloadBtn.FlatAppearance.BorderSize = 0;
-                downloadBtn.Cursor = Cursors.Hand;
-                downloadBtn.Font = new Font("Microsoft YaHei", 9);
+            };
             
-                // 按钮悬停效果 - 添加null检查
-                downloadBtn.MouseEnter += (s, e) => {
-                    if (downloadBtn != null)
-                    {
-                        downloadBtn.BackColor = Color.FromArgb(0, 150, 255);
-                        if (!string.IsNullOrEmpty(Description))
-                        {
-                            toolTip.SetToolTip(downloadBtn, Description);
-                        }
-                    }
-                };
-                
-                downloadBtn.MouseLeave += (s, e) => {
-                    if (downloadBtn != null)
-                    {
-                        downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-                    }
-                };
-                
-                downloadBtn.Click += DownloadBtn_Click;
-                this.Controls.Add(downloadBtn);
-                downloadBtn.Visible = ShowDownloadButton;
-            }
+            downloadBtn.Click += DownloadBtn_Click;
+            this.Controls.Add(downloadBtn);
+            downloadBtn.Visible = ShowDownloadButton;
         }
 
         private void UpdateLabelTheme()
@@ -189,14 +126,7 @@ namespace AppStore
                 namePanel.BackColor = Color.White;
                 borderColor = SystemColors.ControlDark;
             }
-            if (namePanel != null && !namePanel.IsDisposed)
-            {
-                namePanel.Invalidate(); // 触发重绘
-            }
-            else
-            {
-                Logger.LogWarning("namePanel为null或已释放");
-            }
+            namePanel.Invalidate(); // 触发重绘
         }
 
         /// <summary>
@@ -208,60 +138,54 @@ namespace AppStore
             // 使用卡片尺寸作为缓存键
             string cacheKey = $"{Width}_{Height}_10";
             
-            // 双重检查锁模式确保线程安全
+            // 检查缓存中是否已有路径
             if (!BorderCache.TryGetValue(cacheKey, out var borderPath))
             {
-                lock (BorderCache)
+                // 创建临时文件存储路径数据
+                string tempFile = Path.GetTempFileName();
+                try 
                 {
-                    if (!BorderCache.TryGetValue(cacheKey, out borderPath))
+                    // 配置C++程序启动参数
+                    ProcessStartInfo startInfo = new ProcessStartInfo 
                     {
-                        // 创建临时文件存储路径数据
-                        string tempFile = Path.GetTempFileName();
-                        try 
+                        FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
+                        Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
+                        UseShellExecute = false, // 不显示命令行窗口
+                        CreateNoWindow = true    // 静默运行
+                    };
+
+                    // 启动C++程序计算路径
+                    using (var process = Process.Start(startInfo)) 
+                    {
+                        process.WaitForExit();
+                        
+                        // 检查计算结果
+                        if (process.ExitCode == 0 && File.Exists(tempFile)) 
                         {
-                            // 配置C++程序启动参数
-                            ProcessStartInfo startInfo = new ProcessStartInfo 
-                            {
-                                FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
-                                Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
-                                UseShellExecute = false, // 不显示命令行窗口
-                                CreateNoWindow = true    // 静默运行
-                            };
+                            // 读取C++程序生成的路径点
+                            var lines = File.ReadAllLines(tempFile);
+                            PointF[] points = lines.Select(line => {
+                                var parts = line.Split(','); // 解析坐标点
+                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
+                            }).ToArray();
                             
-                            // 启动C++程序计算路径
-                            using (var process = Process.Start(startInfo)) 
-                            {
-                                process.WaitForExit();
+                            // 创建GraphicsPath对象
+                            borderPath = new System.Drawing.Drawing2D.GraphicsPath();
+                            borderPath.AddLines(points); // 添加路径点
                             
-                                // 检查计算结果
-                                if (process.ExitCode == 0 && File.Exists(tempFile)) 
-                                {
-                                    // 读取C++程序生成的路径点
-                                    var lines = File.ReadAllLines(tempFile);
-                                    PointF[] points = lines.Select(line => {
-                                        var parts = line.Split(','); // 解析坐标点
-                                        return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                                    }).ToArray();
-                                    
-                                    // 创建GraphicsPath对象
-                                    borderPath = new System.Drawing.Drawing2D.GraphicsPath();
-                                    borderPath.AddLines(points); // 添加路径点
-                                    
-                                    // 缓存路径对象
-                                    BorderCache.TryAdd(cacheKey, borderPath);
-                                }
-                            }
-                        }
-                        finally 
-                        {
-                            // 确保临时文件被删除
-                            if (File.Exists(tempFile)) 
-                            {
-                                File.Delete(tempFile);
-                            }
+                            // 缓存路径对象
+                            BorderCache.TryAdd(cacheKey, borderPath);
                         }
                     }
                 }
+                finally 
+                {
+                    // 确保临时文件被删除
+                    if (File.Exists(tempFile)) 
+                    {
+                        File.Delete(tempFile);
+                    }
+                }
             }
         }
 
@@ -270,12 +194,6 @@ namespace AppStore
         {
             base.OnPaint(e);
             
-            // 确保边框已初始化
-            if (BorderCache.IsEmpty) 
-            {
-                InitializeBorder();
-            }
-            
             // 绘制背景
             using (var brush = new SolidBrush(this.BackColor)) {
                 e.Graphics.FillRectangle(brush, this.ClientRectangle);
@@ -338,37 +256,22 @@ namespace AppStore
                     };
 
                     // 启动C++程序计算路径
-                    if (startInfo != null)
-                    {
-                        using (var process = Process.Start(startInfo)) 
-                        {
-                            if (process != null)
-                            {
-                                process.WaitForExit();
+                    using (var process = Process.Start(startInfo)) {
+                        process.WaitForExit();
                         
-                                // 检查计算结果
-                                if (process.ExitCode == 0 && File.Exists(tempFile)) 
-                                {
-                                    try
-                                    {
-                                        // 读取生成的路径点
-                                        var lines = File.ReadAllLines(tempFile);
-                                        PointF[] points = lines.Select(line => {
-                                            var parts = line.Split(','); // 解析坐标
-                                            return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                                        }).ToArray();
+                        // 检查计算结果
+                        if (process.ExitCode == 0 && File.Exists(tempFile)) {
+                            // 读取生成的路径点
+                            var lines = File.ReadAllLines(tempFile);
+                            PointF[] points = lines.Select(line => {
+                                var parts = line.Split(','); // 解析坐标
+                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
+                            }).ToArray();
                             
-                                        // 创建并缓存路径对象
-                                        path = new System.Drawing.Drawing2D.GraphicsPath();
-                                        path.AddLines(points);
-                                        PathCache.TryAdd(cacheKey, path);
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        Logger.LogWarning($"读取路径点失败: {ex.Message}");
-                                    }
-                                }
-                            }
+                            // 创建并缓存路径对象
+                            path = new System.Drawing.Drawing2D.GraphicsPath();
+                            path.AddLines(points);
+                            PathCache.TryAdd(cacheKey, path);
                         }
                     }
                 } catch {
@@ -386,7 +289,7 @@ namespace AppStore
             try 
             {
                 var safePath = path ?? CalculatePathFallback(Width, Height, 10);
-                // 更严格的null检查,包括路径和控件状态
+                // 更严格的null检查，包括路径和控件状态
                 if (safePath != null && 
                     safePath.PointCount > 0 && 
                     this.IsHandleCreated &&
@@ -444,18 +347,8 @@ namespace AppStore
 
         public void UpdateDisplay()
         {
-            if (nameLabel != null && AppName != null)
-            {
-                nameLabel.Text = AppName;
-            }
-            else
-            {
-                Logger.LogWarning("nameLabel或AppName为null");
-            }
-            if (iconBox != null && AppIcon != null)
-            {
-                iconBox.Image = AppIcon;
-            }
+            nameLabel.Text = AppName;
+            iconBox.Image = AppIcon;
         }
 
         private void DownloadBtn_Click(object sender, EventArgs e)
@@ -463,17 +356,16 @@ namespace AppStore
             try
             {
                 // 更严格的null检查
-                // 更严格的null检查,包括DownloadManager.Instance和其方法
+                // 更严格的null检查，包括DownloadManager.Instance和其方法
                 // 全面的null和状态检查
-                var downloadManager = DownloadManager.Instance;
                 if (sender == null || e == null || 
                     string.IsNullOrWhiteSpace(DownloadUrl) || 
                     string.IsNullOrWhiteSpace(AppName) ||
                     !this.IsHandleCreated ||
                     this.IsDisposed ||
-                    downloadManager == null ||
-                    downloadManager.DownloadItems == null ||
-                    downloadManager.StartDownload == null)
+                    DownloadManager.Instance == null ||
+                    DownloadManager.Instance.DownloadItems == null ||
+                    DownloadManager.Instance.StartDownload == null)
                 {
                     return;
                 }
@@ -481,7 +373,7 @@ namespace AppStore
                 string safeAppName = AppName ?? "未知应用";
                 string fileName = $"{safeAppName.Replace(" ", "_")}.exe";
                 
-                downloadManager.StartDownload(fileName, DownloadUrl);
+                DownloadManager.Instance.StartDownload(fileName, DownloadUrl);
                 
                 string message = $"已开始下载: {safeAppName}";
                 this.Invoke((MethodInvoker)delegate {

AppSearch.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public static class AppSearch
-    {
-        /// <summary>
-        /// 搜索应用卡片
-        /// </summary>
-        /// <param name="flowPanel">包含应用卡片的FlowLayoutPanel</param>
-        /// <param name="searchText">搜索文本</param>
-        public static void SearchApps(FlowLayoutPanel flowPanel, string searchText)
-        {
-            if (flowPanel == null || string.IsNullOrWhiteSpace(searchText))
-            {
-                ShowAllApps(flowPanel);
-                return;
-            }
-
-            foreach (Control control in flowPanel.Controls)
-            {
-                if (control is AppCard appCard)
-                {
-                    bool isMatch = IsMatchSearch(appCard.AppName, searchText);
-                    control.Visible = isMatch;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 显示所有应用卡片
-        /// </summary>
-        public static void ShowAllApps(FlowLayoutPanel? flowPanel)
-        {
-            if (flowPanel == null) return;
-
-            foreach (Control control in flowPanel.Controls)
-            {
-                control.Visible = true;
-            }
-        }
-
-        /// <summary>
-        /// 检查应用名称是否匹配搜索文本
-        /// </summary>
-        private static bool IsMatchSearch(string appName, string searchText)
-        {
-            if (string.IsNullOrEmpty(appName)) return false;
-
-            // 不区分大小写比较
-            return appName.Contains(searchText, StringComparison.OrdinalIgnoreCase);
-        }
-    }
-}

AppStore.csproj

@@ -12,11 +12,13 @@
     <WarningsAsErrors>CS8618</WarningsAsErrors>
     <ApplicationIcon>img\ico\icon.ico</ApplicationIcon>
     <Platforms>x86;x64</Platforms>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="help.txt" />
+    <None Include="resource\NetWorkManager\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="resource\*.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -35,8 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SunnyUI" Version="3.8.6" />
-    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+    <PackageReference Include="ZXing.Net" Version="0.16.8" />
   </ItemGroup>
 
 </Project>

DownloadItem.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -15,7 +14,6 @@ namespace AppStore
         public string FileName { get; set; } = string.Empty;
         public int Progress { get; set; }
         public string Status { get; set; } = string.Empty;
-        public Process? DownloadProcess { get; set; }
 
         public DownloadItem()
         {
@@ -55,11 +53,10 @@ namespace AppStore
             this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
                 ? Color.White 
                 : Color.Black;
-            this.BorderStyle = BorderStyle.None; // 禁用默认边框
+            this.BorderStyle = BorderStyle.FixedSingle;
             this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
                 ? Color.Black 
                 : Color.White;
-            this.Paint += DownloadItem_Paint; // 添加自定义绘制
 
             // 文件名标签
             nameLabel = new Label();
@@ -101,17 +98,6 @@ namespace AppStore
             nameLabel.Text = FileName;
             progressBar.Value = Progress;
             statusLabel.Text = Status;
-            this.Invalidate(); // 触发重绘
-        }
-
-        private void DownloadItem_Paint(object sender, PaintEventArgs e)
-        {
-            // 自定义边框绘制
-            using (var pen = new Pen(ThemeManager.BorderColor, 1))
-            {
-                e.Graphics.DrawRectangle(pen, 
-                    new Rectangle(0, 0, this.Width - 1, this.Height - 1));
-            }
         }
 
         private void CancelBtn_Click(object sender, EventArgs e)
@@ -125,26 +111,9 @@ namespace AppStore
 
             try
             {
-                // 1. 先取消下载
                 DownloadManager.Instance.CancelDownload(this);
-                
-                // 2. 更新状态为已取消
                 Status = "已取消";
                 UpdateDisplay();
-                
-                // 3. 延迟100ms后移除控件，确保UI更新完成
-                var timer = new System.Windows.Forms.Timer { Interval = 100 };
-                timer.Tick += (s, args) =>
-                {
-                    timer.Stop();
-                    timer.Dispose();
-                    if (this.Parent != null)
-                    {
-                        this.Parent.Controls.Remove(this);
-                        this.Dispose();
-                    }
-                };
-                timer.Start();
             }
             catch (Exception ex)
             {

DownloadManager.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -24,6 +23,7 @@ namespace AppStore
         private static DownloadManager instance = null!;
         public static DownloadManager Instance => instance ??= new DownloadManager();
 
+        private Process? currentProcess;
         public List<DownloadItem> DownloadItems { get; } = new List<DownloadItem>();
         
         public event Action<DownloadItem> DownloadAdded = delegate { };
@@ -41,7 +41,7 @@ namespace AppStore
         private ProcessResult GetProcessResult(Process? process)
         {
             var result = new ProcessResult();
-            if (process == null || process.StartInfo == null) return result;
+            if (process == null) return result;
             
             try 
             {
@@ -58,7 +58,7 @@ namespace AppStore
             }
             catch 
             {
-                // 忽略所有异常,使用默认值
+                // 忽略所有异常，使用默认值
             }
             
             return result;
@@ -77,8 +77,6 @@ namespace AppStore
                 Status = "准备下载"
             };
             
-            // 创建进程并关联到下载项
-            downloadItem.DownloadProcess = new Process();
             DownloadItems.Add(downloadItem);
             DownloadAdded?.Invoke(downloadItem);
 
@@ -87,39 +85,36 @@ namespace AppStore
 
         private void DownloadFile(DownloadItem downloadItem, string fileName, string url)
         {
-            string downloadsDir = string.Empty;
             try
             {
-                // 获取并验证下载路径
-                downloadsDir = GetDownloadPath();
-                
+                // 设置下载目录为用户文件夹中的Downloads
+                // 获取系统下载文件夹路径
+                // 获取系统下载文件夹路径
+                string downloadsDir;
+                IntPtr pathPtr = IntPtr.Zero;
                 try
                 {
-                    // 检查路径是否有效
-                    if (string.IsNullOrWhiteSpace(downloadsDir))
+                    // 使用SHGetKnownFolderPath API获取下载文件夹
+                    var downloadsFolderGuid = new Guid("374DE290-123F-4565-9164-39C4925E467B");
+                    if (SHGetKnownFolderPath(downloadsFolderGuid, 0, IntPtr.Zero, out pathPtr) != 0)
                     {
-                        throw new Exception("下载路径为空");
+                        throw new Exception("无法获取下载文件夹路径");
                     }
                     
-                    // 尝试创建目录（如果不存在）
-                    Directory.CreateDirectory(downloadsDir);
-
-                    // 验证目录是否可写
-                    string testFile = Path.Combine(downloadsDir, "write_test.tmp");
-                    File.WriteAllText(testFile, "test");
-                    File.Delete(testFile);
+                    downloadsDir = Marshal.PtrToStringUni(pathPtr);
                 }
-                catch (Exception ex)
+                catch 
                 {
-                    // 回退到默认下载路径
-                    string defaultPath = Path.Combine(
-                        Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), 
-                        "Downloads");
-                    
-                    Logger.LogError($"下载路径{downloadsDir}不可用,将使用默认路径: {defaultPath}", ex);
-                    downloadsDir = defaultPath;
-                    Directory.CreateDirectory(downloadsDir);
+                    throw new Exception("无法确定下载文件夹位置，请手动指定下载路径");
                 }
+                finally
+                {
+                    if (pathPtr != IntPtr.Zero)
+                    {
+                        Marshal.FreeCoTaskMem(pathPtr);
+                    }
+                }
+                Directory.CreateDirectory(downloadsDir);
                 
 
 
@@ -138,15 +133,18 @@ namespace AppStore
                 var arguments = $"--out=\"{originalFileName}\" --dir=\"{downloadsDir}\" --split=16 --max-connection-per-server=16 {url}";
 
 
-                downloadItem.DownloadProcess.StartInfo = new ProcessStartInfo
+                currentProcess = new Process
                 {
-                    FileName = aria2cPath,
-                    Arguments = arguments,
-                    WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = aria2cPath,
+                        Arguments = arguments,
+                        WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
+                        UseShellExecute = false,
+                        CreateNoWindow = true,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true
+                    }
                 };
 
                 // 获取目标文件路径
@@ -168,7 +166,7 @@ namespace AppStore
                     }
                 };
                 
-                downloadItem.DownloadProcess.OutputDataReceived += (sender, e) =>
+                currentProcess.OutputDataReceived += (sender, e) =>
                 {
                     if (!string.IsNullOrEmpty(e.Data))
                     {
@@ -209,7 +207,7 @@ namespace AppStore
                     }
                 };
 
-                downloadItem.DownloadProcess.ErrorDataReceived += (sender, e) =>
+                currentProcess.ErrorDataReceived += (sender, e) =>
                 {
                     if (!string.IsNullOrEmpty(e.Data))
                     {
@@ -219,9 +217,9 @@ namespace AppStore
                     }
                 };
 
-                downloadItem.DownloadProcess.Exited += (sender, e) =>
+                currentProcess.Exited += (sender, e) =>
                 {
-                    var process = downloadItem.DownloadProcess;
+                    var process = currentProcess;
                     if (process == null) return;
                     
                     var result = GetProcessResult(process);
@@ -290,8 +288,10 @@ namespace AppStore
                     }
                     finally
                     {
-                        // 清理资源
-                        downloadItem.DownloadProcess = null;
+                        if (process != null)
+                        {
+                            currentProcess = null;
+                        }
                     }
                     
                     // 强制更新显示
@@ -300,37 +300,29 @@ namespace AppStore
 
 
 
-                if (!downloadItem.DownloadProcess.Start())
+                if (!currentProcess.Start())
                 {
                     throw new Exception("进程启动失败");
                 }
 
-                downloadItem.DownloadProcess.BeginOutputReadLine();
-                downloadItem.DownloadProcess.BeginErrorReadLine();
+                currentProcess.BeginOutputReadLine();
+                currentProcess.BeginErrorReadLine();
                 progressTimer.Start();
             }
-                catch (Exception ex)
-                {
-                    string errorDetails = $"下载错误: {ex.Message}\n";
-                    errorDetails += $"目标路径: {downloadsDir}\n";
-                    errorDetails += $"URL: {url}";
+            catch (Exception ex)
+            {
+                downloadItem.Status = $"下载错误: {ex.Message}";
+                DownloadCompleted?.Invoke(downloadItem);
 
-                    downloadItem.Status = $"下载失败: {ex.Message}";
-                    Logger.LogError(errorDetails, ex);
-                    
-                    MessageBox.Show($"下载失败:\n{errorDetails}", "错误", 
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    
-                    DownloadCompleted?.Invoke(downloadItem);
-                }
+            }
         }
 
         public void CancelDownload(DownloadItem item)
         {
             try
             {
-                var process = item.DownloadProcess;
-                if (process?.StartInfo == null || process.HasExited)
+                var process = currentProcess;
+                if (process == null || process.HasExited || process.StartInfo == null)
                 {
                     item.Status = "已取消";
                     DownloadProgressChanged?.Invoke(item);
@@ -339,7 +331,7 @@ namespace AppStore
 
                 process.Kill();
                 process.Dispose();
-                item.DownloadProcess = null;
+                currentProcess = null;
                 
                 item.Status = "已取消";
                 DownloadProgressChanged?.Invoke(item);
@@ -350,155 +342,5 @@ namespace AppStore
                 DownloadProgressChanged?.Invoke(item);
             }
         }
-
-        private string GetDownloadPath()
-        {
-            string fallbackPath = string.Empty;
-            // 1. 优先读取用户设置的下载路径
-            try
-            {
-                string jsonPath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                    "zsyg", "kortapp-z", ".date", "dl_path", "download_path.json");
-                
-                Logger.Log($"尝试读取下载路径配置文件: {jsonPath}");
-                
-                if (File.Exists(jsonPath))
-                {
-                    string jsonString = File.ReadAllText(jsonPath);
-                    Logger.Log($"配置文件内容: {jsonString}");
-                    
-                    var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString);
-                    string customPath = jsonData.GetProperty("DownloadPath").GetString()?.Trim();
-                    
-                    if (!string.IsNullOrWhiteSpace(customPath))
-                    {
-                        Logger.Log($"读取到自定义路径: {customPath}");
-                        
-                        // 处理路径格式
-                        customPath = customPath.Replace(@"\\", @"\");
-                        try 
-                        {
-                            // 处理路径中的环境变量和特殊字符
-                            customPath = Environment.ExpandEnvironmentVariables(customPath);
-                            customPath = Path.GetFullPath(customPath);
-                            Logger.Log($"标准化后的路径: {customPath}");
-                            
-                            // 确保路径以目录分隔符结尾
-                            if (!customPath.EndsWith(Path.DirectorySeparatorChar.ToString()))
-                            {
-                                customPath += Path.DirectorySeparatorChar;
-                            }
-
-                            // 验证驱动器是否存在
-                            string drive = Path.GetPathRoot(customPath);
-                            if (!Directory.Exists(drive))
-                            {
-                                Logger.LogError($"驱动器不存在: {drive}");
-                                throw new Exception($"驱动器 {drive} 不存在");
-                            }
-
-                            // 验证路径
-                            if (!Directory.Exists(customPath))
-                            {
-                                Logger.Log($"创建目录: {customPath}");
-                                Directory.CreateDirectory(customPath);
-                            }
-                            
-                            // 更严格的路径可写性测试
-                            string testFile = Path.Combine(customPath, $"write_test_{Guid.NewGuid()}.tmp");
-                            Logger.Log($"测试路径可写性: {testFile}");
-                            try
-                            {
-                                File.WriteAllText(testFile, DateTime.Now.ToString());
-                                string content = File.ReadAllText(testFile);
-                                File.Delete(testFile);
-                                Logger.Log($"路径验证成功: {customPath}");
-                                return customPath.TrimEnd(Path.DirectorySeparatorChar);
-                            }
-                            catch (Exception ex)
-                            {
-                                Logger.LogError($"路径不可写: {customPath}", ex);
-                                throw new Exception($"路径不可写: {customPath}");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.LogError($"路径处理失败: {customPath}", ex);
-                            throw;
-                        }
-                    }
-                }
-                else
-                {
-                    Logger.Log("未找到下载路径配置文件");
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("读取自定义下载路径失败", ex);
-            }
-
-            // 2. 回退到系统默认下载路径
-            IntPtr pathPtr = IntPtr.Zero;
-            try
-            {
-                var downloadsFolderGuid = new Guid("374DE290-123F-4565-9164-39C4925E467B");
-                if (SHGetKnownFolderPath(downloadsFolderGuid, 0, IntPtr.Zero, out pathPtr) == 0)
-                {
-                    string? defaultPath = Marshal.PtrToStringUni(pathPtr);
-                    if (!string.IsNullOrEmpty(defaultPath))
-                    {
-                        Directory.CreateDirectory(defaultPath);
-                        return defaultPath;
-                    }
-                    else
-                    {
-                        Logger.LogWarning("获取到的系统下载路径为空");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("获取系统下载路径失败", ex);
-            }
-            finally
-            {
-                if (pathPtr != IntPtr.Zero)
-                {
-                    Marshal.FreeCoTaskMem(pathPtr);
-                }
-            }
-
-            // 3. 最终回退到相对路径 ~/Downloads
-            string relativePath = "~/Downloads";
-            string userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) ?? 
-                Environment.GetFolderPath(Environment.SpecialFolder.Desktop) ?? 
-                AppDomain.CurrentDomain.BaseDirectory;
-            
-            if (!string.IsNullOrEmpty(userProfile))
-            {
-                fallbackPath = relativePath.Replace("~", userProfile);
-                if (!string.IsNullOrEmpty(fallbackPath))
-                {
-                    fallbackPath = Path.GetFullPath(fallbackPath);
-                }
-            }
-            
-            try {
-                Directory.CreateDirectory(fallbackPath);
-                // 测试路径可写性
-                string testFile = Path.Combine(fallbackPath, "write_test.tmp");
-                if (!string.IsNullOrEmpty(testFile))
-                {
-                    File.WriteAllText(testFile, "test");
-                    File.Delete(testFile);
-                }
-                return fallbackPath;
-            }
-            catch {
-                throw new Exception($"无法使用默认下载路径: {fallbackPath}");
-            }
-        }
     }
 }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 zs-yg
+Copyright (c) 2025 zsyg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,20 +1,20 @@
-# Kortapp-z - Windows应用商店 --主张软件开源、免费,拒绝广告
+# Kortapp-z - Windows应用商店 --主张软件开源、免费，拒绝广告
 
-小立一个flag：从不接受广告,不停更新
+小立一个flag：从不接受广告，不停更新
 
 ## 项目开源行为
 
-1. 项目代码开源,允许任何人使用、修改、分发、商用,但必须注明原作者。
-2. 项目图标、截图等资源开源,允许任何人使用、修改、分发、商用,但必须注明原作者。
+1. 项目代码开源，允许任何人使用、修改、分发、商用，但必须注明原作者。
+2. 项目图标、截图等资源开源，允许任何人使用、修改、分发、商用，但必须注明原作者。
 3. 项目的任何衍生品（包括但不限于网站、APP、插件等）必须遵循以上开源协议。
-4. 项目不接受任何形式的广告,不得在任何地方投放广告。
+4. 项目不接受任何形式的广告，不得在任何地方投放广告。
 5. 项目不接受任何形式的捐赠、赞助
-6. 项目可以进行PR,欢迎任何形式的PR,不提交issue也可以
-7. 本项目可以PR一些你自己的项目,如果star数量不到1k,都会被删除
+6. 项目可以进行PR，欢迎任何形式的PR，不提交issue也可以
+7. 本项目可以PR一些你自己的项目，如果star数量不到1k，都会被删除
 
 ## 项目简介
 
-一个简单的Windows应用商店应用,提供软件下载和管理功能。
+一个简单的Windows应用商店应用，提供软件下载和管理功能。
 提供软件管理、下载管理、内置工具使用等功能
 
 ## 功能特点
@@ -44,7 +44,7 @@ dotnet publish AppStore.csproj -c Release -r win-x86 --self-contained false /p:O
 dotnet publish AppStore.csproj -c Release -r win-x64 --self-contained false /p:Optimize=true /p:DebugType=None
 ```
 
-打包后的可执行文件将包含指定的应用程序图标,输出路径为：
+打包后的可执行文件将包含指定的应用程序图标，输出路径为：
 ```
 bin\Release\net8.0-windows\[platform]\publish
 ```
@@ -83,15 +83,13 @@ Copyright (c) 2025 zsyg
 
 ## 其他网站
 
-gitee镜像仓库:https://gitee.com/chr_super/kortapp-z  (目前已经停止维护,仅镜像代码)
-
-sourceforge镜像仓库:https://sourceforge.net/projects/kortapp-z/ （提供releases镜像）
+gitee镜像仓库:https://gitee.com/chr_super/kortapp-z  (目前已经停止维护)
 
 ## 维护
 
-由于gitee我没怎么用,而且操作麻烦,gitee镜像将不会继续同步,有懂得人可以帮我搞下镜像吗,qq： 3872006562,也可以b站直接私信,我会在readme中鸣谢的,谢谢各位
-由于和Daye发生了矛盾,所以windowscleaner将永远不上架,我要自己努力
-提示：由于github上传文件的限制,img/png/NET.png,请改名为.NET.png,否则程序可能出现无法预料的问题
+由于gitee我没怎么用，而且操作麻烦，gitee镜像将不会继续同步，有懂得人可以帮我搞下镜像吗，qq： 3872006562，也可以b站直接私信，我会在readme中鸣谢的，谢谢各位
+由于和Daye发生了矛盾，所以windowscleaner将永远不上架，我要自己努力
+提示：由于github上传文件的限制，img/png/NET.png，请改名为.NET.png，否则程序可能出现无法预料的问题
 
 每一个人都可以通过PR添加属于自己的合法软件
 

SettingsForm.cs

@@ -3,7 +3,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
 using System.Drawing;
-using System.Text.Json;
 
 namespace AppStore
 {
@@ -50,43 +49,7 @@ namespace AppStore
             btnCleanLogs.Click += (s, e) => CleanLogs();
             this.Controls.Add(btnCleanLogs);
 
-            // 下载路径设置
-            Label lblDownloadPath = new Label();
-            lblDownloadPath.Text = "下载路径:";
-            lblDownloadPath.AutoSize = true;
-            lblDownloadPath.Location = new Point((this.Width - 300) / 2, 170);
-            lblDownloadPath.Font = new Font("Microsoft YaHei", 10);
-            lblDownloadPath.Anchor = AnchorStyles.Top;
-            this.Controls.Add(lblDownloadPath);
-
-            TextBox txtDownloadPath = new TextBox();
-            txtDownloadPath.Size = new Size(300, 30);
-            txtDownloadPath.Location = new Point((this.Width - 300) / 2, 200);
-            txtDownloadPath.Font = new Font("Microsoft YaHei", 10);
-            txtDownloadPath.Anchor = AnchorStyles.Top;
-            txtDownloadPath.ReadOnly = true;
-            this.Controls.Add(txtDownloadPath);
-
-            Button btnBrowse = new Button();
-            btnBrowse.Text = "浏览...";
-            btnBrowse.Size = new Size(80, 30);
-            btnBrowse.Location = new Point(txtDownloadPath.Right + 10, 200);
-            btnBrowse.Font = new Font("Microsoft YaHei", 10);
-            btnBrowse.Anchor = AnchorStyles.Top;
-            btnBrowse.Click += (s, e) => BrowseDownloadPath(txtDownloadPath);
-            this.Controls.Add(btnBrowse);
-
-            Button btnSavePath = new Button();
-            btnSavePath.Text = "保存路径";
-            btnSavePath.Size = new Size(100, 30);
-            btnSavePath.Location = new Point((this.Width - 100) / 2, 240);
-            btnSavePath.Font = new Font("Microsoft YaHei", 10);
-            btnSavePath.Anchor = AnchorStyles.Top;
-            btnSavePath.Click += (s, e) => SaveDownloadPath(txtDownloadPath.Text);
-            this.Controls.Add(btnSavePath);
-
             ThemeManager.ThemeChanged += OnThemeChanged;
-            LoadDownloadPath(txtDownloadPath);
         }
 
         private void SwitchTheme(ThemeManager.ThemeMode theme)
@@ -121,103 +84,5 @@ namespace AppStore
                 MessageBox.Show($"清理日志时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
-
-        private void BrowseDownloadPath(TextBox txtBox)
-        {
-            using (FolderBrowserDialog dialog = new FolderBrowserDialog())
-            {
-                dialog.Description = "选择下载路径";
-                if (dialog.ShowDialog() == DialogResult.OK)
-                {
-                    txtBox.Text = dialog.SelectedPath;
-                }
-            }
-        }
-
-        private void SaveDownloadPath(string path)
-        {
-            try
-            {
-                // 验证路径
-                if (string.IsNullOrWhiteSpace(path))
-                {
-                    MessageBox.Show("下载路径不能为空", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                // 尝试创建目录（如果不存在）
-                try
-                {
-                    Directory.CreateDirectory(path);
-                    
-                    // 验证目录是否可写
-                    string testFile = Path.Combine(path, "write_test.tmp");
-                    File.WriteAllText(testFile, "test");
-                    File.Delete(testFile);
-                }
-                catch
-                {
-                    MessageBox.Show($"无法访问路径: {path}\n请确保路径存在且有写入权限", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                // 保存路径
-                string dlPathDir = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                    "zsyg", "kortapp-z", ".date", "dl_path");
-                
-                if (!Directory.Exists(dlPathDir))
-                {
-                    Directory.CreateDirectory(dlPathDir);
-                }
-
-                string jsonPath = Path.Combine(dlPathDir, "download_path.json");
-                var jsonData = new { DownloadPath = path };
-                string jsonString = JsonSerializer.Serialize(jsonData);
-                
-                File.WriteAllText(jsonPath, jsonString);
-                
-                MessageBox.Show($"下载路径已保存到:\n{path}", "成功", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("保存下载路径时出错", ex);
-                MessageBox.Show($"保存下载路径时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void LoadDownloadPath(TextBox txtBox)
-        {
-            // 默认下载路径为用户文件夹下的Downloads
-            string defaultPath = Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), 
-                "Downloads");
-
-            try
-            {
-                string jsonPath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                    "zsyg", "kortapp-z", ".date", "dl_path", "download_path.json");
-                
-                if (File.Exists(jsonPath))
-                {
-                    string jsonString = File.ReadAllText(jsonPath);
-                    var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString);
-                    string customPath = jsonData.GetProperty("DownloadPath").GetString() ?? "";
-                    
-                    // 如果自定义路径有效则显示,否则显示默认路径
-                    txtBox.Text = !string.IsNullOrWhiteSpace(customPath) ? customPath : defaultPath;
-                }
-                else
-                {
-                    txtBox.Text = defaultPath;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("加载下载路径时出错", ex);
-                txtBox.Text = defaultPath;
-            }
-        }
     }
 }

TXT/Build.txt

@@ -1,4 +1,4 @@
-首先,如果希望编译程序,那么必须安装.NET8.0 SDK
+首先，如果希望编译程序，那么必须安装.NET8.0 SDK
 下载链接：https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer
 
 使用一下指令编译

TXT/Run.txt

@@ -1,4 +1,4 @@
-如果希望运行,那么必须安装.NET8.0 SDK
+如果希望运行，那么必须安装.NET8.0 SDK
 
 下载链接：https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer
 

ThemeManager.cs

@@ -32,7 +32,7 @@ namespace AppStore
             }
             catch
             {
-                // 忽略错误,使用默认主题
+                // 忽略错误，使用默认主题
             }
             return ThemeMode.Light;
         }
@@ -42,8 +42,6 @@ namespace AppStore
             try
             {
                 var dir = Path.GetDirectoryName(ThemeConfigPath);
-                if (dir == null) return;
-                
                 if (!Directory.Exists(dir))
                 {
                     Directory.CreateDirectory(dir);
@@ -58,26 +56,18 @@ namespace AppStore
         }
         
         // 浅色主题颜色
-        private static readonly Color LightBackground = Color.FromArgb(250, 250, 250);
-        private static readonly Color LightControlBackground = Color.FromArgb(245, 245, 245);
-        private static readonly Color LightText = Color.FromArgb(40, 40, 40);
-        private static readonly Color LightButtonHover = Color.FromArgb(235, 235, 235);
-        private static readonly Color LightButtonActive = Color.FromArgb(225, 225, 225);
-        private static readonly Color LightAccent = Color.FromArgb(0, 120, 215);
-        private static readonly Color LightAccentLight = Color.FromArgb(0, 150, 245);
+        private static readonly Color LightBackground = Color.FromArgb(255, 255, 255);
+        private static readonly Color LightControlBackground = Color.FromArgb(240, 240, 240);
+        private static readonly Color LightText = Color.FromArgb(30, 30, 30);
+        private static readonly Color LightButtonHover = Color.FromArgb(230, 230, 230);
+        private static readonly Color LightButtonActive = Color.FromArgb(220, 220, 220);
         
         // 深色主题颜色
-        private static readonly Color DarkBackground = Color.FromArgb(25, 25, 25);
-        private static readonly Color DarkControlBackground = Color.FromArgb(40, 40, 40);
-        private static readonly Color DarkText = Color.FromArgb(245, 245, 245);
-        private static readonly Color DarkButtonHover = Color.FromArgb(55, 55, 55);
-        private static readonly Color DarkButtonActive = Color.FromArgb(65, 65, 65);
-        private static readonly Color DarkBorder = Color.FromArgb(70, 70, 70);
-        private static readonly Color DarkAccent = Color.FromArgb(0, 150, 245);
-        private static readonly Color DarkAccentLight = Color.FromArgb(0, 180, 255);
-        
-        // 浅色主题边框颜色
-        private static readonly Color LightBorder = Color.FromArgb(200, 200, 200);
+        private static readonly Color DarkBackground = Color.FromArgb(30, 30, 30);
+        private static readonly Color DarkControlBackground = Color.FromArgb(45, 45, 45);
+        private static readonly Color DarkText = Color.FromArgb(240, 240, 240);
+        private static readonly Color DarkButtonHover = Color.FromArgb(60, 60, 60);
+        private static readonly Color DarkButtonActive = Color.FromArgb(70, 70, 70);
 
         public static event Action<ThemeMode> ThemeChanged = delegate {};
 
@@ -110,19 +100,6 @@ namespace AppStore
         public static Color ButtonActiveColor => 
             _currentTheme == ThemeMode.Light ? LightButtonActive : DarkButtonActive;
 
-        public static Color BorderColor => 
-            _currentTheme == ThemeMode.Light ? LightBorder : DarkBorder;
-
-        public static Color AccentColor =>
-            _currentTheme == ThemeMode.Light ? LightAccent : DarkAccent;
-
-        public static Color AccentLightColor =>
-            _currentTheme == ThemeMode.Light ? LightAccentLight : DarkAccentLight;
-
-        public static int ControlRadius => 8;
-
-        public static int FormRadius => 12;
-
         public static void ApplyTheme(Control control)
         {
             ApplyThemeToControl(control);
@@ -139,9 +116,6 @@ namespace AppStore
                 button.FlatAppearance.BorderSize = 0;
                 button.FlatAppearance.MouseOverBackColor = ButtonHoverColor;
                 button.FlatAppearance.MouseDownBackColor = ButtonActiveColor;
-                button.BackColor = ControlBackgroundColor;
-                button.Font = new Font(button.Font, FontStyle.Bold);
-                button.Padding = new Padding(10, 5, 10, 5);
             }
 
             foreach (Control childControl in control.Controls)

WebSiteCards.cs

@@ -1,196 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Diagnostics;
-
-namespace AppStore
-{
-    public class WebSiteCards : UserControl
-    {
-        private PictureBox iconBox;
-        private Label nameLabel;
-        private Label descriptionLabel;
-        private Button visitBtn;
-        private ToolTip toolTip;
-        private Color borderColor = SystemColors.ControlDark;
-
-        public string WebSiteName { get; set; } = string.Empty;
-        private Image _webSiteIcon = SystemIcons.Application.ToBitmap();
-        public Image WebSiteIcon 
-        { 
-            get { return _webSiteIcon; }
-            set 
-            {
-                try
-                {
-                    if (value != null)
-                    {
-                        _webSiteIcon = value;
-                    }
-                    else
-                    {
-                        _webSiteIcon = SystemIcons.Application.ToBitmap();
-                    }
-                }
-                catch
-                {
-                    _webSiteIcon = SystemIcons.Application.ToBitmap();
-                }
-                UpdateDisplay();
-            }
-        }
-
-        public string WebSiteIconPath
-        {
-            set
-            {
-                try
-                {
-                    string path = value;
-                    if (!Path.IsPathRooted(path))
-                    {
-                        path = Path.Combine(Application.StartupPath, path);
-                    }
-                    
-                    if (File.Exists(path))
-                    {
-                        _webSiteIcon = Image.FromFile(path);
-                    }
-                    else
-                    {
-                        _webSiteIcon = SystemIcons.Application.ToBitmap();
-                    }
-                }
-                catch
-                {
-                    _webSiteIcon = SystemIcons.Application.ToBitmap();
-                }
-                UpdateDisplay();
-            }
-        }
-        public string WebSiteUrl { get; set; } = string.Empty;
-        public string Description { get; set; } = string.Empty;
-
-        public WebSiteCards()
-        {
-            iconBox = new PictureBox() { SizeMode = PictureBoxSizeMode.StretchImage };
-            nameLabel = new Label() { Text = string.Empty };
-            descriptionLabel = new Label() { Text = string.Empty };
-            visitBtn = new Button() { Text = "访问" };
-            toolTip = new ToolTip();
-            
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            this.Size = new Size(400, 150); // 更宽的卡片以适应横向布局
-            this.BackColor = Color.White;
-            this.Padding = new Padding(10);
-
-            // 网站名称标签 - 顶部
-            nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
-            nameLabel.TextAlign = ContentAlignment.MiddleLeft;
-            nameLabel.Location = new Point(10, 10);
-            nameLabel.Size = new Size(Width - 20, 20);
-            this.Controls.Add(nameLabel);
-
-            // 网站图标 - 左侧
-            iconBox.Size = new Size(80, 80);
-            iconBox.Location = new Point(10, 40);
-            this.Controls.Add(iconBox);
-
-            // 网站描述 - 右侧
-            descriptionLabel.Font = new Font("Microsoft YaHei", 9);
-            descriptionLabel.TextAlign = ContentAlignment.TopLeft;
-            descriptionLabel.AutoSize = false;
-            descriptionLabel.Size = new Size(Width - 110, 80);
-            descriptionLabel.Location = new Point(100, 40);
-            descriptionLabel.MaximumSize = new Size(Width - 110, 0); // 允许自动换行
-            this.Controls.Add(descriptionLabel);
-
-            // 访问按钮 - 右下角
-            visitBtn.Size = new Size(80, 30);
-            visitBtn.Location = new Point(Width - 90, Height - 40);
-            visitBtn.Click += VisitBtn_Click;
-            this.Controls.Add(visitBtn);
-
-            // 工具提示
-            toolTip.AutoPopDelay = 5000;
-            toolTip.InitialDelay = 500;
-            toolTip.ReshowDelay = 500;
-            toolTip.ShowAlways = true;
-            toolTip.SetToolTip(visitBtn, "在浏览器中打开网站");
-
-            UpdateDisplay();
-            UpdateLabelTheme();
-            ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
-        }
-
-        private void UpdateLabelTheme()
-        {
-            if (ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Dark)
-            {
-                this.BackColor = Color.FromArgb(45, 45, 48);
-                nameLabel.ForeColor = Color.White;
-                descriptionLabel.ForeColor = Color.White;
-            }
-            else
-            {
-                this.BackColor = Color.White;
-                nameLabel.ForeColor = Color.Black;
-                descriptionLabel.ForeColor = Color.Black;
-            }
-        }
-
-        public void UpdateDisplay()
-        {
-            nameLabel.Text = WebSiteName;
-            iconBox.Image = WebSiteIcon;
-            descriptionLabel.Text = Description;
-        }
-
-        private void VisitBtn_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                if (!string.IsNullOrEmpty(WebSiteUrl))
-                {
-                    Process.Start(new ProcessStartInfo
-                    {
-                        FileName = WebSiteUrl,
-                        UseShellExecute = true
-                    });
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"打开网站失败: {ex.Message}");
-            }
-        }
-
-        protected override void OnPaint(PaintEventArgs e)
-        {
-            base.OnPaint(e);
-            
-            // 绘制圆角边框
-            using (var pen = new Pen(borderColor, 1))
-            {
-                int radius = 10;
-                var rect = new Rectangle(0, 0, Width - 1, Height - 1);
-                e.Graphics.DrawPath(pen, GetRoundedRectPath(rect, radius));
-            }
-        }
-
-        private System.Drawing.Drawing2D.GraphicsPath GetRoundedRectPath(Rectangle rect, int radius)
-        {
-            var path = new System.Drawing.Drawing2D.GraphicsPath();
-            path.AddArc(rect.X, rect.Y, radius, radius, 180, 90);
-            path.AddArc(rect.X + rect.Width - radius, rect.Y, radius, radius, 270, 90);
-            path.AddArc(rect.X + rect.Width - radius, rect.Y + rect.Height - radius, radius, radius, 0, 90);
-            path.AddArc(rect.X, rect.Y + rect.Height - radius, radius, radius, 90, 90);
-            path.CloseFigure();
-            return path;
-        }
-    }
-}

docs/about.html

@@ -15,13 +15,13 @@
     <main>
         <section class="about-project">
             <h2>项目简介</h2>
-            <p>kortapp-z是一个专为Windows系统设计的实用工具集合,旨在提供一站式的系统优化和管理解决方案。</p>
-            <p>项目始于2025年,由热爱效率工具的开发者创建。</p>
+            <p>kortapp-z是一个专为Windows系统设计的实用工具集合，旨在提供一站式的系统优化和管理解决方案。</p>
+            <p>项目始于2025年，由热爱效率工具的开发者创建。</p>
         </section>
 
         <section class="team">
             <h2>开发团队</h2>
-            <p>我们的团队由经验丰富的开发人员组成,专注于创建高质量的系统工具。</p>
+            <p>我们的团队由经验丰富的开发人员组成，专注于创建高质量的系统工具。</p>
             <ul>
                 <li>核心开发者: 1人</li>
                 <li>UI设计师: 1人</li>
@@ -31,7 +31,7 @@
 
         <section class="contact">
             <h2>联系我们</h2>
-            <p>如有任何问题或建议,欢迎通过GitHub提交issue或pull request。</p>
+            <p>如有任何问题或建议，欢迎通过GitHub提交issue或pull request。</p>
             <a href="https://github.com/zs-yg/kortapp-z/issues" target="_blank">提交反馈</a>
         </section>
     </main>

docs/features.html

@@ -18,20 +18,20 @@
             
             <article class="feature">
                 <h3>应用程序管理</h3>
-                <p>批量安装、卸载(目前没有)和更新应用程序（目前没有）,管理启动项（目前没有）。</p>
-                <p>优势：集中管理所有应用,节省时间,避免系统臃肿。</p>
+                <p>批量安装、卸载(目前没有)和更新应用程序（目前没有），管理启动项（目前没有）。</p>
+                <p>优势：集中管理所有应用，节省时间，避免系统臃肿。</p>
             </article>
             
             <article class="feature">
                 <h3>资源监控（之后可能在内置工具里有）</h3>
                 <p>实时监控CPU、内存、磁盘和网络使用情况。</p>
-                <p>优势：直观的图表展示,及时发现资源瓶颈。</p>
+                <p>优势：直观的图表展示，及时发现资源瓶颈。</p>
             </article>
             
             <article class="feature">
                 <h3>文件管理（之后可能在内置工具里有）</h3>
                 <p>高级文件搜索、批量重命名和快速文件分类。</p>
-                <p>优势：提升文件管理效率,支持正则表达式搜索。</p>
+                <p>优势：提升文件管理效率，支持正则表达式搜索。</p>
             </article>
         </section>
     </main>

inno/innosetup_x64.iss

@@ -1,18 +1,18 @@
 ; 脚本由 Inno Setup 脚本向导生成。
-; 有关创建 Inno Setup 脚本文件的详细信息,请参阅帮助文档！
+; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.3.9"
+#define MyAppVersion "1.1.2"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
-#define MyAppExeName "kortapp-z.exe"
+#define MyAppExeName "kortapp.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
 
 [Setup]
 ; 注意：AppId 的值唯一标识此应用程序。不要在其他应用程序的安装程序中使用相同的 AppId 值。
-; (若要生成新的 GUID,请在 IDE 中单击 "工具|生成 GUID"。)
+; (若要生成新的 GUID，请在 IDE 中单击 "工具|生成 GUID"。)
 AppId={{8020EC01-6133-40BB-8B8B-0EB71E49696C}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
@@ -27,7 +27,7 @@ UninstallDisplayIcon={app}\{#MyAppExeName}
 ; 除 Arm 上的 x64 和 Windows 11 之外的任何平台上。
 ArchitecturesAllowed=x64compatible
 ; "ArchitecturesInstallIn64BitMode=x64compatible" 要求
-; 安装可以在 x64 或 Arm 上的 Windows 11 上以“64 位模式”完成,
+; 安装可以在 x64 或 Arm 上的 Windows 11 上以“64 位模式”完成，
 ; 这意味着它应该使用本机 64 位 Program Files 目录和
 ; 注册表的 64 位视图。
 ArchitecturesInstallIn64BitMode=x64compatible

inno/innosetup_x86.iss

@@ -1,18 +1,18 @@
 ; 脚本由 Inno Setup 脚本向导生成。
-; 有关创建 Inno Setup 脚本文件的详细信息,请参阅帮助文档！
+; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.3.9"
+#define MyAppVersion "1.1.2"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
-#define MyAppExeName "kortapp-z.exe"
+#define MyAppExeName "kortapp.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
 
 [Setup]
 ; 注意：AppId 的值唯一标识此应用程序。不要在其他应用程序的安装程序中使用相同的 AppId 值。
-; (若要生成新的 GUID,请在 IDE 中单击 "工具|生成 GUID"。)
+; (若要生成新的 GUID，请在 IDE 中单击 "工具|生成 GUID"。)
 AppId={{BF1944C3-CD0C-4119-A340-49C54961D48B}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}

log_cleaner.cpp

@@ -44,7 +44,7 @@ int main() {
                 }
             }
         } else {
-            std::cout << "日志目录不存在,无需清理" << std::endl;
+            std::cout << "日志目录不存在，无需清理" << std::endl;
             return 0;
         }
 

logger.cs

@@ -59,35 +59,5 @@ namespace AppStore
             }
             Log(errorMessage);
         }
-
-        public static void LogWarning(string message, Exception? ex = null)
-        {
-            string warningMessage = $"WARNING: {message}";
-            if (ex != null)
-            {
-                warningMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
-            }
-            Log(warningMessage);
-        }
-
-        public static void LogDebug(string message, Exception? ex = null)
-        {
-            string debugMessage = $"DEBUG: {message}";
-            if (ex != null)
-            {
-                debugMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
-            }
-            Log(debugMessage);
-        }
-
-        public static void LogTip(string message, Exception? ex = null)
-        {
-            string tipMessage = $"TIP: {message}";
-            if (ex != null)
-            {
-                tipMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
-            }
-            Log(tipMessage);
-        }
     }
 }

others/C++/Image_format_converter/CMakeLists.txt

@@ -1,83 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(ImageFormatConverter)
-
-# 设置静态编译
-set(CMAKE_EXE_LINKER_FLAGS "-static")
-set(BUILD_SHARED_LIBS OFF)
-set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-
-# 设置C++标准
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# 设置MSYS2库搜索路径
-set(MSYS2_LIB_DIR "C:/msys64/ucrt64/lib")
-
-# 查找依赖库(静态版本)
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(TIFF REQUIRED libtiff-4)
-find_library(TIFF_STATIC_LIB NAMES libtiff.a PATHS ${TIFF_LIBRARY_DIRS})
-
-pkg_check_modules(WEBP REQUIRED libwebp)
-find_library(WEBP_STATIC_LIB NAMES libwebp.a PATHS ${WEBP_LIBRARY_DIRS})
-
-pkg_check_modules(AVIF REQUIRED libavif)
-find_library(AVIF_STATIC_LIB NAMES libavif.a PATHS ${AVIF_LIBRARY_DIRS})
-
-# 使用find_package查找FLTK(静态版本)
-find_package(FLTK REQUIRED)
-find_library(FLTK_STATIC_LIB NAMES libfltk.a PATHS ${FLTK_LIBRARY_DIRS})
-
-# 查找cairo导入库
-find_library(CAIRO_IMPORT_LIB NAMES libcairo.dll.a PATHS "C:/msys64/ucrt64/lib")
-
-# 查找其他依赖库
-find_library(JPEG_STATIC_LIB NAMES libjpeg.a PATHS ${MSYS2_LIB_DIR})
-find_library(ZLIB_STATIC_LIB NAMES libz.a PATHS ${MSYS2_LIB_DIR})
-find_library(ZSTD_STATIC_LIB NAMES libzstd.a PATHS ${MSYS2_LIB_DIR})
-find_library(SHARPYUV_STATIC_LIB NAMES libsharpyuv.a PATHS ${MSYS2_LIB_DIR})
-find_library(JBIG_STATIC_LIB NAMES libjbig.a PATHS ${MSYS2_LIB_DIR})
-find_library(LZMA_STATIC_LIB NAMES liblzma.a PATHS ${MSYS2_LIB_DIR})
-find_library(LIBDEFLATE_STATIC_LIB NAMES libdeflate.a PATHS ${MSYS2_LIB_DIR})
-find_library(LERC_STATIC_LIB NAMES liblerc.a PATHS ${MSYS2_LIB_DIR})
-find_library(AOM_STATIC_LIB NAMES libaom.a PATHS ${MSYS2_LIB_DIR})
-find_library(YUV_STATIC_LIB NAMES libyuv.a PATHS ${MSYS2_LIB_DIR})
-find_library(SVTAV1_ENC_STATIC_LIB NAMES libSvtAv1Enc.a PATHS ${MSYS2_LIB_DIR})
-find_library(RAV1E_STATIC_LIB NAMES librav1e.a PATHS ${MSYS2_LIB_DIR})
-find_library(DAV1D_STATIC_LIB NAMES libdav1d.a PATHS ${MSYS2_LIB_DIR})
-
-# 包含头文件目录
-include_directories(include ${TIFF_INCLUDE_DIRS} ${WEBP_INCLUDE_DIRS} ${FLTK_INCLUDE_DIRS} ${AVIF_INCLUDE_DIRS} "C:/msys64/ucrt64/include/cairo")
-
-# 收集所有源文件
-file(GLOB SOURCES "src/*.cpp")
-
-# 创建可执行文件(设置为WIN32应用程序避免控制台窗口)
-add_executable(ImageFormatConverter WIN32 ${SOURCES})
-
-# 链接静态库
-target_link_libraries(ImageFormatConverter 
-    ${TIFF_STATIC_LIB} 
-    ${WEBP_STATIC_LIB}
-    ${FLTK_STATIC_LIB}
-    ${JPEG_STATIC_LIB}
-    ${ZLIB_STATIC_LIB}
-    ${ZSTD_STATIC_LIB}
-    ${SHARPYUV_STATIC_LIB}
-    ${JBIG_STATIC_LIB}
-    ${LZMA_STATIC_LIB}
-    ${LIBDEFLATE_STATIC_LIB}
-    ${LERC_STATIC_LIB}
-    ${AVIF_STATIC_LIB}
-    ${AOM_STATIC_LIB}
-    ${YUV_STATIC_LIB}
-    ${SVTAV1_ENC_STATIC_LIB}
-    ${RAV1E_STATIC_LIB}
-    ${DAV1D_STATIC_LIB}
-    ${CAIRO_IMPORT_LIB}
-    "C:/msys64/ucrt64/lib/libcairo.a"
-    -lgdi32 -lmsimg32  # 添加Windows图形库
-    -lstdc++ -lgcc -lwinpthread -lcomctl32 -lole32 -luuid -lws2_32 -lntdll)
-
-# 设置输出目录
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)

others/C++/Image_format_converter/include/avif_to_bmp.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToBmpConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_jpeg.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToJpegConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_jpg.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToJpgConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_png.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToPngConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_tiff.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToTiffConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_webp.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToWebpConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/bmp_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class BmpToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/bmp_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToJpgConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_png.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int compression_level = 6);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/common.hpp

@@ -1,25 +0,0 @@
-#pragma once
-#include <vector>
-#include <string>
-#include <memory>
-#include <stb/stb_image.h>
-
-struct ImageData {
-    int width;
-    int height;
-    int channels;
-    std::unique_ptr<unsigned char, void(*)(void*)> pixels;
-    
-    ImageData() : pixels(nullptr, stbi_image_free) {}
-};
-
-enum class ImageFormat {
-    PNG,
-    JPG,
-    TIFF,
-    WEBP,
-    AVIF,
-    UNKNOWN
-};
-
-ImageFormat get_format_from_extension(const std::string& path);

others/C++/Image_format_converter/include/converter_base.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class ConverterBase {
-public:
-    virtual ~ConverterBase() = default;
-    virtual bool convert(const std::string& input, 
-                       const std::string& output) = 0;
-    
-protected:
-    virtual bool validate(const ImageData& data) = 0;
-};

others/C++/Image_format_converter/include/gui_interface.hpp

@@ -1,23 +0,0 @@
-#pragma once
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Input.H>
-#include <FL/Fl_Output.H>
-#include <FL/Fl_Choice.H>
-#include <string>
-
-class MainWindow : public Fl_Window {
-public:
-    MainWindow(int w, int h, const char* title);
-    
-private:
-    Fl_Input* input_path;
-    Fl_Output* output_path;
-    Fl_Choice* format_choice;
-    Fl_Button* convert_btn;
-    
-    static void input_file_cb(Fl_Widget* w, void* data);
-    static void output_file_cb(Fl_Widget* w, void* data);
-    static void convert_cb(Fl_Widget* w, void* data);
-};

others/C++/Image_format_converter/include/image_loader.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include "common.hpp"
-#include <string>
-
-class ImageLoader {
-public:
-    static ImageData load(const std::string& path);
-    static bool save_png(const std::string& path, const ImageData& data);
-    static bool save_jpg(const std::string& path, const ImageData& data, int quality = 90);
-    static void validate_image(const unsigned char* data, int width, int height);
-    
-private:
-};

others/C++/Image_format_converter/include/jpeg_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class JpegToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/jpeg_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpeg_to_png.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpeg_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpeg_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class JpgToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/jpg_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_png.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int compression_level = 6);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class PngToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/png_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToJpgConverter {
-public:
-    static bool convert(const std::string& input_path, 
-                       const std::string& output_path,
-                       int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class TiffToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/tiff_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToJpgConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_png.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int compression_level = 6);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class WebpToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/webp_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToJpgConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_png.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/src/avif_to_bmp.cpp

@@ -1,31 +0,0 @@
-#include "avif_to_bmp.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <stb/stb_image_write.h>
-
-bool AvifToBmpConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载AVIF图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 保存为BMP
-    return stbi_write_bmp(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get());
-}
-
-bool AvifToBmpConverter::validate(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}