Add files via upload

这是一个废弃代码

.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

@@ -51,7 +51,7 @@ namespace AppStore
 
             // 初始化并添加应用信息
             infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 1.1.3\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
+            infoLabel.Text = "kortapp-z\n版本: 1.2.7\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
             infoLabel.Font = new Font("Microsoft YaHei", 12);
             infoLabel.AutoSize = false;
             infoLabel.Width = 300;

AppCard.cs

@@ -48,33 +48,72 @@ namespace AppStore
             this.Padding = new Padding(10);
             
             // 异步初始化卡片路径和边框
+            // 预加载边框路径
             Task.Run(() => {
                 InitializeCardPath();
                 InitializeBorder();
+                
+                // 确保在主线程注册事件
+                this.Invoke((MethodInvoker)(() => {
+                    this.Paint += (sender, e) => {
+                        if (BorderCache.IsEmpty) 
+                        {
+                            Task.Run(() => {
+                                InitializeBorder();
+                                this.Invoke((MethodInvoker)(() => this.Invalidate()));
+                            });
+                        }
+                    };
+                }));
             });
 
-            // 应用图标
+            // 应用图标 - 添加null检查
-            iconBox = new PictureBox();
+            if (iconBox != null && this != null && this.Controls != null)
-            iconBox.Size = new Size(80, 80);
+            {
-            iconBox.Location = new Point((Width - 80) / 2, 15);
+                iconBox.Size = new Size(80, 80);
-            iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
+                iconBox.Location = new Point((Width - 80) / 2, 15);
-            this.Controls.Add(iconBox);
+                iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
+                this.Controls.Add(iconBox);
+            }
+            else
+            {
+                Logger.LogWarning("iconBox或Controls为null");
+            }
 
             // 应用名称 - 使用Panel包裹Label实现边框颜色
