添加应用图标

这是一个废弃代码

.github/workflows/dotnet-desktop.yml

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

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

@@ -1,3 +1,9 @@
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
 using System;
 using System.Drawing;
 using System.Windows.Forms;
@@ -17,12 +23,13 @@ namespace AppStore
         private void InitializeComponent()
         {
             this.Dock = DockStyle.Fill;
-            this.BackColor = Color.White;
+            this.BackColor = ThemeManager.BackgroundColor;
             this.Padding = new Padding(20);
 
             // 创建主布局面板
             TableLayoutPanel mainLayout = new TableLayoutPanel();
             mainLayout.Dock = DockStyle.Fill;
+            mainLayout.BackColor = ThemeManager.BackgroundColor;
             mainLayout.ColumnCount = 1;
             mainLayout.RowCount = 2;
             mainLayout.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
@@ -50,7 +57,7 @@ namespace AppStore
 
             // 初始化并添加应用信息
             infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 1.0.7\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
+            infoLabel.Text = "kortapp-z\n版本: 1.2.5\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
             infoLabel.Font = new Font("Microsoft YaHei", 12);
             infoLabel.AutoSize = false;
             infoLabel.Width = 300;
@@ -68,6 +75,7 @@ namespace AppStore
             // 在底部添加GitHub链接区域
             TableLayoutPanel githubPanel = new TableLayoutPanel();
             githubPanel.Dock = DockStyle.Bottom;
+            githubPanel.BackColor = ThemeManager.BackgroundColor;
             githubPanel.Height = 60;
             githubPanel.ColumnCount = 3;
             githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
@@ -109,6 +117,7 @@ namespace AppStore
             // 创建包含图标和文字的面板
             Panel linkPanel = new Panel();
             linkPanel.AutoSize = true;
+            linkPanel.BackColor = ThemeManager.BackgroundColor;
             linkPanel.Controls.Add(githubIcon);
             linkPanel.Controls.Add(githubLabel);
             githubIcon.Location = new Point(0, 0);

AppCard.cs

@@ -1,3 +1,9 @@
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
 using System;
 using System.Drawing;
 using System.Windows.Forms;
@@ -13,7 +19,9 @@ namespace AppStore
     {
         private PictureBox iconBox;
         private Label nameLabel;
+        private Panel namePanel;
         private Button downloadBtn;
+        private Color borderColor = SystemColors.ControlDark;
         private static readonly ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath> PathCache = 
             new ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath>();
 
@@ -27,6 +35,7 @@ namespace AppStore
             // 确保关键对象不为null
             iconBox = new PictureBox() { SizeMode = PictureBoxSizeMode.StretchImage };
             nameLabel = new Label() { Text = string.Empty };
+            namePanel = new Panel();
             downloadBtn = new Button() { Text = "下载" };
             
             // 确保DownloadManager已初始化
@@ -45,51 +54,142 @@ 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()));
+                            });
+                        }
+                    };
+                }));
             });
 
-            // 应用图标
-            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);
+            // 应用图标 - 添加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");
+            }
 
-            // 应用名称
+            // 应用名称 - 使用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}");
+                    }
+                };
+            }
+            
             nameLabel = new Label();
-            nameLabel.AutoSize = false;
-            nameLabel.Size = new Size(Width - 20, 40);
-            nameLabel.Location = new Point(10, 100);
+            nameLabel.Dock = DockStyle.Fill;
             nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
             nameLabel.TextAlign = ContentAlignment.MiddleCenter;
-            this.Controls.Add(nameLabel);
+            
+            if (namePanel != null && nameLabel != null)
+            {
+                namePanel.Controls.Add(nameLabel);
+            }
+            
+            // 初始主题设置
+            UpdateLabelTheme();
+            
+            // 订阅主题变化事件
+            ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
+            
+            if (this != null && this.Controls != null && namePanel != null)
+            {
+                this.Controls.Add(namePanel);
+            }
 
-            // 下载按钮
-            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);
-            
-            // 按钮悬停效果
-            downloadBtn.MouseEnter += (s, e) => {
-                downloadBtn.BackColor = Color.FromArgb(0, 150, 255);
-            };
-            
-            downloadBtn.MouseLeave += (s, e) => {
+            // 下载按钮 - 添加null检查
+            if (downloadBtn != null)
+            {
+                downloadBtn.Text = "下载";
+                downloadBtn.Size = new Size(100, 32);
+                downloadBtn.Location = new Point((Width - 100) / 2, 150);
                 downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-            };
-            
-            downloadBtn.Click += DownloadBtn_Click;
-            this.Controls.Add(downloadBtn);
-            downloadBtn.Visible = ShowDownloadButton;
+                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);
+                    }
+                };
+                
+                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;
+            }
+        }
+
+        private void UpdateLabelTheme()
+        {
+            if (ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Dark)
+            {
+                nameLabel.BackColor = Color.Black;
+                nameLabel.ForeColor = Color.White;
+                namePanel.BackColor = Color.Black;
+                borderColor = Color.White;
+            }
+            else
+            {
+                nameLabel.BackColor = Color.White;
+                nameLabel.ForeColor = Color.Black;
+                namePanel.BackColor = Color.White;
+                borderColor = SystemColors.ControlDark;
+            }
+            if (namePanel != null && !namePanel.IsDisposed)
+            {
+                namePanel.Invalidate(); // 触发重绘
+            }
+            else
+            {
+                Logger.LogWarning("namePanel为null或已释放");
+            }
         }
 
         /// <summary>
@@ -101,52 +201,58 @@ namespace AppStore
             // 使用卡片尺寸作为缓存键
             string cacheKey = $"{Width}_{Height}_10";
             
-            // 检查缓存中是否已有路径
+            // 双重检查锁模式确保线程安全
             if (!BorderCache.TryGetValue(cacheKey, out var borderPath))
             {
-                // 创建临时文件存储路径数据
-                string tempFile = Path.GetTempFileName();
-                try 
+                lock (BorderCache)
                 {
-                    // 配置C++程序启动参数
-                    ProcessStartInfo startInfo = new ProcessStartInfo 
+                    if (!BorderCache.TryGetValue(cacheKey, out borderPath))
                     {
-                        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)) 
+                        // 创建临时文件存储路径数据
+                        string tempFile = Path.GetTempFileName();
+                        try 
                         {
-                            // 读取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);
+                            // 配置C++程序启动参数
+                            ProcessStartInfo startInfo = new ProcessStartInfo 
+                            {
+                                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++程序生成的路径点
+                                    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);
+                            }
                         }
-                    }
-                }
-                finally 
-                {
-                    // 确保临时文件被删除
-                    if (File.Exists(tempFile)) 
-                    {
-                        File.Delete(tempFile);
                     }
                 }
             }
@@ -157,6 +263,12 @@ namespace AppStore
         {
             base.OnPaint(e);
             
+            // 确保边框已初始化
+            if (BorderCache.IsEmpty) 
+            {
+                InitializeBorder();
+            }
+            
             // 绘制背景
             using (var brush = new SolidBrush(this.BackColor)) {
                 e.Graphics.FillRectangle(brush, this.ClientRectangle);
@@ -219,22 +331,37 @@ namespace AppStore
                     };
 
                     // 启动C++程序计算路径
-                    using (var process = Process.Start(startInfo)) {
-                        process.WaitForExit();
-                        
-                        // 检查计算结果
-                        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);
+                    if (startInfo != null)
+                    {
+                        using (var process = Process.Start(startInfo)) 
+                        {
+                            if (process != null)
+                            {
+                                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();
+                                        
+                                        // 创建并缓存路径对象
+                                        path = new System.Drawing.Drawing2D.GraphicsPath();
+                                        path.AddLines(points);
+                                        PathCache.TryAdd(cacheKey, path);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        Logger.LogWarning($"读取路径点失败: {ex.Message}");
+                                    }
+                                }
+                            }
                         }
                     }
                 } catch {
@@ -310,8 +437,18 @@ namespace AppStore
 
         public void UpdateDisplay()
         {
-            nameLabel.Text = AppName;
-            iconBox.Image = AppIcon;
+            if (nameLabel != null && AppName != null)
+            {
+                nameLabel.Text = AppName;
+            }
+            else
+            {
+                Logger.LogWarning("nameLabel或AppName为null");
+            }
+            if (iconBox != null && AppIcon != null)
+            {
+                iconBox.Image = AppIcon;
+            }
         }
 
         private void DownloadBtn_Click(object sender, EventArgs e)
@@ -321,14 +458,15 @@ namespace AppStore
                 // 更严格的null检查
                 // 更严格的null检查，包括DownloadManager.Instance和其方法
                 // 全面的null和状态检查
+                var downloadManager = DownloadManager.Instance;
                 if (sender == null || e == null || 
                     string.IsNullOrWhiteSpace(DownloadUrl) || 
                     string.IsNullOrWhiteSpace(AppName) ||
                     !this.IsHandleCreated ||
                     this.IsDisposed ||
-                    DownloadManager.Instance == null ||
-                    DownloadManager.Instance.DownloadItems == null ||
-                    DownloadManager.Instance.StartDownload == null)
+                    downloadManager == null ||
+                    downloadManager.DownloadItems == null ||
+                    downloadManager.StartDownload == null)
                 {
                     return;
                 }
@@ -336,7 +474,7 @@ namespace AppStore
                 string safeAppName = AppName ?? "未知应用";
                 string fileName = $"{safeAppName.Replace(" ", "_")}.exe";
                 
-                DownloadManager.Instance.StartDownload(fileName, DownloadUrl);
+                downloadManager.StartDownload(fileName, DownloadUrl);
                 
                 string message = $"已开始下载: {safeAppName}";
                 this.Invoke((MethodInvoker)delegate {

AppSearch.cs

@@ -0,0 +1,63 @@
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+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

@@ -1,36 +1,41 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <NoWarn>CS8622</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <WarningsAsErrors>CS8618</WarningsAsErrors>
-    <ApplicationIcon>img\ico\icon.ico</ApplicationIcon>
-    <Platforms>x86;x64</Platforms>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="help.txt" />
-    <None Include="resource\*.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="img\png\*.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="img\jpg\*.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-	<None Include="img\resource\png\*.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="img\ico\*.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NoWarn>CS8622</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <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\*.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="img\png\*.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="img\jpg\*.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+	<None Include="img\resource\png\*.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="img\ico\*.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+  </ItemGroup>
+
+</Project>

DownloadItem.cs

@@ -1,92 +1,131 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class DownloadItem : UserControl
-    {
-        private Label nameLabel;
-        private ProgressBar progressBar;
-        private Label statusLabel;
-        private Button cancelBtn;
-
-        public string FileName { get; set; } = string.Empty;
-        public int Progress { get; set; }
-        public string Status { get; set; } = string.Empty;
-
-        public DownloadItem()
-        {
-            nameLabel = new Label();
-            progressBar = new ProgressBar();
-            statusLabel = new Label();
-            cancelBtn = new Button();
-            
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            this.Size = new Size(400, 60);
-            this.BackColor = Color.White;
-            this.BorderStyle = BorderStyle.FixedSingle;
-
-            // 文件名标签
-            nameLabel = new Label();
-            nameLabel.AutoSize = true;
-            nameLabel.Location = new Point(10, 10);
-            nameLabel.Font = new Font("Microsoft YaHei", 9, FontStyle.Bold);
-            this.Controls.Add(nameLabel);
-
-            // 进度条
-            progressBar = new ProgressBar();
-            progressBar.Size = new Size(200, 20);
-            progressBar.Location = new Point(10, 30);
-            this.Controls.Add(progressBar);
-
-            // 状态标签
-            statusLabel = new Label();
-            statusLabel.AutoSize = true;
-            statusLabel.Location = new Point(220, 30);
-            statusLabel.Font = new Font("Microsoft YaHei", 8);
-            this.Controls.Add(statusLabel);
-
-            // 取消按钮
-            cancelBtn = new Button();
-            cancelBtn.Text = "取消";
-            cancelBtn.Size = new Size(60, 25);
-            cancelBtn.Location = new Point(320, 30);
-            cancelBtn.Click += CancelBtn_Click;
-            this.Controls.Add(cancelBtn);
-        }
-
-        public void UpdateDisplay()
-        {
-            nameLabel.Text = FileName;
-            progressBar.Value = Progress;
-            statusLabel.Text = Status;
-        }
-
-        private void CancelBtn_Click(object sender, EventArgs e)
-        {
-            if (sender == null || e == null) return;
-            if (InvokeRequired)
-            {
-                Invoke(new EventHandler(CancelBtn_Click), sender, e);
-                return;
-            }
-
-            try
-            {
-                DownloadManager.Instance.CancelDownload(this);
-                Status = "已取消";
-                UpdateDisplay();
-            }
-            catch (Exception ex)
-            {
-                Status = $"取消失败: {ex.Message}";
-                UpdateDisplay();
-            }
-        }
-    }
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class DownloadItem : UserControl
+    {
+        private Label nameLabel;
+        private ProgressBar progressBar;
+        private Label statusLabel;
+        private Button cancelBtn;
+
+        public string FileName { get; set; } = string.Empty;
+        public int Progress { get; set; }
+        public string Status { get; set; } = string.Empty;
+
+        public DownloadItem()
+        {
+            nameLabel = new Label();
+            progressBar = new ProgressBar();
+            statusLabel = new Label();
+            cancelBtn = new Button();
+            
+            InitializeComponent();
+            
+            // 监听主题变化
+            ThemeManager.ThemeChanged += (theme) => {
+                this.Invoke((MethodInvoker)delegate {
+                    ApplyTheme();
+                });
+            };
+        }
+
+        private void ApplyTheme()
+        {
+            this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.White 
+                : Color.Black;
+            this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.Black 
+                : Color.White;
+            
+            cancelBtn.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? SystemColors.Control 
+                : Color.FromArgb(70, 70, 70);
+            cancelBtn.ForeColor = ThemeManager.TextColor;
+        }
+
+        private void InitializeComponent()
+        {
+            this.Size = new Size(400, 60);
+            this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.White 
+                : Color.Black;
+            this.BorderStyle = BorderStyle.FixedSingle;
+            this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.Black 
+                : Color.White;
+
+            // 文件名标签
+            nameLabel = new Label();
+            nameLabel.AutoSize = true;
+            nameLabel.Location = new Point(10, 10);
+            nameLabel.Font = new Font("Microsoft YaHei", 9, FontStyle.Bold);
+            this.Controls.Add(nameLabel);
+
+            // 进度条
+            progressBar = new ProgressBar();
+            progressBar.Size = new Size(200, 20);
+            progressBar.Location = new Point(10, 30);
+            this.Controls.Add(progressBar);
+
+            // 状态标签
+            statusLabel = new Label();
+            statusLabel.AutoSize = true;
+            statusLabel.Location = new Point(220, 30);
+            statusLabel.Font = new Font("Microsoft YaHei", 8);
+            this.Controls.Add(statusLabel);
+
+            // 取消按钮
+            cancelBtn = new Button();
+            cancelBtn.Text = "取消";
+            cancelBtn.Size = new Size(60, 25);
+            cancelBtn.Location = new Point(320, 30);
+            cancelBtn.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? SystemColors.Control 
+                : Color.FromArgb(70, 70, 70);
+            cancelBtn.ForeColor = ThemeManager.TextColor;
+            cancelBtn.FlatStyle = FlatStyle.Flat;
+            cancelBtn.FlatAppearance.BorderSize = 0;
+            cancelBtn.Click += CancelBtn_Click;
+            this.Controls.Add(cancelBtn);
+        }
+
+        public void UpdateDisplay()
+        {
+            nameLabel.Text = FileName;
+            progressBar.Value = Progress;
+            statusLabel.Text = Status;
+        }
+
+        private void CancelBtn_Click(object sender, EventArgs e)
+        {
+            if (sender == null || e == null) return;
+            if (InvokeRequired)
+            {
+                Invoke(new EventHandler(CancelBtn_Click), sender, e);
+                return;
+            }
+
+            try
+            {
+                DownloadManager.Instance.CancelDownload(this);
+                Status = "已取消";
+                UpdateDisplay();
+            }
+            catch (Exception ex)
+            {
+                Status = $"取消失败: {ex.Message}";
+                UpdateDisplay();
+            }
+        }
+    }
+}

DownloadManager.cs

@@ -1,346 +1,514 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class DownloadManager
-    {
-
-
-        [DllImport("shell32.dll")]
-        private static extern int SHGetKnownFolderPath(
-            [MarshalAs(UnmanagedType.LPStruct)] Guid rfid,
-            uint dwFlags,
-            IntPtr hToken,
-            out IntPtr ppszPath);
-
-
-        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 { };
-        public event Action<DownloadItem> DownloadProgressChanged = delegate { };
-        public event Action<DownloadItem> DownloadCompleted = delegate { };
-
-        // 内部类封装进程结果
-        private class ProcessResult
-        {
-            public int ExitCode { get; set; } = -1;
-            public bool HasExited { get; set; }
-        }
-
-        // 安全获取进程结果
-        private ProcessResult GetProcessResult(Process? process)
-        {
-            var result = new ProcessResult();
-            if (process == null) return result;
-            
-            try 
-            {
-                if (!process.HasExited)
-                {
-                    process.WaitForExit(5000);
-                }
-                
-                result.HasExited = process.HasExited;
-                if (result.HasExited)
-                {
-                    result.ExitCode = process.ExitCode;
-                }
-            }
-            catch 
-            {
-                // 忽略所有异常，使用默认值
-            }
-            
-            return result;
-        }
-
-        public void StartDownload(string fileName, string url)
-        {
-            // 从URL获取原始文件名用于显示
-            var uri = new Uri(url);
-            var originalFileName = Path.GetFileName(uri.LocalPath);
-            
-            var downloadItem = new DownloadItem
-            {
-                FileName = originalFileName, // 显示原始文件名
-                Progress = 0,
-                Status = "准备下载"
-            };
-            
-            DownloadItems.Add(downloadItem);
-            DownloadAdded?.Invoke(downloadItem);
-
-            Task.Run(() => DownloadFile(downloadItem, fileName, url));
-        }
-
-        private void DownloadFile(DownloadItem downloadItem, string fileName, string url)
-        {
-            try
-            {
-                // 设置下载目录为用户文件夹中的Downloads
-                // 获取系统下载文件夹路径
-                // 获取系统下载文件夹路径
-                string downloadsDir;
-                IntPtr pathPtr = IntPtr.Zero;
-                try
-                {
-                    // 使用SHGetKnownFolderPath API获取下载文件夹
-                    var downloadsFolderGuid = new Guid("374DE290-123F-4565-9164-39C4925E467B");
-                    if (SHGetKnownFolderPath(downloadsFolderGuid, 0, IntPtr.Zero, out pathPtr) != 0)
-                    {
-                        throw new Exception("无法获取下载文件夹路径");
-                    }
-                    
-                    downloadsDir = Marshal.PtrToStringUni(pathPtr);
-                }
-                catch 
-                {
-                    throw new Exception("无法确定下载文件夹位置，请手动指定下载路径");
-                }
-                finally
-                {
-                    if (pathPtr != IntPtr.Zero)
-                    {
-                        Marshal.FreeCoTaskMem(pathPtr);
-                    }
-                }
-                Directory.CreateDirectory(downloadsDir);
-                
-
-
-                // 构建aria2c路径
-                var aria2cPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "resource", "aria2c.exe");
-                
-                if (!File.Exists(aria2cPath))
-                {
-                    throw new FileNotFoundException($"找不到aria2c.exe: {aria2cPath}");
-                }
-
-                // 设置线程数为16并添加详细日志
-                // 从URL获取原始文件名
-                var uri = new Uri(url);
-                var originalFileName = Path.GetFileName(uri.LocalPath);
-                var arguments = $"--out=\"{originalFileName}\" --dir=\"{downloadsDir}\" --split=16 --max-connection-per-server=16 {url}";
-
-
-                currentProcess = new Process
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = aria2cPath,
-                        Arguments = arguments,
-                        WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
-                        UseShellExecute = false,
-                        CreateNoWindow = true,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true
-                    }
-                };
-
-                // 获取目标文件路径
-                string downloadPath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-                    "Downloads",
-                    fileName);
-                
-                long totalSize = 0;
-                
-                // 添加进度检测超时机制
-                var progressTimer = new System.Timers.Timer(5000); // 5秒无更新视为完成
-                progressTimer.Elapsed += (s, e) => {
-                    progressTimer.Stop();
-                    if (downloadItem.Progress < 100) {
-                        downloadItem.Progress = 100;
-                        downloadItem.Status = "下载完成 (100%)";
-                        DownloadProgressChanged?.Invoke(downloadItem);
-                    }
-                };
-                
-                currentProcess.OutputDataReceived += (sender, e) =>
-                {
-                    if (!string.IsNullOrEmpty(e.Data))
-                    {
-
-                        
-                        // 重置超时计时器
-                        progressTimer.Stop();
-                        progressTimer.Start();
-                        
-                        // 解析总大小
-                        if (e.Data.Contains("Length:"))
-                        {
-                            var sizeStr = e.Data.Split(new[]{"Length:"}, StringSplitOptions.RemoveEmptyEntries)[1]
-                                .Split('(')[0].Trim();
-                            if (long.TryParse(sizeStr, out totalSize))
-                            {
-
-                            }
-                        }
-                        
-                        // 解析进度百分比
-                        if (e.Data.Contains("%)"))
-                        {
-                            var start = e.Data.IndexOf("(") + 1;
-                            var end = e.Data.IndexOf("%)");
-                            if (start > 0 && end > start)
-                            {
-                                var progressStr = e.Data.Substring(start, end - start);
-                                if (int.TryParse(progressStr, out int progress))
-                                {
-                                    progress = Math.Min(progress, 100);
-                                    downloadItem.Progress = progress;
-                                    downloadItem.Status = $"下载中({progress}%)";
-                                    DownloadProgressChanged?.Invoke(downloadItem);
-                                }
-                            }
-                        }
-                    }
-                };
-
-                currentProcess.ErrorDataReceived += (sender, e) =>
-                {
-                    if (!string.IsNullOrEmpty(e.Data))
-                    {
-
-                        downloadItem.Status = $"错误: {e.Data}";
-                        DownloadProgressChanged?.Invoke(downloadItem);
-                    }
-                };
-
-                currentProcess.Exited += (sender, e) =>
-                {
-                    var process = currentProcess;
-                    if (process == null) return;
-                    
-                    var result = GetProcessResult(process);
-                    
-                    if (result.ExitCode == 0)
-                    {
-                        // 最终状态强制更新
-                        downloadItem.Progress = 100;
-                        downloadItem.Status = "下载完成 (100%)";
-                        
-                        // 验证文件完整性
-                        string downloadPath = Path.Combine(
-                            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-                            "Downloads",
-                            downloadItem.FileName);
-                            
-                        if (File.Exists(downloadPath))
-                        {
-
-                        }
-                        else
-                        {
-
-                        }
-                        
-                        // 触发界面更新
-                        DownloadProgressChanged?.Invoke(downloadItem);
-                        DownloadCompleted?.Invoke(downloadItem);
-                        downloadItem.UpdateDisplay();
-                        
-                        try 
-                        {
-                            // 双重确保在主线程显示提示
-                            if (Application.OpenForms.Count > 0)
-                            {
-                                var mainForm = Application.OpenForms[0];
-                                mainForm.Invoke((MethodInvoker)delegate {
-                            MessageBox.Show(mainForm, 
-                                $"文件 {downloadItem.FileName} 已成功下载到：\n{Path.Combine(downloadsDir, downloadItem.FileName)}", 
-                                "下载完成", 
-                                MessageBoxButtons.OK, 
-                                MessageBoxIcon.Information);
-                                });
-                            }
-                            else
-                            {
-
-                            }
-                        }
-                        catch 
-                        {
-                        }
-                    }
-                    else
-                    {
-                        downloadItem.Status = $"下载失败 (代码: {result.ExitCode})";
-                        MessageBox.Show($"文件 {downloadItem.FileName} 下载失败", "下载失败", 
-                            MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                    
-                    DownloadCompleted?.Invoke(downloadItem);
-                    
-                    try
-                    {
-                        process?.Dispose();
-                    }
-                    finally
-                    {
-                        if (process != null)
-                        {
-                            currentProcess = null;
-                        }
-                    }
-                    
-                    // 强制更新显示
-                    downloadItem.UpdateDisplay();
-                };
-
-
-
-                if (!currentProcess.Start())
-                {
-                    throw new Exception("进程启动失败");
-                }
-
-                currentProcess.BeginOutputReadLine();
-                currentProcess.BeginErrorReadLine();
-                progressTimer.Start();
-            }
-            catch (Exception ex)
-            {
-                downloadItem.Status = $"下载错误: {ex.Message}";
-                DownloadCompleted?.Invoke(downloadItem);
-
-            }
-        }
-
-        public void CancelDownload(DownloadItem item)
-        {
-            try
-            {
-                var process = currentProcess;
-                if (process == null || process.HasExited || process.StartInfo == null)
-                {
-                    item.Status = "已取消";
-                    DownloadProgressChanged?.Invoke(item);
-                    return;
-                }
-
-                process.Kill();
-                process.Dispose();
-                currentProcess = null;
-                
-                item.Status = "已取消";
-                DownloadProgressChanged?.Invoke(item);
-            }
-            catch (Exception ex)
-            {
-                item.Status = $"取消失败: {ex.Message}";
-                DownloadProgressChanged?.Invoke(item);
-            }
-        }
-    }
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+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;
+
+namespace AppStore
+{
+    public class DownloadManager
+    {
+
+
+        [DllImport("shell32.dll")]
+        private static extern int SHGetKnownFolderPath(
+            [MarshalAs(UnmanagedType.LPStruct)] Guid rfid,
+            uint dwFlags,
+            IntPtr hToken,
+            out IntPtr ppszPath);
+
+
+        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 { };
+        public event Action<DownloadItem> DownloadProgressChanged = delegate { };
+        public event Action<DownloadItem> DownloadCompleted = delegate { };
+
+        // 内部类封装进程结果
+        private class ProcessResult
+        {
+            public int ExitCode { get; set; } = -1;
+            public bool HasExited { get; set; }
+        }
+
+        // 安全获取进程结果
+        private ProcessResult GetProcessResult(Process? process)
+        {
+            var result = new ProcessResult();
+            if (process == null || process.StartInfo == null) return result;
+            
+            try 
+            {
+                if (!process.HasExited)
+                {
+                    process.WaitForExit(5000);
+                }
+                
+                result.HasExited = process.HasExited;
+                if (result.HasExited)
+                {
+                    result.ExitCode = process.ExitCode;
+                }
+            }
+            catch 
+            {
+                // 忽略所有异常，使用默认值
+            }
+            
+            return result;
+        }
+
+        public void StartDownload(string fileName, string url)
+        {
+            // 从URL获取原始文件名用于显示
+            var uri = new Uri(url);
+            var originalFileName = Path.GetFileName(uri.LocalPath);
+            
+            var downloadItem = new DownloadItem
+            {
+                FileName = originalFileName, // 显示原始文件名
+                Progress = 0,
+                Status = "准备下载"
+            };
+            
+            DownloadItems.Add(downloadItem);
+            DownloadAdded?.Invoke(downloadItem);
+
+            Task.Run(() => DownloadFile(downloadItem, fileName, url));
+        }
+
+        private void DownloadFile(DownloadItem downloadItem, string fileName, string url)
+        {
+            string downloadsDir = string.Empty;
+            try
+            {
+                // 获取并验证下载路径
+                downloadsDir = GetDownloadPath();
+                
+                try
+                {
+                    // 检查路径是否有效
+                    if (string.IsNullOrWhiteSpace(downloadsDir))
+                    {
+                        throw new Exception("下载路径为空");
+                    }
+
+                    // 尝试创建目录（如果不存在）
+                    Directory.CreateDirectory(downloadsDir);
+
+                    // 验证目录是否可写
+                    string testFile = Path.Combine(downloadsDir, "write_test.tmp");
+                    File.WriteAllText(testFile, "test");
+                    File.Delete(testFile);
+                }
+                catch (Exception ex)
+                {
+                    // 回退到默认下载路径
+                    string defaultPath = Path.Combine(
+                        Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), 
+                        "Downloads");
+                    
+                    Logger.LogError($"下载路径{downloadsDir}不可用，将使用默认路径: {defaultPath}", ex);
+                    downloadsDir = defaultPath;
+                    Directory.CreateDirectory(downloadsDir);
+                }
+                
+
+
+                // 构建aria2c路径
+                var aria2cPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "resource", "aria2c.exe");
+                
+                if (!File.Exists(aria2cPath))
+                {
+                    throw new FileNotFoundException($"找不到aria2c.exe: {aria2cPath}");
+                }
+
+                // 设置线程数为16并添加详细日志
+                // 从URL获取原始文件名
+                var uri = new Uri(url);
+                var originalFileName = Path.GetFileName(uri.LocalPath);
+                var arguments = $"--out=\"{originalFileName}\" --dir=\"{downloadsDir}\" --split=16 --max-connection-per-server=16 {url}";
+
+
+                currentProcess = new Process
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = aria2cPath,
+                        Arguments = arguments,
+                        WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
+                        UseShellExecute = false,
+                        CreateNoWindow = true,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true
+                    }
+                };
+
+                // 获取目标文件路径
+                string downloadPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    "Downloads",
+                    fileName);
+                
+                long totalSize = 0;
+                
+                // 添加进度检测超时机制
+                var progressTimer = new System.Timers.Timer(5000); // 5秒无更新视为完成
+                progressTimer.Elapsed += (s, e) => {
+                    progressTimer.Stop();
+                    if (downloadItem.Progress < 100) {
+                        downloadItem.Progress = 100;
+                        downloadItem.Status = "下载完成 (100%)";
+                        DownloadProgressChanged?.Invoke(downloadItem);
+                    }
+                };
+                
+                currentProcess.OutputDataReceived += (sender, e) =>
+                {
+                    if (!string.IsNullOrEmpty(e.Data))
+                    {
+
+                        
+                        // 重置超时计时器
+                        progressTimer.Stop();
+                        progressTimer.Start();
+                        
+                        // 解析总大小
+                        if (e.Data.Contains("Length:"))
+                        {
+                            var sizeStr = e.Data.Split(new[]{"Length:"}, StringSplitOptions.RemoveEmptyEntries)[1]
+                                .Split('(')[0].Trim();
+                            if (long.TryParse(sizeStr, out totalSize))
+                            {
+
+                            }
+                        }
+                        
+                        // 解析进度百分比
+                        if (e.Data.Contains("%)"))
+                        {
+                            var start = e.Data.IndexOf("(") + 1;
+                            var end = e.Data.IndexOf("%)");
+                            if (start > 0 && end > start)
+                            {
+                                var progressStr = e.Data.Substring(start, end - start);
+                                if (int.TryParse(progressStr, out int progress))
+                                {
+                                    progress = Math.Min(progress, 100);
+                                    downloadItem.Progress = progress;
+                                    downloadItem.Status = $"下载中({progress}%)";
+                                    DownloadProgressChanged?.Invoke(downloadItem);
+                                }
+                            }
+                        }
+                    }
+                };
+
+                currentProcess.ErrorDataReceived += (sender, e) =>
+                {
+                    if (!string.IsNullOrEmpty(e.Data))
+                    {
+
+                        downloadItem.Status = $"错误: {e.Data}";
+                        DownloadProgressChanged?.Invoke(downloadItem);
+                    }
+                };
+
+                currentProcess.Exited += (sender, e) =>
+                {
+                    var process = currentProcess;
+                    if (process == null) return;
+                    
+                    var result = GetProcessResult(process);
+                    
+                    if (result.ExitCode == 0)
+                    {
+                        // 最终状态强制更新
+                        downloadItem.Progress = 100;
+                        downloadItem.Status = "下载完成 (100%)";
+                        
+                        // 验证文件完整性
+                        string downloadPath = Path.Combine(
+                            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                            "Downloads",
+                            downloadItem.FileName);
+                            
+                        if (File.Exists(downloadPath))
+                        {
+
+                        }
+                        else
+                        {
+
+                        }
+                        
+                        // 触发界面更新
+                        DownloadProgressChanged?.Invoke(downloadItem);
+                        DownloadCompleted?.Invoke(downloadItem);
+                        downloadItem.UpdateDisplay();
+                        
+                        try 
+                        {
+                            // 双重确保在主线程显示提示
+                            if (Application.OpenForms.Count > 0)
+                            {
+                                var mainForm = Application.OpenForms[0];
+                                mainForm.Invoke((MethodInvoker)delegate {
+                            MessageBox.Show(mainForm, 
+                                $"文件 {downloadItem.FileName} 已成功下载到：\n{Path.Combine(downloadsDir, downloadItem.FileName)}", 
+                                "下载完成", 
+                                MessageBoxButtons.OK, 
+                                MessageBoxIcon.Information);
+                                });
+                            }
+                            else
+                            {
+
+                            }
+                        }
+                        catch 
+                        {
+                        }
+                    }
+                    else
+                    {
+                        downloadItem.Status = $"下载失败 (代码: {result.ExitCode})";
+                        MessageBox.Show($"文件 {downloadItem.FileName} 下载失败", "下载失败", 
+                            MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                    
+                    DownloadCompleted?.Invoke(downloadItem);
+                    
+                    try
+                    {
+                        process?.Dispose();
+                    }
+                    finally
+                    {
+                        if (process != null)
+                        {
+                            currentProcess = null;
+                        }
+                    }
+                    
+                    // 强制更新显示
+                    downloadItem.UpdateDisplay();
+                };
+
+
+
+                if (!currentProcess.Start())
+                {
+                    throw new Exception("进程启动失败");
+                }
+
+                currentProcess.BeginOutputReadLine();
+                currentProcess.BeginErrorReadLine();
+                progressTimer.Start();
+            }
+                catch (Exception ex)
+                {
+                    string errorDetails = $"下载错误: {ex.Message}\n";
+                    errorDetails += $"目标路径: {downloadsDir}\n";
+                    errorDetails += $"URL: {url}";
+                    
+                    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 = currentProcess;
+                if (process?.StartInfo == null || process.HasExited)
+                {
+                    item.Status = "已取消";
+                    DownloadProgressChanged?.Invoke(item);
+                    return;
+                }
+
+                process.Kill();
+                process.Dispose();
+                currentProcess = null;
+                
+                item.Status = "已取消";
+                DownloadProgressChanged?.Invoke(item);
+            }
+            catch (Exception ex)
+            {
+                item.Status = $"取消失败: {ex.Message}";
+                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}");
+            }
+        }
+    }
+}

ImageCompressorForm.cs

@@ -1,190 +1,196 @@
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class ImageCompressorForm : Form
-    {
-        private Button btnSelectInput = new Button();
-        private Button btnSelectOutput = new Button();
-        private Button btnCompress = new Button();
-        private TextBox txtInput = new TextBox();
-        private TextBox txtOutput = new TextBox();
-        private RadioButton rbLossy = new RadioButton();
-        private RadioButton rbLossless = new RadioButton();
-        private TrackBar tbQuality = new TrackBar();
-        private Label lblQuality = new Label();
-        private CheckBox cbKeepExif = new CheckBox();
-        private ProgressBar progressBar = new ProgressBar();
-
-        public ImageCompressorForm()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            this.Text = "图片压缩工具";
-            this.Size = new Size(500, 350);
-            this.StartPosition = FormStartPosition.CenterScreen;
-            this.FormBorderStyle = FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-
-            // 输入文件选择
-            btnSelectInput.Text = "选择...";
-            btnSelectInput.Location = new Point(400, 20);
-            btnSelectInput.Click += (s, e) => SelectFile(txtInput);
-            this.Controls.Add(btnSelectInput);
-
-            txtInput.Location = new Point(20, 20);
-            txtInput.Size = new Size(370, 20);
-            txtInput.ReadOnly = true;
-            this.Controls.Add(txtInput);
-
-            Label lblInput = new Label();
-            lblInput.Text = "输入文件:";
-            lblInput.Location = new Point(20, 0);
-            this.Controls.Add(lblInput);
-
-            // 输出文件选择
-            btnSelectOutput.Text = "选择...";
-            btnSelectOutput.Location = new Point(400, 70);
-            btnSelectOutput.Click += (s, e) => SelectFile(txtOutput, true);
-            this.Controls.Add(btnSelectOutput);
-
-            txtOutput.Location = new Point(20, 70);
-            txtOutput.Size = new Size(370, 20);
-            this.Controls.Add(txtOutput);
-
-            Label lblOutput = new Label();
-            lblOutput.Text = "输出文件:";
-            lblOutput.Location = new Point(20, 50);
-            this.Controls.Add(lblOutput);
-
-            // 压缩类型
-            rbLossy.Text = "有损压缩 (JPEG)";
-            rbLossy.Location = new Point(20, 110);
-            rbLossy.Checked = true;
-            this.Controls.Add(rbLossy);
-
-            rbLossless.Text = "无损压缩 (PNG)";
-            rbLossless.Location = new Point(20, 135);
-            this.Controls.Add(rbLossless);
-
-            // 质量设置
-            tbQuality.Minimum = 1;
-            tbQuality.Maximum = 1000;
-            tbQuality.Value = 800;
-            tbQuality.Location = new Point(20, 190);
-            tbQuality.Size = new Size(300, 50);
-            tbQuality.Scroll += (s, e) => lblQuality.Text = $"压缩质量: {tbQuality.Value}";
-            this.Controls.Add(tbQuality);
-
-            lblQuality.Text = $"压缩质量: {tbQuality.Value}";
-            lblQuality.Location = new Point(20, 170);
-            this.Controls.Add(lblQuality);
-
-            // EXIF选项
-            cbKeepExif.Text = "保留EXIF信息";
-            cbKeepExif.Location = new Point(20, 240);
-            this.Controls.Add(cbKeepExif);
-
-            // 压缩按钮
-            btnCompress.Text = "开始压缩";
-            btnCompress.Location = new Point(20, 280);
-            btnCompress.Size = new Size(460, 30);
-            btnCompress.Click += BtnCompress_Click;
-            this.Controls.Add(btnCompress);
-
-            // 调整窗体大小
-            this.Size = new Size(500, 370);
-        }
-
-        private void SelectFile(TextBox target, bool isSave = false)
-        {
-            var dialog = isSave ? new SaveFileDialog() : new OpenFileDialog() as FileDialog;
-            dialog.Filter = "图片文件|*.jpg;*.jpeg;*.png;*.bmp|所有文件|*.*";
-
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                target.Text = dialog.FileName;
-            }
-        }
-
-        private void BtnCompress_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(txtInput.Text) || !File.Exists(txtInput.Text))
-            {
-                MessageBox.Show("请选择有效的输入文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (string.IsNullOrEmpty(txtOutput.Text))
-            {
-                MessageBox.Show("请指定输出文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            btnCompress.Enabled = false;
-
-            try
-            {
-                string toolPath = Path.Combine(Application.StartupPath, "resource", "image_compressor.exe");
-                if (!File.Exists(toolPath))
-                {
-                    MessageBox.Show("图片压缩工具未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                string args = $"\"{txtInput.Text}\" \"{txtOutput.Text}\"";
-                args += $" -t {(rbLossy.Checked ? "lossy" : "lossless")}";
-                args += $" -q {tbQuality.Value}";
-                if (cbKeepExif.Checked) args += " -e";
-
-                var process = new Process();
-                process.StartInfo.FileName = toolPath;
-                process.StartInfo.Arguments = args;
-                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.CreateNoWindow = true;
-                process.StartInfo.RedirectStandardOutput = true;
-                process.StartInfo.RedirectStandardError = true;
-
-                process.OutputDataReceived += (s, ev) => {
-                    if (!string.IsNullOrEmpty(ev.Data))
-                        Console.WriteLine(ev.Data);
-                };
-
-                process.ErrorDataReceived += (s, ev) => {
-                    if (!string.IsNullOrEmpty(ev.Data))
-                        Console.Error.WriteLine(ev.Data);
-                };
-
-                process.Start();
-                process.BeginOutputReadLine();
-                process.BeginErrorReadLine();
-                process.WaitForExit();
-
-                if (process.ExitCode == 0)
-                {
-                    MessageBox.Show("图片压缩完成", "完成", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("图片压缩失败", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"压缩过程中发生错误: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            finally
-            {
-                btnCompress.Enabled = true;
-                progressBar.Visible = false;
-            }
-        }
-    }
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class ImageCompressorForm : Form
+    {
+        private Button btnSelectInput = new Button();
+        private Button btnSelectOutput = new Button();
+        private Button btnCompress = new Button();
+        private TextBox txtInput = new TextBox();
+        private TextBox txtOutput = new TextBox();
+        private RadioButton rbLossy = new RadioButton();
+        private RadioButton rbLossless = new RadioButton();
+        private TrackBar tbQuality = new TrackBar();
+        private Label lblQuality = new Label();
+        private CheckBox cbKeepExif = new CheckBox();
+        private ProgressBar progressBar = new ProgressBar();
+
+        public ImageCompressorForm()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            this.Text = "图片压缩工具";
+            this.Size = new Size(500, 350);
+            this.StartPosition = FormStartPosition.CenterScreen;
+            this.FormBorderStyle = FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+
+            // 输入文件选择
+            btnSelectInput.Text = "选择...";
+            btnSelectInput.Location = new Point(400, 20);
+            btnSelectInput.Click += (s, e) => SelectFile(txtInput);
+            this.Controls.Add(btnSelectInput);
+
+            txtInput.Location = new Point(20, 20);
+            txtInput.Size = new Size(370, 20);
+            txtInput.ReadOnly = true;
+            this.Controls.Add(txtInput);
+
+            Label lblInput = new Label();
+            lblInput.Text = "输入文件:";
+            lblInput.Location = new Point(20, 0);
+            this.Controls.Add(lblInput);
+
+            // 输出文件选择
+            btnSelectOutput.Text = "选择...";
+            btnSelectOutput.Location = new Point(400, 70);
+            btnSelectOutput.Click += (s, e) => SelectFile(txtOutput, true);
+            this.Controls.Add(btnSelectOutput);
+
+            txtOutput.Location = new Point(20, 70);
+            txtOutput.Size = new Size(370, 20);
+            this.Controls.Add(txtOutput);
+
+            Label lblOutput = new Label();
+            lblOutput.Text = "输出文件:";
+            lblOutput.Location = new Point(20, 50);
+            this.Controls.Add(lblOutput);
+
+            // 压缩类型
+            rbLossy.Text = "有损压缩 (JPEG)";
+            rbLossy.Location = new Point(20, 110);
+            rbLossy.Checked = true;
+            this.Controls.Add(rbLossy);
+
+            rbLossless.Text = "无损压缩 (PNG)";
+            rbLossless.Location = new Point(20, 135);
+            this.Controls.Add(rbLossless);
+
+            // 质量设置
+            tbQuality.Minimum = 1;
+            tbQuality.Maximum = 1000;
+            tbQuality.Value = 800;
+            tbQuality.Location = new Point(20, 190);
+            tbQuality.Size = new Size(300, 50);
+            tbQuality.Scroll += (s, e) => lblQuality.Text = $"压缩质量: {tbQuality.Value}";
+            this.Controls.Add(tbQuality);
+
+            lblQuality.Text = $"压缩质量: {tbQuality.Value}";
+            lblQuality.Location = new Point(20, 170);
+            this.Controls.Add(lblQuality);
+
+            // EXIF选项
+            cbKeepExif.Text = "保留EXIF信息";
+            cbKeepExif.Location = new Point(20, 240);
+            this.Controls.Add(cbKeepExif);
+
+            // 压缩按钮
+            btnCompress.Text = "开始压缩";
+            btnCompress.Location = new Point(20, 280);
+            btnCompress.Size = new Size(460, 30);
+            btnCompress.Click += BtnCompress_Click;
+            this.Controls.Add(btnCompress);
+
+            // 调整窗体大小
+            this.Size = new Size(500, 370);
+        }
+
+        private void SelectFile(TextBox target, bool isSave = false)
+        {
+            var dialog = isSave ? new SaveFileDialog() : new OpenFileDialog() as FileDialog;
+            dialog.Filter = "图片文件|*.jpg;*.jpeg;*.png;*.bmp|所有文件|*.*";
+
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                target.Text = dialog.FileName;
+            }
+        }
+
+        private void BtnCompress_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(txtInput.Text) || !File.Exists(txtInput.Text))
+            {
+                MessageBox.Show("请选择有效的输入文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            if (string.IsNullOrEmpty(txtOutput.Text))
+            {
+                MessageBox.Show("请指定输出文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            btnCompress.Enabled = false;
+
+            try
+            {
+                string toolPath = Path.Combine(Application.StartupPath, "resource", "image_compressor.exe");
+                if (!File.Exists(toolPath))
+                {
+                    MessageBox.Show("图片压缩工具未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+
+                string args = $"\"{txtInput.Text}\" \"{txtOutput.Text}\"";
+                args += $" -t {(rbLossy.Checked ? "lossy" : "lossless")}";
+                args += $" -q {tbQuality.Value}";
+                if (cbKeepExif.Checked) args += " -e";
+
+                var process = new Process();
+                process.StartInfo.FileName = toolPath;
+                process.StartInfo.Arguments = args;
+                process.StartInfo.UseShellExecute = false;
+                process.StartInfo.CreateNoWindow = true;
+                process.StartInfo.RedirectStandardOutput = true;
+                process.StartInfo.RedirectStandardError = true;
+
+                process.OutputDataReceived += (s, ev) => {
+                    if (!string.IsNullOrEmpty(ev.Data))
+                        Console.WriteLine(ev.Data);
+                };
+
+                process.ErrorDataReceived += (s, ev) => {
+                    if (!string.IsNullOrEmpty(ev.Data))
+                        Console.Error.WriteLine(ev.Data);
+                };
+
+                process.Start();
+                process.BeginOutputReadLine();
+                process.BeginErrorReadLine();
+                process.WaitForExit();
+
+                if (process.ExitCode == 0)
+                {
+                    MessageBox.Show("图片压缩完成", "完成", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("图片压缩失败", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"压缩过程中发生错误: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            finally
+            {
+                btnCompress.Enabled = true;
+                progressBar.Visible = false;
+            }
+        }
+    }
+}

MainForm.cs

@@ -1,3 +1,9 @@
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
 #nullable enable
 using System;
 using System.Drawing;
@@ -140,11 +146,19 @@ namespace AppStore
             this.StartPosition = FormStartPosition.CenterScreen;
             this.Icon = new Icon("img/ico/icon.ico"); // 设置窗体图标
 
+            // 注册主题变更事件
+            ThemeManager.ThemeChanged += (theme) => 
+            {
+                this.Invoke((MethodInvoker)delegate {
+                    AnimateThemeChange();
+                });
+            };
+
             // 现代化顶部导航栏
             Panel buttonPanel = new Panel();
             buttonPanel.Dock = DockStyle.Top;
             buttonPanel.Height = 70;
-            buttonPanel.BackColor = Color.FromArgb(240, 240, 240);
+            buttonPanel.BackColor = ThemeManager.ControlBackgroundColor;
             buttonPanel.Padding = new Padding(10, 15, 10, 0);
             buttonPanel.AutoScroll = true;
             buttonPanel.AutoSize = true;
@@ -154,11 +168,13 @@ namespace AppStore
             Action<Button> styleButton = (Button btn) => {
                 btn.FlatStyle = FlatStyle.Flat;
                 btn.FlatAppearance.BorderSize = 0;
-                btn.BackColor = Color.Transparent;
-                btn.ForeColor = Color.FromArgb(64, 64, 64);
+                btn.BackColor = ThemeManager.ControlBackgroundColor;
+                btn.ForeColor = ThemeManager.TextColor;
                 btn.Font = new Font("Microsoft YaHei", 10, FontStyle.Regular);
                 btn.Size = new Size(120, 40);
                 btn.Cursor = Cursors.Hand;
+                btn.FlatAppearance.MouseOverBackColor = ThemeManager.ButtonHoverColor;
+                btn.FlatAppearance.MouseDownBackColor = ThemeManager.ButtonActiveColor;
                 
                 // 悬停效果
                 btn.MouseEnter += (s, e) => {
@@ -167,7 +183,7 @@ namespace AppStore
                 };
                 
                 btn.MouseLeave += (s, e) => {
-                    btn.ForeColor = Color.FromArgb(64, 64, 64);
+                    btn.ForeColor = ThemeManager.TextColor;
                     btn.Font = new Font(btn.Font, FontStyle.Regular);
                 };
             };
@@ -230,19 +246,22 @@ namespace AppStore
             // 现代化内容区域
             contentPanel = new Panel();
             contentPanel.Dock = DockStyle.Fill;
-            contentPanel.BackColor = Color.White;
+            contentPanel.BackColor = ThemeManager.BackgroundColor;
             contentPanel.Padding = new Padding(20);
+            contentPanel.AutoScroll = true;
             this.Controls.Add(contentPanel);
 
             // 添加分隔线
             Panel separator = new Panel();
             separator.Dock = DockStyle.Top;
             separator.Height = 1;
-            separator.BackColor = Color.FromArgb(230, 230, 230);
+            separator.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.FromArgb(230, 230, 230) 
+                : Color.FromArgb(60, 60, 60);
             contentPanel.Controls.Add(separator);
 
             this.Controls.Add(buttonPanel);
-            this.BackColor = Color.White;
+            this.BackColor = ThemeManager.BackgroundColor;
 
             // 默认显示软件下载视图
             ShowAppsView();
@@ -446,43 +465,109 @@ namespace AppStore
             };
             flowPanel.Controls.Add(systemInfoCard);
 
-            // 视频压缩工具卡片
-            var videoCompressorCard = new ToolCard();
-            videoCompressorCard.ToolName = "视频压缩工具";
-            
+            // 计算器工具卡片
+            var calculatorCard = new CalculatorToolCard();
             try 
             {
-                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "video_compressor.png");
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "Calculator.png");
                 if (File.Exists(iconPath))
                 {
-                    videoCompressorCard.ToolIcon = Image.FromFile(iconPath);
+                    calculatorCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                calculatorCard.UpdateDisplay();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("加载计算器图标失败", ex);
+            }
+            flowPanel.Controls.Add(calculatorCard);
+
+            // 图片查看工具卡片
+            var imageViewerCard = new KortAppZ.Tools.Viewer.ImageViewerToolCard();
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "ImageCompressor.png");
+                if (File.Exists(iconPath))
+                {
+                    imageViewerCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                imageViewerCard.UpdateDisplay();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("加载图片查看器图标失败", ex);
+            }
+            flowPanel.Controls.Add(imageViewerCard);
+
+            // 密码生成器工具卡片
+            var passwordGeneratorCard = new ToolCard();
+            passwordGeneratorCard.ToolName = "密码生成器";
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "password_generator.png");
+                if (File.Exists(iconPath))
+                {
+                    passwordGeneratorCard.ToolIcon = Image.FromFile(iconPath);
                 }
                 else
                 {
-                    videoCompressorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+                    passwordGeneratorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
                 }
             }
             catch
             {
-                videoCompressorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+                passwordGeneratorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
             }
-            
-            videoCompressorCard.UpdateDisplay();
-            videoCompressorCard.ToolCardClicked += (s, e) => {
+            passwordGeneratorCard.ToolCardClicked += (s, e) => {
                 try {
-                    string toolPath = Path.Combine(Application.StartupPath, "resource", "video_compressor.exe");
+                    string toolPath = Path.Combine(Application.StartupPath, "resource", "password_generator.exe");
                     if (File.Exists(toolPath)) {
                         Process.Start(toolPath);
                     } else {
-                        MessageBox.Show("视频压缩工具未找到，请确保已正确安装", "错误", 
+                        MessageBox.Show("密码生成器工具未找到，请确保已正确安装", "错误", 
                             MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 } catch (Exception ex) {
-                    MessageBox.Show($"启动视频压缩工具失败: {ex.Message}", "错误", 
+                    MessageBox.Show($"启动密码生成器失败: {ex.Message}", "错误", 
                         MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             };
-            flowPanel.Controls.Add(videoCompressorCard);
+            passwordGeneratorCard.UpdateDisplay();
+            flowPanel.Controls.Add(passwordGeneratorCard);
+
+            // 自启动管理工具卡片
+            var selfStartingManagerCard = new SelfStartingManagerToolCard();
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "Self_starting_management.png");
+                if (File.Exists(iconPath))
+                {
+                    selfStartingManagerCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                selfStartingManagerCard.UpdateDisplay();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("加载自启动管理工具图标失败", ex);
+            }
+            flowPanel.Controls.Add(selfStartingManagerCard);
+
+            // 图标提取器工具卡片
+            var iconExtractorCard = new AppStore.Tools.IconExtractor.IconExtractorToolCard();
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "ico_extractor.png");
+                if (File.Exists(iconPath))
+                {
+                    iconExtractorCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                iconExtractorCard.UpdateDisplay();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("加载图标提取器图标失败", ex);
+            }
+            flowPanel.Controls.Add(iconExtractorCard);
 
             }
             catch (Exception ex)
@@ -551,11 +636,11 @@ namespace AppStore
             flowPanel.Dock = DockStyle.Fill;
             flowPanel.AutoScroll = true;
             flowPanel.Padding = new Padding(15, 15, 15, 15);
-            flowPanel.WrapContents = true;
+            flowPanel.WrapContents = false;
             flowPanel.Margin = new Padding(0);
             flowPanel.AutoSize = true;
             flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            flowPanel.AutoScrollMinSize = new Size(0, 3350);
+            flowPanel.AutoScrollMinSize = new Size(0, 5000);
 
             // 创建搜索框
             TextBox searchBox = new TextBox();
@@ -583,11 +668,11 @@ namespace AppStore
             flowPanel.Dock = DockStyle.Fill;
             flowPanel.AutoScroll = true;
             flowPanel.Padding = new Padding(15, 60, 15, 15);
-            flowPanel.WrapContents = true;
+            flowPanel.WrapContents = false;
             flowPanel.Margin = new Padding(0);
             flowPanel.AutoSize = true;
             flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            flowPanel.AutoScrollMinSize = new Size(0, 3350);
+            flowPanel.AutoScrollMinSize = new Size(0, 5000);
             contentPanel.Controls.Add(flowPanel);
 
             // 添加窗体关闭事件处理
@@ -625,7 +710,7 @@ namespace AppStore
             flowPanel.Margin = new Padding(0);
             flowPanel.AutoSize = true;
             flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            flowPanel.AutoScrollMinSize = new Size(0, 3350);
+            flowPanel.AutoScrollMinSize = new Size(0, 3800);//大概一行250像素
             contentPanel.Controls.Add(flowPanel);
 
             // 添加所有应用卡片并恢复位置
@@ -633,7 +718,7 @@ namespace AppStore
 
             flowPanel.Controls.Add(CreateAppCard(
                 "XDM",
-                "https://github.com/subhra74/xdm/releases/download/7.2.11/xdm-setup.msi",
+                "https://ghproxy.net/https://github.com/subhra74/xdm/releases/download/7.2.11/xdm-setup.msi",
                 "img/png/XDM.png"));
 
             flowPanel.Controls.Add(CreateAppCard(
@@ -698,9 +783,14 @@ namespace AppStore
 
             flowPanel.Controls.Add(CreateAppCard(
                 "Msys2",
-                "https://github.com/msys2/msys2-installer/releases/download/2025-02-21/msys2-x86_64-20250221.exe",
+                "https://ghproxy.net/https://github.com/msys2/msys2-installer/releases/download/2025-02-21/msys2-x86_64-20250221.exe",
                 "img/png/MSYS2.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "OpenJDK by Azul JDKs",
+                "https://cdn.azul.com/zulu/bin/zulu21.42.19-ca-jdk21.0.7-win_x64.msi",
+                "img/png/Azul_JDKs.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 ".NET SDK 8.0",
                 "https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer",
@@ -736,6 +826,16 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/game1024/OpenSpeedy/releases/download/v1.7.1/OpenSpeedy-v1.7.1.zip",
                 "img/png/openspeedy.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "Final2x",
+                "https://ghproxy.net/https://github.com/Tohrusky/Final2x/releases/download/2024-12-14/Final2x-windows-x64-setup.exe",
+                "img/png/Final2x.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Pixpin",
+                "https://download.pixpin.cn/PixPin_2.0.0.3.exe",
+                "img/png/pixpin.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "QuickLook",
                 "https://ghproxy.net/https://github.com/QL-Win/QuickLook/releases/download/4.0.2/QuickLook-4.0.2.exe",
@@ -798,7 +898,7 @@ namespace AppStore
 
             flowPanel.Controls.Add(CreateAppCard(
                 "frp",
-                "https://github.com/fatedier/frp/releases/download/v0.62.1/frp_0.62.1_windows_amd64.zip",
+                "https://ghproxy.net/https://github.com/fatedier/frp/releases/download/v0.62.1/frp_0.62.1_windows_amd64.zip",
                 ""));
 
             flowPanel.Controls.Add(CreateAppCard(
@@ -922,15 +1022,55 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/vnotex/vnote/releases/download/v3.19.2/VNote-3.19.2-win64.zip",
                 "img/png/vnote.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "notepad--",
+                "https://www.ghproxy.cn/https://github.com/cxasm/notepad--/releases/download/notepad-v3.3/Notepad--v3.3-plugin-Installer.exe",
+                "img/png/notepad--.png"));
+                
+            flowPanel.Controls.Add(CreateAppCard(
+                "chatlog",
+                "https://www.ghproxy.cn/https://github.com/sjzar/chatlog/releases/download/v0.0.15/chatlog_0.0.15_windows_amd64.zip",
+                "img/jpg/github.jpg"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "PowerToys",
                 "https://ghproxy.net/https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-x64.exe",
                 "img/png/PowerToys.png"));
+                
+            flowPanel.Controls.Add(CreateAppCard(
+                "Powershell",
+                "https://ghproxy.net/https://github.com/Powershell/Powershell/releases/download/v7.5.2/Powershell-7.5.2-win-x64.exe",
+                "img/png/powershell.png"));
 
             flowPanel.Controls.Add(CreateAppCard(
                 "terminal",
                 "https://ghproxy.net/https://github.com/microsoft/terminal/releases/download/v1.22.11141.0/Microsoft.WindowsTerminal_1.22.11141.0_x64.zip",
                 "img/png/terminal.png"));
+                
+            flowPanel.Controls.Add(CreateAppCard(
+                "edit",
+                "https://ghproxy.net/https://github.com/microsoft/edit/releases/download/v1.2.0/edit-1.2.0-x86_64-windows.zip",
+                "img/png/edit.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "github_cli",
+                "https://ghproxy.cn/https://github.com/cli/cli/releases/download/v2.74.2/gh_2.74.2_windows_arm64.msi",
+                "img/png/github_cli.png"));
+                
+            flowPanel.Controls.Add(CreateAppCard(
+                "VideoCaptioner",
+                "https://ghproxy.cn/https://github.com/WEIFENG2333/VideoCaptioner/releases/download/v1.3.3/VideoCaptioner-Setup-win64-v1.3.3.exe",
+                "img/png/VideoCaptioner.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "ReactOS",
+                "https://ghproxy.cn/https://github.com/reactos/reactos/releases/download/0.4.15-release/ReactOS-0.4.15-release-1-gdbb43bbaeb2-x86-iso.zip",
+                "img/png/ReactOS.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Ubuntu桌面发行版",
+                "https://releases.ubuntu.com/24.04/ubuntu-24.04.2-desktop-amd64.iso",
+                "img/png/Ubuntu.png"));
 
             flowPanel.Controls.Add(CreateAppCard(
                 "typescript",
@@ -942,6 +1082,11 @@ namespace AppStore
                 "https://mirror.nju.edu.cn/gimp/gimp/v3.0/windows/gimp-3.0.4-setup.exe",
                 "img/jpg/Gimp.jpg"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "ClamAV",
+                "https://www.clamav.net/downloads/production/clamav-1.4.3.win.x64.msi",
+                "img/png/ClamAV.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "Shotcut",
                 "https://sourceforge.net/projects/shotcut/files/v25.05.11/shotcut-win64-250511.exe/download",
@@ -1097,6 +1242,11 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/cloudreve/cloudreve/releases/download/3.8.3/cloudreve_3.8.3_windows_amd64.zip",
                 "img/png/cloudreve.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "ollama",
+                "https://www.ghproxy.cn/https://github.com/ollama/ollama/releases/download/v0.9.5/OllamaSetup.exe",
+                "img/png/ollama.png"));
+	
             flowPanel.Controls.Add(CreateAppCard(
                 "SeelenUI",
                 "https://ghproxy.net/https://github.com/eythaann/Seelen-UI/releases/download/v2.3.8/Seelen.UI_2.3.8_x64-setup.exe",
@@ -1201,6 +1351,9 @@ namespace AppStore
             // 初始化窗体组件
             InitializeComponent();
             
+            // 应用主题
+            ThemeManager.ApplyTheme(this);
+            
             // 订阅下载管理器事件
             DownloadManager.Instance.DownloadAdded += OnDownloadAdded; // 下载添加事件
             DownloadManager.Instance.DownloadProgressChanged += OnDownloadProgressChanged; // 下载进度变化事件
@@ -1282,5 +1435,69 @@ namespace AppStore
             Logger.Log($"下载完成: {item.FileName}, 状态: {item.Status}"); // 记录日志
             item.UpdateDisplay(); // 更新UI显示
         }
+
+        /// <summary>
+        /// 主题切换动画效果
+        /// </summary>
+        private void AnimateThemeChange()
+        {
+            const int animationSteps = 10;
+            const int animationInterval = 30;
+            
+            var timer = new System.Windows.Forms.Timer { Interval = animationInterval };
+            int step = 0;
+            
+            // 保存当前和目标颜色
+            var originalBackColor = this.BackColor;
+            var targetBackColor = ThemeManager.BackgroundColor;
+            var originalForeColor = this.ForeColor;
+            var targetForeColor = ThemeManager.TextColor;
+            
+            timer.Tick += (s, e) => {
+                if (step >= animationSteps)
+                {
+                    timer.Stop();
+                    timer.Dispose();
+                    // 确保最终颜色准确
+                    ThemeManager.ApplyTheme(this);
+                    return;
+                }
+                
+                // 计算插值比例
+                float ratio = (float)step / animationSteps;
+                step++;
+                
+                // 插值计算新颜色
+                var newBackColor = Color.FromArgb(
+                    (int)(originalBackColor.R + (targetBackColor.R - originalBackColor.R) * ratio),
+                    (int)(originalBackColor.G + (targetBackColor.G - originalBackColor.G) * ratio),
+                    (int)(originalBackColor.B + (targetBackColor.B - originalBackColor.B) * ratio));
+                    
+                var newForeColor = Color.FromArgb(
+                    (int)(originalForeColor.R + (targetForeColor.R - originalForeColor.R) * ratio),
+                    (int)(originalForeColor.G + (targetForeColor.G - originalForeColor.G) * ratio),
+                    (int)(originalForeColor.B + (targetForeColor.B - originalForeColor.B) * ratio));
+                
+                // 应用新颜色
+                this.Invoke((MethodInvoker)delegate {
+                    this.BackColor = newBackColor;
+                    this.ForeColor = newForeColor;
+                    foreach (Control control in this.Controls)
+                    {
+                        control.BackColor = newBackColor;
+                        control.ForeColor = newForeColor;
+                        
+                        // 特殊处理按钮的悬停状态
+                        if (control is Button button)
+                        {
+                            button.FlatAppearance.MouseOverBackColor = ThemeManager.ButtonHoverColor;
+                            button.FlatAppearance.MouseDownBackColor = ThemeManager.ButtonActiveColor;
+                        }
+                    }
+                });
+            };
+            
+            timer.Start();
+        }
     }
 }

Program.cs

@@ -1,16 +1,22 @@
-using System;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    static class Program
-    {
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
-        }
-    }
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    static class Program
+    {
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new MainForm());
+        }
+    }
+}

README.md

@@ -5,14 +5,12 @@
 ## 项目开源行为
 
 1. 项目代码开源，允许任何人使用、修改、分发、商用，但必须注明原作者。
-2. 项目文档开源，允许任何人使用、修改、分发、商用，但必须注明原作者。
-3. 项目图标、截图等资源开源，允许任何人使用、修改、分发、商用，但必须注明原作者。
-4. 项目的任何衍生品（包括但不限于网站、APP、插件等）必须遵循以上开源协议。
-5. 项目不接受任何形式的广告，不得在任何地方投放广告。
-6. 项目不接受任何形式的捐赠。
-7. 项目不接受任何形式的赞助。
-8. 项目可以进行PR，欢迎任何形式的PR，不提交issue也可以
-9. 本项目可以PR一些你自己的项目，如果star数量不到1k，都会被删除
+2. 项目图标、截图等资源开源，允许任何人使用、修改、分发、商用，但必须注明原作者。
+3. 项目的任何衍生品（包括但不限于网站、APP、插件等）必须遵循以上开源协议。
+4. 项目不接受任何形式的广告，不得在任何地方投放广告。
+5. 项目不接受任何形式的捐赠、赞助
+6. 项目可以进行PR，欢迎任何形式的PR，不提交issue也可以
+7. 本项目可以PR一些你自己的项目，如果star数量不到1k，都会被删除
 
 ## 项目简介
 
@@ -35,14 +33,15 @@
 
 ### 打包指令
 
+
 #### 32位版本
 ```bash
-dotnet publish -c Release -r win-x86 -p:PublishSingleFile=true
+dotnet publish AppStore.csproj -c Release -r win-x86 --self-contained false /p:Optimize=true /p:DebugType=None
 ```
 
 #### 64位版本
 ```bash
-dotnet publish -c Release -r win-x64 -p:PublishSingleFile=true
+dotnet publish AppStore.csproj -c Release -r win-x64 --self-contained false /p:Optimize=true /p:DebugType=None
 ```
 
 打包后的可执行文件将包含指定的应用程序图标，输出路径为：
@@ -51,7 +50,9 @@ bin\Release\net8.0-windows\[platform]\publish
 ```
 
 ### 高级选项
-- 添加`--self-contained true`可生成独立包（体积较大）
+- 使用`--self-contained false`生成框架依赖包（默认）
+- 使用`/p:Optimize=true`启用代码优化（默认）
+- 使用`/p:DebugType=None`禁用调试符号生成（默认）
 - 添加`-p:PublishTrimmed=true`可减小包体积（实验性）
 
 ## 项目结构

SettingsForm.cs

@@ -1,53 +1,229 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class SettingsUserControl : UserControl
-    {
-        private Button btnCleanLogs;
-
-        public SettingsUserControl()
-        {
-            this.Dock = DockStyle.Fill;
-            this.BackColor = Color.White;
-            
-            // 设置顶部内边距
-            this.Padding = new Padding(0, 30, 0, 0);
-            
-            btnCleanLogs = new Button();
-            btnCleanLogs.Text = "清理日志";
-            btnCleanLogs.Size = new Size(150, 40);
-            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 50); // 调整Y坐标为50靠近顶部
-            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
-            btnCleanLogs.Anchor = AnchorStyles.Top; // 添加顶部锚点
-            btnCleanLogs.Click += (s, e) => CleanLogs();
-            this.Controls.Add(btnCleanLogs);
-        }
-
-        private void CleanLogs()
-        {
-            try
-            {
-                string logCleanerPath = Path.Combine("resource", "log_cleaner.exe");
-                
-                if (File.Exists(logCleanerPath))
-                {
-                    Process.Start(logCleanerPath);
-                    MessageBox.Show("日志清理程序已启动", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("日志清理程序未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("清理日志时出错", ex);
-                MessageBox.Show($"清理日志时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-    }
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Text.Json;
+
+namespace AppStore
+{
+    public class SettingsUserControl : UserControl
+    {
+        private Button btnCleanLogs;
+        private Button btnLightTheme;
+        private Button btnDarkTheme;
+
+        public SettingsUserControl()
+        {
+            this.Dock = DockStyle.Fill;
+            ThemeManager.ApplyTheme(this);
+            
+            // 设置顶部内边距
+            this.Padding = new Padding(0, 30, 0, 0);
+            
+            // 主题切换按钮
+            btnLightTheme = new Button();
+            btnLightTheme.Text = "浅色模式";
+            btnLightTheme.Size = new Size(150, 40);
+            btnLightTheme.Location = new Point((this.Width - 320) / 2, 50);
+            btnLightTheme.Font = new Font("Microsoft YaHei", 10);
+            btnLightTheme.Anchor = AnchorStyles.Top;
+            btnLightTheme.Click += (s, e) => SwitchTheme(ThemeManager.ThemeMode.Light);
+            this.Controls.Add(btnLightTheme);
+
+            btnDarkTheme = new Button();
+            btnDarkTheme.Text = "深色模式";
+            btnDarkTheme.Size = new Size(150, 40);
+            btnDarkTheme.Location = new Point(btnLightTheme.Right + 20, 50);
+            btnDarkTheme.Font = new Font("Microsoft YaHei", 10);
+            btnDarkTheme.Anchor = AnchorStyles.Top;
+            btnDarkTheme.Click += (s, e) => SwitchTheme(ThemeManager.ThemeMode.Dark);
+            this.Controls.Add(btnDarkTheme);
+            
+            // 清理日志按钮
+            btnCleanLogs = new Button();
+            btnCleanLogs.Text = "清理日志";
+            btnCleanLogs.Size = new Size(150, 40);
+            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 110);
+            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
+            btnCleanLogs.Anchor = AnchorStyles.Top;
+            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)
+        {
+            ThemeManager.CurrentTheme = theme;
+        }
+
+        private void OnThemeChanged(ThemeManager.ThemeMode theme)
+        {
+            ThemeManager.ApplyTheme(this);
+        }
+
+        private void CleanLogs()
+        {
+            try
+            {
+                string logCleanerPath = Path.Combine("resource", "log_cleaner.exe");
+                
+                if (File.Exists(logCleanerPath))
+                {
+                    Process.Start(logCleanerPath);
+                    MessageBox.Show("日志清理程序已启动", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("日志清理程序未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("清理日志时出错", ex);
+                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

@@ -0,0 +1,12 @@
+首先，如果希望编译程序，那么必须安装.NET8.0 SDK
+下载链接：https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer
+
+使用一下指令编译
+
+x86:
+
+dotnet publish AppStore.csproj -c Release -r win-x86 --self-contained false /p:Optimize=true /p:DebugType=None
+
+x64:
+
+dotnet publish AppStore.csproj -c Release -r win-x64 --self-contained false /p:Optimize=true /p:DebugType=None

TXT/Run.txt

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

ThemeManager.cs

@@ -0,0 +1,142 @@
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Text.Json;
+using System.IO;
+
+namespace AppStore
+{
+    public static class ThemeManager
+    {
+        public enum ThemeMode
+        {
+            Light,
+            Dark
+        }
+
+        private static readonly string ThemeConfigPath = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "zsyg", "kortapp-z", ".date", "theme.json");
+
+        private static ThemeMode _currentTheme = LoadTheme();
+
+        private static ThemeMode LoadTheme()
+        {
+            try
+            {
+                if (File.Exists(ThemeConfigPath))
+                {
+                    var json = File.ReadAllText(ThemeConfigPath);
+                    return JsonSerializer.Deserialize<ThemeMode>(json);
+                }
+            }
+            catch
+            {
+                // 忽略错误，使用默认主题
+            }
+            return ThemeMode.Light;
+        }
+
+        private static void SaveTheme(ThemeMode theme)
+        {
+            try
+            {
+                var dir = Path.GetDirectoryName(ThemeConfigPath);
+                if (dir == null) return;
+                
+                if (!Directory.Exists(dir))
+                {
+                    Directory.CreateDirectory(dir);
+                }
+                var json = JsonSerializer.Serialize(theme);
+                File.WriteAllText(ThemeConfigPath, json);
+            }
+            catch
+            {
+                // 忽略错误
+            }
+        }
+        
+        // 浅色主题颜色
+        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(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);
+        private static readonly Color DarkBorder = Color.FromArgb(80, 80, 80);
+        
+        // 浅色主题边框颜色
+        private static readonly Color LightBorder = Color.FromArgb(180, 180, 180);
+
+        public static event Action<ThemeMode> ThemeChanged = delegate {};
+
+        public static ThemeMode CurrentTheme
+        {
+            get => _currentTheme;
+            set
+            {
+                if (_currentTheme != value)
+                {
+                    _currentTheme = value;
+                    ThemeChanged?.Invoke(value);
+                    SaveTheme(value);
+                }
+            }
+        }
+
+        public static Color BackgroundColor => 
+            _currentTheme == ThemeMode.Light ? LightBackground : DarkBackground;
+
+        public static Color ControlBackgroundColor => 
+            _currentTheme == ThemeMode.Light ? LightControlBackground : DarkControlBackground;
+
+        public static Color TextColor => 
+            _currentTheme == ThemeMode.Light ? LightText : DarkText;
+
+        public static Color ButtonHoverColor => 
+            _currentTheme == ThemeMode.Light ? LightButtonHover : DarkButtonHover;
+
+        public static Color ButtonActiveColor => 
+            _currentTheme == ThemeMode.Light ? LightButtonActive : DarkButtonActive;
+
+        public static Color BorderColor => 
+            _currentTheme == ThemeMode.Light ? LightBorder : DarkBorder;
+
+        public static void ApplyTheme(Control control)
+        {
+            ApplyThemeToControl(control);
+        }
+
+        private static void ApplyThemeToControl(Control control)
+        {
+            control.BackColor = BackgroundColor;
+            control.ForeColor = TextColor;
+
+            if (control is Button button)
+            {
+                button.FlatStyle = FlatStyle.Flat;
+                button.FlatAppearance.BorderSize = 0;
+                button.FlatAppearance.MouseOverBackColor = ButtonHoverColor;
+                button.FlatAppearance.MouseDownBackColor = ButtonActiveColor;
+            }
+
+            foreach (Control childControl in control.Controls)
+            {
+                ApplyThemeToControl(childControl);
+            }
+        }
+    }
+}

ToolCard.cs

@@ -1,77 +1,119 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class ToolCard : UserControl
-    {
-        private PictureBox iconBox = new PictureBox();
-        private Label nameLabel = new Label();
-        
-        public string ToolName { get; set; } = string.Empty;
-        public Image ToolIcon { get; set; } = SystemIcons.Shield.ToBitmap();
-
-        // 自定义点击事件初始化为空委托
-        public event EventHandler ToolCardClicked = delegate {};
-
-        public ToolCard()
-        {
-            // 启用双缓冲
-            this.SetStyle(ControlStyles.OptimizedDoubleBuffer | 
-                        ControlStyles.ResizeRedraw, true);
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            this.Size = new Size(240, 220);
-            this.BackColor = Color.White;
-            this.Padding = new Padding(5);
-            this.BorderStyle = BorderStyle.FixedSingle;
-            
-            // 工具图标
-            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);
-
-            // 工具名称
-            nameLabel = new Label();
-            nameLabel.AutoSize = false;
-            nameLabel.Size = new Size(Width - 20, 30);
-            nameLabel.Location = new Point(10, 100);
-            nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
-            nameLabel.TextAlign = ContentAlignment.MiddleCenter;
-            this.Controls.Add(nameLabel);
-
-            // 打开按钮
-            var openButton = new Button();
-            openButton.Text = "打开工具";
-            openButton.Size = new Size(100, 30);
-            openButton.Location = new Point((Width - 100) / 2, 140);
-            openButton.BackColor = Color.FromArgb(0, 120, 215);
-            openButton.ForeColor = Color.White;
-            openButton.FlatStyle = FlatStyle.Flat;
-            openButton.FlatAppearance.BorderSize = 0;
-            openButton.Cursor = Cursors.Hand;
-            // 按钮点击直接触发ToolCardClicked事件
-            openButton.Click += (s, e) => {
-                ToolCardClicked?.Invoke(this, e);
-            };
-            this.Controls.Add(openButton);
-
-            // 设置按钮悬停效果
-            openButton.BackColor = Color.FromArgb(0, 120, 215);
-            openButton.FlatAppearance.MouseOverBackColor = Color.FromArgb(0, 100, 180);
-            openButton.FlatAppearance.MouseDownBackColor = Color.FromArgb(0, 80, 160);
-        }
-
-        public void UpdateDisplay()
-        {
-            nameLabel.Text = ToolName;
-            iconBox.Image = ToolIcon;
-        }
-    }
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class ToolCard : UserControl
+    {
+        private PictureBox iconBox = new PictureBox();
+        private Label nameLabel = new Label();
+        private Panel namePanel = new Panel();
+        private Color borderColor = SystemColors.ControlDark;
+        
+        public string ToolName { get; set; } = string.Empty;
+        public Image ToolIcon { get; set; } = SystemIcons.Shield.ToBitmap();
+
+        // 自定义点击事件初始化为空委托
+        public event EventHandler ToolCardClicked = delegate {};
+
+        public ToolCard()
+        {
+            // 启用双缓冲
+            this.SetStyle(ControlStyles.OptimizedDoubleBuffer | 
+                        ControlStyles.ResizeRedraw, true);
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            this.Size = new Size(240, 220);
+            this.BackColor = Color.White;
+            this.Padding = new Padding(5);
+            this.BorderStyle = BorderStyle.FixedSingle;
+            
+            // 工具图标
+            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实现边框颜色
+            namePanel = new Panel();
+            namePanel.Size = new Size(Width - 20, 30);
+            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;
+            namePanel.Controls.Add(nameLabel);
+            
+            // 初始主题设置
+            UpdateLabelTheme();
+            
+            // 订阅主题变化事件
+            ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
+            
+            this.Controls.Add(namePanel);
+
+            // 打开按钮
+            var openButton = new Button();
+            openButton.Text = "打开工具";
+            openButton.Size = new Size(100, 30);
+            openButton.Location = new Point((Width - 100) / 2, 140);
+            openButton.BackColor = Color.FromArgb(0, 120, 215);
+            openButton.ForeColor = Color.White;
+            openButton.FlatStyle = FlatStyle.Flat;
+            openButton.FlatAppearance.BorderSize = 0;
+            openButton.Cursor = Cursors.Hand;
+            // 按钮点击直接触发ToolCardClicked事件
+            openButton.Click += (s, e) => {
+                ToolCardClicked?.Invoke(this, e);
+            };
+            this.Controls.Add(openButton);
+
+            // 设置按钮悬停效果
+            openButton.BackColor = Color.FromArgb(0, 120, 215);
+            openButton.FlatAppearance.MouseOverBackColor = Color.FromArgb(0, 100, 180);
+            openButton.FlatAppearance.MouseDownBackColor = Color.FromArgb(0, 80, 160);
+        }
+
+        private void UpdateLabelTheme()
+        {
+            if (ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Dark)
+            {
+                nameLabel.BackColor = Color.Black;
+                nameLabel.ForeColor = Color.White;
+                namePanel.BackColor = Color.Black;
+                borderColor = Color.White;
+            }
+            else
+            {
+                nameLabel.BackColor = Color.White;
+                nameLabel.ForeColor = Color.Black;
+                namePanel.BackColor = Color.White;
+                borderColor = SystemColors.ControlDark;
+            }
+            namePanel.Invalidate(); // 触发重绘
+        }
+
+        public void UpdateDisplay()
+        {
+            nameLabel.Text = ToolName;
+            iconBox.Image = ToolIcon;
+            UpdateLabelTheme();
+        }
+    }
+}

border_renderer.cpp

@@ -1,64 +1,70 @@
-#include <windows.h>
-#include <vector>
-#include <fstream>
-#include <cmath>
-#include <d2d1.h>
-
-// 高性能边框路径生成
-void GenerateBorderPath(int width, int height, int radius, const char* outputPath) {
-    std::ofstream out(outputPath);
-    const float pi = 3.1415926f;
-    const int segments = 24; // 高分段数确保平滑
-    
-    std::vector<POINTFLOAT> points;
-    
-    // 优化后的圆角路径生成
-    auto addArc = [&](float startAngle, float endAngle, float cx, float cy) {
-        for (int i = 0; i <= segments; ++i) {
-            float angle = startAngle + (endAngle - startAngle) * i / segments;
-            points.push_back({
-                cx + radius * cosf(angle),
-                cy + radius * sinf(angle)
-            });
-        }
-    };
-
-    // 左上角
-    addArc(pi, 3*pi/2, radius, radius);
-    
-    // 右上角 
-    addArc(3*pi/2, 2*pi, width - radius, radius);
-    
-    // 右下角
-    addArc(0, pi/2, width - radius, height - radius);
-    
-    // 左下角
-    addArc(pi/2, pi, radius, height - radius);
-
-    // 闭合路径
-    points.push_back(points[0]);
-    
-    // 写入优化格式
-    if (out.is_open()) {
-        for (const auto& p : points) {
-            out << p.x << "," << p.y << "\n";
-        }
-    }
-}
-
-int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) {
-    int argc;
-    LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
-    
-    if (argc != 5) return 1;
-    
-    int width = _wtoi(argv[1]);
-    int height = _wtoi(argv[2]);
-    int radius = _wtoi(argv[3]);
-    
-    char outputPath[MAX_PATH];
-    wcstombs(outputPath, argv[4], MAX_PATH);
-    
-    GenerateBorderPath(width, height, radius, outputPath);
-    return 0;
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+#include <windows.h>
+#include <vector>
+#include <fstream>
+#include <cmath>
+#include <d2d1.h>
+
+// 高性能边框路径生成
+void GenerateBorderPath(int width, int height, int radius, const char* outputPath) {
+    std::ofstream out(outputPath);
+    const float pi = 3.1415926f;
+    const int segments = 24; // 高分段数确保平滑
+    
+    std::vector<POINTFLOAT> points;
+    
+    // 优化后的圆角路径生成
+    auto addArc = [&](float startAngle, float endAngle, float cx, float cy) {
+        for (int i = 0; i <= segments; ++i) {
+            float angle = startAngle + (endAngle - startAngle) * i / segments;
+            points.push_back({
+                cx + radius * cosf(angle),
+                cy + radius * sinf(angle)
+            });
+        }
+    };
+
+    // 左上角
+    addArc(pi, 3*pi/2, radius, radius);
+    
+    // 右上角 
+    addArc(3*pi/2, 2*pi, width - radius, radius);
+    
+    // 右下角
+    addArc(0, pi/2, width - radius, height - radius);
+    
+    // 左下角
+    addArc(pi/2, pi, radius, height - radius);
+
+    // 闭合路径
+    points.push_back(points[0]);
+    
+    // 写入优化格式
+    if (out.is_open()) {
+        for (const auto& p : points) {
+            out << p.x << "," << p.y << "\n";
+        }
+    }
+}
+
+int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) {
+    int argc;
+    LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    
+    if (argc != 5) return 1;
+    
+    int width = _wtoi(argv[1]);
+    int height = _wtoi(argv[2]);
+    int radius = _wtoi(argv[3]);
+    
+    char outputPath[MAX_PATH];
+    wcstombs(outputPath, argv[4], MAX_PATH);
+    
+    GenerateBorderPath(width, height, radius, outputPath);
+    return 0;
+}

card_calculator.cpp

@@ -1,90 +1,96 @@
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <cmath>
-#include <windows.h>
-
-using namespace std;
-
-struct Point {
-    float x;
-    float y;
-};
-
-void WritePathToFile(const vector<Point>& path, const string& filename) {
-    ofstream outFile(filename);
-    if (!outFile) {
-        cerr << "无法打开输出文件: " << filename << endl;
-        return;
-    }
-
-    for (const auto& point : path) {
-        outFile << point.x << "," << point.y << "\n";
-    }
-    outFile.close();
-}
-
-vector<Point> CalculateRoundedRectPath(int width, int height, int radius) {
-    vector<Point> pathPoints;
-    
-    const int segments = 10;
-    const float angleStep = 3.1415926f / (2 * segments);
-    
-    // 左上角
-    for (int i = 0; i <= segments; i++) {
-        float angle = 3.1415926f + i * angleStep;
-        pathPoints.push_back({
-            radius + radius * cosf(angle),
-            radius + radius * sinf(angle)
-        });
-    }
-    
-    // 右上角
-    for (int i = 0; i <= segments; i++) {
-        float angle = 3 * 3.1415926f / 2 + i * angleStep;
-        pathPoints.push_back({
-            width - radius + radius * cosf(angle),
-            radius + radius * sinf(angle)
-        });
-    }
-    
-    // 右下角
-    for (int i = 0; i <= segments; i++) {
-        float angle = 0 + i * angleStep;
-        pathPoints.push_back({
-            width - radius + radius * cosf(angle),
-            height - radius + radius * sinf(angle)
-        });
-    }
-    
-    // 左下角
-    for (int i = 0; i <= segments; i++) {
-        float angle = 3.1415926f / 2 + i * angleStep;
-        pathPoints.push_back({
-            radius + radius * cosf(angle),
-            height - radius + radius * sinf(angle)
-        });
-    }
-    
-    // 闭合路径
-    pathPoints.push_back(pathPoints[0]);
-    
-    return pathPoints;
-}
-
-int main(int argc, char* argv[]) {
-    if (argc != 5) {
-        cout << "用法: card_calculator [宽度] [高度] [圆角半径] [输出文件]" << endl;
-        return 1;
-    }
-
-    int width = stoi(argv[1]);
-    int height = stoi(argv[2]);
-    int radius = stoi(argv[3]);
-    string outputFile = argv[4];
-
-    auto path = CalculateRoundedRectPath(width, height, radius);
-    WritePathToFile(path, outputFile);
-
-    return 0;
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <cmath>
+#include <windows.h>
+
+using namespace std;
+
+struct Point {
+    float x;
+    float y;
+};
+
+void WritePathToFile(const vector<Point>& path, const string& filename) {
+    ofstream outFile(filename);
+    if (!outFile) {
+        cerr << "无法打开输出文件: " << filename << endl;
+        return;
+    }
+
+    for (const auto& point : path) {
+        outFile << point.x << "," << point.y << "\n";
+    }
+    outFile.close();
+}
+
+vector<Point> CalculateRoundedRectPath(int width, int height, int radius) {
+    vector<Point> pathPoints;
+    
+    const int segments = 10;
+    const float angleStep = 3.1415926f / (2 * segments);
+    
+    // 左上角
+    for (int i = 0; i <= segments; i++) {
+        float angle = 3.1415926f + i * angleStep;
+        pathPoints.push_back({
+            radius + radius * cosf(angle),
+            radius + radius * sinf(angle)
+        });
+    }
+    
+    // 右上角
+    for (int i = 0; i <= segments; i++) {
+        float angle = 3 * 3.1415926f / 2 + i * angleStep;
+        pathPoints.push_back({
+            width - radius + radius * cosf(angle),
+            radius + radius * sinf(angle)
+        });
+    }
+    
+    // 右下角
+    for (int i = 0; i <= segments; i++) {
+        float angle = 0 + i * angleStep;
+        pathPoints.push_back({
+            width - radius + radius * cosf(angle),
+            height - radius + radius * sinf(angle)
+        });
+    }
+    
+    // 左下角
+    for (int i = 0; i <= segments; i++) {
+        float angle = 3.1415926f / 2 + i * angleStep;
+        pathPoints.push_back({
+            radius + radius * cosf(angle),
+            height - radius + radius * sinf(angle)
+        });
+    }
+    
+    // 闭合路径
+    pathPoints.push_back(pathPoints[0]);
+    
+    return pathPoints;
+}
+
+int main(int argc, char* argv[]) {
+    if (argc != 5) {
+        cout << "用法: card_calculator [宽度] [高度] [圆角半径] [输出文件]" << endl;
+        return 1;
+    }
+
+    int width = stoi(argv[1]);
+    int height = stoi(argv[2]);
+    int radius = stoi(argv[3]);
+    string outputFile = argv[4];
+
+    auto path = CalculateRoundedRectPath(width, height, radius);
+    WritePathToFile(path, outputFile);
+
+    return 0;
+}

docs/features.html

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

inno/innosetup_x64.iss

@@ -0,0 +1,64 @@
+; 脚本由 Inno Setup 脚本向导生成。
+; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
+
+#define MyAppName "kortapp-z"
+#define MyAppVersion "1.2.5"
+#define MyAppPublisher "zsyg"
+#define MyAppURL "https://github.com/zs-yg/kortapp-z"
+#define MyAppExeName "kortapp-z.exe"
+#define MyAppAssocName MyAppName + ""
+#define MyAppAssocExt ".exe"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; 注意：AppId 的值唯一标识此应用程序。不要在其他应用程序的安装程序中使用相同的 AppId 值。
+; (若要生成新的 GUID，请在 IDE 中单击 "工具|生成 GUID"。)
+AppId={{8020EC01-6133-40BB-8B8B-0EB71E49696C}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" 指定安装程序无法运行
+; 除 Arm 上的 x64 和 Windows 11 之外的任何平台上。
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" 要求
+; 安装可以在 x64 或 Arm 上的 Windows 11 上以“64 位模式”完成，
+; 这意味着它应该使用本机 64 位 Program Files 目录和
+; 注册表的 64 位视图。
+ArchitecturesInstallIn64BitMode=x64compatible
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=C:\Users\Administrator\Downloads\LICENSE.txt
+; 取消注释以下行以在非管理安装模式下运行 (仅为当前用户安装)。
+;PrivilegesRequired=lowest
+OutputDir=D:\C#\kortapp-z_Release\setup
+OutputBaseFilename=kortapp-z_setup_x64
+SolidCompression=yes
+WizardStyle=modern
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "D:\C#\kortapp-z_Release\x64_inno\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\C#\kortapp-z_Release\x64_inno\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; 注意：不要在任何共享系统文件上使用 "Flags: ignoreversion"
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

inno/innosetup_x86.iss

@@ -0,0 +1,56 @@
+; 脚本由 Inno Setup 脚本向导生成。
+; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
+
+#define MyAppName "kortapp-z"
+#define MyAppVersion "1.2.5"
+#define MyAppPublisher "zsyg"
+#define MyAppURL "https://github.com/zs-yg/kortapp-z"
+#define MyAppExeName "kortapp-z.exe"
+#define MyAppAssocName MyAppName + ""
+#define MyAppAssocExt ".exe"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; 注意：AppId 的值唯一标识此应用程序。不要在其他应用程序的安装程序中使用相同的 AppId 值。
+; (若要生成新的 GUID，请在 IDE 中单击 "工具|生成 GUID"。)
+AppId={{BF1944C3-CD0C-4119-A340-49C54961D48B}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=C:\Users\Administrator\Downloads\LICENSE.txt
+; 取消注释以下行以在非管理安装模式下运行 (仅为当前用户安装)。
+;PrivilegesRequired=lowest
+OutputDir=D:\C#\kortapp-z_Release\setup
+OutputBaseFilename=kortapp-z_setup_x86
+SolidCompression=yes
+WizardStyle=modern
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "D:\C#\kortapp-z_Release\x86_inno\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\C#\kortapp-z_Release\x86_inno\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; 注意：不要在任何共享系统文件上使用 "Flags: ignoreversion"
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

log_cleaner.cpp

@@ -1,65 +1,71 @@
-#include <iostream>
-#include <filesystem>
-#include <chrono>
-
-namespace fs = std::filesystem;
-
-int main() {
-    try {
-        auto start = std::chrono::high_resolution_clock::now();
-        
-        // 定义日志目录路径
-        fs::path logDir;
-        
-        #ifdef _WIN32
-            // Windows系统获取AppData路径
-            char* appData = nullptr;
-            size_t len = 0;
-            if (_dupenv_s(&appData, &len, "APPDATA") == 0 && appData != nullptr) {
-                logDir = fs::path(appData) / "zsyg" / "kortapp-z" / ".logs";
-                free(appData);
-            } else {
-                std::cerr << "无法获取APPDATA环境变量" << std::endl;
-                return 1;
-            }
-        #else
-            // 非Windows系统使用默认路径
-            logDir = fs::path(getenv("HOME")) / ".zsyg" / "kortapp-z" / ".logs";
-        #endif
-        size_t deletedCount = 0;
-        size_t errorCount = 0;
-
-        // 检查目录是否存在
-        if (fs::exists(logDir) && fs::is_directory(logDir)) {
-            // 遍历并删除所有日志文件
-            for (const auto& entry : fs::directory_iterator(logDir)) {
-                try {
-                    if (fs::is_regular_file(entry)) {
-                        fs::remove(entry);
-                        deletedCount++;
-                    }
-                } catch (const std::exception& e) {
-                    std::cerr << "删除文件失败: " << entry.path() << " - " << e.what() << std::endl;
-                    errorCount++;
-                }
-            }
-        } else {
-            std::cout << "日志目录不存在，无需清理" << std::endl;
-            return 0;
-        }
-
-        auto end = std::chrono::high_resolution_clock::now();
-        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-
-        std::cout << "日志清理完成: " << std::endl;
-        std::cout << "删除文件数: " << deletedCount << std::endl;
-        std::cout << "错误数: " << errorCount << std::endl;
-        std::cout << "耗时: " << duration.count() << " 毫秒" << std::endl;
-
-    } catch (const std::exception& e) {
-        std::cerr << "发生错误: " << e.what() << std::endl;
-        return 1;
-    }
-
-    return 0;
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|              
+#include <iostream>
+#include <filesystem>
+#include <chrono>
+
+namespace fs = std::filesystem;
+
+int main() {
+    try {
+        auto start = std::chrono::high_resolution_clock::now();
+        
+        // 定义日志目录路径
+        fs::path logDir;
+        
+        #ifdef _WIN32
+            // Windows系统获取AppData路径
+            char* appData = nullptr;
+            size_t len = 0;
+            if (_dupenv_s(&appData, &len, "APPDATA") == 0 && appData != nullptr) {
+                logDir = fs::path(appData) / "zsyg" / "kortapp-z" / ".logs";
+                free(appData);
+            } else {
+                std::cerr << "无法获取APPDATA环境变量" << std::endl;
+                return 1;
+            }
+        #else
+            // 非Windows系统使用默认路径
+            logDir = fs::path(getenv("HOME")) / ".zsyg" / "kortapp-z" / ".logs";
+        #endif
+        size_t deletedCount = 0;
+        size_t errorCount = 0;
+
+        // 检查目录是否存在
+        if (fs::exists(logDir) && fs::is_directory(logDir)) {
+            // 遍历并删除所有日志文件
+            for (const auto& entry : fs::directory_iterator(logDir)) {
+                try {
+                    if (fs::is_regular_file(entry)) {
+                        fs::remove(entry);
+                        deletedCount++;
+                    }
+                } catch (const std::exception& e) {
+                    std::cerr << "删除文件失败: " << entry.path() << " - " << e.what() << std::endl;
+                    errorCount++;
+                }
+            }
+        } else {
+            std::cout << "日志目录不存在，无需清理" << std::endl;
+            return 0;
+        }
+
+        auto end = std::chrono::high_resolution_clock::now();
+        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
+
+        std::cout << "日志清理完成: " << std::endl;
+        std::cout << "删除文件数: " << deletedCount << std::endl;
+        std::cout << "错误数: " << errorCount << std::endl;
+        std::cout << "耗时: " << duration.count() << " 毫秒" << std::endl;
+
+    } catch (const std::exception& e) {
+        std::cerr << "发生错误: " << e.what() << std::endl;
+        return 1;
+    }
+
+    return 0;
+}

logger.cs

@@ -1,63 +1,99 @@
-using System;
-using System.IO;
-using System.Text;
-
-namespace AppStore
-{
-    public static class Logger
-    {
-        private static readonly string LogsDirectory = Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-            "zsyg", "kortapp-z", ".logs");
-        private static readonly object LockObject = new object();
-
-        static Logger()
-        {
-            try
-            {
-                // 确保logs目录存在
-                if (!Directory.Exists(LogsDirectory))
-                {
-                    Directory.CreateDirectory(LogsDirectory);
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"无法创建日志目录: {LogsDirectory}, 错误: {ex.Message}");
-                throw;
-            }
-        }
-
-        public static void Log(string message)
-        {
-            lock (LockObject)
-            {
-                try
-                {
-                    string fileName = $"{DateTime.Now:yyyyMMddHHmmss}.log";
-                    string filePath = Path.Combine(LogsDirectory, fileName);
-                    
-                    using (StreamWriter writer = new StreamWriter(filePath, true, Encoding.UTF8))
-                    {
-                        writer.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] {message}");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // 日志记录失败时输出到控制台
-                    Console.WriteLine($"日志记录失败: {ex.Message}");
-                }
-            }
-        }
-
-        public static void LogError(string message, Exception? ex = null)
-        {
-            string errorMessage = $"ERROR: {message}";
-            if (ex != null)
-            {
-                errorMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
-            }
-            Log(errorMessage);
-        }
-    }
-}
+ // _              _                             
+ //| | _____  _ __| |_ __ _ _ __  _ __       ____
+ //| |/ / _ \| '__| __/ _` | '_ \| '_ \ ____|_  /
+ //|   | (_) | |  | || (_| | |_) | |_) |_____/ / 
+ //|_|\_\___/|_|   \__\__,_| .__/| .__/     /___|
+ //                        |_|   |_|             
+using System;
+using System.IO;
+using System.Text;
+
+namespace AppStore
+{
+    public static class Logger
+    {
+        private static readonly string LogsDirectory = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "zsyg", "kortapp-z", ".logs");
+        private static readonly object LockObject = new object();
+
+        static Logger()
+        {
+            try
+            {
+                // 确保logs目录存在
+                if (!Directory.Exists(LogsDirectory))
+                {
+                    Directory.CreateDirectory(LogsDirectory);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"无法创建日志目录: {LogsDirectory}, 错误: {ex.Message}");
+                throw;
+            }
+        }
+
+        public static void Log(string message)
+        {
+            lock (LockObject)
+            {
+                try
+                {
+                    string fileName = $"{DateTime.Now:yyyyMMddHHmmss}.log";
+                    string filePath = Path.Combine(LogsDirectory, fileName);
+                    
+                    using (StreamWriter writer = new StreamWriter(filePath, true, Encoding.UTF8))
+                    {
+                        writer.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] {message}");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // 日志记录失败时输出到控制台
+                    Console.WriteLine($"日志记录失败: {ex.Message}");
+                }
+            }
+        }
+
+        public static void LogError(string message, Exception? ex = null)
+        {
+            string errorMessage = $"ERROR: {message}";
+            if (ex != null)
+            {
+                errorMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
+            }
+            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++/gcc_OCR/Makefile

@@ -0,0 +1,30 @@
+# 编译器设置
+CXX = g++
+CXXFLAGS = -std=c++17 -Wall -Wextra -Iinclude
+LDFLAGS = -lfltk -ltesseract -lleptonica
+
+# 源文件和目标文件
+SRCS = src/main.cpp src/gui_window.cpp src/ocr_engine.cpp \
+       src/file_io.cpp src/error_handler.cpp src/image_processor.cpp
+OBJS = $(patsubst src/%.cpp,obj/%.o,$(SRCS))
+
+# 目标可执行文件
+TARGET = ocr_app.exe
+
+# 默认目标
+all: $(TARGET)
+
+# 链接规则
+$(TARGET): $(OBJS)
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
+
+# 编译规则
+obj/%.o: src/%.cpp
+	@mkdir -p obj
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+# 清理
+clean:
+	rm -rf obj $(TARGET)
+
+.PHONY: all clean

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

@@ -0,0 +1,19 @@
+#ifndef COMMON_HPP
+#define COMMON_HPP
+
+#include <iostream>
+#include <string>
+#include <memory>
+#include <stdexcept>
+
+// 公共宏定义
+#define APP_NAME "OCR识别器"
+#define APP_VERSION "1.0.0"
+
+// 公共类型定义
+using String = std::string;
+
+// 错误处理宏
+#define THROW_EXCEPTION(msg) throw std::runtime_error(std::string(__FILE__) + ":" + std::to_string(__LINE__) + " " + msg)
+
+#endif // COMMON_HPP

others/C++/gcc_OCR/include/config.hpp

@@ -0,0 +1,40 @@
+#ifndef CONFIG_HPP
+#define CONFIG_HPP
+
+#include "../include/common.hpp"
+#include <map>
+
+struct AppConfig {
+    String language;  // OCR识别语言
+    String lastDir;    // 最后打开的目录
+    int windowWidth;   // 窗口宽度
+    int windowHeight;  // 窗口高度
+};
+
+class ConfigManager {
+public:
+    ConfigManager();
+    
+    // 加载配置
+    bool loadConfig(const String& filePath = "config.ini");
+    
+    // 保存配置
+    bool saveConfig(const String& filePath = "config.ini");
+    
+    // 获取配置
+    AppConfig getConfig() const;
+    
+    // 更新配置
+    void updateConfig(const AppConfig& newConfig);
+    
+private:
+    AppConfig config;
+    
+    // 解析INI文件
+    void parseIni(const String& content);
+    
+    // 生成INI文件内容
+    String generateIni() const;
+};
+
+#endif // CONFIG_HPP

others/C++/gcc_OCR/include/error_handler.hpp

@@ -0,0 +1,28 @@
+#ifndef ERROR_HANDLER_HPP
+#define ERROR_HANDLER_HPP
+
+#include "../include/common.hpp"
+#include <stdexcept>
+
+// 错误代码枚举
+enum class ErrorCode {
+    FILE_IO_ERROR,
+    OCR_INIT_ERROR,
+    OCR_PROCESS_ERROR,
+    GUI_ERROR,
+    UNKNOWN_ERROR
+};
+
+// 自定义异常类
+class OCRException : public std::runtime_error {
+public:
+    ErrorCode code;
+    
+    OCRException(ErrorCode ec, const String& msg)
+        : std::runtime_error(msg), code(ec) {}
+};
+
+// 错误处理函数
+void handleError(const std::exception& e);
+
+#endif // ERROR_HANDLER_HPP

others/C++/gcc_OCR/include/file_io.hpp

@@ -0,0 +1,16 @@
+#ifndef FILE_IO_HPP
+#define FILE_IO_HPP
+
+#include "../include/common.hpp"
+#include <vector>
+
+// 保存文本到文件
+bool saveTextToFile(const String& filePath, const String& content);
+
+// 从文件加载文本
+String loadTextFromFile(const String& filePath);
+
+// 获取支持的图像格式列表
+std::vector<String> getSupportedImageFormats();
+
+#endif // FILE_IO_HPP

others/C++/gcc_OCR/include/gui_window.hpp

@@ -0,0 +1,50 @@
+#ifndef GUI_WINDOW_HPP
+#define GUI_WINDOW_HPP
+
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Text_Display.H>
+#include <FL/Fl_Text_Buffer.H>
+#include <FL/Fl_Choice.H>
+#include "../include/common.hpp"
+
+class GUIWindow {
+public:
+    GUIWindow(int width, int height, const char* title);
+    ~GUIWindow();
+    
+    // 设置OCR结果文本
+    void setOCRResult(const String& text);
+    
+    // 按钮状态控制
+    void disableButtons();
+    void enableButtons();
+    
+    // 获取当前语言设置
+    String getLanguage() const;
+    
+private:
+    Fl_Window* window;
+    Fl_Text_Display* textDisplay;
+    Fl_Text_Buffer* textBuffer;
+    Fl_Button* openButton;
+    Fl_Button* saveButton;
+    Fl_Choice* languageChoice;
+    
+    // 支持的语言列表
+    static constexpr const char* LANGUAGES[3] = {"英文", "简体中文", "中英文混合"};
+    static constexpr const char* LANGUAGE_CODES[3] = {"eng", "chi_sim", "eng+chi_sim"};
+    
+    // 回调函数
+    static void openCallback(Fl_Widget* w, void* data);
+    static void saveCallback(Fl_Widget* w, void* data);
+    
+    // 初始化UI
+    void initUI();
+    
+    // 异常处理辅助方法
+    static void handleException(void* data);
+};
+
+#endif // GUI_WINDOW_HPP

others/C++/gcc_OCR/include/image_processor.hpp

@@ -0,0 +1,31 @@
+#ifndef IMAGE_PROCESSOR_HPP
+#define IMAGE_PROCESSOR_HPP
+
+#include "../include/common.hpp"
+#include <leptonica/allheaders.h>
+
+class ImageProcessor {
+public:
+    // 从文件加载图像并进行预处理
+    static Pix* loadAndPreprocess(const String& filePath);
+    
+    // 图像预处理
+    static Pix* preprocess(Pix* image);
+    
+    // 转换为灰度图像
+    static Pix* convertToGrayscale(Pix* image);
+    
+    // 二值化处理
+    static Pix* binarize(Pix* image);
+    
+    // 调整对比度
+    static Pix* adjustContrast(Pix* image, float factor);
+    
+    // 调整亮度
+    static Pix* adjustBrightness(Pix* image, int delta);
+    
+    // 降噪处理
+    static Pix* removeNoise(Pix* image);
+};
+
+#endif // IMAGE_PROCESSOR_HPP

others/C++/gcc_OCR/include/ocr_engine.hpp

@@ -0,0 +1,30 @@
+#ifndef OCR_ENGINE_HPP
+#define OCR_ENGINE_HPP
+
+#include <tesseract/baseapi.h>
+#include <leptonica/allheaders.h>
+#include "../include/common.hpp"
+
+class OCREngine {
+public:
+    OCREngine();
+    ~OCREngine();
+    
+    // 设置识别语言
+    bool setLanguage(const String& lang);
+    
+    // 从图像文件识别文本
+    String recognizeFromFile(const String& filePath);
+    
+    // 从内存图像识别文本
+    String recognizeFromImage(Pix* image);
+    
+private:
+    tesseract::TessBaseAPI* api;
+    String currentLanguage;
+    
+    // 初始化Tesseract
+    void initTesseract();
+};
+
+#endif // OCR_ENGINE_HPP

others/C++/gcc_OCR/include/result_display.hpp

@@ -0,0 +1,27 @@
+#ifndef RESULT_DISPLAY_HPP
+#define RESULT_DISPLAY_HPP
+
+#include "../include/common.hpp"
+#include <vector>
+
+class ResultDisplay {
+public:
+    // 格式化OCR结果
+    static String formatResult(const String& rawText);
+    
+    // 校正常见OCR错误
+    static String correctCommonErrors(const String& text);
+    
+    // 分割段落
+    static std::vector<String> splitParagraphs(const String& text);
+    
+    // 高亮低置信度区域
+    static String highlightLowConfidence(const String& text, const std::vector<float>& confidences);
+    
+    // 导出为不同格式
+    static bool exportAsText(const String& filePath, const String& content);
+    static bool exportAsHtml(const String& filePath, const String& content);
+    static bool exportAsPdf(const String& filePath, const String& content);
+};
+
+#endif // RESULT_DISPLAY_HPP

others/C++/gcc_OCR/include/utils.hpp

@@ -0,0 +1,20 @@
+#ifndef UTILS_HPP
+#define UTILS_HPP
+
+#include "../include/common.hpp"
+#include <vector>
+
+// 字符串工具
+String trim(const String& str);
+std::vector<String> split(const String& str, char delimiter);
+String join(const std::vector<String>& strings, const String& delimiter);
+
+// 图像工具
+bool isImageFile(const String& filePath);
+String getFileExtension(const String& filePath);
+
+// 系统工具
+String getCurrentDateTime();
+String getHomeDirectory();
+
+#endif // UTILS_HPP

others/C++/gcc_OCR/src/error_handler.cpp

@@ -0,0 +1,27 @@
+#include "../include/error_handler.hpp"
+#include <iostream>
+#include <FL/Fl.H>
+#include <FL/fl_ask.H>
+
+void handleError(const std::exception& e) {
+    // 记录错误到控制台
+    std::cerr << "错误: " << e.what() << std::endl;
+    
+    // 显示用户友好的错误消息
+    if (Fl::first_window()) {
+        fl_alert("%s", e.what());
+    } else {
+        std::cerr << "无法显示错误对话框: 没有可用的GUI窗口" << std::endl;
+    }
+}
+
+String errorCodeToString(ErrorCode code) {
+    switch(code) {
+        case ErrorCode::FILE_IO_ERROR: return "文件IO错误";
+        case ErrorCode::OCR_INIT_ERROR: return "OCR初始化错误";
+        case ErrorCode::OCR_PROCESS_ERROR: return "OCR处理错误";
+        case ErrorCode::GUI_ERROR: return "GUI错误";
+        case ErrorCode::UNKNOWN_ERROR: return "未知错误";
+        default: return "未定义的错误代码";
+    }
+}

others/C++/gcc_OCR/src/file_io.cpp

@@ -0,0 +1,39 @@
+#include "../include/file_io.hpp"
+#include "../include/error_handler.hpp"
+#include <fstream>
+#include <sstream>
+
+bool saveTextToFile(const String& filePath, const String& content) {
+    std::ofstream outFile(filePath);
+    if (!outFile) {
+        THROW_EXCEPTION("无法打开文件进行写入: " + filePath);
+        return false;
+    }
+    
+    outFile << content;
+    outFile.close();
+    return true;
+}
+
+String loadTextFromFile(const String& filePath) {
+    std::ifstream inFile(filePath);
+    if (!inFile) {
+        THROW_EXCEPTION("无法打开文件进行读取: " + filePath);
+    }
+    
+    std::stringstream buffer;
+    buffer << inFile.rdbuf();
+    inFile.close();
+    return buffer.str();
+}
+
+std::vector<String> getSupportedImageFormats() {
+    return {
+        "*.png",
+        "*.jpg",
+        "*.jpeg",
+        "*.bmp",
+        "*.tif",
+        "*.tiff"
+    };
+}

others/C++/gcc_OCR/src/gui_window.cpp

@@ -0,0 +1,106 @@
+#include "../include/gui_window.hpp"
+#include "../include/file_io.hpp"
+#include "../include/ocr_engine.hpp"
+#include <FL/Fl_File_Chooser.H>
+#include <thread>
+
+// 异常信息结构体
+struct ExceptionData {
+    GUIWindow* window;
+    String errorMsg;
+};
+
+GUIWindow::GUIWindow(int width = 900, int height = 700, const char* title = "OCR识别工具") {
+    window = new Fl_Window(width, height, title);
+    initUI();
+    window->end();
+    window->show();
+}
+
+GUIWindow::~GUIWindow() {
+    delete textBuffer;
+    delete window;
+}
+
+void GUIWindow::initUI() {
+    textBuffer = new Fl_Text_Buffer();
+    textDisplay = new Fl_Text_Display(20, 20, 860, 550, "识别结果");
+    textDisplay->buffer(textBuffer);
+    
+    // 添加语言选择下拉菜单
+    languageChoice = new Fl_Choice(70, 580, 300, 25, "识别语言");
+    for (int i = 0; i < 3; ++i) {
+        languageChoice->add(LANGUAGES[i]);
+    }
+    languageChoice->value(0); // 默认选择英文
+    
+    openButton = new Fl_Button(390, 580, 150, 25, "打开图片");
+    openButton->callback(openCallback, this);
+    
+    saveButton = new Fl_Button(550, 580, 150, 25, "保存结果");
+    saveButton->callback(saveCallback, this);
+}
+
+void GUIWindow::setOCRResult(const String& text) {
+    textBuffer->text(text.c_str());
+}
+
+String GUIWindow::getLanguage() const {
+    return LANGUAGE_CODES[languageChoice->value()];
+}
+
+void GUIWindow::handleException(void* data) {
+    ExceptionData* exData = static_cast<ExceptionData*>(data);
+    exData->window->setOCRResult("无法识别");
+    exData->window->enableButtons();
+    fl_alert("识别错误: %s", exData->errorMsg.c_str());
+    delete exData;
+}
+
+void GUIWindow::openCallback(Fl_Widget* w, void* data) {
+    (void)w;
+    GUIWindow* win = static_cast<GUIWindow*>(data);
+    const char* filename = fl_file_chooser("选择图片文件", "*.{png,jpg,bmp}", "");
+    if (filename) {
+        win->setOCRResult("正在识别...");
+        win->disableButtons();
+        
+        std::thread([win, filename]() {
+            try {
+                OCREngine ocr;
+                if (!ocr.setLanguage(win->getLanguage())) {
+                    throw std::runtime_error("无法设置识别语言");
+                }
+                String result = ocr.recognizeFromFile(filename);
+                Fl::awake([](void* data) {
+                    auto* ctx = static_cast<std::pair<GUIWindow*, String>*>(data);
+                    ctx->first->setOCRResult(ctx->second.empty() ? "无法识别" : ctx->second);
+                    ctx->first->enableButtons();
+                    delete ctx;
+                }, new std::pair<GUIWindow*, String>(win, result));
+            } catch (const std::exception& e) {
+                ExceptionData* exData = new ExceptionData{win, e.what()};
+                Fl::awake(handleException, exData);
+            }
+        }).detach();
+    }
+}
+
+void GUIWindow::disableButtons() {
+    openButton->deactivate();
+    saveButton->deactivate();
+}
+
+void GUIWindow::enableButtons() {
+    openButton->activate();
+    saveButton->activate();
+}
+
+void GUIWindow::saveCallback(Fl_Widget* w, void* data) {
+    (void)w;
+    GUIWindow* win = static_cast<GUIWindow*>(data);
+    const char* filename = fl_file_chooser("保存识别结果", "*.txt", "");
+    if (filename && win->textBuffer->length() > 0) {
+        saveTextToFile(filename, win->textBuffer->text());
+    }
+}

others/C++/gcc_OCR/src/image_processor.cpp

@@ -0,0 +1,64 @@
+#include "../include/image_processor.hpp"
+#include "../include/error_handler.hpp"
+#include <leptonica/allheaders.h>
+
+Pix* ImageProcessor::loadAndPreprocess(const String& filePath) {
+    Pix* image = pixRead(filePath.c_str());
+    if (!image) {
+        THROW_EXCEPTION("无法加载图像文件: " + filePath);
+    }
+    return preprocess(image);
+}
+
+Pix* ImageProcessor::preprocess(Pix* image) {
+    Pix* processed = convertToGrayscale(image);
+    processed = adjustContrast(processed, 1.5f);
+    processed = binarize(processed);
+    processed = removeNoise(processed);
+    return processed;
+}
+
+Pix* ImageProcessor::convertToGrayscale(Pix* image) {
+    Pix* gray = pixConvertRGBToGray(image, 0.3f, 0.59f, 0.11f);
+    if (!gray) {
+        pixDestroy(&image);
+        THROW_EXCEPTION("灰度转换失败");
+    }
+    return gray;
+}
+
+Pix* ImageProcessor::binarize(Pix* image) {
+    // 使用更精细的局部二值化
+    if (pixOtsuAdaptiveThreshold(image, 16, 16, 5, 5, 0.1f, nullptr, nullptr) != 0) {
+        pixDestroy(&image);
+        THROW_EXCEPTION("二值化失败");
+    }
+    return image;
+}
+
+Pix* ImageProcessor::adjustContrast(Pix* image, float factor) {
+    Pix* contrast = pixContrastTRC(nullptr, image, factor);
+    if (!contrast) {
+        pixDestroy(&image);
+        THROW_EXCEPTION("对比度调整失败");
+    }
+    return contrast;
+}
+
+Pix* ImageProcessor::adjustBrightness(Pix* image, int delta) {
+    if (pixMultConstantGray(image, 1.0f + delta/255.0f) != 0) {
+        pixDestroy(&image);
+        THROW_EXCEPTION("亮度调整失败");
+    }
+    return image;
+}
+
+Pix* ImageProcessor::removeNoise(Pix* image) {
+    // 增强降噪效果
+    Pix* denoised = pixCleanImage(image, 2, 0, 2, 10);
+    if (!denoised) {
+        pixDestroy(&image);
+        THROW_EXCEPTION("降噪失败");
+    }
+    return denoised;
+}

others/C++/gcc_OCR/src/main.cpp

@@ -0,0 +1,21 @@
+#include "../include/common.hpp"
+#include "../include/gui_window.hpp"
+#include "../include/ocr_engine.hpp"
+
+int main(int argc, char** argv) {
+    (void)argc;
+    (void)argv;
+    try {
+        // 初始化GUI窗口
+        GUIWindow window(900, 700, "OCR识别器");
+        
+        // 初始化OCR引擎
+        OCREngine ocr;
+        
+        // 运行主循环
+        return Fl::run();
+    } catch (const std::exception& e) {
+        std::cerr << "错误: " << e.what() << std::endl;
+        return EXIT_FAILURE;
+    }
+}

others/C++/gcc_OCR/src/ocr_engine.cpp

@@ -0,0 +1,68 @@
+#include "../include/ocr_engine.hpp"
+#include "../include/error_handler.hpp"
+#include <tesseract/baseapi.h>
+#include <leptonica/allheaders.h>
+
+OCREngine::OCREngine() : api(new tesseract::TessBaseAPI()), currentLanguage("eng") {
+    initTesseract();
+}
+
+OCREngine::~OCREngine() {
+    if (api) {
+        api->End();
+        delete api;
+    }
+}
+
+bool OCREngine::setLanguage(const String& lang) {
+    // 支持多语言混合识别，如"eng+chi_sim"
+    if (api->Init("C:/msys64/ucrt64/share/tessdata/", lang.c_str())) {
+        // 尝试回退到英文
+        if (api->Init("C:/msys64/ucrt64/share/tessdata/", "eng")) {
+            THROW_EXCEPTION("无法设置OCR语言: " + lang + " 且回退到英文失败");
+            return false;
+        }
+        currentLanguage = "eng";
+        return false;
+    }
+    currentLanguage = lang;
+    
+    // 针对中文优化识别参数
+    if (lang.find("chi") != String::npos) {
+        api->SetVariable("tessedit_char_whitelist", 
+            "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            "的一是在不了有和人这中大为上个国我以要他时来用们生到作地于出就分对成会可主发年动同工也能下过子说产种面而方后多定行学法所民得经十三之进着等部度家电力里如水化高自二理起小物现实加量都两体制机当使点从业本去把性好应开它合还因由其些然前外天政四日那社义事平形相全表间样与关各重新线内数正心反你明看原又么利比或但质气第向道命此变条只没结解问意建月公无系军很情者最立代想已通并提直题党程展五果料象员革位入常文总次品式活设及管特件长求老头基资边流路级少图山统接知较将组见计别她手角期根论运农指几九区强放决西被干做必战先回则任取据处队南给色光门即保治北造百规热领七海口东导器压志世金增争济阶油思术极交受联什认六共权收证改清己美再采转更单风切打白教速花带安场身车例真务具万每目至达走积示议声报斗完类八离华名确才科张信马节话米整空元况今集温传土许步群广石记需段研界拉林律叫且究观越织装影算低持音众书布复容儿须际商非验连断深难近矿千周委素技备半办青省列习响约支般史感劳便团往酸历市克何除消构府称太准精值号率族维划选标写存候毛亲快效斯院查江型眼王按格养易置派层片始却专状育厂京识适属圆包火住调满县局照参红细引听该铁价严龙飞");
+        api->SetPageSegMode(tesseract::PSM_SPARSE_TEXT_OSD);
+    }
+    return true;
+}
+
+String OCREngine::recognizeFromFile(const String& filePath) {
+    Pix* image = pixRead(filePath.c_str());
+    if (!image) {
+        THROW_EXCEPTION("无法加载图像文件: " + filePath);
+    }
+    
+    String result = recognizeFromImage(image);
+    pixDestroy(&image);
+    return result;
+}
+
+String OCREngine::recognizeFromImage(Pix* image) {
+    api->SetImage(image);
+    char* text = api->GetUTF8Text();
+    if (!text) {
+        THROW_EXCEPTION("OCR识别失败");
+    }
+    
+    String result(text);
+    delete[] text;
+    return result;
+}
+
+void OCREngine::initTesseract() {
+    if (api->Init("C:/msys64/ucrt64/share/tessdata/", currentLanguage.c_str())) {
+        THROW_EXCEPTION("无法初始化Tesseract OCR引擎");
+    }
+    api->SetPageSegMode(tesseract::PSM_AUTO);
+}

others/C++/password_generator/Makefile

@@ -0,0 +1,20 @@
+CXX = g++
+CXXFLAGS = -std=c++11 -Iinclude
+LDFLAGS = -static -mwindows -lfltk -lole32 -luuid -lcomctl32 -lgdi32 -lwsock32 -lcomdlg32 -lwinspool
+
+SRC = $(wildcard src/*.cpp)
+OBJ = $(patsubst src/%.cpp,obj/%.o,$(SRC))
+TARGET = password_generator
+
+all: $(TARGET)
+
+$(TARGET): $(OBJ)
+	$(CXX) $^ -o $@ $(LDFLAGS)
+
+obj/%.o: src/%.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+clean:
+	rm -f $(OBJ) $(TARGET)
+
+.PHONY: all clean

others/C++/password_generator/include/password_generator.hpp

@@ -0,0 +1,27 @@
+#ifndef PASSWORD_GENERATOR_HPP
+#define PASSWORD_GENERATOR_HPP
+
+#include "string.hpp"
+
+class PasswordGenerator {
+public:
+    enum Mode {
+        DIGITS,         // 纯数字
+        ENGLISH,        // 纯英文
+        SYMBOLS,        // 纯符号
+        DIGITS_ENGLISH, // 数字+英文
+        DIGITS_SYMBOLS, // 数字+符号
+        ENGLISH_SYMBOLS // 英文+符号
+    };
+
+    PasswordGenerator();
+    String generate(int length, Mode mode = DIGITS);
+
+private:
+    String generateDigits(int length);
+    String generateEnglish(int length);
+    String generateSymbols(int length);
+    String generateMixed(int length, const String& charSet);
+};
+
+#endif // PASSWORD_GENERATOR_HPP

others/C++/password_generator/include/password_gui.hpp

@@ -0,0 +1,28 @@
+#ifndef PASSWORD_GUI_HPP
+#define PASSWORD_GUI_HPP
+
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Input.H>
+#include <FL/Fl_Choice.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Output.H>
+#include "password_generator.hpp"
+
+class PasswordGUI {
+public:
+    PasswordGUI();
+    void show();
+
+private:
+    Fl_Window* window;
+    Fl_Input* lengthInput;
+    Fl_Choice* modeChoice;
+    Fl_Button* generateButton;
+    Fl_Output* passwordOutput;
+    PasswordGenerator generator;
+
+    static void onGenerate(Fl_Widget* widget, void* data);
+};
+
+#endif // PASSWORD_GUI_HPP

others/C++/password_generator/include/string.hpp

@@ -0,0 +1,25 @@
+#ifndef STRING_HPP
+#define STRING_HPP
+
+#include <cstddef>
+
+class String {
+public:
+    String();
+    String(const char* str);
+    String(const String& other);
+    ~String();
+
+    size_t length() const;
+    const char* c_str() const;
+    
+    String& operator=(const String& other);
+    String operator+(const String& other) const;
+    bool operator==(const String& other) const;
+
+private:
+    char* data;
+    size_t len;
+};
+
+#endif // STRING_HPP

others/C++/password_generator/src/main.cpp

@@ -0,0 +1,7 @@
+#include "password_gui.hpp"
+
+int main(int argc, char** argv) {
+    PasswordGUI gui;
+    gui.show();
+    return Fl::run();
+}

others/C++/password_generator/src/password_generator.cpp

@@ -0,0 +1,96 @@
+#include "password_generator.hpp"
+#include <cstdlib>
+#include <ctime>
+
+PasswordGenerator::PasswordGenerator() {
+    srand(time(nullptr));
+}
+
+String PasswordGenerator::generate(int length, Mode mode) {
+    if (length < 1 || length > 100) {
+        return String("无效长度(1-100)");
+    }
+
+    switch (mode) {
+        case DIGITS:
+            return generateDigits(length);
+        case ENGLISH:
+            return generateEnglish(length);
+        case SYMBOLS:
+            return generateSymbols(length);
+        case DIGITS_ENGLISH: {
+            String charSet = String("0123456789") + 
+                           String("abcdefghijklmnopqrstuvwxyz") + 
+                           String("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+            return generateMixed(length, charSet);
+        }
+        case DIGITS_SYMBOLS: {
+            String charSet = String("0123456789") + String("!@#$%^&*()_+-=[]{}|;:,.<>?");
+            return generateMixed(length, charSet);
+        }
+        case ENGLISH_SYMBOLS: {
+            String charSet = String("abcdefghijklmnopqrstuvwxyz") + 
+                           String("ABCDEFGHIJKLMNOPQRSTUVWXYZ") + 
+                           String("!@#$%^&*()_+-=[]{}|;:,.<>?");
+            return generateMixed(length, charSet);
+        }
+        default:
+            return String("不支持的模式");
+    }
+}
+
+String PasswordGenerator::generateDigits(int length) {
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        buffer[i] = '0' + (rand() % 10);
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}
+
+String PasswordGenerator::generateEnglish(int length) {
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        int choice = rand() % 2;
+        if (choice == 0) {
+            buffer[i] = 'a' + (rand() % 26); // 小写字母
+        } else {
+            buffer[i] = 'A' + (rand() % 26); // 大写字母
+        }
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}
+
+String PasswordGenerator::generateSymbols(int length) {
+    const char symbols[] = "!@#$%^&*()_+-=[]{}|;:,.<>?";
+    const int symbolCount = sizeof(symbols) - 1; // 减去末尾的\0
+    
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        buffer[i] = symbols[rand() % symbolCount];
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}
+
+String PasswordGenerator::generateMixed(int length, const String& charSet) {
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        buffer[i] = charSet.c_str()[rand() % charSet.length()];
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}

others/C++/password_generator/src/password_gui.cpp

@@ -0,0 +1,36 @@
+#include "password_gui.hpp"
+#include <cstdlib>
+
+PasswordGUI::PasswordGUI() {
+    window = new Fl_Window(400, 350, "密码生成器");
+    
+    lengthInput = new Fl_Input(150, 50, 200, 30, "密码长度:");
+    modeChoice = new Fl_Choice(150, 90, 200, 30, "密码模式:");
+    modeChoice->add("纯数字");
+    modeChoice->add("纯英文");
+    modeChoice->add("纯符号");
+    modeChoice->add("数字+英文");
+    modeChoice->add("数字+符号");
+    modeChoice->add("英文+符号");
+    modeChoice->value(0); // 默认选择纯数字模式
+    
+    generateButton = new Fl_Button(150, 140, 100, 40, "生成密码");
+    passwordOutput = new Fl_Output(100, 210, 250, 40, "生成结果:");
+
+    generateButton->callback(onGenerate, this);
+    window->end();
+}
+
+void PasswordGUI::show() {
+    window->show();
+}
+
+void PasswordGUI::onGenerate(Fl_Widget* widget, void* data) {
+    PasswordGUI* gui = static_cast<PasswordGUI*>(data);
+    const char* lengthStr = gui->lengthInput->value();
+    int length = atoi(lengthStr);
+    
+    PasswordGenerator::Mode mode = static_cast<PasswordGenerator::Mode>(gui->modeChoice->value());
+    String password = gui->generator.generate(length, mode);
+    gui->passwordOutput->value(password.c_str());
+}

others/C++/password_generator/src/string.cpp

@@ -0,0 +1,51 @@
+#include "string.hpp"
+#include <cstring>
+
+String::String() : data(nullptr), len(0) {}
+
+String::String(const char* str) {
+    len = strlen(str);
+    data = new char[len + 1];
+    strcpy(data, str);
+}
+
+String::String(const String& other) {
+    len = other.len;
+    data = new char[len + 1];
+    strcpy(data, other.data);
+}
+
+String::~String() {
+    delete[] data;
+}
+
+size_t String::length() const {
+    return len;
+}
+
+const char* String::c_str() const {
+    return data;
+}
+
+String& String::operator=(const String& other) {
+    if (this != &other) {
+        delete[] data;
+        len = other.len;
+        data = new char[len + 1];
+        strcpy(data, other.data);
+    }
+    return *this;
+}
+
+String String::operator+(const String& other) const {
+    String result;
+    result.len = len + other.len;
+    result.data = new char[result.len + 1];
+    strcpy(result.data, data);
+    strcat(result.data, other.data);
+    return result;
+}
+
+bool String::operator==(const String& other) const {
+    return strcmp(data, other.data) == 0;
+}

others/C/System_Information/include/about_dialog.h

@@ -1,8 +1,8 @@
-#ifndef ABOUT_DIALOG_H
-#define ABOUT_DIALOG_H
-
-#include <windows.h>
-
-void show_about_dialog(HWND hParent);
-
-#endif // ABOUT_DIALOG_H
+#ifndef ABOUT_DIALOG_H
+#define ABOUT_DIALOG_H
+
+#include <windows.h>
+
+void show_about_dialog(HWND hParent);
+
+#endif // ABOUT_DIALOG_H

others/C/System_Information/include/config.h

@@ -1,10 +1,10 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#define APP_NAME "系统信息查看器"
-#define APP_VERSION "1.0"
-#define MAX_DISKS 26
-#define MAX_ADAPTERS 10
-#define UPDATE_INTERVAL 5000 // 5秒
-
-#endif // CONFIG_H
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define APP_NAME "系统信息查看器"
+#define APP_VERSION "1.0"
+#define MAX_DISKS 26
+#define MAX_ADAPTERS 10
+#define UPDATE_INTERVAL 5000 // 5秒
+
+#endif // CONFIG_H

others/C/System_Information/include/disk_info.h

@@ -1,15 +1,15 @@
-#ifndef DISK_INFO_H
-#define DISK_INFO_H
-
-#include <windows.h>
-
-typedef struct {
-    char driveLetter;
-    DWORD64 totalBytes;
-    DWORD64 freeBytes;
-    char fileSystem[32];
-} DiskInfo;
-
-void get_disk_info(DiskInfo* disks, int* count);
-
-#endif // DISK_INFO_H
+#ifndef DISK_INFO_H
+#define DISK_INFO_H
+
+#include <windows.h>
+
+typedef struct {
+    char driveLetter;
+    DWORD64 totalBytes;
+    DWORD64 freeBytes;
+    char fileSystem[32];
+} DiskInfo;
+
+void get_disk_info(DiskInfo* disks, int* count);
+
+#endif // DISK_INFO_H

others/C/System_Information/include/logging.h

@@ -1,15 +1,15 @@
-#ifndef LOGGING_H
-#define LOGGING_H
-
-#include <windows.h>
-
-typedef enum {
-    LOG_DEBUG,
-    LOG_INFO,
-    LOG_WARNING,
-    LOG_ERROR
-} LogLevel;
-
-void log_message(LogLevel level, const char* format, ...);
-
-#endif // LOGGING_H
+#ifndef LOGGING_H
+#define LOGGING_H
+
+#include <windows.h>
+
+typedef enum {
+    LOG_DEBUG,
+    LOG_INFO,
+    LOG_WARNING,
+    LOG_ERROR
+} LogLevel;
+
+void log_message(LogLevel level, const char* format, ...);
+
+#endif // LOGGING_H

others/C/System_Information/include/main_window.h

@@ -5,5 +5,7 @@
 #include "system_info.h"
 
 void update_main_window(HWND hWnd, SystemInfo* sysInfo);
+void toggle_fullscreen(HWND hWnd);
+LRESULT CALLBACK MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 #endif // MAIN_WINDOW_H

others/C/System_Information/include/network_info.h

@@ -1,23 +1,23 @@
-#ifndef NETWORK_INFO_H
-#define NETWORK_INFO_H
-
-#include <windows.h>
-#include <iphlpapi.h>
-
-// 确保GetAdaptersInfo函数声明
-#ifndef _IPHLPAPI_
-#define _IPHLPAPI_
-DWORD GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen);
-#endif
-
-typedef struct {
-    char adapterName[MAX_ADAPTER_NAME_LENGTH + 4];
-    char description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4];
-    char ipAddress[16];
-    char macAddress[18];
-    ULONG speed; // in Mbps
-} NetworkAdapterInfo;
-
-void get_network_adapters(NetworkAdapterInfo* adapters, int* count);
-
-#endif // NETWORK_INFO_H
+#ifndef NETWORK_INFO_H
+#define NETWORK_INFO_H
+
+#include <windows.h>
+#include <iphlpapi.h>
+
+// 确保GetAdaptersInfo函数声明
+#ifndef _IPHLPAPI_
+#define _IPHLPAPI_
+DWORD GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen);
+#endif
+
+typedef struct {
+    char adapterName[MAX_ADAPTER_NAME_LENGTH + 4];
+    char description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4];
+    char ipAddress[16];
+    char macAddress[18];
+    ULONG speed; // in Mbps
+} NetworkAdapterInfo;
+
+void get_network_adapters(NetworkAdapterInfo* adapters, int* count);
+
+#endif // NETWORK_INFO_H

others/C/System_Information/include/performance_info.h

@@ -1,26 +1,26 @@
-#ifndef PERFORMANCE_INFO_H
-#define PERFORMANCE_INFO_H
-
-#include <windows.h>
-#include <pdh.h>
-
-// 确保PDH函数声明
-#ifndef _PDH_H_
-#define _PDH_H_
-PDH_STATUS PdhOpenQueryA(LPCSTR szDataSource, DWORD_PTR dwUserData, PDH_HQUERY* phQuery);
-PDH_STATUS PdhAddCounterA(PDH_HQUERY hQuery, LPCSTR szFullCounterPath, DWORD_PTR dwUserData, PDH_HCOUNTER* phCounter);
-PDH_STATUS PdhCollectQueryData(PDH_HQUERY hQuery);
-PDH_STATUS PdhGetFormattedCounterValue(PDH_HCOUNTER hCounter, DWORD dwFormat, LPDWORD lpdwType, PPDH_FMT_COUNTERVALUE pValue);
-#endif
-
-typedef struct {
-    DWORD cpuUsage;         // CPU使用率百分比
-    DWORD memoryUsage;       // 内存使用率百分比
-    DWORD processesCount;   // 进程数量
-    DWORD threadsCount;      // 线程数量
-    DWORD handlesCount;      // 句柄数量
-} PerformanceInfo;
-
-void get_performance_info(PerformanceInfo* perfInfo);
-
-#endif // PERFORMANCE_INFO_H
+#ifndef PERFORMANCE_INFO_H
+#define PERFORMANCE_INFO_H
+
+#include <windows.h>
+#include <pdh.h>
+
+// 确保PDH函数声明
+#ifndef _PDH_H_
+#define _PDH_H_
+PDH_STATUS PdhOpenQueryA(LPCSTR szDataSource, DWORD_PTR dwUserData, PDH_HQUERY* phQuery);
+PDH_STATUS PdhAddCounterA(PDH_HQUERY hQuery, LPCSTR szFullCounterPath, DWORD_PTR dwUserData, PDH_HCOUNTER* phCounter);
+PDH_STATUS PdhCollectQueryData(PDH_HQUERY hQuery);
+PDH_STATUS PdhGetFormattedCounterValue(PDH_HCOUNTER hCounter, DWORD dwFormat, LPDWORD lpdwType, PPDH_FMT_COUNTERVALUE pValue);
+#endif
+
+typedef struct {
+    DWORD cpuUsage;         // CPU使用率百分比
+    DWORD memoryUsage;       // 内存使用率百分比
+    DWORD processesCount;   // 进程数量
+    DWORD threadsCount;      // 线程数量
+    DWORD handlesCount;      // 句柄数量
+} PerformanceInfo;
+
+void get_performance_info(PerformanceInfo* perfInfo);
+
+#endif // PERFORMANCE_INFO_H

others/C/System_Information/include/resource.h

@@ -1,11 +1,11 @@
-#ifndef RESOURCE_H
-#define RESOURCE_H
-
-#define IDI_MAIN_ICON 101
-#define IDR_MAIN_MENU 102
-
-#define IDM_EXIT 1001
-#define IDM_ABOUT 1002
-#define IDM_SHOW_INFO 1003
-
-#endif // RESOURCE_H
+#ifndef RESOURCE_H
+#define RESOURCE_H
+
+#define IDI_MAIN_ICON 101
+#define IDR_MAIN_MENU 102
+
+#define IDM_EXIT 1001
+#define IDM_ABOUT 1002
+#define IDM_SHOW_INFO 1003
+
+#endif // RESOURCE_H

others/C/System_Information/include/system_info.h

@@ -1,21 +1,21 @@
-#ifndef SYSTEM_INFO_H
-#define SYSTEM_INFO_H
-
-#include <windows.h>
-
-typedef struct {
-    char cpuName[256];
-    DWORD cpuCores;
-    DWORD cpuThreads;
-    MEMORYSTATUSEX memoryStatus;
-    SYSTEM_INFO systemInfo;
-    OSVERSIONINFOEX osVersion;
-} SystemInfo;
-
-// 初始化系统信息
-void init_system_info(SystemInfo* sysInfo);
-
-// 创建主窗口
-int create_main_window(HINSTANCE hInstance, SystemInfo* sysInfo, UINT codePage);
-
-#endif // SYSTEM_INFO_H
+#ifndef SYSTEM_INFO_H
+#define SYSTEM_INFO_H
+
+#include <windows.h>
+
+typedef struct {
+    char cpuName[256];
+    DWORD cpuCores;
+    DWORD cpuThreads;
+    MEMORYSTATUSEX memoryStatus;
+    SYSTEM_INFO systemInfo;
+    OSVERSIONINFOEX osVersion;
+} SystemInfo;
+
+// 初始化系统信息
+void init_system_info(SystemInfo* sysInfo);
+
+// 创建主窗口
+int create_main_window(HINSTANCE hInstance, SystemInfo* sysInfo, UINT codePage);
+
+#endif // SYSTEM_INFO_H

others/C/System_Information/include/system_tray.h

@@ -1,13 +1,13 @@
-#ifndef SYSTEM_TRAY_H
-#define SYSTEM_TRAY_H
-
-#include <windows.h>
-
-#define WM_TRAYICON (WM_USER + 1)
-#define ID_TRAYICON 100
-
-void create_tray_icon(HWND hWnd, HICON hIcon);
-void update_tray_icon(HWND hWnd, HICON hIcon, LPCTSTR tooltip);
-void remove_tray_icon(HWND hWnd);
-
-#endif // SYSTEM_TRAY_H
+#ifndef SYSTEM_TRAY_H
+#define SYSTEM_TRAY_H
+
+#include <windows.h>
+
+#define WM_TRAYICON (WM_USER + 1)
+#define ID_TRAYICON 100
+
+void create_tray_icon(HWND hWnd, HICON hIcon);
+void update_tray_icon(HWND hWnd, HICON hIcon, LPCTSTR tooltip);
+void remove_tray_icon(HWND hWnd);
+
+#endif // SYSTEM_TRAY_H

others/C/System_Information/include/utils.h

@@ -1,18 +1,18 @@
-#ifndef UTILS_H
-#define UTILS_H
-
-#include <windows.h>
-
-// 安全释放内存
-#define SAFE_FREE(ptr) if (ptr) { free(ptr); ptr = NULL; }
-
-// 宽字符转多字节字符串
-char* wchar_to_mb(const wchar_t* wstr);
-
-// 多字节字符串转宽字符
-wchar_t* mb_to_wchar(const char* str);
-
-// 获取当前时间字符串
-char* get_current_time_string();
-
-#endif // UTILS_H
+#ifndef UTILS_H
+#define UTILS_H
+
+#include <windows.h>
+
+// 安全释放内存
+#define SAFE_FREE(ptr) if (ptr) { free(ptr); ptr = NULL; }
+
+// 宽字符转多字节字符串
+char* wchar_to_mb(const wchar_t* wstr);
+
+// 多字节字符串转宽字符
+wchar_t* mb_to_wchar(const char* str);
+
+// 获取当前时间字符串
+char* get_current_time_string();
+
+#endif // UTILS_H

others/C/System_Information/include/window_utils.h

@@ -1,16 +1,16 @@
-#ifndef WINDOW_UTILS_H
-#define WINDOW_UTILS_H
-
-#include <windows.h>
-#include "system_info.h"
-
-// 窗口过程函数
-LRESULT CALLBACK MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-
-// 创建主窗口
-int create_main_window(HINSTANCE hInstance, SystemInfo* sysInfo, UINT codePage);
-
-// 注册窗口类
-BOOL register_window_class(HINSTANCE hInstance);
-
-#endif // WINDOW_UTILS_H
+#ifndef WINDOW_UTILS_H
+#define WINDOW_UTILS_H
+
+#include <windows.h>
+#include "system_info.h"
+
+// 窗口过程函数
+LRESULT CALLBACK MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+
+// 创建主窗口
+int create_main_window(HINSTANCE hInstance, SystemInfo* sysInfo, UINT codePage);
+
+// 注册窗口类
+BOOL register_window_class(HINSTANCE hInstance);
+
+#endif // WINDOW_UTILS_H

others/C/System_Information/src/about_dialog.c

@@ -1,9 +1,9 @@
-#include "about_dialog.h"
-#include <tchar.h>
-
-void show_about_dialog(HWND hParent) {
-    MessageBox(hParent, 
-        _T("系统信息查看器\n版本 1.0\n\n一个简单的Windows系统信息工具"),
-        _T("关于"), 
-        MB_OK | MB_ICONINFORMATION);
-}
+#include "about_dialog.h"
+#include <tchar.h>
+
+void show_about_dialog(HWND hParent) {
+    MessageBox(hParent, 
+        _T("系统信息查看器\n版本 1.0\n\n一个简单的Windows系统信息工具"),
+        _T("关于"), 
+        MB_OK | MB_ICONINFORMATION);
+}

others/C/System_Information/src/disk_info.c

@@ -1,40 +1,40 @@
-#include "disk_info.h"
-#include <tchar.h>
-
-void get_disk_info(DiskInfo* disks, int* count) {
-    DWORD drives = GetLogicalDrives();
-    *count = 0;
-
-    for (char drive = 'A'; drive <= 'Z'; drive++) {
-        if (drives & (1 << (drive - 'A'))) {
-            TCHAR rootPath[4] = {drive, ':', '\\', '\0'};
-            TCHAR fileSystem[32];
-            DWORD serialNumber, maxComponentLength, fileSystemFlags;
-
-            if (GetVolumeInformation(
-                rootPath,
-                NULL, 0,
-                &serialNumber,
-                &maxComponentLength,
-                &fileSystemFlags,
-                fileSystem, sizeof(fileSystem))) {
-
-                DiskInfo* disk = &disks[(*count)++];
-                disk->driveLetter = drive;
-
-                ULARGE_INTEGER freeBytes, totalBytes, totalFreeBytes;
-                if (GetDiskFreeSpaceEx(
-                    rootPath,
-                    &freeBytes,
-                    &totalBytes,
-                    &totalFreeBytes)) {
-                    disk->totalBytes = totalBytes.QuadPart;
-                    disk->freeBytes = freeBytes.QuadPart;
-                }
-
-                strncpy(disk->fileSystem, fileSystem, sizeof(disk->fileSystem) - 1);
-                disk->fileSystem[sizeof(disk->fileSystem) - 1] = '\0';
-            }
-        }
-    }
-}
+#include "disk_info.h"
+#include <tchar.h>
+
+void get_disk_info(DiskInfo* disks, int* count) {
+    DWORD drives = GetLogicalDrives();
+    *count = 0;
+
+    for (char drive = 'A'; drive <= 'Z'; drive++) {
+        if (drives & (1 << (drive - 'A'))) {
+            TCHAR rootPath[4] = {drive, ':', '\\', '\0'};
+            TCHAR fileSystem[32];
+            DWORD serialNumber, maxComponentLength, fileSystemFlags;
+
+            if (GetVolumeInformation(
+                rootPath,
+                NULL, 0,
+                &serialNumber,
+                &maxComponentLength,
+                &fileSystemFlags,
+                fileSystem, sizeof(fileSystem))) {
+
+                DiskInfo* disk = &disks[(*count)++];
+                disk->driveLetter = drive;
+
+                ULARGE_INTEGER freeBytes, totalBytes, totalFreeBytes;
+                if (GetDiskFreeSpaceEx(
+                    rootPath,
+                    &freeBytes,
+                    &totalBytes,
+                    &totalFreeBytes)) {
+                    disk->totalBytes = totalBytes.QuadPart;
+                    disk->freeBytes = freeBytes.QuadPart;
+                }
+
+                strncpy(disk->fileSystem, fileSystem, sizeof(disk->fileSystem) - 1);
+                disk->fileSystem[sizeof(disk->fileSystem) - 1] = '\0';
+            }
+        }
+    }
+}

others/C/System_Information/src/logging.c

@@ -1,41 +1,41 @@
-#include "logging.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-
-static const char* level_strings[] = {
-    "DEBUG",
-    "INFO",
-    "WARNING",
-    "ERROR"
-};
-
-void log_message(LogLevel level, const char* format, ...) {
-    va_list args;
-    va_start(args, format);
-
-    // 获取当前时间
-    time_t now;
-    time(&now);
-    struct tm* timeinfo = localtime(&now);
-    char time_str[20];
-    strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", timeinfo);
-
-    // 格式化日志消息
-    char message[1024];
-    vsnprintf(message, sizeof(message), format, args);
-
-    // 输出到调试控制台
-    char output[2048];
-    snprintf(output, sizeof(output), "[%s] [%s] %s\n", time_str, level_strings[level], message);
-    OutputDebugStringA(output);
-
-    // 输出到文件
-    FILE* log_file = fopen("system_info.log", "a");
-    if (log_file) {
-        fprintf(log_file, "%s", output);
-        fclose(log_file);
-    }
-
-    va_end(args);
-}
+#include "logging.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <time.h>
+
+static const char* level_strings[] = {
+    "DEBUG",
+    "INFO",
+    "WARNING",
+    "ERROR"
+};
+
+void log_message(LogLevel level, const char* format, ...) {
+    va_list args;
+    va_start(args, format);
+
+    // 获取当前时间
+    time_t now;
+    time(&now);
+    struct tm* timeinfo = localtime(&now);
+    char time_str[20];
+    strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", timeinfo);
+
+    // 格式化日志消息
+    char message[1024];
+    vsnprintf(message, sizeof(message), format, args);
+
+    // 输出到调试控制台
+    char output[2048];
+    snprintf(output, sizeof(output), "[%s] [%s] %s\n", time_str, level_strings[level], message);
+    OutputDebugStringA(output);
+
+    // 输出到文件
+    FILE* log_file = fopen("system_info.log", "a");
+    if (log_file) {
+        fprintf(log_file, "%s", output);
+        fclose(log_file);
+    }
+
+    va_end(args);
+}

others/C/System_Information/src/main.c

@@ -1,29 +1,29 @@
-#include <windows.h>
-#include <tchar.h>
-#include <locale.h>
-#include "system_info.h"
-#include "window_utils.h"
-#include "logging.h"
-
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-    UNREFERENCED_PARAMETER(nCmdShow);
-    
-    // 设置控制台编码为UTF-8
-    SetConsoleOutputCP(65001);
-    setlocale(LC_ALL, "chs");
-
-    // 初始化日志系统
-    log_message(LOG_INFO, "应用程序启动");
-
-    // 初始化系统信息收集
-    SystemInfo sysInfo;
-    init_system_info(&sysInfo);
-
-    // 创建并显示主窗口，传递UTF-8编码标识
-    int result = create_main_window(hInstance, &sysInfo, 65001);
-
-    log_message(LOG_INFO, "应用程序退出");
-    return result;
-}
+#include <windows.h>
+#include <tchar.h>
+#include <locale.h>
+#include "system_info.h"
+#include "window_utils.h"
+#include "logging.h"
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(lpCmdLine);
+    UNREFERENCED_PARAMETER(nCmdShow);
+    
+    // 设置控制台编码为UTF-8
+    SetConsoleOutputCP(65001);
+    setlocale(LC_ALL, "chs");
+
+    // 初始化日志系统
+    log_message(LOG_INFO, "应用程序启动");
+
+    // 初始化系统信息收集
+    SystemInfo sysInfo;
+    init_system_info(&sysInfo);
+
+    // 创建并显示主窗口，传递UTF-8编码标识
+    int result = create_main_window(hInstance, &sysInfo, 65001);
+
+    log_message(LOG_INFO, "应用程序退出");
+    return result;
+}

others/C/System_Information/src/main_window.c

@@ -1,31 +1,101 @@
 #include "main_window.h"
+#include "disk_info.h"
 #include <tchar.h>
 #include <commctrl.h>
 #include <wchar.h>
 #include <stdio.h>
 
 #define IDC_INFO_TEXT 1002
+#define IDM_FULLSCREEN 1003
+
+// 全屏状态标志
+static BOOL g_isFullScreen = FALSE;
+// 保存原始窗口位置和大小
+static RECT g_windowRect;
+
+void toggle_fullscreen(HWND hWnd) {
+    g_isFullScreen = !g_isFullScreen;
+    
+    if (g_isFullScreen) {
+        // 保存当前窗口位置和大小
+        GetWindowRect(hWnd, &g_windowRect);
+        
+        // 设置全屏样式
+        SetWindowLong(hWnd, GWL_STYLE, 
+                     WS_OVERLAPPEDWINDOW & ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU));
+        
+        // 设置全屏尺寸
+        MONITORINFO mi = {0};
+        mi.cbSize = sizeof(mi);
+        GetMonitorInfo(MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST), &mi);
+        SetWindowPos(hWnd, HWND_TOP,
+                    mi.rcMonitor.left,
+                    mi.rcMonitor.top,
+                    mi.rcMonitor.right - mi.rcMonitor.left,
+                    mi.rcMonitor.bottom - mi.rcMonitor.top,
+                    SWP_FRAMECHANGED);
+    } else {
+        // 恢复窗口样式
+        SetWindowLong(hWnd, GWL_STYLE, WS_OVERLAPPEDWINDOW);
+        
+        // 恢复原始大小和位置
+        SetWindowPos(hWnd, NULL,
+                    g_windowRect.left,
+                    g_windowRect.top,
+                    g_windowRect.right - g_windowRect.left,
+                    g_windowRect.bottom - g_windowRect.top,
+                    SWP_FRAMECHANGED);
+    }
+}
 
 void update_main_window(HWND hWnd, SystemInfo* sysInfo) {
+    // 根据全屏状态计算窗口尺寸
+    int windowWidth, windowHeight;
+    if (g_isFullScreen) {
+        MONITORINFO mi = {0};
+        mi.cbSize = sizeof(mi);
+        GetMonitorInfo(MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST), &mi);
+        windowWidth = mi.rcMonitor.right - mi.rcMonitor.left;
+        windowHeight = mi.rcMonitor.bottom - mi.rcMonitor.top;
+    } else {
+        // 普通模式下使用70%屏幕尺寸
+        windowWidth = (int)(GetSystemMetrics(SM_CXSCREEN) * 0.7);
+        windowHeight = (int)(GetSystemMetrics(SM_CYSCREEN) * 0.7);
+    }
+    
     HWND hInfoText = GetDlgItem(hWnd, IDC_INFO_TEXT);
-    if (!hInfoText) {
+    if (hInfoText) {
+        // 更新现有控件大小和位置
+        SetWindowPos(hInfoText, NULL, 
+                    30, 50, windowWidth - 60, windowHeight - 80,
+                    SWP_NOZORDER);
+    } else {
         // 创建信息显示控件
         hInfoText = CreateWindow(
-            _T("EDIT"),
+            _T("EDIT"), 
             _T(""),
-            WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_MULTILINE | ES_READONLY,
-            20, 50, 800, 550,
+            WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_MULTILINE | ES_READONLY | WS_BORDER,
+            30, 50, windowWidth - 60, windowHeight - 80,
             hWnd,
             (HMENU)IDC_INFO_TEXT,
             (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE),
             NULL);
         
-        SendMessage(hInfoText, WM_SETFONT, 
-                   (WPARAM)GetStockObject(DEFAULT_GUI_FONT), TRUE);
+    // 计算动态字体大小
+    int fontSize = max(16, windowHeight / 30);
+    
+    // 创建支持中文的字体
+    HFONT hFont = CreateFont(
+        fontSize, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
+        DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+        DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE,
+        _T("Microsoft YaHei"));
+        
+        SendMessage(hInfoText, WM_SETFONT, (WPARAM)hFont, TRUE);
     }
 
     // 使用宽字符处理所有文本
-    wchar_t infoText[2048];
+    wchar_t infoText[4096];  // 增大缓冲区以适应磁盘信息
     wchar_t cpuNameW[256];
     MultiByteToWideChar(CP_UTF8, 0, sysInfo->cpuName, -1, cpuNameW, 256);
     
@@ -51,5 +121,26 @@ void update_main_window(HWND hWnd, SystemInfo* sysInfo) {
         sysInfo->osVersion.dwMinorVersion,
         sysInfo->osVersion.dwBuildNumber);
 
+    // 添加磁盘信息
+    DiskInfo disks[26];
+    int diskCount;
+    get_disk_info(disks, &diskCount);
+    
+    wchar_t diskInfoText[2048];
+    swprintf(diskInfoText, 2048,
+        L"\r\n[磁盘信息]\r\n"
+        L"磁盘数量: %d\r\n", diskCount);
+    wcscat(infoText, diskInfoText);
+    
+    for (int i = 0; i < diskCount; i++) {
+        swprintf(diskInfoText, 2048,
+            L"%c: 文件系统: %ls, 总容量: %.2f GB, 剩余容量: %.2f GB\r\n",
+            disks[i].driveLetter,
+            disks[i].fileSystem[0] ? L"NTFS" : L"",
+            (float)disks[i].totalBytes / (1024 * 1024 * 1024),
+            (float)disks[i].freeBytes / (1024 * 1024 * 1024));
+        wcscat(infoText, diskInfoText);
+    }
+
     SetWindowTextW(hInfoText, infoText);
 }

others/C/System_Information/src/network_info.c

@@ -1,85 +1,85 @@
-#include "network_info.h"
-#include "config.h"
-#include <stdio.h>
-
-// 定义函数指针类型
-typedef DWORD (WINAPI *GetAdaptersInfoFunc)(_Out_ PIP_ADAPTER_INFO, _Inout_ PULONG);
-
-// 安全的函数指针转换函数
-static FARPROC safe_get_proc_address(HMODULE module, const char* name) {
-    FARPROC proc = GetProcAddress(module, name);
-    if (!proc) {
-        return NULL;
-    }
-    return proc;
-}
-
-// 辅助宏用于安全的函数指针转换
-#define GET_PROC_ADDRESS(module, name, type) \
-    ((type)(void*)safe_get_proc_address(module, name))
-
-void get_network_adapters(NetworkAdapterInfo* adapters, int* count) {
-    HMODULE hModule = LoadLibrary("iphlpapi.dll");
-    if (!hModule) return;
-
-    // 使用类型安全的函数指针转换
-    GetAdaptersInfoFunc pGetAdaptersInfo = GET_PROC_ADDRESS(hModule, "GetAdaptersInfo", GetAdaptersInfoFunc);
-    if (!pGetAdaptersInfo) {
-        FreeLibrary(hModule);
-        return;
-    }
-
-    PIP_ADAPTER_INFO pAdapterInfo = NULL;
-    PIP_ADAPTER_INFO pAdapter = NULL;
-    DWORD dwRetVal = 0;
-    ULONG ulOutBufLen = sizeof(IP_ADAPTER_INFO);
-    
-    *count = 0;
-
-    pAdapterInfo = (IP_ADAPTER_INFO*)malloc(sizeof(IP_ADAPTER_INFO));
-    if (pAdapterInfo == NULL) {
-        FreeLibrary(hModule);
-        return;
-    }
-
-    // 第一次调用获取缓冲区大小
-    if (pGetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) {
-        free(pAdapterInfo);
-        pAdapterInfo = (IP_ADAPTER_INFO*)malloc(ulOutBufLen);
-        if (pAdapterInfo == NULL) {
-            FreeLibrary(hModule);
-            return;
-        }
-    }
-
-    if ((dwRetVal = pGetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == NO_ERROR) {
-        pAdapter = pAdapterInfo;
-        while (pAdapter && *count < MAX_ADAPTERS) {
-            NetworkAdapterInfo* adapter = &adapters[(*count)++];
-            
-            // 复制适配器名称和描述
-            strncpy(adapter->adapterName, pAdapter->AdapterName, MAX_ADAPTER_NAME_LENGTH);
-            strncpy(adapter->description, pAdapter->Description, MAX_ADAPTER_DESCRIPTION_LENGTH);
-            
-            // 格式化IP地址
-            if (pAdapter->IpAddressList.IpAddress.String[0] != '\0') {
-                strncpy(adapter->ipAddress, pAdapter->IpAddressList.IpAddress.String, 15);
-                adapter->ipAddress[15] = '\0';
-            } else {
-                strcpy(adapter->ipAddress, "N/A");
-            }
-            
-            // 格式化MAC地址
-            sprintf(adapter->macAddress, "%02X:%02X:%02X:%02X:%02X:%02X",
-                   pAdapter->Address[0], pAdapter->Address[1],
-                   pAdapter->Address[2], pAdapter->Address[3],
-                   pAdapter->Address[4], pAdapter->Address[5]);
-            
-            adapter->speed = pAdapter->DhcpEnabled ? 100 : 10; // 简化处理，实际项目中应使用更精确的方法
-            
-            pAdapter = pAdapter->Next;
-        }
-    }
-
-    free(pAdapterInfo);
-}
+#include "network_info.h"
+#include "config.h"
+#include <stdio.h>
+
+// 定义函数指针类型
+typedef DWORD (WINAPI *GetAdaptersInfoFunc)(_Out_ PIP_ADAPTER_INFO, _Inout_ PULONG);
+
+// 安全的函数指针转换函数
+static FARPROC safe_get_proc_address(HMODULE module, const char* name) {
+    FARPROC proc = GetProcAddress(module, name);
+    if (!proc) {
+        return NULL;
+    }
+    return proc;
+}
+
+// 辅助宏用于安全的函数指针转换
+#define GET_PROC_ADDRESS(module, name, type) \
+    ((type)(void*)safe_get_proc_address(module, name))
+
+void get_network_adapters(NetworkAdapterInfo* adapters, int* count) {
+    HMODULE hModule = LoadLibrary("iphlpapi.dll");
+    if (!hModule) return;
+
+    // 使用类型安全的函数指针转换
+    GetAdaptersInfoFunc pGetAdaptersInfo = GET_PROC_ADDRESS(hModule, "GetAdaptersInfo", GetAdaptersInfoFunc);
+    if (!pGetAdaptersInfo) {
+        FreeLibrary(hModule);
+        return;
+    }
+
+    PIP_ADAPTER_INFO pAdapterInfo = NULL;
+    PIP_ADAPTER_INFO pAdapter = NULL;
+    DWORD dwRetVal = 0;
+    ULONG ulOutBufLen = sizeof(IP_ADAPTER_INFO);
+    
+    *count = 0;
+
+    pAdapterInfo = (IP_ADAPTER_INFO*)malloc(sizeof(IP_ADAPTER_INFO));
+    if (pAdapterInfo == NULL) {
+        FreeLibrary(hModule);
+        return;
+    }
+
+    // 第一次调用获取缓冲区大小
+    if (pGetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) {
+        free(pAdapterInfo);
+        pAdapterInfo = (IP_ADAPTER_INFO*)malloc(ulOutBufLen);
+        if (pAdapterInfo == NULL) {
+            FreeLibrary(hModule);
+            return;
+        }
+    }
+
+    if ((dwRetVal = pGetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == NO_ERROR) {
+        pAdapter = pAdapterInfo;
+        while (pAdapter && *count < MAX_ADAPTERS) {
+            NetworkAdapterInfo* adapter = &adapters[(*count)++];
+            
+            // 复制适配器名称和描述
+            strncpy(adapter->adapterName, pAdapter->AdapterName, MAX_ADAPTER_NAME_LENGTH);
+            strncpy(adapter->description, pAdapter->Description, MAX_ADAPTER_DESCRIPTION_LENGTH);
+            
+            // 格式化IP地址
+            if (pAdapter->IpAddressList.IpAddress.String[0] != '\0') {
+                strncpy(adapter->ipAddress, pAdapter->IpAddressList.IpAddress.String, 15);
+                adapter->ipAddress[15] = '\0';
+            } else {
+                strcpy(adapter->ipAddress, "N/A");
+            }
+            
+            // 格式化MAC地址
+            sprintf(adapter->macAddress, "%02X:%02X:%02X:%02X:%02X:%02X",
+                   pAdapter->Address[0], pAdapter->Address[1],
+                   pAdapter->Address[2], pAdapter->Address[3],
+                   pAdapter->Address[4], pAdapter->Address[5]);
+            
+            adapter->speed = pAdapter->DhcpEnabled ? 100 : 10; // 简化处理，实际项目中应使用更精确的方法
+            
+            pAdapter = pAdapter->Next;
+        }
+    }
+
+    free(pAdapterInfo);
+}

others/C/System_Information/src/performance_info.c

@@ -1,137 +1,137 @@
-#include "performance_info.h"
-#include <pdh.h>
-#include <psapi.h>
-
-
-
-#include "performance_info.h"
-#include <windows.h>
-#include <psapi.h>
-
-// 定义函数指针类型
-typedef PDH_STATUS (WINAPI *PdhOpenQueryFunc)(_In_opt_ LPCSTR, _In_ DWORD_PTR, _Out_ PDH_HQUERY*);
-typedef PDH_STATUS (WINAPI *PdhAddCounterFunc)(_In_ PDH_HQUERY, _In_ LPCSTR, _In_ DWORD_PTR, _Out_ PDH_HCOUNTER*);
-typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)(_In_ PDH_HQUERY);
-typedef PDH_STATUS (WINAPI *PdhGetFormattedCounterValueFunc)(_In_ PDH_HCOUNTER, _In_ DWORD, _Out_opt_ LPDWORD, _Out_ PPDH_FMT_COUNTERVALUE);
-
-// 安全的函数指针转换函数
-static FARPROC safe_get_proc_address(HMODULE module, const char* name) {
-    FARPROC proc = GetProcAddress(module, name);
-    if (!proc) {
-        return NULL;
-    }
-    return proc;
-}
-
-// 辅助宏用于安全的函数指针转换
-#define GET_PROC_ADDRESS(module, name, type) \
-    ((type)(void*)safe_get_proc_address(module, name))
-
-static PDH_HQUERY cpuQuery;
-static PDH_HCOUNTER cpuTotal;
-static HMODULE hPdhModule = NULL;
-static PdhOpenQueryFunc pPdhOpenQuery = NULL;
-static PdhAddCounterFunc pPdhAddCounter = NULL;
-static PdhCollectQueryDataFunc pPdhCollectQueryData = NULL;
-static PdhGetFormattedCounterValueFunc pPdhGetFormattedCounterValue = NULL;
-
-void init_performance_counters() {
-    hPdhModule = LoadLibrary("pdh.dll");
-    if (!hPdhModule) {
-        return;
-    }
-
-    pPdhOpenQuery = GET_PROC_ADDRESS(hPdhModule, "PdhOpenQueryA", PdhOpenQueryFunc);
-    pPdhAddCounter = GET_PROC_ADDRESS(hPdhModule, "PdhAddCounterA", PdhAddCounterFunc);
-    pPdhCollectQueryData = GET_PROC_ADDRESS(hPdhModule, "PdhCollectQueryData", PdhCollectQueryDataFunc);
-    pPdhGetFormattedCounterValue = GET_PROC_ADDRESS(hPdhModule, "PdhGetFormattedCounterValue", PdhGetFormattedCounterValueFunc);
-
-    if (pPdhOpenQuery && pPdhAddCounter && pPdhCollectQueryData) {
-        // 初始化性能计数器
-        if (pPdhOpenQuery(NULL, 0, &cpuQuery) != ERROR_SUCCESS) {
-            return;
-        }
-        
-        // 添加CPU计数器
-        if (pPdhAddCounter(cpuQuery, "\\Processor(_Total)\\% Processor Time", 0, &cpuTotal) != ERROR_SUCCESS) {
-            return;
-        }
-        
-        // 第一次收集数据，用于初始化
-        pPdhCollectQueryData(cpuQuery);
-        Sleep(1000); // 等待1秒获取基准数据
-        pPdhCollectQueryData(cpuQuery);
-    }
-}
-
-void get_performance_info(PerformanceInfo* perfInfo) {
-    static BOOL initialized = FALSE;
-    if (!initialized) {
-        init_performance_counters();
-        initialized = TRUE;
-    }
-
-    // 获取CPU使用率
-    if (pPdhCollectQueryData && pPdhGetFormattedCounterValue) {
-        // 第一次收集数据作为基准
-        pPdhCollectQueryData(cpuQuery);
-        Sleep(1000); // 等待1秒
-        pPdhCollectQueryData(cpuQuery); // 第二次收集数据
-        
-        PDH_FMT_COUNTERVALUE counterVal;
-        if (pPdhGetFormattedCounterValue(cpuTotal, PDH_FMT_DOUBLE, NULL, &counterVal) == ERROR_SUCCESS) {
-            perfInfo->cpuUsage = (DWORD)counterVal.doubleValue;
-        } else {
-            perfInfo->cpuUsage = 0;
-        }
-    } else {
-        // 如果PDH不可用，使用GetSystemTimes作为备用方案
-        FILETIME idleTime, kernelTime, userTime;
-        if (GetSystemTimes(&idleTime, &kernelTime, &userTime)) {
-            ULONGLONG idle = ((ULONGLONG)idleTime.dwHighDateTime << 32) | idleTime.dwLowDateTime;
-            ULONGLONG kernel = ((ULONGLONG)kernelTime.dwHighDateTime << 32) | kernelTime.dwLowDateTime;
-            ULONGLONG user = ((ULONGLONG)userTime.dwHighDateTime << 32) | userTime.dwLowDateTime;
-            
-            static ULONGLONG prevIdle = 0, prevKernel = 0, prevUser = 0;
-            ULONGLONG idleDiff = idle - prevIdle;
-            ULONGLONG kernelDiff = kernel - prevKernel;
-            ULONGLONG userDiff = user - prevUser;
-            
-            if (prevIdle != 0 && (kernelDiff + userDiff) > 0) {
-                perfInfo->cpuUsage = (DWORD)(100.0 - (100.0 * idleDiff) / (kernelDiff + userDiff));
-            } else {
-                perfInfo->cpuUsage = 0;
-            }
-            
-            prevIdle = idle;
-            prevKernel = kernel;
-            prevUser = user;
-        } else {
-            perfInfo->cpuUsage = 0;
-        }
-    }
-
-    // 获取内存使用率
-    MEMORYSTATUSEX memInfo;
-    memInfo.dwLength = sizeof(MEMORYSTATUSEX);
-    GlobalMemoryStatusEx(&memInfo);
-    // 使用GlobalMemoryStatusEx获取更精确的内存使用率
-    MEMORYSTATUSEX memStatus;
-    memStatus.dwLength = sizeof(memStatus);
-    GlobalMemoryStatusEx(&memStatus);
-    perfInfo->memoryUsage = memStatus.dwMemoryLoad;
-
-    // 获取进程和线程数量
-    PERFORMANCE_INFORMATION perfInfoStruct;
-    GetPerformanceInfo(&perfInfoStruct, sizeof(perfInfoStruct));
-    perfInfo->processesCount = perfInfoStruct.ProcessCount;
-    perfInfo->threadsCount = perfInfoStruct.ThreadCount;
-    perfInfo->handlesCount = perfInfoStruct.HandleCount;
-}
-
-void cleanup_performance_counters() {
-    if (hPdhModule) {
-        FreeLibrary(hPdhModule);
-        hPdhModule = NULL;
-    }
+#include "performance_info.h"
+#include <pdh.h>
+#include <psapi.h>
+
+
+
+#include "performance_info.h"
+#include <windows.h>
+#include <psapi.h>
+
+// 定义函数指针类型
+typedef PDH_STATUS (WINAPI *PdhOpenQueryFunc)(_In_opt_ LPCSTR, _In_ DWORD_PTR, _Out_ PDH_HQUERY*);
+typedef PDH_STATUS (WINAPI *PdhAddCounterFunc)(_In_ PDH_HQUERY, _In_ LPCSTR, _In_ DWORD_PTR, _Out_ PDH_HCOUNTER*);
+typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)(_In_ PDH_HQUERY);
+typedef PDH_STATUS (WINAPI *PdhGetFormattedCounterValueFunc)(_In_ PDH_HCOUNTER, _In_ DWORD, _Out_opt_ LPDWORD, _Out_ PPDH_FMT_COUNTERVALUE);
+
+// 安全的函数指针转换函数
+static FARPROC safe_get_proc_address(HMODULE module, const char* name) {
+    FARPROC proc = GetProcAddress(module, name);
+    if (!proc) {
+        return NULL;
+    }
+    return proc;
+}
+
+// 辅助宏用于安全的函数指针转换
+#define GET_PROC_ADDRESS(module, name, type) \
+    ((type)(void*)safe_get_proc_address(module, name))
+
+static PDH_HQUERY cpuQuery;
+static PDH_HCOUNTER cpuTotal;
+static HMODULE hPdhModule = NULL;
+static PdhOpenQueryFunc pPdhOpenQuery = NULL;
+static PdhAddCounterFunc pPdhAddCounter = NULL;
+static PdhCollectQueryDataFunc pPdhCollectQueryData = NULL;
+static PdhGetFormattedCounterValueFunc pPdhGetFormattedCounterValue = NULL;
+
+void init_performance_counters() {
+    hPdhModule = LoadLibrary("pdh.dll");
+    if (!hPdhModule) {
+        return;
+    }
+
+    pPdhOpenQuery = GET_PROC_ADDRESS(hPdhModule, "PdhOpenQueryA", PdhOpenQueryFunc);
+    pPdhAddCounter = GET_PROC_ADDRESS(hPdhModule, "PdhAddCounterA", PdhAddCounterFunc);
+    pPdhCollectQueryData = GET_PROC_ADDRESS(hPdhModule, "PdhCollectQueryData", PdhCollectQueryDataFunc);
+    pPdhGetFormattedCounterValue = GET_PROC_ADDRESS(hPdhModule, "PdhGetFormattedCounterValue", PdhGetFormattedCounterValueFunc);
+
+    if (pPdhOpenQuery && pPdhAddCounter && pPdhCollectQueryData) {
+        // 初始化性能计数器
+        if (pPdhOpenQuery(NULL, 0, &cpuQuery) != ERROR_SUCCESS) {
+            return;
+        }
+        
+        // 添加CPU计数器
+        if (pPdhAddCounter(cpuQuery, "\\Processor(_Total)\\% Processor Time", 0, &cpuTotal) != ERROR_SUCCESS) {
+            return;
+        }
+        
+        // 第一次收集数据，用于初始化
+        pPdhCollectQueryData(cpuQuery);
+        Sleep(1000); // 等待1秒获取基准数据
+        pPdhCollectQueryData(cpuQuery);
+    }
+}
+
+void get_performance_info(PerformanceInfo* perfInfo) {
+    static BOOL initialized = FALSE;
+    if (!initialized) {
+        init_performance_counters();
+        initialized = TRUE;
+    }
+
+    // 获取CPU使用率
+    if (pPdhCollectQueryData && pPdhGetFormattedCounterValue) {
+        // 第一次收集数据作为基准
+        pPdhCollectQueryData(cpuQuery);
+        Sleep(1000); // 等待1秒
+        pPdhCollectQueryData(cpuQuery); // 第二次收集数据
+        
+        PDH_FMT_COUNTERVALUE counterVal;
+        if (pPdhGetFormattedCounterValue(cpuTotal, PDH_FMT_DOUBLE, NULL, &counterVal) == ERROR_SUCCESS) {
+            perfInfo->cpuUsage = (DWORD)counterVal.doubleValue;
+        } else {
+            perfInfo->cpuUsage = 0;
+        }
+    } else {
+        // 如果PDH不可用，使用GetSystemTimes作为备用方案
+        FILETIME idleTime, kernelTime, userTime;
+        if (GetSystemTimes(&idleTime, &kernelTime, &userTime)) {
+            ULONGLONG idle = ((ULONGLONG)idleTime.dwHighDateTime << 32) | idleTime.dwLowDateTime;
+            ULONGLONG kernel = ((ULONGLONG)kernelTime.dwHighDateTime << 32) | kernelTime.dwLowDateTime;
+            ULONGLONG user = ((ULONGLONG)userTime.dwHighDateTime << 32) | userTime.dwLowDateTime;
+            
+            static ULONGLONG prevIdle = 0, prevKernel = 0, prevUser = 0;
+            ULONGLONG idleDiff = idle - prevIdle;
+            ULONGLONG kernelDiff = kernel - prevKernel;
+            ULONGLONG userDiff = user - prevUser;
+            
+            if (prevIdle != 0 && (kernelDiff + userDiff) > 0) {
+                perfInfo->cpuUsage = (DWORD)(100.0 - (100.0 * idleDiff) / (kernelDiff + userDiff));
+            } else {
+                perfInfo->cpuUsage = 0;
+            }
+            
+            prevIdle = idle;
+            prevKernel = kernel;
+            prevUser = user;
+        } else {
+            perfInfo->cpuUsage = 0;
+        }
+    }
+
+    // 获取内存使用率
+    MEMORYSTATUSEX memInfo;
+    memInfo.dwLength = sizeof(MEMORYSTATUSEX);
+    GlobalMemoryStatusEx(&memInfo);
+    // 使用GlobalMemoryStatusEx获取更精确的内存使用率
+    MEMORYSTATUSEX memStatus;
+    memStatus.dwLength = sizeof(memStatus);
+    GlobalMemoryStatusEx(&memStatus);
+    perfInfo->memoryUsage = memStatus.dwMemoryLoad;
+
+    // 获取进程和线程数量
+    PERFORMANCE_INFORMATION perfInfoStruct;
+    GetPerformanceInfo(&perfInfoStruct, sizeof(perfInfoStruct));
+    perfInfo->processesCount = perfInfoStruct.ProcessCount;
+    perfInfo->threadsCount = perfInfoStruct.ThreadCount;
+    perfInfo->handlesCount = perfInfoStruct.HandleCount;
+}
+
+void cleanup_performance_counters() {
+    if (hPdhModule) {
+        FreeLibrary(hPdhModule);
+        hPdhModule = NULL;
+    }
 }

others/C/System_Information/src/system_info.c

@@ -1,26 +1,26 @@
-#include "system_info.h"
-#include <intrin.h>
-
-void init_system_info(SystemInfo* sysInfo) {
-    // 获取CPU信息
-    int cpuInfo[4] = {0};
-    __cpuid(cpuInfo, 0x80000002);
-    memcpy(sysInfo->cpuName, cpuInfo, sizeof(cpuInfo));
-    __cpuid(cpuInfo, 0x80000003);
-    memcpy(sysInfo->cpuName + 16, cpuInfo, sizeof(cpuInfo));
-    __cpuid(cpuInfo, 0x80000004);
-    memcpy(sysInfo->cpuName + 32, cpuInfo, sizeof(cpuInfo));
-
-    // 获取系统信息
-    GetSystemInfo(&sysInfo->systemInfo);
-    sysInfo->cpuCores = sysInfo->systemInfo.dwNumberOfProcessors;
-    sysInfo->cpuThreads = sysInfo->cpuCores; // 简化处理
-
-    // 获取内存信息
-    sysInfo->memoryStatus.dwLength = sizeof(sysInfo->memoryStatus);
-    GlobalMemoryStatusEx(&sysInfo->memoryStatus);
-
-    // 获取操作系统版本
-    sysInfo->osVersion.dwOSVersionInfoSize = sizeof(sysInfo->osVersion);
-    GetVersionEx((LPOSVERSIONINFO)&sysInfo->osVersion);
-}
+#include "system_info.h"
+#include <intrin.h>
+
+void init_system_info(SystemInfo* sysInfo) {
+    // 获取CPU信息
+    int cpuInfo[4] = {0};
+    __cpuid(cpuInfo, 0x80000002);
+    memcpy(sysInfo->cpuName, cpuInfo, sizeof(cpuInfo));
+    __cpuid(cpuInfo, 0x80000003);
+    memcpy(sysInfo->cpuName + 16, cpuInfo, sizeof(cpuInfo));
+    __cpuid(cpuInfo, 0x80000004);
+    memcpy(sysInfo->cpuName + 32, cpuInfo, sizeof(cpuInfo));
+
+    // 获取系统信息
+    GetSystemInfo(&sysInfo->systemInfo);
+    sysInfo->cpuCores = sysInfo->systemInfo.dwNumberOfProcessors;
+    sysInfo->cpuThreads = sysInfo->cpuCores; // 简化处理
+
+    // 获取内存信息
+    sysInfo->memoryStatus.dwLength = sizeof(sysInfo->memoryStatus);
+    GlobalMemoryStatusEx(&sysInfo->memoryStatus);
+
+    // 获取操作系统版本
+    sysInfo->osVersion.dwOSVersionInfoSize = sizeof(sysInfo->osVersion);
+    GetVersionEx((LPOSVERSIONINFO)&sysInfo->osVersion);
+}

others/C/System_Information/src/system_tray.c

@@ -1,45 +1,45 @@
-#include "system_tray.h"
-#include <shellapi.h>
-#include <strsafe.h>
-
-void create_tray_icon(HWND hWnd, HICON hIcon) {
-    NOTIFYICONDATA nid = {0};
-    nid.cbSize = sizeof(NOTIFYICONDATA);
-    nid.hWnd = hWnd;
-    nid.uID = ID_TRAYICON;
-    nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-    nid.uCallbackMessage = WM_TRAYICON;
-    nid.hIcon = hIcon;
-    #if defined(UNICODE) || defined(_UNICODE)
-    StringCbCopyW(nid.szTip, sizeof(nid.szTip), L"系统信息查看器");
-    #else
-    StringCbCopyA(nid.szTip, sizeof(nid.szTip), "系统信息查看器");
-    #endif
-    
-    Shell_NotifyIcon(NIM_ADD, &nid);
-}
-
-void update_tray_icon(HWND hWnd, HICON hIcon, LPCTSTR tooltip) {
-    NOTIFYICONDATA nid = {0};
-    nid.cbSize = sizeof(NOTIFYICONDATA);
-    nid.hWnd = hWnd;
-    nid.uID = ID_TRAYICON;
-    nid.uFlags = NIF_ICON | NIF_TIP;
-    nid.hIcon = hIcon;
-    #if defined(UNICODE) || defined(_UNICODE)
-    StringCbCopyW(nid.szTip, sizeof(nid.szTip), tooltip);
-    #else
-    StringCbCopyA(nid.szTip, sizeof(nid.szTip), tooltip);
-    #endif
-    
-    Shell_NotifyIcon(NIM_MODIFY, &nid);
-}
-
-void remove_tray_icon(HWND hWnd) {
-    NOTIFYICONDATA nid = {0};
-    nid.cbSize = sizeof(NOTIFYICONDATA);
-    nid.hWnd = hWnd;
-    nid.uID = ID_TRAYICON;
-    
-    Shell_NotifyIcon(NIM_DELETE, &nid);
-}
+#include "system_tray.h"
+#include <shellapi.h>
+#include <strsafe.h>
+
+void create_tray_icon(HWND hWnd, HICON hIcon) {
+    NOTIFYICONDATA nid = {0};
+    nid.cbSize = sizeof(NOTIFYICONDATA);
+    nid.hWnd = hWnd;
+    nid.uID = ID_TRAYICON;
+    nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+    nid.uCallbackMessage = WM_TRAYICON;
+    nid.hIcon = hIcon;
+    #if defined(UNICODE) || defined(_UNICODE)
+    StringCbCopyW(nid.szTip, sizeof(nid.szTip), L"系统信息查看器");
+    #else
+    StringCbCopyA(nid.szTip, sizeof(nid.szTip), "系统信息查看器");
+    #endif
+    
+    Shell_NotifyIcon(NIM_ADD, &nid);
+}
+
+void update_tray_icon(HWND hWnd, HICON hIcon, LPCTSTR tooltip) {
+    NOTIFYICONDATA nid = {0};
+    nid.cbSize = sizeof(NOTIFYICONDATA);
+    nid.hWnd = hWnd;
+    nid.uID = ID_TRAYICON;
+    nid.uFlags = NIF_ICON | NIF_TIP;
+    nid.hIcon = hIcon;
+    #if defined(UNICODE) || defined(_UNICODE)
+    StringCbCopyW(nid.szTip, sizeof(nid.szTip), tooltip);
+    #else
+    StringCbCopyA(nid.szTip, sizeof(nid.szTip), tooltip);
+    #endif
+    
+    Shell_NotifyIcon(NIM_MODIFY, &nid);
+}
+
+void remove_tray_icon(HWND hWnd) {
+    NOTIFYICONDATA nid = {0};
+    nid.cbSize = sizeof(NOTIFYICONDATA);
+    nid.hWnd = hWnd;
+    nid.uID = ID_TRAYICON;
+    
+    Shell_NotifyIcon(NIM_DELETE, &nid);
+}

others/C/System_Information/src/utils.c

@@ -1,38 +1,38 @@
-#include "utils.h"
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-char* wchar_to_mb(const wchar_t* wstr) {
-    if (!wstr) return NULL;
-
-    int size = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);
-    char* mbstr = (char*)malloc(size);
-    if (mbstr) {
-        WideCharToMultiByte(CP_UTF8, 0, wstr, -1, mbstr, size, NULL, NULL);
-    }
-    return mbstr;
-}
-
-wchar_t* mb_to_wchar(const char* str) {
-    if (!str) return NULL;
-
-    int size = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
-    wchar_t* wstr = (wchar_t*)malloc(size * sizeof(wchar_t));
-    if (wstr) {
-        MultiByteToWideChar(CP_UTF8, 0, str, -1, wstr, size);
-    }
-    return wstr;
-}
-
-char* get_current_time_string() {
-    time_t now;
-    time(&now);
-    struct tm* timeinfo = localtime(&now);
-    
-    char* time_str = (char*)malloc(20);
-    if (time_str) {
-        strftime(time_str, 20, "%Y-%m-%d %H:%M:%S", timeinfo);
-    }
-    return time_str;
-}
+#include "utils.h"
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+char* wchar_to_mb(const wchar_t* wstr) {
+    if (!wstr) return NULL;
+
+    int size = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);
+    char* mbstr = (char*)malloc(size);
+    if (mbstr) {
+        WideCharToMultiByte(CP_UTF8, 0, wstr, -1, mbstr, size, NULL, NULL);
+    }
+    return mbstr;
+}
+
+wchar_t* mb_to_wchar(const char* str) {
+    if (!str) return NULL;
+
+    int size = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
+    wchar_t* wstr = (wchar_t*)malloc(size * sizeof(wchar_t));
+    if (wstr) {
+        MultiByteToWideChar(CP_UTF8, 0, str, -1, wstr, size);
+    }
+    return wstr;
+}
+
+char* get_current_time_string() {
+    time_t now;
+    time(&now);
+    struct tm* timeinfo = localtime(&now);
+    
+    char* time_str = (char*)malloc(20);
+    if (time_str) {
+        strftime(time_str, 20, "%Y-%m-%d %H:%M:%S", timeinfo);
+    }
+    return time_str;
+}

others/C/System_Information/src/window_utils.c

@@ -21,7 +21,7 @@ BOOL register_window_class(HINSTANCE hInstance) {
     wcex.hInstance = hInstance;
     wcex.hIcon = LoadIcon(hInstance, IDI_APPLICATION);
     wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wcex.hbrBackground = CreateSolidBrush(RGB(240, 240, 240));
     wcex.lpszMenuName = NULL;
     wcex.lpszClassName = _T("SystemInfoWindowClass");
     wcex.hIconSm = LoadIcon(hInstance, IDI_APPLICATION);
@@ -47,10 +47,10 @@ int create_main_window(HINSTANCE hInstance, SystemInfo* sysInfo, UINT codePage)
         HWND hWnd = CreateWindowW(
         L"SystemInfoWindowClass",
         windowTitle,
-        WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_CLIPCHILDREN,
+        WS_POPUP | WS_VISIBLE,
         CW_USEDEFAULT, CW_USEDEFAULT,
-        450, 300,
-        NULL, NULL, hInstance, NULL);
+        800, 600,
+        NULL, NULL, hInstance, sysInfo);
 
     if (!hWnd) {
         return 0;
@@ -75,14 +75,28 @@ int create_main_window(HINSTANCE hInstance, SystemInfo* sysInfo, UINT codePage)
 LRESULT CALLBACK MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
     switch (message) {
         case WM_CREATE: {
+            // 安全初始化系统信息指针
+            if (lParam) {
+                g_sysInfo = (SystemInfo*)((CREATESTRUCT*)lParam)->lpCreateParams;
+            }
+            if (!g_sysInfo) {
+                MessageBoxW(hWnd, L"系统信息初始化失败", L"错误", MB_ICONERROR);
+                return -1;
+            }
+            
             // 创建显示系统信息的按钮
-            CreateWindowW(L"BUTTON", L"刷新信息", 
-                         WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,
-                         10, 10, 150, 30, 
-                         hWnd, (HMENU)IDC_MAIN_BUTTON, 
+            CreateWindowW(L"BUTTON", L"刷新信息",
+                         WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON | WS_BORDER,
+                         10, 10, 150, 30,
+                         hWnd, (HMENU)IDC_MAIN_BUTTON,
                          (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE), NULL);
             break;
         }
+        case WM_SIZE: {
+            // 窗口大小变化时更新布局
+            update_main_window(hWnd, g_sysInfo);
+            break;
+        }
         case WM_COMMAND: {
             if (LOWORD(wParam) == IDC_MAIN_BUTTON) {
                 // 刷新系统信息
@@ -91,6 +105,25 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar
             }
             break;
         }
+        case WM_KEYDOWN: {
+            // F11键切换全屏
+            if (wParam == VK_F11) {
+                toggle_fullscreen(hWnd);
+                update_main_window(hWnd, g_sysInfo);
+            }
+            break;
+        }
+        case WM_NCCALCSIZE:
+            if (wParam) {
+                return 0;
+            }
+            break;
+        case WM_ERASEBKGND: {
+            RECT rc;
+            GetClientRect(hWnd, &rc);
+            FillRect((HDC)wParam, &rc, (HBRUSH)GetClassLongPtr(hWnd, GCLP_HBRBACKGROUND));
+            return 1;
+        }
         case WM_DESTROY: {
             PostQuitMessage(0);
             break;

renexe.bat

@@ -1,2 +1,2 @@
-ren bin\Release\net8.0-windows\win-x86\publish\AppStore.exe kortapp.exe
-ren bin\Release\net8.0-windows\win-x64\publish\AppStore.exe kortapp.exe
+ren bin\Release\net8.0-windows\win-x86\publish\AppStore.exe kortapp-z.exe
+ren bin\Release\net8.0-windows\win-x64\publish\AppStore.exe kortapp-z.exe

tools/Calculator.cs

@@ -0,0 +1,34 @@
+using System;
+
+namespace AppStore
+{
+    /// <summary>
+    /// 提供基本数学运算功能的工具类
+    /// </summary>
+    public static class Calculator
+    {
+        /// <summary>
+        /// 加法运算
+        /// </summary>
+        public static double Add(double a, double b) => a + b;
+
+        /// <summary>
+        /// 减法运算
+        /// </summary>
+        public static double Subtract(double a, double b) => a - b;
+
+        /// <summary>
+        /// 乘法运算
+        /// </summary>
+        public static double Multiply(double a, double b) => a * b;
+
+        /// <summary>
+        /// 除法运算
+        /// </summary>
+        public static double Divide(double a, double b)
+        {
+            if (b == 0) throw new DivideByZeroException("除数不能为零");
+            return a / b;
+        }
+    }
+}

tools/CalculatorForm.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using AppStore;
+
+namespace AppStore
+{
+    public class CalculatorForm : Form
+    {
+        private TextBox display = new TextBox();
+        private double firstNumber = 0;
+        private string operation = "";
+        
+        public CalculatorForm()
+        {
+            this.Text = "计算器";
+            this.Size = new Size(300, 400);
+            this.StartPosition = FormStartPosition.CenterScreen;
+            CreateControls();
+        }
+
+        private void CreateControls()
+        {
+            // 显示框
+            display = new TextBox();
+            display.ReadOnly = true;
+            display.TextAlign = HorizontalAlignment.Right;
+            display.Font = new Font("Microsoft YaHei", 14);
+            display.Size = new Size(260, 40);
+            display.Location = new Point(20, 20);
+            this.Controls.Add(display);
+
+            // 按钮布局
+            string[] buttonLabels = {
+                "7", "8", "9", "/",
+                "4", "5", "6", "*", 
+                "1", "2", "3", "-",
+                "0", ".", "=", "+"
+            };
+
+            for (int i = 0; i < buttonLabels.Length; i++)
+            {
+                var btn = new Button();
+                btn.Text = buttonLabels[i];
+                btn.Size = new Size(60, 50);
+                btn.Location = new Point(20 + (i % 4) * 65, 70 + (i / 4) * 55);
+                btn.Font = new Font("Microsoft YaHei", 12);
+                btn.Click += ButtonClickHandler;
+                this.Controls.Add(btn);
+            }
+
+            // 清除按钮
+            var clearBtn = new Button();
+            clearBtn.Text = "C";
+            clearBtn.Size = new Size(260, 40);
+            clearBtn.Location = new Point(20, 300);
+            clearBtn.Font = new Font("Microsoft YaHei", 12);
+            clearBtn.Click += (s, e) => {
+                display.Text = "";
+                firstNumber = 0;
+                operation = "";
+            };
+            this.Controls.Add(clearBtn);
+        }
+
+        private void ButtonClickHandler(object sender, EventArgs e)
+        {
+            var button = sender as Button;
+            if (button == null) return;
+
+            switch (button.Text)
+            {
+                case "+":
+                case "-":
+                case "*":
+                case "/":
+                    if (!string.IsNullOrEmpty(display.Text))
+                    {
+                        firstNumber = double.Parse(display.Text);
+                        operation = button.Text;
+                        display.Text = "";
+                    }
+                    break;
+                    
+                case "=":
+                    if (!string.IsNullOrEmpty(operation) && !string.IsNullOrEmpty(display.Text))
+                    {
+                        double secondNumber = double.Parse(display.Text);
+                        double result = 0;
+                        
+                        try
+                        {
+                            result = operation switch
+                            {
+                                "+" => AppStore.Calculator.Add(firstNumber, secondNumber),
+                                "-" => AppStore.Calculator.Subtract(firstNumber, secondNumber),
+                                "*" => AppStore.Calculator.Multiply(firstNumber, secondNumber),
+                                "/" => AppStore.Calculator.Divide(firstNumber, secondNumber),
+                                _ => 0
+                            };
+                            
+                            display.Text = result.ToString();
+                        }
+                        catch (DivideByZeroException)
+                        {
+                            MessageBox.Show("除数不能为零", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        }
+                        operation = "";
+                    }
+                    break;
+                    
+                default:
+                    display.Text += button.Text;
+                    break;
+            }
+        }
+    }
+}

tools/CalculatorToolCard.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class CalculatorToolCard : ToolCard
+    {
+        public CalculatorToolCard()
+        {
+            ToolName = "计算器";
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "Calculator.png");
+                if (File.Exists(iconPath))
+                {
+                    ToolIcon = Image.FromFile(iconPath);
+                }
+                else
+                {
+                    ToolIcon = SystemIcons.Application.ToBitmap();
+                }
+            }
+            catch
+            {
+                ToolIcon = SystemIcons.Application.ToBitmap();
+            }
+            this.ToolCardClicked += OnCalculatorCardClicked;
+            UpdateDisplay();
+        }
+
+        private void OnCalculatorCardClicked(object sender, EventArgs e)
+        {
+            var calculatorForm = new CalculatorForm();
+            calculatorForm.ShowDialog();
+        }
+    }
+}

tools/QrCodeGenerator.cs

@@ -1,136 +1,136 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using ZXing;
-using ZXing.Common;
-using ZXing.QrCode;
-
-namespace AppStore
-{
-    public class QrCodeGeneratorForm : Form
-    {
-        private TextBox? inputTextBox;
-        private PictureBox? qrCodePictureBox;
-        private Button? generateButton;
-        private Button? saveButton;
-
-        public QrCodeGeneratorForm()
-        {
-            InitializeComponent();
-            this.Text = "二维码生成器";
-            this.Size = new Size(500, 600);
-            this.StartPosition = FormStartPosition.CenterScreen;
-            this.FormBorderStyle = FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-        }
-
-        private void InitializeComponent()
-        {
-            // 输入文本框
-            inputTextBox = new TextBox();
-            inputTextBox.Multiline = true;
-            inputTextBox.ScrollBars = ScrollBars.Vertical;
-            inputTextBox.Size = new Size(400, 100);
-            inputTextBox.Location = new Point(50, 30);
-            inputTextBox.PlaceholderText = "请输入要生成二维码的文本内容...";
-            this.Controls.Add(inputTextBox);
-
-            // 生成按钮
-            generateButton = new Button();
-            generateButton.Text = "生成二维码";
-            generateButton.Size = new Size(150, 40);
-            generateButton.Location = new Point(50, 150);
-            generateButton.Click += GenerateButton_Click;
-            this.Controls.Add(generateButton);
-
-            // 二维码显示区域
-            qrCodePictureBox = new PictureBox();
-            qrCodePictureBox.Size = new Size(300, 300);
-            qrCodePictureBox.Location = new Point(100, 220);
-            qrCodePictureBox.SizeMode = PictureBoxSizeMode.StretchImage;
-            qrCodePictureBox.BorderStyle = BorderStyle.FixedSingle;
-            this.Controls.Add(qrCodePictureBox);
-
-            // 保存按钮
-            saveButton = new Button();
-            saveButton.Text = "保存二维码";
-            saveButton.Size = new Size(150, 40);
-            saveButton.Location = new Point(300, 150);
-            saveButton.Click += SaveButton_Click;
-            this.Controls.Add(saveButton);
-        }
-
-        private void GenerateButton_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrWhiteSpace(inputTextBox?.Text))
-            {
-                MessageBox.Show("请输入要生成二维码的文本内容", "提示", 
-                    MessageBoxButtons.OK, MessageBoxIcon.Information);
-                return;
-            }
-
-            try
-            {
-                var writer = new BarcodeWriterPixelData
-                {
-                    Format = BarcodeFormat.QR_CODE,
-                    Options = new QrCodeEncodingOptions
-                    {
-                        Width = 300,
-                        Height = 300,
-                        Margin = 1
-                    }
-                };
-
-                var pixelData = writer.Write(inputTextBox.Text);
-                var bitmap = new Bitmap(pixelData.Width, pixelData.Height, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
-                var bitmapData = bitmap.LockBits(new Rectangle(0, 0, pixelData.Width, pixelData.Height), 
-                    System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
-                try
-                {
-                    System.Runtime.InteropServices.Marshal.Copy(pixelData.Pixels, 0, bitmapData.Scan0, pixelData.Pixels.Length);
-                }
-                finally
-                {
-                    bitmap.UnlockBits(bitmapData);
-                }
-                qrCodePictureBox!.Image = bitmap;
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"生成二维码失败: {ex.Message}", "错误", 
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void SaveButton_Click(object sender, EventArgs e)
-        {
-            if (qrCodePictureBox?.Image == null)
-            {
-                MessageBox.Show("请先生成二维码", "提示", 
-                    MessageBoxButtons.OK, MessageBoxIcon.Information);
-                return;
-            }
-
-            using (var saveDialog = new SaveFileDialog())
-            {
-                saveDialog.Filter = "PNG 图片|*.png|JPEG 图片|*.jpg|BMP 图片|*.bmp";
-                saveDialog.Title = "保存二维码图片";
-                if (saveDialog.ShowDialog() == DialogResult.OK)
-                {
-                    try
-                    {
-                        qrCodePictureBox!.Image.Save(saveDialog.FileName);
-                        MessageBox.Show("二维码保存成功", "成功", 
-                            MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show($"保存二维码失败: {ex.Message}", "错误", 
-                            MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-    }
-}
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using ZXing;
+using ZXing.Common;
+using ZXing.QrCode;
+
+namespace AppStore
+{
+    public class QrCodeGeneratorForm : Form
+    {
+        private TextBox? inputTextBox;
+        private PictureBox? qrCodePictureBox;
+        private Button? generateButton;
+        private Button? saveButton;
+
+        public QrCodeGeneratorForm()
+        {
+            InitializeComponent();
+            this.Text = "二维码生成器";
+            this.Size = new Size(500, 600);
+            this.StartPosition = FormStartPosition.CenterScreen;
+            this.FormBorderStyle = FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+        }
+
+        private void InitializeComponent()
+        {
+            // 输入文本框
+            inputTextBox = new TextBox();
+            inputTextBox.Multiline = true;
+            inputTextBox.ScrollBars = ScrollBars.Vertical;
+            inputTextBox.Size = new Size(400, 100);
+            inputTextBox.Location = new Point(50, 30);
+            inputTextBox.PlaceholderText = "请输入要生成二维码的文本内容...";
+            this.Controls.Add(inputTextBox);
+
+            // 生成按钮
+            generateButton = new Button();
+            generateButton.Text = "生成二维码";
+            generateButton.Size = new Size(150, 40);
+            generateButton.Location = new Point(50, 150);
+            generateButton.Click += GenerateButton_Click;
+            this.Controls.Add(generateButton);
+
+            // 二维码显示区域
+            qrCodePictureBox = new PictureBox();
+            qrCodePictureBox.Size = new Size(300, 300);
+            qrCodePictureBox.Location = new Point(100, 220);
+            qrCodePictureBox.SizeMode = PictureBoxSizeMode.StretchImage;
+            qrCodePictureBox.BorderStyle = BorderStyle.FixedSingle;
+            this.Controls.Add(qrCodePictureBox);
+
+            // 保存按钮
+            saveButton = new Button();
+            saveButton.Text = "保存二维码";
+            saveButton.Size = new Size(150, 40);
+            saveButton.Location = new Point(300, 150);
+            saveButton.Click += SaveButton_Click;
+            this.Controls.Add(saveButton);
+        }
+
+        private void GenerateButton_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(inputTextBox?.Text))
+            {
+                MessageBox.Show("请输入要生成二维码的文本内容", "提示", 
+                    MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return;
+            }
+
+            try
+            {
+                var writer = new BarcodeWriterPixelData
+                {
+                    Format = BarcodeFormat.QR_CODE,
+                    Options = new QrCodeEncodingOptions
+                    {
+                        Width = 300,
+                        Height = 300,
+                        Margin = 1
+                    }
+                };
+
+                var pixelData = writer.Write(inputTextBox.Text);
+                var bitmap = new Bitmap(pixelData.Width, pixelData.Height, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
+                var bitmapData = bitmap.LockBits(new Rectangle(0, 0, pixelData.Width, pixelData.Height), 
+                    System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
+                try
+                {
+                    System.Runtime.InteropServices.Marshal.Copy(pixelData.Pixels, 0, bitmapData.Scan0, pixelData.Pixels.Length);
+                }
+                finally
+                {
+                    bitmap.UnlockBits(bitmapData);
+                }
+                qrCodePictureBox!.Image = bitmap;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"生成二维码失败: {ex.Message}", "错误", 
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void SaveButton_Click(object sender, EventArgs e)
+        {
+            if (qrCodePictureBox?.Image == null)
+            {
+                MessageBox.Show("请先生成二维码", "提示", 
+                    MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return;
+            }
+
+            using (var saveDialog = new SaveFileDialog())
+            {
+                saveDialog.Filter = "PNG 图片|*.png|JPEG 图片|*.jpg|BMP 图片|*.bmp";
+                saveDialog.Title = "保存二维码图片";
+                if (saveDialog.ShowDialog() == DialogResult.OK)
+                {
+                    try
+                    {
+                        qrCodePictureBox!.Image.Save(saveDialog.FileName);
+                        MessageBox.Show("二维码保存成功", "成功", 
+                            MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show($"保存二维码失败: {ex.Message}", "错误", 
+                            MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+    }
+}