-            // namePanel已在构造函数中初始化
+            if (namePanel != null)
-            namePanel.Size = new Size(Width - 20, 40);
+            {
-            namePanel.Location = new Point(10, 100);
+                namePanel.Size = new Size(Width - 20, 40);
-            namePanel.Paint += (sender, e) => {
+                namePanel.Location = new Point(10, 100);
-                ControlPaint.DrawBorder(e.Graphics, namePanel.ClientRectangle, 
+                namePanel.Paint += (sender, e) => {
-                    borderColor, ButtonBorderStyle.Solid);
+                    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.Dock = DockStyle.Fill;
             nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
             nameLabel.TextAlign = ContentAlignment.MiddleCenter;
             
-            namePanel.Controls.Add(nameLabel);
+            if (namePanel != null && nameLabel != null)
+            {
+                namePanel.Controls.Add(nameLabel);
+            }
             
             // 初始主题设置
             UpdateLabelTheme();
@@ -82,32 +121,43 @@ namespace AppStore
             // 订阅主题变化事件
             ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
             
-            this.Controls.Add(namePanel);
+            if (this != null && this.Controls != null && namePanel != null)
+            {
+                this.Controls.Add(namePanel);
+            }
 
-            // 下载按钮
+            // 下载按钮 - 添加null检查
-            downloadBtn = new Button();
+            if (downloadBtn != null)
-            downloadBtn.Text = "下载";
+            {
-            downloadBtn.Size = new Size(100, 32);
+                downloadBtn.Text = "下载";
-            downloadBtn.Location = new Point((Width - 100) / 2, 150);
+                downloadBtn.Size = new Size(100, 32);
-            downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
+                downloadBtn.Location = new Point((Width - 100) / 2, 150);
-            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) => {
                 downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-            };
+                downloadBtn.ForeColor = Color.White;
-            
+                downloadBtn.FlatStyle = FlatStyle.Flat;
-            downloadBtn.Click += DownloadBtn_Click;
+                downloadBtn.FlatAppearance.BorderSize = 0;
-            this.Controls.Add(downloadBtn);
+                downloadBtn.Cursor = Cursors.Hand;
-            downloadBtn.Visible = ShowDownloadButton;
+                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()
@@ -126,7 +176,14 @@ namespace AppStore
                 namePanel.BackColor = Color.White;
                 borderColor = SystemColors.ControlDark;
             }
-            namePanel.Invalidate(); // 触发重绘
+            if (namePanel != null && !namePanel.IsDisposed)
+            {
+                namePanel.Invalidate(); // 触发重绘
+            }
+            else
+            {
+                Logger.LogWarning("namePanel为null或已释放");
+            }
         }
 
         /// <summary>
@@ -138,52 +195,58 @@ namespace AppStore
             // 使用卡片尺寸作为缓存键
             string cacheKey = $"{Width}_{Height}_10";
             
-            // 检查缓存中是否已有路径
+            // 双重检查锁模式确保线程安全
             if (!BorderCache.TryGetValue(cacheKey, out var borderPath))
             {
-                // 创建临时文件存储路径数据
+                lock (BorderCache)
-                string tempFile = Path.GetTempFileName();
-                try 
                 {
-                    // 配置C++程序启动参数
+                    if (!BorderCache.TryGetValue(cacheKey, out borderPath))
-                    ProcessStartInfo startInfo = new ProcessStartInfo 
                     {
-                        FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
+                        // 创建临时文件存储路径数据
-                        Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
+                        string tempFile = Path.GetTempFileName();
-                        UseShellExecute = false, // 不显示命令行窗口
+                        try 
-                        CreateNoWindow = true    // 静默运行
-                    };
-
-                    // 启动C++程序计算路径
-                    using (var process = Process.Start(startInfo)) 
-                    {
-                        process.WaitForExit();
-                        
-                        // 检查计算结果
-                        if (process.ExitCode == 0 && File.Exists(tempFile)) 
                         {
-                            // 读取C++程序生成的路径点
+                            // 配置C++程序启动参数
-                            var lines = File.ReadAllLines(tempFile);
+                            ProcessStartInfo startInfo = new ProcessStartInfo 
-                            PointF[] points = lines.Select(line => {
+                            {
-                                var parts = line.Split(','); // 解析坐标点
+                                FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
-                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
+                                Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
-                            }).ToArray();
+                                UseShellExecute = false, // 不显示命令行窗口
-                            
+                                CreateNoWindow = true    // 静默运行
-                            // 创建GraphicsPath对象
+                            };
-                            borderPath = new System.Drawing.Drawing2D.GraphicsPath();
+
-                            borderPath.AddLines(points); // 添加路径点
+                            // 启动C++程序计算路径
-                            
+                            using (var process = Process.Start(startInfo)) 
-                            // 缓存路径对象
+                            {
-                            BorderCache.TryAdd(cacheKey, borderPath);
+                                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);
                     }
                 }
             }
@@ -194,6 +257,12 @@ namespace AppStore
         {
             base.OnPaint(e);
             
+            // 确保边框已初始化
+            if (BorderCache.IsEmpty) 
+            {
+                InitializeBorder();
+            }
+            
             // 绘制背景
             using (var brush = new SolidBrush(this.BackColor)) {
                 e.Graphics.FillRectangle(brush, this.ClientRectangle);
@@ -256,22 +325,37 @@ namespace AppStore
                     };
 
                     // 启动C++程序计算路径
-                    using (var process = Process.Start(startInfo)) {
+                    if (startInfo != null)
-                        process.WaitForExit();
+                    {
-                        
+                        using (var process = Process.Start(startInfo)) 
-                        // 检查计算结果
+                        {
-                        if (process.ExitCode == 0 && File.Exists(tempFile)) {
+                            if (process != null)
-                            // 读取生成的路径点
+                            {
-                            var lines = File.ReadAllLines(tempFile);
+                                process.WaitForExit();
-                            PointF[] points = lines.Select(line => {
+                                
-                                var parts = line.Split(','); // 解析坐标
+                                // 检查计算结果
-                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
+                                if (process.ExitCode == 0 && File.Exists(tempFile)) 
-                            }).ToArray();
+                                {
-                            
+                                    try
-                            // 创建并缓存路径对象
+                                    {
-                            path = new System.Drawing.Drawing2D.GraphicsPath();
+                                        // 读取生成的路径点
-                            path.AddLines(points);
+                                        var lines = File.ReadAllLines(tempFile);
-                            PathCache.TryAdd(cacheKey, path);
+                                        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 {
@@ -347,10 +431,14 @@ namespace AppStore
 
         public void UpdateDisplay()
         {
-            if (nameLabel != null)
+            if (nameLabel != null && AppName != null)
             {
                 nameLabel.Text = AppName;
             }
+            else
+            {
+                Logger.LogWarning("nameLabel或AppName为null");
+            }
             if (iconBox != null && AppIcon != null)
             {
                 iconBox.Image = AppIcon;
@@ -364,14 +452,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 == null ||
-                    DownloadManager.Instance.DownloadItems == null ||
+                    downloadManager.DownloadItems == null ||
-                    DownloadManager.Instance.StartDownload == null)
+                    downloadManager.StartDownload == null)
                 {
                     return;
                 }
@@ -379,7 +468,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 {

AppStore.csproj

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

DownloadItem.cs

@@ -53,10 +53,11 @@ namespace AppStore
             this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
                 ? Color.White 
                 : Color.Black;
-            this.BorderStyle = BorderStyle.FixedSingle;
+            this.BorderStyle = BorderStyle.None; // 禁用默认边框
             this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
                 ? Color.Black 
                 : Color.White;
+            this.Paint += DownloadItem_Paint; // 添加自定义绘制
 
             // 文件名标签
             nameLabel = new Label();
@@ -98,6 +99,17 @@ namespace AppStore
             nameLabel.Text = FileName;
             progressBar.Value = Progress;
             statusLabel.Text = Status;
+            this.Invalidate(); // 触发重绘
+        }
+
+        private void DownloadItem_Paint(object sender, PaintEventArgs e)
+        {
+            // 自定义边框绘制
+            using (var pen = new Pen(ThemeManager.BorderColor, 1))
+            {
+                e.Graphics.DrawRectangle(pen, 
+                    new Rectangle(0, 0, this.Width - 1, this.Height - 1));
+            }
         }
 
         private void CancelBtn_Click(object sender, EventArgs e)

DownloadManager.cs

@@ -1,491 +1,508 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Diagnostics;
+using System.Diagnostics;
-using System.IO;
+using System.IO;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-using System.Text.Json;
+using System.Text.Json;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace AppStore
+namespace AppStore
-{
+{
-    public class DownloadManager
+    public class DownloadManager
-    {
+    {
-
+
-
+
-        [DllImport("shell32.dll")]
+        [DllImport("shell32.dll")]
-        private static extern int SHGetKnownFolderPath(
+        private static extern int SHGetKnownFolderPath(
-            [MarshalAs(UnmanagedType.LPStruct)] Guid rfid,
+            [MarshalAs(UnmanagedType.LPStruct)] Guid rfid,
-            uint dwFlags,
+            uint dwFlags,
-            IntPtr hToken,
+            IntPtr hToken,
-            out IntPtr ppszPath);
+            out IntPtr ppszPath);
-
+
-
+
-        private static DownloadManager instance = null!;
+        private static DownloadManager instance = null!;
-        public static DownloadManager Instance => instance ??= new DownloadManager();
+        public static DownloadManager Instance => instance ??= new DownloadManager();
-
+
-        private Process? currentProcess;
+        private Process? currentProcess;
-        public List<DownloadItem> DownloadItems { get; } = new List<DownloadItem>();
+        public List<DownloadItem> DownloadItems { get; } = new List<DownloadItem>();
-        
+        
-        public event Action<DownloadItem> DownloadAdded = delegate { };
+        public event Action<DownloadItem> DownloadAdded = delegate { };
-        public event Action<DownloadItem> DownloadProgressChanged = delegate { };
+        public event Action<DownloadItem> DownloadProgressChanged = delegate { };
-        public event Action<DownloadItem> DownloadCompleted = delegate { };
+        public event Action<DownloadItem> DownloadCompleted = delegate { };
-
+
-        // 内部类封装进程结果
+        // 内部类封装进程结果
-        private class ProcessResult
+        private class ProcessResult
-        {
+        {
-            public int ExitCode { get; set; } = -1;
+            public int ExitCode { get; set; } = -1;
-            public bool HasExited { get; set; }
+            public bool HasExited { get; set; }
-        }
+        }
-
+
-        // 安全获取进程结果
+        // 安全获取进程结果
-        private ProcessResult GetProcessResult(Process? process)
+        private ProcessResult GetProcessResult(Process? process)
-        {
+        {
-            var result = new ProcessResult();
+            var result = new ProcessResult();
-            if (process == null) return result;
+            if (process == null || process.StartInfo == null) return result;
-            
+            
-            try 
+            try 
-            {
+            {
-                if (!process.HasExited)
+                if (!process.HasExited)
-                {
+                {
-                    process.WaitForExit(5000);
+                    process.WaitForExit(5000);
-                }
+                }
-                
+                
-                result.HasExited = process.HasExited;
+                result.HasExited = process.HasExited;
-                if (result.HasExited)
+                if (result.HasExited)
-                {
+                {
-                    result.ExitCode = process.ExitCode;
+                    result.ExitCode = process.ExitCode;
-                }
+                }
-            }
+            }
-            catch 
+            catch 
-            {
+            {
-                // 忽略所有异常，使用默认值
+                // 忽略所有异常，使用默认值
-            }
+            }
-            
+            
-            return result;
+            return result;
-        }
+        }
-
+
-        public void StartDownload(string fileName, string url)
+        public void StartDownload(string fileName, string url)
-        {
+        {
-            // 从URL获取原始文件名用于显示
+            // 从URL获取原始文件名用于显示
-            var uri = new Uri(url);
+            var uri = new Uri(url);
-            var originalFileName = Path.GetFileName(uri.LocalPath);
+            var originalFileName = Path.GetFileName(uri.LocalPath);
-            
+            
-            var downloadItem = new DownloadItem
+            var downloadItem = new DownloadItem
-            {
+            {
-                FileName = originalFileName, // 显示原始文件名
+                FileName = originalFileName, // 显示原始文件名
-                Progress = 0,
+                Progress = 0,
-                Status = "准备下载"
+                Status = "准备下载"
-            };
+            };
-            
+            
-            DownloadItems.Add(downloadItem);
+            DownloadItems.Add(downloadItem);
-            DownloadAdded?.Invoke(downloadItem);
+            DownloadAdded?.Invoke(downloadItem);
-
+
-            Task.Run(() => DownloadFile(downloadItem, fileName, url));
+            Task.Run(() => DownloadFile(downloadItem, fileName, url));
-        }
+        }
-
+
-        private void DownloadFile(DownloadItem downloadItem, string fileName, string url)
+        private void DownloadFile(DownloadItem downloadItem, string fileName, string url)
-        {
+        {
-            string downloadsDir = string.Empty;
+            string downloadsDir = string.Empty;
-            try
+            try
-            {
+            {
-                // 获取并验证下载路径
+                // 获取并验证下载路径
-                downloadsDir = GetDownloadPath();
+                downloadsDir = GetDownloadPath();
-                
+                
-                try
+                try
-                {
+                {
-                    // 检查路径是否有效
+                    // 检查路径是否有效
-                    if (string.IsNullOrWhiteSpace(downloadsDir))
+                    if (string.IsNullOrWhiteSpace(downloadsDir))
-                    {
+                    {
-                        throw new Exception("下载路径为空");
+                        throw new Exception("下载路径为空");
-                    }
+                    }
-
+
-                    // 尝试创建目录（如果不存在）
+                    // 尝试创建目录（如果不存在）
-                    Directory.CreateDirectory(downloadsDir);
+                    Directory.CreateDirectory(downloadsDir);
-
+
-                    // 验证目录是否可写
+                    // 验证目录是否可写
-                    string testFile = Path.Combine(downloadsDir, "write_test.tmp");
+                    string testFile = Path.Combine(downloadsDir, "write_test.tmp");
-                    File.WriteAllText(testFile, "test");
+                    File.WriteAllText(testFile, "test");
-                    File.Delete(testFile);
+                    File.Delete(testFile);
-                }
+                }
-                catch (Exception ex)
+                catch (Exception ex)
-                {
+                {
-                    // 回退到默认下载路径
+                    // 回退到默认下载路径
-                    string defaultPath = Path.Combine(
+                    string defaultPath = Path.Combine(
-                        Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), 
+                        Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), 
-                        "Downloads");
+                        "Downloads");
-                    
+                    
-                    Logger.LogError($"下载路径{downloadsDir}不可用，将使用默认路径: {defaultPath}", ex);
+                    Logger.LogError($"下载路径{downloadsDir}不可用，将使用默认路径: {defaultPath}", ex);
-                    downloadsDir = defaultPath;
+                    downloadsDir = defaultPath;
-                    Directory.CreateDirectory(downloadsDir);
+                    Directory.CreateDirectory(downloadsDir);
-                }
+                }
-                
+                
-
+
-
+
-                // 构建aria2c路径
+                // 构建aria2c路径
-                var aria2cPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "resource", "aria2c.exe");
+                var aria2cPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "resource", "aria2c.exe");
-                
+                
-                if (!File.Exists(aria2cPath))
+                if (!File.Exists(aria2cPath))
-                {
+                {
-                    throw new FileNotFoundException($"找不到aria2c.exe: {aria2cPath}");
+                    throw new FileNotFoundException($"找不到aria2c.exe: {aria2cPath}");
-                }
+                }
-
+
-                // 设置线程数为16并添加详细日志
+                // 设置线程数为16并添加详细日志
-                // 从URL获取原始文件名
+                // 从URL获取原始文件名
-                var uri = new Uri(url);
+                var uri = new Uri(url);
-                var originalFileName = Path.GetFileName(uri.LocalPath);
+                var originalFileName = Path.GetFileName(uri.LocalPath);
-                var arguments = $"--out=\"{originalFileName}\" --dir=\"{downloadsDir}\" --split=16 --max-connection-per-server=16 {url}";
+                var arguments = $"--out=\"{originalFileName}\" --dir=\"{downloadsDir}\" --split=16 --max-connection-per-server=16 {url}";
-
+
-
+
-                currentProcess = new Process
+                currentProcess = new Process
-                {
+                {
-                    StartInfo = new ProcessStartInfo
+                    StartInfo = new ProcessStartInfo
-                    {
+                    {
-                        FileName = aria2cPath,
+                        FileName = aria2cPath,
-                        Arguments = arguments,
+                        Arguments = arguments,
-                        WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
+                        WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
-                        UseShellExecute = false,
+                        UseShellExecute = false,
-                        CreateNoWindow = true,
+                        CreateNoWindow = true,
-                        RedirectStandardOutput = true,
+                        RedirectStandardOutput = true,
-                        RedirectStandardError = true
+                        RedirectStandardError = true
-                    }
+                    }
-                };
+                };
-
+
-                // 获取目标文件路径
+                // 获取目标文件路径
-                string downloadPath = Path.Combine(
+                string downloadPath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-                    "Downloads",
+                    "Downloads",
-                    fileName);
+                    fileName);
-                
+                
-                long totalSize = 0;
+                long totalSize = 0;
-                
+                
-                // 添加进度检测超时机制
+                // 添加进度检测超时机制
-                var progressTimer = new System.Timers.Timer(5000); // 5秒无更新视为完成
+                var progressTimer = new System.Timers.Timer(5000); // 5秒无更新视为完成
-                progressTimer.Elapsed += (s, e) => {
+                progressTimer.Elapsed += (s, e) => {
-                    progressTimer.Stop();
+                    progressTimer.Stop();
-                    if (downloadItem.Progress < 100) {
+                    if (downloadItem.Progress < 100) {
-                        downloadItem.Progress = 100;
+                        downloadItem.Progress = 100;
-                        downloadItem.Status = "下载完成 (100%)";
+                        downloadItem.Status = "下载完成 (100%)";
-                        DownloadProgressChanged?.Invoke(downloadItem);
+                        DownloadProgressChanged?.Invoke(downloadItem);
-                    }
+                    }
-                };
+                };
-                
+                
-                currentProcess.OutputDataReceived += (sender, e) =>
+                currentProcess.OutputDataReceived += (sender, e) =>
-                {
+                {
-                    if (!string.IsNullOrEmpty(e.Data))
+                    if (!string.IsNullOrEmpty(e.Data))
-                    {
+                    {
-
+
-                        
+                        
-                        // 重置超时计时器
+                        // 重置超时计时器
-                        progressTimer.Stop();
+                        progressTimer.Stop();
-                        progressTimer.Start();
+                        progressTimer.Start();
-                        
+                        
-                        // 解析总大小
+                        // 解析总大小
-                        if (e.Data.Contains("Length:"))
+                        if (e.Data.Contains("Length:"))
-                        {
+                        {
-                            var sizeStr = e.Data.Split(new[]{"Length:"}, StringSplitOptions.RemoveEmptyEntries)[1]
+                            var sizeStr = e.Data.Split(new[]{"Length:"}, StringSplitOptions.RemoveEmptyEntries)[1]
-                                .Split('(')[0].Trim();
+                                .Split('(')[0].Trim();
-                            if (long.TryParse(sizeStr, out totalSize))
+                            if (long.TryParse(sizeStr, out totalSize))
-                            {
+                            {
-
+
-                            }
+                            }
-                        }
+                        }
-                        
+                        
-                        // 解析进度百分比
+                        // 解析进度百分比
-                        if (e.Data.Contains("%)"))
+                        if (e.Data.Contains("%)"))
-                        {
+                        {
-                            var start = e.Data.IndexOf("(") + 1;
+                            var start = e.Data.IndexOf("(") + 1;
-                            var end = e.Data.IndexOf("%)");
+                            var end = e.Data.IndexOf("%)");
-                            if (start > 0 && end > start)
+                            if (start > 0 && end > start)
-                            {
+                            {
-                                var progressStr = e.Data.Substring(start, end - start);
+                                var progressStr = e.Data.Substring(start, end - start);
-                                if (int.TryParse(progressStr, out int progress))
+                                if (int.TryParse(progressStr, out int progress))
-                                {
+                                {
-                                    progress = Math.Min(progress, 100);
+                                    progress = Math.Min(progress, 100);
-                                    downloadItem.Progress = progress;
+                                    downloadItem.Progress = progress;
-                                    downloadItem.Status = $"下载中({progress}%)";
+                                    downloadItem.Status = $"下载中({progress}%)";
-                                    DownloadProgressChanged?.Invoke(downloadItem);
+                                    DownloadProgressChanged?.Invoke(downloadItem);
-                                }
+                                }
-                            }
+                            }
-                        }
+                        }
-                    }
+                    }
-                };
+                };
-
+
-                currentProcess.ErrorDataReceived += (sender, e) =>
+                currentProcess.ErrorDataReceived += (sender, e) =>
-                {
+                {
-                    if (!string.IsNullOrEmpty(e.Data))
+                    if (!string.IsNullOrEmpty(e.Data))
-                    {
+                    {
-
+
-                        downloadItem.Status = $"错误: {e.Data}";
+                        downloadItem.Status = $"错误: {e.Data}";
-                        DownloadProgressChanged?.Invoke(downloadItem);
+                        DownloadProgressChanged?.Invoke(downloadItem);
-                    }
+                    }
-                };
+                };
-
+
-                currentProcess.Exited += (sender, e) =>
+                currentProcess.Exited += (sender, e) =>
-                {
+                {
-                    var process = currentProcess;
+                    var process = currentProcess;
-                    if (process == null) return;
+                    if (process == null) return;
-                    
+                    
-                    var result = GetProcessResult(process);
+                    var result = GetProcessResult(process);
-                    
+                    
-                    if (result.ExitCode == 0)
+                    if (result.ExitCode == 0)
-                    {
+                    {
-                        // 最终状态强制更新
+                        // 最终状态强制更新
-                        downloadItem.Progress = 100;
+                        downloadItem.Progress = 100;
-                        downloadItem.Status = "下载完成 (100%)";
+                        downloadItem.Status = "下载完成 (100%)";
-                        
+                        
-                        // 验证文件完整性
+                        // 验证文件完整性
-                        string downloadPath = Path.Combine(
+                        string downloadPath = Path.Combine(
-                            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-                            "Downloads",
+                            "Downloads",
-                            downloadItem.FileName);
+                            downloadItem.FileName);
-                            
+                            
-                        if (File.Exists(downloadPath))
+                        if (File.Exists(downloadPath))
-                        {
+                        {
-
+
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-
+
-                        }
+                        }
-                        
+                        
-                        // 触发界面更新
+                        // 触发界面更新
-                        DownloadProgressChanged?.Invoke(downloadItem);
+                        DownloadProgressChanged?.Invoke(downloadItem);
-                        DownloadCompleted?.Invoke(downloadItem);
+                        DownloadCompleted?.Invoke(downloadItem);
-                        downloadItem.UpdateDisplay();
+                        downloadItem.UpdateDisplay();
-                        
+                        
-                        try 
+                        try 
-                        {
+                        {
-                            // 双重确保在主线程显示提示
+                            // 双重确保在主线程显示提示
-                            if (Application.OpenForms.Count > 0)
+                            if (Application.OpenForms.Count > 0)
-                            {
+                            {
-                                var mainForm = Application.OpenForms[0];
+                                var mainForm = Application.OpenForms[0];
-                                mainForm.Invoke((MethodInvoker)delegate {
+                                mainForm.Invoke((MethodInvoker)delegate {
-                            MessageBox.Show(mainForm, 
+                            MessageBox.Show(mainForm, 
-                                $"文件 {downloadItem.FileName} 已成功下载到：\n{Path.Combine(downloadsDir, downloadItem.FileName)}", 
+                                $"文件 {downloadItem.FileName} 已成功下载到：\n{Path.Combine(downloadsDir, downloadItem.FileName)}", 
-                                "下载完成", 
+                                "下载完成", 
-                                MessageBoxButtons.OK, 
+                                MessageBoxButtons.OK, 
-                                MessageBoxIcon.Information);
+                                MessageBoxIcon.Information);
-                                });
+                                });
-                            }
+                            }
-                            else
+                            else
-                            {
+                            {
-
+
-                            }
+                            }
-                        }
+                        }
-                        catch 
+                        catch 
-                        {
+                        {
-                        }
+                        }
-                    }
+                    }
-                    else
+                    else
-                    {
+                    {
-                        downloadItem.Status = $"下载失败 (代码: {result.ExitCode})";
+                        downloadItem.Status = $"下载失败 (代码: {result.ExitCode})";
-                        MessageBox.Show($"文件 {downloadItem.FileName} 下载失败", "下载失败", 
+                        MessageBox.Show($"文件 {downloadItem.FileName} 下载失败", "下载失败", 
-                            MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
+                    }
-                    
+                    
-                    DownloadCompleted?.Invoke(downloadItem);
+                    DownloadCompleted?.Invoke(downloadItem);
-                    
+                    
-                    try
+                    try
-                    {
+                    {
-                        process?.Dispose();
+                        process?.Dispose();
-                    }
+                    }
-                    finally
+                    finally
-                    {
+                    {
-                        if (process != null)
+                        if (process != null)
-                        {
+                        {
-                            currentProcess = null;
+                            currentProcess = null;
-                        }
+                        }
-                    }
+                    }
-                    
+                    
-                    // 强制更新显示
+                    // 强制更新显示
-                    downloadItem.UpdateDisplay();
+                    downloadItem.UpdateDisplay();
-                };
+                };
-
+
-
+
-
+
-                if (!currentProcess.Start())
+                if (!currentProcess.Start())
-                {
+                {
-                    throw new Exception("进程启动失败");
+                    throw new Exception("进程启动失败");
-                }
+                }
-
+
-                currentProcess.BeginOutputReadLine();
+                currentProcess.BeginOutputReadLine();
-                currentProcess.BeginErrorReadLine();
+                currentProcess.BeginErrorReadLine();
-                progressTimer.Start();
+                progressTimer.Start();
-            }
+            }
-                catch (Exception ex)
+                catch (Exception ex)
-                {
+                {
-                    string errorDetails = $"下载错误: {ex.Message}\n";
+                    string errorDetails = $"下载错误: {ex.Message}\n";
-                    errorDetails += $"目标路径: {downloadsDir}\n";
+                    errorDetails += $"目标路径: {downloadsDir}\n";
-                    errorDetails += $"URL: {url}";
+                    errorDetails += $"URL: {url}";
-                    
+                    
-                    downloadItem.Status = $"下载失败: {ex.Message}";
+                    downloadItem.Status = $"下载失败: {ex.Message}";
-                    Logger.LogError(errorDetails, ex);
+                    Logger.LogError(errorDetails, ex);
-                    
+                    
-                    MessageBox.Show($"下载失败:\n{errorDetails}", "错误", 
+                    MessageBox.Show($"下载失败:\n{errorDetails}", "错误", 
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    
+                    
-                    DownloadCompleted?.Invoke(downloadItem);
+                    DownloadCompleted?.Invoke(downloadItem);
-                }
+                }
-        }
+        }
-
+
-        public void CancelDownload(DownloadItem item)
+        public void CancelDownload(DownloadItem item)
-        {
+        {
-            try
+            try
-            {
+            {
-                var process = currentProcess;
+                var process = currentProcess;
-                if (process?.StartInfo == null || process.HasExited)
+                if (process?.StartInfo == null || process.HasExited)
-                {
+                {
-                    item.Status = "已取消";
+                    item.Status = "已取消";
-                    DownloadProgressChanged?.Invoke(item);
+                    DownloadProgressChanged?.Invoke(item);
-                    return;
+                    return;
-                }
+                }
-
+
-                process.Kill();
+                process.Kill();
-                process.Dispose();
+                process.Dispose();
-                currentProcess = null;
+                currentProcess = null;
-                
+                
-                item.Status = "已取消";
+                item.Status = "已取消";
-                DownloadProgressChanged?.Invoke(item);
+                DownloadProgressChanged?.Invoke(item);
-            }
+            }
-            catch (Exception ex)
+            catch (Exception ex)
-            {
+            {
-                item.Status = $"取消失败: {ex.Message}";
+                item.Status = $"取消失败: {ex.Message}";
-                DownloadProgressChanged?.Invoke(item);
+                DownloadProgressChanged?.Invoke(item);
-            }
+            }
-        }
+        }
-
+
-        private string GetDownloadPath()
+        private string GetDownloadPath()
-        {
+        {
-            // 1. 优先读取用户设置的下载路径
+            string fallbackPath = string.Empty;
-            try
+            // 1. 优先读取用户设置的下载路径
-            {
+            try
-                string jsonPath = Path.Combine(
+            {
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                string jsonPath = Path.Combine(
-                    "zsyg", "kortapp-z", ".date", "dl_path", "download_path.json");
+                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                
+                    "zsyg", "kortapp-z", ".date", "dl_path", "download_path.json");
-                Logger.Log($"尝试读取下载路径配置文件: {jsonPath}");
+                
-                
+                Logger.Log($"尝试读取下载路径配置文件: {jsonPath}");
-                if (File.Exists(jsonPath))
+                
-                {
+                if (File.Exists(jsonPath))
-                    string jsonString = File.ReadAllText(jsonPath);
+                {
-                    Logger.Log($"配置文件内容: {jsonString}");
+                    string jsonString = File.ReadAllText(jsonPath);
-                    
+                    Logger.Log($"配置文件内容: {jsonString}");
-                    var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString);
+                    
-                    string customPath = jsonData.GetProperty("DownloadPath").GetString()?.Trim();
+                    var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString);
-                    
+                    string customPath = jsonData.GetProperty("DownloadPath").GetString()?.Trim();
-                    if (!string.IsNullOrWhiteSpace(customPath))
+                    
-                    {
+                    if (!string.IsNullOrWhiteSpace(customPath))
-                        Logger.Log($"读取到自定义路径: {customPath}");
+                    {
-                        
+                        Logger.Log($"读取到自定义路径: {customPath}");
-                        // 处理路径格式
+                        
-                        customPath = customPath.Replace(@"\\", @"\");
+                        // 处理路径格式
-                        try 
+                        customPath = customPath.Replace(@"\\", @"\");
-                        {
+                        try 
-                            // 处理路径中的环境变量和特殊字符
+                        {
-                            customPath = Environment.ExpandEnvironmentVariables(customPath);
+                            // 处理路径中的环境变量和特殊字符
-                            customPath = Path.GetFullPath(customPath);
+                            customPath = Environment.ExpandEnvironmentVariables(customPath);
-                            Logger.Log($"标准化后的路径: {customPath}");
+                            customPath = Path.GetFullPath(customPath);
-                            
+                            Logger.Log($"标准化后的路径: {customPath}");
-                            // 确保路径以目录分隔符结尾
+                            
-                            if (!customPath.EndsWith(Path.DirectorySeparatorChar.ToString()))
+                            // 确保路径以目录分隔符结尾
-                            {
+                            if (!customPath.EndsWith(Path.DirectorySeparatorChar.ToString()))
-                                customPath += Path.DirectorySeparatorChar;
+                            {
-                            }
+                                customPath += Path.DirectorySeparatorChar;
-
+                            }
-                            // 验证驱动器是否存在
+
-                            string drive = Path.GetPathRoot(customPath);
+                            // 验证驱动器是否存在
-                            if (!Directory.Exists(drive))
+                            string drive = Path.GetPathRoot(customPath);
-                            {
+                            if (!Directory.Exists(drive))
-                                Logger.LogError($"驱动器不存在: {drive}");
+                            {
-                                throw new Exception($"驱动器 {drive} 不存在");
+                                Logger.LogError($"驱动器不存在: {drive}");
-                            }
+                                throw new Exception($"驱动器 {drive} 不存在");
-
+                            }
-                            // 验证路径
+
-                            if (!Directory.Exists(customPath))
+                            // 验证路径
-                            {
+                            if (!Directory.Exists(customPath))
-                                Logger.Log($"创建目录: {customPath}");
+                            {
-                                Directory.CreateDirectory(customPath);
+                                Logger.Log($"创建目录: {customPath}");
-                            }
+                                Directory.CreateDirectory(customPath);
-                            
+                            }
-                            // 更严格的路径可写性测试
+                            
-                            string testFile = Path.Combine(customPath, $"write_test_{Guid.NewGuid()}.tmp");
+                            // 更严格的路径可写性测试
-                            Logger.Log($"测试路径可写性: {testFile}");
+                            string testFile = Path.Combine(customPath, $"write_test_{Guid.NewGuid()}.tmp");
-                            try
+                            Logger.Log($"测试路径可写性: {testFile}");
-                            {
+                            try
-                                File.WriteAllText(testFile, DateTime.Now.ToString());
+                            {
-                                string content = File.ReadAllText(testFile);
+                                File.WriteAllText(testFile, DateTime.Now.ToString());
-                                File.Delete(testFile);
+                                string content = File.ReadAllText(testFile);
-                                Logger.Log($"路径验证成功: {customPath}");
+                                File.Delete(testFile);
-                                return customPath.TrimEnd(Path.DirectorySeparatorChar);
+                                Logger.Log($"路径验证成功: {customPath}");
-                            }
+                                return customPath.TrimEnd(Path.DirectorySeparatorChar);
-                            catch (Exception ex)
+                            }
-                            {
+                            catch (Exception ex)
-                                Logger.LogError($"路径不可写: {customPath}", ex);
+                            {
-                                throw new Exception($"路径不可写: {customPath}");
+                                Logger.LogError($"路径不可写: {customPath}", ex);
-                            }
+                                throw new Exception($"路径不可写: {customPath}");
-                        }
+                            }
-                        catch (Exception ex)
+                        }
-                        {
+                        catch (Exception ex)
-                            Logger.LogError($"路径处理失败: {customPath}", ex);
+                        {
-                            throw;
+                            Logger.LogError($"路径处理失败: {customPath}", ex);
-                        }
+                            throw;
-                    }
+                        }
-                }
+                    }
-                else
+                }
-                {
+                else
-                    Logger.Log("未找到下载路径配置文件");
+                {
-                }
+                    Logger.Log("未找到下载路径配置文件");
-            }
+                }
-            catch (Exception ex)
+            }
-            {
+            catch (Exception ex)
-                Logger.LogError("读取自定义下载路径失败", ex);
+            {
-            }
+                Logger.LogError("读取自定义下载路径失败", ex);
-
+            }
-            // 2. 回退到系统默认下载路径
+
-            IntPtr pathPtr = IntPtr.Zero;
+            // 2. 回退到系统默认下载路径
-            try
+            IntPtr pathPtr = IntPtr.Zero;
-            {
+            try
-                var downloadsFolderGuid = new Guid("374DE290-123F-4565-9164-39C4925E467B");
+            {
-                if (SHGetKnownFolderPath(downloadsFolderGuid, 0, IntPtr.Zero, out pathPtr) == 0)
+                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))
+                    string? defaultPath = Marshal.PtrToStringUni(pathPtr);
-                    {
+                    if (!string.IsNullOrEmpty(defaultPath))
-                        Directory.CreateDirectory(defaultPath);
+                    {
-                        return defaultPath;
+                        Directory.CreateDirectory(defaultPath);
-                    }
+                        return defaultPath;
-                }
+                    }
-            }
+                    else
-            catch (Exception ex)
+                    {
-            {
+                        Logger.LogWarning("获取到的系统下载路径为空");
-                Logger.LogError("获取系统下载路径失败", ex);
+                    }
-            }
+                }
-            finally
+            }
-            {
+            catch (Exception ex)
-                if (pathPtr != IntPtr.Zero)
+            {
-                {
+                Logger.LogError("获取系统下载路径失败", ex);
-                    Marshal.FreeCoTaskMem(pathPtr);
+            }
-                }
+            finally
-            }
+            {
-
+                if (pathPtr != IntPtr.Zero)
-            // 3. 最终回退到相对路径 ~/Downloads
+                {
-            string relativePath = "~/Downloads";
+                    Marshal.FreeCoTaskMem(pathPtr);
-            string fallbackPath = relativePath.Replace("~", 
+                }
-                Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
+            }
-            fallbackPath = Path.GetFullPath(fallbackPath);
+
-            
+            // 3. 最终回退到相对路径 ~/Downloads
-            try {
+            string relativePath = "~/Downloads";
-                Directory.CreateDirectory(fallbackPath);
+            string userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) ?? 
-                // 测试路径可写性
+                Environment.GetFolderPath(Environment.SpecialFolder.Desktop) ?? 
-                string testFile = Path.Combine(fallbackPath, "write_test.tmp");
+                AppDomain.CurrentDomain.BaseDirectory;
-                File.WriteAllText(testFile, "test");
+            
-                File.Delete(testFile);
+            if (!string.IsNullOrEmpty(userProfile))
-                return fallbackPath;
+            {
-            }
+                fallbackPath = relativePath.Replace("~", userProfile);
-            catch {
+                if (!string.IsNullOrEmpty(fallbackPath))
-                throw new Exception($"无法使用默认下载路径: {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,190 @@
-using System;
+using System;
-using System.Diagnostics;
+using System.Diagnostics;
-using System.Drawing;
+using System.Drawing;
-using System.IO;
+using System.IO;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace AppStore
+namespace AppStore
-{
+{
-    public class ImageCompressorForm : Form
+    public class ImageCompressorForm : Form
-    {
+    {
-        private Button btnSelectInput = new Button();
+        private Button btnSelectInput = new Button();
-        private Button btnSelectOutput = new Button();
+        private Button btnSelectOutput = new Button();
-        private Button btnCompress = new Button();
+        private Button btnCompress = new Button();
-        private TextBox txtInput = new TextBox();
+        private TextBox txtInput = new TextBox();
-        private TextBox txtOutput = new TextBox();
+        private TextBox txtOutput = new TextBox();
-        private RadioButton rbLossy = new RadioButton();
+        private RadioButton rbLossy = new RadioButton();
-        private RadioButton rbLossless = new RadioButton();
+        private RadioButton rbLossless = new RadioButton();
-        private TrackBar tbQuality = new TrackBar();
+        private TrackBar tbQuality = new TrackBar();
-        private Label lblQuality = new Label();
+        private Label lblQuality = new Label();
-        private CheckBox cbKeepExif = new CheckBox();
+        private CheckBox cbKeepExif = new CheckBox();
-        private ProgressBar progressBar = new ProgressBar();
+        private ProgressBar progressBar = new ProgressBar();
-
+
-        public ImageCompressorForm()
+        public ImageCompressorForm()
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-        }
+        }
-
+
-        private void InitializeComponent()
+        private void InitializeComponent()
-        {
+        {
-            this.Text = "图片压缩工具";
+            this.Text = "图片压缩工具";
-            this.Size = new Size(500, 350);
+            this.Size = new Size(500, 350);
-            this.StartPosition = FormStartPosition.CenterScreen;
+            this.StartPosition = FormStartPosition.CenterScreen;
-            this.FormBorderStyle = FormBorderStyle.FixedDialog;
+            this.FormBorderStyle = FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
+            this.MaximizeBox = false;
-
+
-            // 输入文件选择
+            // 输入文件选择
-            btnSelectInput.Text = "选择...";
+            btnSelectInput.Text = "选择...";
-            btnSelectInput.Location = new Point(400, 20);
+            btnSelectInput.Location = new Point(400, 20);
-            btnSelectInput.Click += (s, e) => SelectFile(txtInput);
+            btnSelectInput.Click += (s, e) => SelectFile(txtInput);
-            this.Controls.Add(btnSelectInput);
+            this.Controls.Add(btnSelectInput);
-
+
-            txtInput.Location = new Point(20, 20);
+            txtInput.Location = new Point(20, 20);
-            txtInput.Size = new Size(370, 20);
+            txtInput.Size = new Size(370, 20);
-            txtInput.ReadOnly = true;
+            txtInput.ReadOnly = true;
-            this.Controls.Add(txtInput);
+            this.Controls.Add(txtInput);
-
+
-            Label lblInput = new Label();
+            Label lblInput = new Label();
-            lblInput.Text = "输入文件:";
+            lblInput.Text = "输入文件:";
-            lblInput.Location = new Point(20, 0);
+            lblInput.Location = new Point(20, 0);
-            this.Controls.Add(lblInput);
+            this.Controls.Add(lblInput);
-
+
-            // 输出文件选择
+            // 输出文件选择
-            btnSelectOutput.Text = "选择...";
+            btnSelectOutput.Text = "选择...";
-            btnSelectOutput.Location = new Point(400, 70);
+            btnSelectOutput.Location = new Point(400, 70);
-            btnSelectOutput.Click += (s, e) => SelectFile(txtOutput, true);
+            btnSelectOutput.Click += (s, e) => SelectFile(txtOutput, true);
-            this.Controls.Add(btnSelectOutput);
+            this.Controls.Add(btnSelectOutput);
-
+
-            txtOutput.Location = new Point(20, 70);
+            txtOutput.Location = new Point(20, 70);
-            txtOutput.Size = new Size(370, 20);
+            txtOutput.Size = new Size(370, 20);
-            this.Controls.Add(txtOutput);
+            this.Controls.Add(txtOutput);
-
+
-            Label lblOutput = new Label();
+            Label lblOutput = new Label();
-            lblOutput.Text = "输出文件:";
+            lblOutput.Text = "输出文件:";
-            lblOutput.Location = new Point(20, 50);
+            lblOutput.Location = new Point(20, 50);
-            this.Controls.Add(lblOutput);
+            this.Controls.Add(lblOutput);
-
+
-            // 压缩类型
+            // 压缩类型
-            rbLossy.Text = "有损压缩 (JPEG)";
+            rbLossy.Text = "有损压缩 (JPEG)";
-            rbLossy.Location = new Point(20, 110);
+            rbLossy.Location = new Point(20, 110);
-            rbLossy.Checked = true;
+            rbLossy.Checked = true;
-            this.Controls.Add(rbLossy);
+            this.Controls.Add(rbLossy);
-
+
-            rbLossless.Text = "无损压缩 (PNG)";
+            rbLossless.Text = "无损压缩 (PNG)";
-            rbLossless.Location = new Point(20, 135);
+            rbLossless.Location = new Point(20, 135);
-            this.Controls.Add(rbLossless);
+            this.Controls.Add(rbLossless);
-
+
-            // 质量设置
+            // 质量设置
-            tbQuality.Minimum = 1;
+            tbQuality.Minimum = 1;
-            tbQuality.Maximum = 1000;
+            tbQuality.Maximum = 1000;
-            tbQuality.Value = 800;
+            tbQuality.Value = 800;
-            tbQuality.Location = new Point(20, 190);
+            tbQuality.Location = new Point(20, 190);
-            tbQuality.Size = new Size(300, 50);
+            tbQuality.Size = new Size(300, 50);
-            tbQuality.Scroll += (s, e) => lblQuality.Text = $"压缩质量: {tbQuality.Value}";
+            tbQuality.Scroll += (s, e) => lblQuality.Text = $"压缩质量: {tbQuality.Value}";
-            this.Controls.Add(tbQuality);
+            this.Controls.Add(tbQuality);
-
+
-            lblQuality.Text = $"压缩质量: {tbQuality.Value}";
+            lblQuality.Text = $"压缩质量: {tbQuality.Value}";
-            lblQuality.Location = new Point(20, 170);
+            lblQuality.Location = new Point(20, 170);
-            this.Controls.Add(lblQuality);
+            this.Controls.Add(lblQuality);
-
+
-            // EXIF选项
+            // EXIF选项
-            cbKeepExif.Text = "保留EXIF信息";
+            cbKeepExif.Text = "保留EXIF信息";
-            cbKeepExif.Location = new Point(20, 240);
+            cbKeepExif.Location = new Point(20, 240);
-            this.Controls.Add(cbKeepExif);
+            this.Controls.Add(cbKeepExif);
-
+
-            // 压缩按钮
+            // 压缩按钮
-            btnCompress.Text = "开始压缩";
+            btnCompress.Text = "开始压缩";
-            btnCompress.Location = new Point(20, 280);
+            btnCompress.Location = new Point(20, 280);
-            btnCompress.Size = new Size(460, 30);
+            btnCompress.Size = new Size(460, 30);
-            btnCompress.Click += BtnCompress_Click;
+            btnCompress.Click += BtnCompress_Click;
-            this.Controls.Add(btnCompress);
+            this.Controls.Add(btnCompress);
-
+
-            // 调整窗体大小
+            // 调整窗体大小
-            this.Size = new Size(500, 370);
+            this.Size = new Size(500, 370);
-        }
+        }
-
+
-        private void SelectFile(TextBox target, bool isSave = false)
+        private void SelectFile(TextBox target, bool isSave = false)
-        {
+        {
-            var dialog = isSave ? new SaveFileDialog() : new OpenFileDialog() as FileDialog;
+            var dialog = isSave ? new SaveFileDialog() : new OpenFileDialog() as FileDialog;
-            dialog.Filter = "图片文件|*.jpg;*.jpeg;*.png;*.bmp|所有文件|*.*";
+            dialog.Filter = "图片文件|*.jpg;*.jpeg;*.png;*.bmp|所有文件|*.*";
-
+
-            if (dialog.ShowDialog() == DialogResult.OK)
+            if (dialog.ShowDialog() == DialogResult.OK)
-            {
+            {
-                target.Text = dialog.FileName;
+                target.Text = dialog.FileName;
-            }
+            }
-        }
+        }
-
+
-        private void BtnCompress_Click(object sender, EventArgs e)
+        private void BtnCompress_Click(object sender, EventArgs e)
-        {
+        {
-            if (string.IsNullOrEmpty(txtInput.Text) || !File.Exists(txtInput.Text))
+            if (string.IsNullOrEmpty(txtInput.Text) || !File.Exists(txtInput.Text))
-            {
+            {
-                MessageBox.Show("请选择有效的输入文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("请选择有效的输入文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
+                return;
-            }
+            }
-
+
-            if (string.IsNullOrEmpty(txtOutput.Text))
+            if (string.IsNullOrEmpty(txtOutput.Text))
-            {
+            {
-                MessageBox.Show("请指定输出文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("请指定输出文件", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
+                return;
-            }
+            }
-
+
-            btnCompress.Enabled = false;
+            btnCompress.Enabled = false;
-
+
-            try
+            try
-            {
+            {
-                string toolPath = Path.Combine(Application.StartupPath, "resource", "image_compressor.exe");
+                string toolPath = Path.Combine(Application.StartupPath, "resource", "image_compressor.exe");
-                if (!File.Exists(toolPath))
+                if (!File.Exists(toolPath))
-                {
+                {
-                    MessageBox.Show("图片压缩工具未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show("图片压缩工具未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
+                    return;
-                }
+                }
-
+
-                string args = $"\"{txtInput.Text}\" \"{txtOutput.Text}\"";
+                string args = $"\"{txtInput.Text}\" \"{txtOutput.Text}\"";
-                args += $" -t {(rbLossy.Checked ? "lossy" : "lossless")}";
+                args += $" -t {(rbLossy.Checked ? "lossy" : "lossless")}";
-                args += $" -q {tbQuality.Value}";
+                args += $" -q {tbQuality.Value}";
-                if (cbKeepExif.Checked) args += " -e";
+                if (cbKeepExif.Checked) args += " -e";
-
+
-                var process = new Process();
+                var process = new Process();
-                process.StartInfo.FileName = toolPath;
+                process.StartInfo.FileName = toolPath;
-                process.StartInfo.Arguments = args;
+                process.StartInfo.Arguments = args;
-                process.StartInfo.UseShellExecute = false;
+                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.CreateNoWindow = true;
+                process.StartInfo.CreateNoWindow = true;
-                process.StartInfo.RedirectStandardOutput = true;
+                process.StartInfo.RedirectStandardOutput = true;
-                process.StartInfo.RedirectStandardError = true;
+                process.StartInfo.RedirectStandardError = true;
-
+
-                process.OutputDataReceived += (s, ev) => {
+                process.OutputDataReceived += (s, ev) => {
-                    if (!string.IsNullOrEmpty(ev.Data))
+                    if (!string.IsNullOrEmpty(ev.Data))
-                        Console.WriteLine(ev.Data);
+                        Console.WriteLine(ev.Data);
-                };
+                };
-
+
-                process.ErrorDataReceived += (s, ev) => {
+                process.ErrorDataReceived += (s, ev) => {
-                    if (!string.IsNullOrEmpty(ev.Data))
+                    if (!string.IsNullOrEmpty(ev.Data))
-                        Console.Error.WriteLine(ev.Data);
+                        Console.Error.WriteLine(ev.Data);
-                };
+                };
-
+
-                process.Start();
+                process.Start();
-                process.BeginOutputReadLine();
+                process.BeginOutputReadLine();
-                process.BeginErrorReadLine();
+                process.BeginErrorReadLine();
-                process.WaitForExit();
+                process.WaitForExit();
-
+
-                if (process.ExitCode == 0)
+                if (process.ExitCode == 0)
-                {
+                {
-                    MessageBox.Show("图片压缩完成", "完成", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("图片压缩完成", "完成", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
+                }
-                else
+                else
-                {
+                {
-                    MessageBox.Show("图片压缩失败", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show("图片压缩失败", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
+                }
-            }
+            }
-            catch (Exception ex)
+            catch (Exception ex)
-            {
+            {
-                MessageBox.Show($"压缩过程中发生错误: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show($"压缩过程中发生错误: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
+            }
-            finally
+            finally
-            {
+            {
-                btnCompress.Enabled = true;
+                btnCompress.Enabled = true;
-                progressBar.Visible = false;
+                progressBar.Visible = false;
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

Program.cs

@@ -1,16 +1,16 @@
-using System;
+using System;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace AppStore
+namespace AppStore
-{
+{
-    static class Program
+    static class Program
-    {
+    {
-        [STAThread]
+        [STAThread]
-        static void Main()
+        static void Main()
-        {
+        {
-            Application.EnableVisualStyles();
+            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
+            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
+            Application.Run(new MainForm());
-        }
+        }
-    }
+    }
-}
+}

SettingsForm.cs

@@ -203,7 +203,7 @@ namespace AppStore
                 {
                     string jsonString = File.ReadAllText(jsonPath);
                     var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString);
-                    string customPath = jsonData.GetProperty("DownloadPath").GetString();
+                    string customPath = jsonData.GetProperty("DownloadPath").GetString() ?? "";
                     
                     // 如果自定义路径有效则显示，否则显示默认路径
                     txtBox.Text = !string.IsNullOrWhiteSpace(customPath) ? customPath : defaultPath;

ThemeManager.cs

@@ -70,6 +70,10 @@ namespace AppStore
         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 {};
 
@@ -102,6 +106,9 @@ namespace AppStore
         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);

ToolCard.cs

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

border_renderer.cpp

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

card_calculator.cpp

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

docs/features.html

@@ -17,21 +17,7 @@
             <h2>核心功能</h2>
             
             <article class="feature">
-                <h3>应用程序管理</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>
             </article>
         </section>
     </main>

inno/innosetup_x64.iss

@@ -2,10 +2,10 @@
 ; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.1.3"
+#define MyAppVersion "1.2.7"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
-#define MyAppExeName "kortapp.exe"
+#define MyAppExeName "kortapp-z.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt

inno/innosetup_x86.iss

@@ -2,10 +2,10 @@
 ; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.1.3"
+#define MyAppVersion "1.2.7"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
-#define MyAppExeName "kortapp.exe"
+#define MyAppExeName "kortapp-z.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt

log_cleaner.cpp

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

logger.cs

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

@@ -0,0 +1,37 @@
+# 编译器设置
+CXX = g++
+FLTK_CONFIG = fltk-config
+
+# 编译选项
+CXXFLAGS = -std=c++11 -Wall -Iinclude
+LDFLAGS = -static -mwindows `$(FLTK_CONFIG) --use-images --ldstaticflags` -lcrypto -lws2_32 -lcrypt32
+
+# 源文件和目标文件
+SRC_DIR = src
+OBJ_DIR = obj
+SRCS = $(wildcard $(SRC_DIR)/*.cpp)
+OBJS = $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS))
+
+# 可执行文件
+TARGET = text_converter.exe
+
+# 默认目标
+all: $(OBJ_DIR) $(TARGET)
+
+# 创建obj目录
+$(OBJ_DIR):
+	mkdir -p $(OBJ_DIR)
+
+# 生成目标文件
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+# 链接生成可执行文件
+$(TARGET): $(OBJS)
+	$(CXX) $^ -o $@ $(LDFLAGS)
+
+# 清理
+clean:
+	rm -rf $(OBJ_DIR) $(TARGET)
+
+.PHONY: all clean

others/C++/text converter/include/About.hpp

@@ -0,0 +1,16 @@
+#ifndef ABOUT_HPP
+#define ABOUT_HPP
+
+#include <string>
+
+class About {
+public:
+    static std::string getName() { return "文本转换器"; }
+    static std::string getVersion() { return "1.0.0"; }
+    static std::string getAuthor() { return "zsyg"; }
+    static std::string getDescription() { 
+        return "一个简单的文本转换工具，支持文本转换"; 
+    }
+};
+
+#endif // ABOUT_HPP

others/C++/text converter/include/Ascii85Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef ASCII85CONVERTER_HPP
+#define ASCII85CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+
+class Ascii85Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "Ascii85"; }
+};
+
+#endif // ASCII85CONVERTER_HPP

others/C++/text converter/include/Base32Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef BASE32CONVERTER_HPP
+#define BASE32CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+
+class Base32Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "Base32"; }
+};
+
+#endif // BASE32CONVERTER_HPP

others/C++/text converter/include/Base64Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef BASE64CONVERTER_HPP
+#define BASE64CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+
+class Base64Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "Base64"; }
+};
+
+#endif // BASE64CONVERTER_HPP

others/C++/text converter/include/BinaryConverter.hpp

@@ -0,0 +1,14 @@
+#ifndef BINARYCONVERTER_HPP
+#define BINARYCONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+#include <bitset>
+
+class BinaryConverter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "二进制"; }
+};
+
+#endif // BINARYCONVERTER_HPP

others/C++/text converter/include/CRC32Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef CRC32CONVERTER_HPP
+#define CRC32CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+
+class CRC32Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "CRC32"; }
+};
+
+#endif // CRC32CONVERTER_HPP

others/C++/text converter/include/Config.hpp

@@ -0,0 +1,30 @@
+#ifndef CONFIG_HPP
+#define CONFIG_HPP
+
+namespace Config {
+    constexpr int WINDOW_WIDTH = 450;
+    constexpr int WINDOW_HEIGHT = 250;
+    constexpr const char* WINDOW_TITLE = "文本转换器";
+    
+    constexpr int INPUT_X = 70;
+    constexpr int INPUT_Y = 40;
+    constexpr int INPUT_WIDTH = 360;
+    constexpr int INPUT_HEIGHT = 30;
+    
+    constexpr int OUTPUT_X = 70;
+    constexpr int OUTPUT_Y = 100;
+    constexpr int OUTPUT_WIDTH = 360;
+    constexpr int OUTPUT_HEIGHT = 30;
+    
+    constexpr int CHOICE_X = 70;
+    constexpr int CHOICE_Y = 160;
+    constexpr int CHOICE_WIDTH = 120;
+    constexpr int CHOICE_HEIGHT = 30;
+    
+    constexpr int BUTTON_X = 210;
+    constexpr int BUTTON_Y = 160;
+    constexpr int BUTTON_WIDTH = 100;
+    constexpr int BUTTON_HEIGHT = 30;
+};
+
+#endif // CONFIG_HPP

others/C++/text converter/include/Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef CONVERTER_HPP
+#define CONVERTER_HPP
+
+#include <string>
+
+class Converter {
+public:
+    virtual ~Converter() = default;
+    virtual std::string convert(const std::string& input) = 0;
+    virtual std::string getName() const = 0;
+};
+
+#endif // CONVERTER_HPP

others/C++/text converter/include/HexConverter.hpp

@@ -0,0 +1,15 @@
+#ifndef HEXCONVERTER_HPP
+#define HEXCONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+#include <iomanip>
+#include <sstream>
+
+class HexConverter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "十六进制"; }
+};
+
+#endif // HEXCONVERTER_HPP

others/C++/text converter/include/MD5Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef MD5CONVERTER_HPP
+#define MD5CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+
+class MD5Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "MD5"; }
+};
+
+#endif // MD5CONVERTER_HPP

others/C++/text converter/include/MainWindow.hpp

@@ -0,0 +1,26 @@
+#ifndef MAINWINDOW_HPP
+#define MAINWINDOW_HPP
+
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Input.H>
+#include <FL/Fl_Output.H>
+#include <FL/Fl_Choice.H>
+
+class MainWindow : public Fl_Window {
+public:
+    MainWindow(int w, int h, const char* title);
+    ~MainWindow();
+
+private:
+    Fl_Input* inputText;
+    Fl_Output* outputText;
+    Fl_Choice* conversionType;
+    Fl_Button* convertButton;
+
+    static void ConvertCallback(Fl_Widget* widget, void* data);
+    void ConvertText();
+};
+
+#endif // MAINWINDOW_HPP

others/C++/text converter/include/ROT13Converter.hpp

@@ -0,0 +1,14 @@
+#ifndef ROT13CONVERTER_HPP
+#define ROT13CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+#include <cctype>
+
+class ROT13Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "ROT13"; }
+};
+
+#endif // ROT13CONVERTER_HPP

others/C++/text converter/include/SHA1Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef SHA1CONVERTER_HPP
+#define SHA1CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+
+class SHA1Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "SHA1"; }
+};
+
+#endif // SHA1CONVERTER_HPP

others/C++/text converter/include/SHA256Converter.hpp

@@ -0,0 +1,13 @@
+#ifndef SHA256CONVERTER_HPP
+#define SHA256CONVERTER_HPP
+
+#include "Converter.hpp"
+#include <string>
+
+class SHA256Converter : public Converter {
+public:
+    std::string convert(const std::string& input) override;
+    std::string getName() const override { return "SHA256"; }
+};
+
+#endif // SHA256CONVERTER_HPP

others/C++/text converter/include/Utils.hpp

@@ -0,0 +1,14 @@
+#ifndef UTILS_HPP
+#define UTILS_HPP
+
+#include <memory>
+#include "Converter.hpp"
+#include "BinaryConverter.hpp"
+#include "HexConverter.hpp"
+
+class Utils {
+public:
+    static std::unique_ptr<Converter> createConverter(int type);
+};
+
+#endif // UTILS_HPP

others/C++/text converter/src/Ascii85Converter.cpp

@@ -0,0 +1,47 @@
+#include "../include/Ascii85Converter.hpp"
+#include <string>
+#include <cmath>
+#include <sstream>
+#include <cstdint>
+
+const std::string ASCII85_PREFIX = "<~";
+const std::string ASCII85_SUFFIX = "~>";
+
+std::string Ascii85Converter::convert(const std::string& input) {
+    std::stringstream result;
+    result << ASCII85_PREFIX;
+
+    size_t i = 0;
+    while (i < input.size()) {
+        uint32_t value = 0;
+        int bytes = 0;
+
+        // 读取4个字节
+        for (int j = 0; j < 4 && (i + j) < input.size(); j++) {
+            value = (value << 8) | static_cast<unsigned char>(input[i + j]);
+            bytes++;
+        }
+        i += bytes;
+
+        // 特殊处理全0的4字节
+        if (value == 0 && bytes == 4) {
+            result << 'z';
+            continue;
+        }
+
+        // 转换为Ascii85
+        char chars[5];
+        for (int j = 4; j >= 0; j--) {
+            chars[j] = value % 85 + '!';
+            value /= 85;
+        }
+
+        // 写入结果(只写入bytes+1个字符)
+        for (int j = 0; j < bytes + 1; j++) {
+            result << chars[j];
+        }
+    }
+
+    result << ASCII85_SUFFIX;
+    return result.str();
+}

others/C++/text converter/src/Base32Converter.cpp

@@ -0,0 +1,37 @@
+#include "../include/Base32Converter.hpp"
+#include <string>
+#include <stdexcept>
+
+const std::string BASE32_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+
+std::string Base32Converter::convert(const std::string& input) {
+    std::string result;
+    int buffer = 0;
+    int bitsLeft = 0;
+    int count = 0;
+
+    for (unsigned char c : input) {
+        buffer <<= 8;
+        buffer |= c;
+        bitsLeft += 8;
+        count++;
+
+        while (bitsLeft >= 5) {
+            int index = (buffer >> (bitsLeft - 5)) & 0x1F;
+            result += BASE32_CHARS[index];
+            bitsLeft -= 5;
+        }
+    }
+
+    if (bitsLeft > 0) {
+        int index = (buffer << (5 - bitsLeft)) & 0x1F;
+        result += BASE32_CHARS[index];
+    }
+
+    // 添加填充字符
+    while (result.size() % 8 != 0) {
+        result += '=';
+    }
+
+    return result;
+}

others/C++/text converter/src/Base64Converter.cpp

@@ -0,0 +1,22 @@
+#include "../include/Base64Converter.hpp"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <string>
+
+std::string Base64Converter::convert(const std::string& input) {
+    // Base64编码
+    BIO *b64 = BIO_new(BIO_f_base64());
+    BIO *bio = BIO_new(BIO_s_mem());
+    BIO_push(b64, bio);
+    BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+
+    BIO_write(b64, input.c_str(), input.length());
+    BIO_flush(b64);
+
+    char* buffer;
+    long length = BIO_get_mem_data(bio, &buffer);
+    std::string result(buffer, length);
+    
+    BIO_free_all(b64);
+    return result;
+}

others/C++/text converter/src/BinaryConverter.cpp

@@ -0,0 +1,27 @@
+#include "../include/BinaryConverter.hpp"
+#include <bitset>
+#include <sstream>
+#include <algorithm>
+
+std::string BinaryConverter::convert(const std::string& input) {
+    if (input.empty()) {
+        return "";
+    }
+
+    std::stringstream result;
+    for (char c : input) {
+        std::string binary = std::bitset<8>(c).to_string();
+        // 去除前导0，保留后6位
+        size_t firstOne = binary.find('1');
+        if (firstOne != std::string::npos) {
+            binary = binary.substr(firstOne);
+        }
+        result << binary << " ";
+    }
+
+    std::string output = result.str();
+    if (!output.empty()) {
+        output.pop_back(); // 移除最后一个空格
+    }
+    return output;
+}

others/C++/text converter/src/CRC32Converter.cpp

@@ -0,0 +1,28 @@
+#include "../include/CRC32Converter.hpp"
+#include <string>
+#include <sstream>
+#include <iomanip>
+#include <cstdint>
+
+// CRC32多项式
+const uint32_t CRC32_POLY = 0xEDB88320;
+
+uint32_t computeCRC32(const std::string& input) {
+    uint32_t crc = 0xFFFFFFFF;
+    
+    for (char c : input) {
+        crc ^= static_cast<unsigned char>(c);
+        for (int i = 0; i < 8; i++) {
+            crc = (crc >> 1) ^ ((crc & 1) ? CRC32_POLY : 0);
+        }
+    }
+    
+    return ~crc;
+}
+
+std::string CRC32Converter::convert(const std::string& input) {
+    uint32_t crc = computeCRC32(input);
+    std::stringstream ss;
+    ss << std::hex << std::setw(8) << std::setfill('0') << crc;
+    return ss.str();
+}

others/C++/text converter/src/HexConverter.cpp

@@ -0,0 +1,23 @@
+#include "../include/HexConverter.hpp"
+#include <iomanip>
+#include <sstream>
+
+std::string HexConverter::convert(const std::string& input) {
+    if (input.empty()) {
+        return "";
+    }
+
+    std::stringstream result;
+    for (char c : input) {
+        result << std::hex << std::setw(2) << std::setfill('0') 
+               << static_cast<int>(static_cast<unsigned char>(c)) << " ";
+    }
+
+    std::string output = result.str();
+    // 移除最后一个空格
+    if (!output.empty()) {
+        output.pop_back();
+    }
+
+    return output;
+}

others/C++/text converter/src/MD5Converter.cpp

@@ -0,0 +1,23 @@
+#include "../include/MD5Converter.hpp"
+#include <openssl/evp.h>
+#include <sstream>
+#include <iomanip>
+
+std::string MD5Converter::convert(const std::string& input) {
+    EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
+    const EVP_MD* md = EVP_md5();
+    unsigned char digest[EVP_MAX_MD_SIZE];
+    unsigned int digest_len;
+
+    EVP_DigestInit_ex(mdctx, md, nullptr);
+    EVP_DigestUpdate(mdctx, input.c_str(), input.length());
+    EVP_DigestFinal_ex(mdctx, digest, &digest_len);
+    EVP_MD_CTX_free(mdctx);
+
+    std::stringstream ss;
+    for(unsigned int i = 0; i < digest_len; i++) {
+        ss << std::hex << std::setw(2) << std::setfill('0') << (int)digest[i];
+    }
+
+    return ss.str();
+}

others/C++/text converter/src/Main.cpp

@@ -0,0 +1,14 @@
+#include "../include/MainWindow.hpp"
+#include "../include/Config.hpp"
+#include <FL/Fl.H>
+
+int main(int argc, char **argv) {
+    // 创建主窗口
+    MainWindow window(Config::WINDOW_WIDTH, Config::WINDOW_HEIGHT, Config::WINDOW_TITLE);
+    
+    // 显示窗口
+    window.show(argc, argv);
+    
+    // 运行FLTK主循环
+    return Fl::run();
+}

others/C++/text converter/src/MainWindow.cpp

@@ -0,0 +1,66 @@
+#include "../include/MainWindow.hpp"
+#include "../include/Utils.hpp"
+#include "../include/Config.hpp"
+#include <FL/Fl_Box.H>
+#include <FL/fl_ask.H>
+
+MainWindow::MainWindow(int w, int h, const char* title) : Fl_Window(w, h, title) {
+    // 初始化UI元素
+    inputText = new Fl_Input(Config::INPUT_X, Config::INPUT_Y, 
+                            Config::INPUT_WIDTH, Config::INPUT_HEIGHT, "输入文本:");
+    outputText = new Fl_Output(Config::OUTPUT_X, Config::OUTPUT_Y, 
+                              Config::OUTPUT_WIDTH, Config::OUTPUT_HEIGHT, "输出结果:");
+    conversionType = new Fl_Choice(Config::CHOICE_X, Config::CHOICE_Y, 
+                                  Config::CHOICE_WIDTH, Config::CHOICE_HEIGHT, "转换类型:");
+    convertButton = new Fl_Button(Config::BUTTON_X, Config::BUTTON_Y, 
+                                Config::BUTTON_WIDTH, Config::BUTTON_HEIGHT, "转换");
+
+    // 设置转换类型选项
+    conversionType->add("二进制");
+    conversionType->add("十六进制");
+    conversionType->add("ROT13");
+    conversionType->add("MD5");
+    conversionType->add("SHA1");
+    conversionType->add("SHA256");
+    conversionType->add("Base64");
+    conversionType->add("Base32");
+    conversionType->add("Ascii85");
+    conversionType->add("CRC32");
+    conversionType->value(0); // 默认选择二进制
+
+    // 设置按钮回调
+    convertButton->callback(ConvertCallback, this);
+
+    end(); // 结束窗口组件添加
+}
+
+MainWindow::~MainWindow() {
+    // 清理资源
+    delete inputText;
+    delete outputText;
+    delete conversionType;
+    delete convertButton;
+}
+
+void MainWindow::ConvertCallback(Fl_Widget* widget, void* data) {
+    MainWindow* window = static_cast<MainWindow*>(data);
+    window->ConvertText();
+}
+
+void MainWindow::ConvertText() {
+    const char* input = inputText->value();
+    if (!input || strlen(input) == 0) {
+        fl_alert("请输入要转换的文本");
+        return;
+    }
+
+    int type = conversionType->value();
+    auto converter = Utils::createConverter(type);
+    if (!converter) {
+        fl_alert("不支持的转换类型");
+        return;
+    }
+
+    std::string result = converter->convert(input);
+    outputText->value(result.c_str());
+}

others/C++/text converter/src/ROT13Converter.cpp

@@ -0,0 +1,13 @@
+#include "../include/ROT13Converter.hpp"
+
+std::string ROT13Converter::convert(const std::string& input) {
+    std::string result;
+    for (char c : input) {
+        if (isalpha(c)) {
+            char base = isupper(c) ? 'A' : 'a';
+            c = (c - base + 13) % 26 + base;
+        }
+        result += c;
+    }
+    return result;
+}

others/C++/text converter/src/SHA1Converter.cpp

@@ -0,0 +1,23 @@
+#include "../include/SHA1Converter.hpp"
+#include <openssl/evp.h>
+#include <sstream>
+#include <iomanip>
+
+std::string SHA1Converter::convert(const std::string& input) {
+    EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
+    const EVP_MD* md = EVP_sha1();
+    unsigned char digest[EVP_MAX_MD_SIZE];
+    unsigned int digest_len;
+
+    EVP_DigestInit_ex(mdctx, md, nullptr);
+    EVP_DigestUpdate(mdctx, input.c_str(), input.length());
+    EVP_DigestFinal_ex(mdctx, digest, &digest_len);
+    EVP_MD_CTX_free(mdctx);
+
+    std::stringstream ss;
+    for(unsigned int i = 0; i < digest_len; i++) {
+        ss << std::hex << std::setw(2) << std::setfill('0') << (int)digest[i];
+    }
+
+    return ss.str();
+}

others/C++/text converter/src/SHA256Converter.cpp

@@ -0,0 +1,23 @@
+#include "../include/SHA256Converter.hpp"
+#include <openssl/evp.h>
+#include <sstream>
+#include <iomanip>
+
+std::string SHA256Converter::convert(const std::string& input) {
+    EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
+    const EVP_MD* md = EVP_sha256();
+    unsigned char digest[EVP_MAX_MD_SIZE];
+    unsigned int digest_len;
+
+    EVP_DigestInit_ex(mdctx, md, nullptr);
+    EVP_DigestUpdate(mdctx, input.c_str(), input.length());
+    EVP_DigestFinal_ex(mdctx, digest, &digest_len);
+    EVP_MD_CTX_free(mdctx);
+
+    std::stringstream ss;
+    for(unsigned int i = 0; i < digest_len; i++) {
+        ss << std::hex << std::setw(2) << std::setfill('0') << (int)digest[i];
+    }
+
+    return ss.str();
+}

others/C++/text converter/src/Utils.cpp

@@ -0,0 +1,25 @@
+#include "../include/Utils.hpp"
+#include "../include/ROT13Converter.hpp"
+#include "../include/MD5Converter.hpp"
+#include "../include/SHA1Converter.hpp"
+#include "../include/SHA256Converter.hpp"
+#include "../include/Base64Converter.hpp"
+#include "../include/Base32Converter.hpp"
+#include "../include/Ascii85Converter.hpp"
+#include "../include/CRC32Converter.hpp"
+
+std::unique_ptr<Converter> Utils::createConverter(int type) {
+    switch (type) {
+        case 0: return std::unique_ptr<Converter>(new BinaryConverter());
+        case 1: return std::unique_ptr<Converter>(new HexConverter());
+        case 2: return std::unique_ptr<Converter>(new ROT13Converter());
+        case 3: return std::unique_ptr<Converter>(new MD5Converter());
+        case 4: return std::unique_ptr<Converter>(new SHA1Converter());
+        case 5: return std::unique_ptr<Converter>(new SHA256Converter());
+        case 6: return std::unique_ptr<Converter>(new Base64Converter());
+        case 7: return std::unique_ptr<Converter>(new Base32Converter());
+        case 8: return std::unique_ptr<Converter>(new Ascii85Converter());
+        case 9: return std::unique_ptr<Converter>(new CRC32Converter());
+        default: return nullptr;
+    }
+}

others/C/System_Information/include/about_dialog.h

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

others/C/System_Information/include/config.h

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

others/C/System_Information/include/disk_info.h

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

others/C/System_Information/include/logging.h

@@ -1,15 +1,15 @@
-#ifndef LOGGING_H
+#ifndef LOGGING_H
-#define LOGGING_H
+#define LOGGING_H
-
+
-#include <windows.h>
+#include <windows.h>
-
+
-typedef enum {
+typedef enum {
-    LOG_DEBUG,
+    LOG_DEBUG,
-    LOG_INFO,
+    LOG_INFO,
-    LOG_WARNING,
+    LOG_WARNING,
-    LOG_ERROR
+    LOG_ERROR
-} LogLevel;
+} LogLevel;
-
+
-void log_message(LogLevel level, const char* format, ...);
+void log_message(LogLevel level, const char* format, ...);
-
+
-#endif // LOGGING_H
+#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
+#ifndef NETWORK_INFO_H
-#define NETWORK_INFO_H
+#define NETWORK_INFO_H
-
+
-#include <windows.h>
+#include <windows.h>
-#include <iphlpapi.h>
+#include <iphlpapi.h>
-
+
-// 确保GetAdaptersInfo函数声明
+// 确保GetAdaptersInfo函数声明
-#ifndef _IPHLPAPI_
+#ifndef _IPHLPAPI_
-#define _IPHLPAPI_
+#define _IPHLPAPI_
-DWORD GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen);
+DWORD GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen);
-#endif
+#endif
-
+
-typedef struct {
+typedef struct {
-    char adapterName[MAX_ADAPTER_NAME_LENGTH + 4];
+    char adapterName[MAX_ADAPTER_NAME_LENGTH + 4];
-    char description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4];
+    char description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4];
-    char ipAddress[16];
+    char ipAddress[16];
-    char macAddress[18];
+    char macAddress[18];
-    ULONG speed; // in Mbps
+    ULONG speed; // in Mbps
-} NetworkAdapterInfo;
+} NetworkAdapterInfo;
-
+
-void get_network_adapters(NetworkAdapterInfo* adapters, int* count);
+void get_network_adapters(NetworkAdapterInfo* adapters, int* count);
-
+
-#endif // NETWORK_INFO_H
+#endif // NETWORK_INFO_H

others/C/System_Information/include/performance_info.h

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

others/C/System_Information/include/resource.h

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

others/C/System_Information/include/system_info.h

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

others/C/System_Information/include/system_tray.h

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

others/C/System_Information/include/utils.h

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

others/C/System_Information/include/window_utils.h

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

others/C/System_Information/src/about_dialog.c

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

others/C/System_Information/src/disk_info.c

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

others/C/System_Information/src/logging.c

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

others/C/System_Information/src/main.c

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