Compare commits

..

73 Commits

Author SHA1 Message Date
zsyg
481fc24735 修改版本号 2025-07-11 08:17:57 +08:00
zsyg
bebd804b7a 美化ui 2025-07-11 08:17:26 +08:00
zsyg
4202013265 添加依赖 2025-07-11 08:16:11 +08:00
zsyg
d26ac95dd5 添加图片转换器代码 2025-07-10 13:21:27 +08:00
zsyg
0432c5fa42 添加图片转换器工具图标 2025-07-10 13:21:03 +08:00
zsyg
94da204ca9 提交同转换器程序 2025-07-10 13:20:34 +08:00
zsyg
9770c58166 添加应用卡片 2025-07-10 13:19:02 +08:00
zsyg
c006f78693 修改版本号 2025-07-10 13:18:22 +08:00
zsyg
ab6080cdd0 修改版本号 2025-07-09 12:53:17 +08:00
zsyg
4b77884d32 增强调试信息 2025-07-09 11:36:12 +08:00
zsyg
d45e3029b7 支持显示图标 2025-07-09 11:35:36 +08:00
zsyg
41b056c074 支持显示图标 2025-07-09 11:35:08 +08:00
zsyg
6955655e64 支持显示图标 2025-07-09 11:34:21 +08:00
zsyg
4310557659 添加图标 2025-07-08 21:19:34 +08:00
zsyg
510362688a 添加Code::Blocks 2025-07-08 21:19:02 +08:00
zsyg
34962bba3f 添加Dev-cpp 2025-07-08 21:16:09 +08:00
zsyg
0bab6ccaab 添加构建工具 2025-07-08 21:08:34 +08:00
zsyg
973d984c55 废弃的零宽字符隐藏器
2025-07-07 20:37:34 +08:00
zsyg
280a9122b9 废弃的聊天室代码
😭😭😭
2025-07-07 20:34:34 +08:00
zsyg
837aba38ba Add files via upload 2025-07-07 19:15:34 +08:00
zsyg
92c2a57773 添加应用卡片 2025-07-07 19:14:20 +08:00
zsyg
43027d7953 Add files via upload 2025-07-07 18:07:29 +08:00
zsyg
6d2711da08 删除艺术字 2025-07-07 17:52:13 +08:00
zsyg
e47f905a8c Add files via upload 2025-07-07 16:59:18 +08:00
zsyg
6899e4767f 添加文本转换器程序 2025-07-07 16:53:44 +08:00
zsyg
d5a0564847 添加文本转换器代码 2025-07-07 16:52:56 +08:00
zsyg
525c823397 添加应用图标 2025-07-06 13:47:54 +08:00
zsyg
7db2d8813e Add files via upload 2025-07-06 13:47:04 +08:00
zsyg
7216f62cef 添加OCR代码
这是一个废弃代码
2025-07-06 12:51:43 +08:00
zsyg
a777991b8c 添加ClamAV图标 2025-07-05 19:34:02 +08:00
zsyg
e2c6c52b32 Add files via upload 2025-07-05 19:33:25 +08:00
zsyg
33089c39b6 Update features.html 2025-07-05 19:15:03 +08:00
zsyg
45805178cc 修改版本号 2025-07-05 19:09:08 +08:00
zsyg
08a11f025a 修复bug和扩展功能 2025-07-05 19:08:44 +08:00
zsyg
5bb3886bc5 添加乌班图的图标 2025-07-05 17:58:10 +08:00
zsyg
ce5f964776 添加应用卡片 2025-07-05 17:57:27 +08:00
zsyg
f52c7908d7 添加应用卡片图标 2025-07-05 17:32:23 +08:00
zsyg
abcbf06493 添加应用卡片图标 2025-07-05 17:32:04 +08:00
zsyg
f56bcb3627 添加应用卡片图标 2025-07-05 17:31:40 +08:00
zsyg
f789c7904a 修改版本号 2025-07-05 17:30:57 +08:00
zsyg
e04709637c 修改版本号 2025-07-05 17:30:38 +08:00
zsyg
e39f976607 添加更多应用卡片 2025-07-05 17:30:18 +08:00
zsyg
0d9ec0ad44 修改版本号 2025-07-05 16:44:38 +08:00
zsyg
122ada92d9 修改版本号 2025-07-05 16:44:11 +08:00
zsyg
d571729c89 修改版本号 2025-07-05 16:43:38 +08:00
zsyg
351e1e97c3 修改布局 2025-07-05 16:43:14 +08:00
zsyg
cff4c39e8c 添加版本号 2025-07-05 14:42:42 +08:00
zsyg
5f41f57e8d Add files via upload 2025-07-05 14:41:38 +08:00
zsyg
f2756ddbd8 添加图标 2025-07-05 14:40:40 +08:00
zsyg
d7a90ca422 添加notepad--图标 2025-07-05 14:30:46 +08:00
zsyg
7404bdfb5d 添加notepad-- 2025-07-05 14:28:40 +08:00
zsyg
5e8de310df 添加图标提取器图标 2025-07-05 14:17:32 +08:00
zsyg
f3cca9b3a1 添加图标提取器代码 2025-07-05 14:16:38 +08:00
zsyg
2154f465b7 Add files via upload 2025-07-05 14:16:00 +08:00
zsyg
99bbda4668 添加版本号 2025-07-05 10:24:08 +08:00
zsyg
d1d69da3e3 Add files via upload 2025-07-05 10:22:19 +08:00
zsyg
4c8cb807d9 添加ollama 2025-07-05 10:20:04 +08:00
zsyg
1ad64feab9 添加ollama 2025-07-05 10:19:19 +08:00
zsyg
ef7c582c50 删除视频压缩工具 2025-07-02 20:14:29 +08:00
zsyg
ee65689048 Add files via upload 2025-07-02 18:01:12 +08:00
zsyg
4ef8099054 添加自启动工具 2025-07-02 18:00:22 +08:00
zsyg
6dd8819f22 Add files via upload 2025-07-02 17:59:18 +08:00
zsyg
59900081da Create dotnet.yml 2025-07-02 17:19:33 +08:00
zsyg
2c60d0b970 Create dotnet-desktop.yml 2025-07-02 17:17:38 +08:00
zsyg
815ba41bdc 提高代码质量 2025-07-02 16:53:47 +08:00
zsyg
459c0bc9d7 Add files via upload 2025-07-02 16:05:28 +08:00
zsyg
7c78a118a9 解决非win环境下编译问题 2025-07-02 16:04:10 +08:00
zsyg
d5f944280e Add files via upload 2025-07-02 11:11:16 +08:00
zsyg
1cd722bf89 Add files via upload 2025-07-02 11:10:09 +08:00
zsyg
e34a954777 添加艺术字 2025-07-02 11:09:21 +08:00
zsyg
125bf6b0d4 移动位置 2025-07-02 10:29:36 +08:00
zsyg
983a0d5bf4 修改位置 2025-07-02 10:28:33 +08:00
zsyg
259b075541 允许自定义下载和修改编译路径 2025-07-02 10:25:17 +08:00
207 changed files with 9868 additions and 4027 deletions

115
.github/workflows/dotnet-desktop.yml vendored Normal file
View File

@@ -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

28
.github/workflows/dotnet.yml vendored Normal file
View File

@@ -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

View File

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

View File

@@ -48,33 +48,72 @@ namespace AppStore
this.Padding = new Padding(10); this.Padding = new Padding(10);
// 异步初始化卡片路径和边框 // 异步初始化卡片路径和边框
// 预加载边框路径
Task.Run(() => { Task.Run(() => {
InitializeCardPath(); InitializeCardPath();
InitializeBorder(); 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实现边框颜色 // 应用名称 - 使用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 = 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); if (namePanel != null && nameLabel != null)
{
namePanel.Controls.Add(nameLabel);
}
// 初始主题设置 // 初始主题设置
UpdateLabelTheme(); UpdateLabelTheme();
@@ -82,32 +121,43 @@ namespace AppStore
// 订阅主题变化事件 // 订阅主题变化事件
ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme(); 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.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() private void UpdateLabelTheme()
@@ -126,7 +176,14 @@ namespace AppStore
namePanel.BackColor = Color.White; namePanel.BackColor = Color.White;
borderColor = SystemColors.ControlDark; borderColor = SystemColors.ControlDark;
} }
namePanel.Invalidate(); // 触发重绘 if (namePanel != null && !namePanel.IsDisposed)
{
namePanel.Invalidate(); // 触发重绘
}
else
{
Logger.LogWarning("namePanel为null或已释放");
}
} }
/// <summary> /// <summary>
@@ -138,52 +195,58 @@ namespace AppStore
// 使用卡片尺寸作为缓存键 // 使用卡片尺寸作为缓存键
string cacheKey = $"{Width}_{Height}_10"; string cacheKey = $"{Width}_{Height}_10";
// 检查缓存中是否已有路径 // 双重检查锁模式确保线程安全
if (!BorderCache.TryGetValue(cacheKey, out var borderPath)) 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); base.OnPaint(e);
// 确保边框已初始化
if (BorderCache.IsEmpty)
{
InitializeBorder();
}
// 绘制背景 // 绘制背景
using (var brush = new SolidBrush(this.BackColor)) { using (var brush = new SolidBrush(this.BackColor)) {
e.Graphics.FillRectangle(brush, this.ClientRectangle); e.Graphics.FillRectangle(brush, this.ClientRectangle);
@@ -256,22 +325,37 @@ namespace AppStore
}; };
// 启动C++程序计算路径 // 启动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 { } catch {
@@ -347,10 +431,14 @@ namespace AppStore
public void UpdateDisplay() public void UpdateDisplay()
{ {
if (nameLabel != null) if (nameLabel != null && AppName != null)
{ {
nameLabel.Text = AppName; nameLabel.Text = AppName;
} }
else
{
Logger.LogWarning("nameLabel或AppName为null");
}
if (iconBox != null && AppIcon != null) if (iconBox != null && AppIcon != null)
{ {
iconBox.Image = AppIcon; iconBox.Image = AppIcon;
@@ -364,14 +452,15 @@ namespace AppStore
// 更严格的null检查 // 更严格的null检查
// 更严格的null检查包括DownloadManager.Instance和其方法 // 更严格的null检查包括DownloadManager.Instance和其方法
// 全面的null和状态检查 // 全面的null和状态检查
var downloadManager = DownloadManager.Instance;
if (sender == null || e == null || if (sender == null || e == null ||
string.IsNullOrWhiteSpace(DownloadUrl) || string.IsNullOrWhiteSpace(DownloadUrl) ||
string.IsNullOrWhiteSpace(AppName) || string.IsNullOrWhiteSpace(AppName) ||
!this.IsHandleCreated || !this.IsHandleCreated ||
this.IsDisposed || this.IsDisposed ||
DownloadManager.Instance == null || downloadManager == null ||
DownloadManager.Instance.DownloadItems == null || downloadManager.DownloadItems == null ||
DownloadManager.Instance.StartDownload == null) downloadManager.StartDownload == null)
{ {
return; return;
} }
@@ -379,7 +468,7 @@ namespace AppStore
string safeAppName = AppName ?? "未知应用"; string safeAppName = AppName ?? "未知应用";
string fileName = $"{safeAppName.Replace(" ", "_")}.exe"; string fileName = $"{safeAppName.Replace(" ", "_")}.exe";
DownloadManager.Instance.StartDownload(fileName, DownloadUrl); downloadManager.StartDownload(fileName, DownloadUrl);
string message = $"已开始下载: {safeAppName}"; string message = $"已开始下载: {safeAppName}";
this.Invoke((MethodInvoker)delegate { this.Invoke((MethodInvoker)delegate {

View File

@@ -12,6 +12,7 @@
<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>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -34,6 +35,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SunnyUI" Version="3.8.6" />
<PackageReference Include="ZXing.Net" Version="0.16.9" /> <PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup> </ItemGroup>

View File

@@ -53,10 +53,11 @@ namespace AppStore
this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light
? Color.White ? Color.White
: Color.Black; : Color.Black;
this.BorderStyle = BorderStyle.FixedSingle; this.BorderStyle = BorderStyle.None; // 禁用默认边框
this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light
? Color.Black ? Color.Black
: Color.White; : Color.White;
this.Paint += DownloadItem_Paint; // 添加自定义绘制
// 文件名标签 // 文件名标签
nameLabel = new Label(); nameLabel = new Label();
@@ -98,6 +99,17 @@ namespace AppStore
nameLabel.Text = FileName; nameLabel.Text = FileName;
progressBar.Value = Progress; progressBar.Value = Progress;
statusLabel.Text = Status; 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) private void CancelBtn_Click(object sender, EventArgs e)

View File

@@ -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}");
}
}
}
}

View File

@@ -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;
} }
} }
} }
} }

File diff suppressed because it is too large Load Diff

View File

@@ -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());
} }
} }
} }

View File

@@ -203,7 +203,7 @@ namespace AppStore
{ {
string jsonString = File.ReadAllText(jsonPath); string jsonString = File.ReadAllText(jsonPath);
var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString); 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; txtBox.Text = !string.IsNullOrWhiteSpace(customPath) ? customPath : defaultPath;

View File

@@ -58,18 +58,26 @@ namespace AppStore
} }
// 浅色主题颜色 // 浅色主题颜色
private static readonly Color LightBackground = Color.FromArgb(255, 255, 255); private static readonly Color LightBackground = Color.FromArgb(250, 250, 250);
private static readonly Color LightControlBackground = Color.FromArgb(240, 240, 240); private static readonly Color LightControlBackground = Color.FromArgb(245, 245, 245);
private static readonly Color LightText = Color.FromArgb(30, 30, 30); private static readonly Color LightText = Color.FromArgb(40, 40, 40);
private static readonly Color LightButtonHover = Color.FromArgb(230, 230, 230); private static readonly Color LightButtonHover = Color.FromArgb(235, 235, 235);
private static readonly Color LightButtonActive = Color.FromArgb(220, 220, 220); private static readonly Color LightButtonActive = Color.FromArgb(225, 225, 225);
private static readonly Color LightAccent = Color.FromArgb(0, 120, 215);
private static readonly Color LightAccentLight = Color.FromArgb(0, 150, 245);
// 深色主题颜色 // 深色主题颜色
private static readonly Color DarkBackground = Color.FromArgb(30, 30, 30); private static readonly Color DarkBackground = Color.FromArgb(25, 25, 25);
private static readonly Color DarkControlBackground = Color.FromArgb(45, 45, 45); private static readonly Color DarkControlBackground = Color.FromArgb(40, 40, 40);
private static readonly Color DarkText = Color.FromArgb(240, 240, 240); private static readonly Color DarkText = Color.FromArgb(245, 245, 245);
private static readonly Color DarkButtonHover = Color.FromArgb(60, 60, 60); private static readonly Color DarkButtonHover = Color.FromArgb(55, 55, 55);
private static readonly Color DarkButtonActive = Color.FromArgb(70, 70, 70); private static readonly Color DarkButtonActive = Color.FromArgb(65, 65, 65);
private static readonly Color DarkBorder = Color.FromArgb(70, 70, 70);
private static readonly Color DarkAccent = Color.FromArgb(0, 150, 245);
private static readonly Color DarkAccentLight = Color.FromArgb(0, 180, 255);
// 浅色主题边框颜色
private static readonly Color LightBorder = Color.FromArgb(200, 200, 200);
public static event Action<ThemeMode> ThemeChanged = delegate {}; public static event Action<ThemeMode> ThemeChanged = delegate {};
@@ -102,6 +110,19 @@ namespace AppStore
public static Color ButtonActiveColor => public static Color ButtonActiveColor =>
_currentTheme == ThemeMode.Light ? LightButtonActive : DarkButtonActive; _currentTheme == ThemeMode.Light ? LightButtonActive : DarkButtonActive;
public static Color BorderColor =>
_currentTheme == ThemeMode.Light ? LightBorder : DarkBorder;
public static Color AccentColor =>
_currentTheme == ThemeMode.Light ? LightAccent : DarkAccent;
public static Color AccentLightColor =>
_currentTheme == ThemeMode.Light ? LightAccentLight : DarkAccentLight;
public static int ControlRadius => 8;
public static int FormRadius => 12;
public static void ApplyTheme(Control control) public static void ApplyTheme(Control control)
{ {
ApplyThemeToControl(control); ApplyThemeToControl(control);
@@ -118,6 +139,9 @@ namespace AppStore
button.FlatAppearance.BorderSize = 0; button.FlatAppearance.BorderSize = 0;
button.FlatAppearance.MouseOverBackColor = ButtonHoverColor; button.FlatAppearance.MouseOverBackColor = ButtonHoverColor;
button.FlatAppearance.MouseDownBackColor = ButtonActiveColor; button.FlatAppearance.MouseDownBackColor = ButtonActiveColor;
button.BackColor = ControlBackgroundColor;
button.Font = new Font(button.Font, FontStyle.Bold);
button.Padding = new Padding(10, 5, 10, 5);
} }
foreach (Control childControl in control.Controls) foreach (Control childControl in control.Controls)

View File

@@ -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();
} }
} }
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -17,21 +17,7 @@
<h2>核心功能</h2> <h2>核心功能</h2>
<article class="feature"> <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> </article>
</section> </section>
</main> </main>

BIN
img/png/Azul_JDKs.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
img/png/ClamAV.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

BIN
img/png/CodeBlocks.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
img/png/Dev-C++.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
img/png/Final2x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
img/png/ReactOS.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

BIN
img/png/Ubuntu.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 853 B

BIN
img/png/VideoCaptioner.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
img/png/edit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
img/png/github_cli.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
img/png/notepad--.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 766 B

BIN
img/png/ollama.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

BIN
img/png/pixpin.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 KiB

BIN
img/png/pocketbase.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 660 B

BIN
img/png/powershell.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 523 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 946 KiB

View File

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

View File

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

View File

@@ -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;
} }

156
logger.cs
View File

@@ -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);
}
}
}

View File

@@ -0,0 +1,25 @@
CXX = g++
CXXFLAGS = -I"C:/msys64/ucrt64/include" -I"./include" -std=c++17 -Wall -mwindows
LDFLAGS = -L"C:/msys64/ucrt64/lib" -lfltk -lfltk_images -ltiff -ljpeg -lz -lzstd -lwebp -llerc -ljbig -llzma -ldeflate -lsharpyuv -lcomctl32 -lgdi32 -lole32 -luuid -lws2_32 -lwinspool -lcomdlg32 -static
SRC = src/main.cpp src/gui.cpp src/utils.cpp src/stb_impl.cpp \
src/png_to_jpg.cpp src/jpg_to_png.cpp src/image_loader.cpp \
src/bmp_to_png.cpp src/bmp_to_jpg.cpp src/png_to_bmp.cpp \
src/jpg_to_bmp.cpp src/tiff_to_bmp.cpp src/bmp_to_tiff.cpp \
src/tiff_to_png.cpp src/png_to_tiff.cpp src/tiff_to_jpg.cpp \
src/jpg_to_tiff.cpp
OBJ = $(SRC:src/%.cpp=obj/%.o)
TARGET = image_converter
all: $(TARGET)
$(TARGET): $(OBJ)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
obj/%.o: src/%.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@
clean:
rm -f $(OBJ) $(TARGET)
.PHONY: all clean

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,35 @@
#include "bmp_to_jpg.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <string>
bool BmpToJpgConverter::convert(const std::string& input_path,
const std::string& output_path,
int quality) {
// 加载BMP图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入格式
if (!validate_input(data)) {
return false;
}
// 保存为JPG
return stbi_write_jpg(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
quality);
}
bool BmpToJpgConverter::validate_input(const ImageData& data) {
// 确保是有效的图像数据
return data.width > 0 && data.height > 0 &&
(data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,35 @@
#include "bmp_to_png.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <string>
bool BmpToPngConverter::convert(const std::string& input_path,
const std::string& output_path,
int compression_level) {
// 加载BMP图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入格式
if (!validate_input(data)) {
return false;
}
// 保存为PNG
return stbi_write_png(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
data.width * data.channels);
}
bool BmpToPngConverter::validate_input(const ImageData& data) {
// 确保是有效的图像数据
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,61 @@
#include "bmp_to_tiff.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <tiffio.h>
#include <stb/stb_image.h>
#include <string>
bool BmpToTiffConverter::convert(const std::string& input_path,
const std::string& output_path) {
// 加载BMP图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入
if (!validate_input(data)) {
return false;
}
// 创建TIFF文件
TIFF* tif = TIFFOpen(output_path.c_str(), "w");
if (!tif) {
return false;
}
// 设置TIFF标签
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, data.width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, data.height);
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, data.channels);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
// 根据通道数设置PhotometricInterpretation
if (data.channels == 1) {
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
} else if (data.channels == 3 || data.channels == 4) {
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
} else {
TIFFClose(tif);
return false;
}
// 写入图像数据
tsize_t linebytes = data.width * data.channels;
unsigned char* buf = (unsigned char*)_TIFFmalloc(linebytes);
for (int y = 0; y < data.height; y++) {
memcpy(buf, &data.pixels.get()[y * linebytes], linebytes);
TIFFWriteScanline(tif, buf, y, 0);
}
_TIFFfree(buf);
TIFFClose(tif);
return true;
}
bool BmpToTiffConverter::validate_input(const ImageData& data) {
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,137 @@
#include <locale.h>
#include "gui_interface.hpp"
#include "png_to_jpg.hpp"
#include "jpg_to_png.hpp"
#include "bmp_to_png.hpp"
#include "bmp_to_jpg.hpp"
#include "png_to_bmp.hpp"
#include "jpg_to_bmp.hpp"
#include "tiff_to_bmp.hpp"
#include "bmp_to_tiff.hpp"
#include "tiff_to_png.hpp"
#include "png_to_tiff.hpp"
#include "tiff_to_jpg.hpp"
#include "jpg_to_tiff.hpp"
#include <FL/Fl_File_Chooser.H>
#include <FL/fl_ask.H>
#include <stdexcept>
static void init_locale() {
setlocale(LC_ALL, "chs");
}
MainWindow::MainWindow(int w, int h, const char* title)
: Fl_Window(w, h, "图像格式转换器") {
init_locale();
input_path = new Fl_Input(100, 20, 250, 25, "输入文件:");
Fl_Button* input_btn = new Fl_Button(360, 20, 30, 25, "...");
input_btn->callback(input_file_cb, this);
output_path = new Fl_Output(100, 60, 250, 25, "输出文件:");
Fl_Button* output_btn = new Fl_Button(360, 60, 30, 25, "...");
output_btn->callback(output_file_cb, this);
format_choice = new Fl_Choice(100, 100, 150, 25, "转换格式:");
format_choice->add("PNG to JPG");
format_choice->add("JPG to PNG");
format_choice->add("BMP to PNG");
format_choice->add("BMP to JPG");
format_choice->add("PNG to BMP");
format_choice->add("JPG to BMP");
format_choice->add("TIFF to BMP");
format_choice->add("BMP to TIFF");
format_choice->add("TIFF to PNG");
format_choice->add("PNG to TIFF");
format_choice->add("TIFF to JPG");
format_choice->add("JPG to TIFF");
format_choice->value(0);
convert_btn = new Fl_Button(150, 150, 100, 30, "转换");
convert_btn->callback(convert_cb, this);
end();
}
void MainWindow::input_file_cb(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
Fl_File_Chooser chooser(".", "*.*", Fl_File_Chooser::SINGLE, "选择输入文件");
chooser.show();
while(chooser.shown()) Fl::wait();
if(chooser.value()) {
win->input_path->value(chooser.value());
}
}
void MainWindow::output_file_cb(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
Fl_File_Chooser chooser(".", "*.*", Fl_File_Chooser::CREATE, "选择输出文件");
chooser.show();
while(chooser.shown()) Fl::wait();
if(chooser.value()) {
win->output_path->value(chooser.value());
}
}
void MainWindow::convert_cb(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
std::string input = win->input_path->value();
std::string output = win->output_path->value();
if (input.empty() || output.empty()) {
fl_alert("请输入有效的文件路径!");
return;
}
bool success = false;
try {
switch(win->format_choice->value()) {
case 0: // PNG to JPG
success = PngToJpgConverter::convert(input, output);
break;
case 1: // JPG to PNG
success = JpgToPngConverter::convert(input, output);
break;
case 2: // BMP to PNG
success = BmpToPngConverter::convert(input, output);
break;
case 3: // BMP to JPG
success = BmpToJpgConverter::convert(input, output);
break;
case 4: // PNG to BMP
success = PngToBmpConverter::convert(input, output);
break;
case 5: // JPG to BMP
success = JpgToBmpConverter::convert(input, output);
break;
case 6: // TIFF to BMP
success = TiffToBmpConverter::convert(input, output);
break;
case 7: // BMP to TIFF
success = BmpToTiffConverter::convert(input, output);
break;
case 8: // TIFF to PNG
success = TiffToPngConverter::convert(input, output);
break;
case 9: // PNG to TIFF
success = PngToTiffConverter::convert(input, output);
break;
case 10: // TIFF to JPG
success = TiffToJpgConverter::convert(input, output);
break;
case 11: // JPG to TIFF
success = JpgToTiffConverter::convert(input, output);
break;
}
if (!success) throw std::runtime_error("转换失败");
} catch (const std::exception& e) {
fl_alert("转换错误: %s", e.what());
return;
}
if (success) {
fl_message("转换成功!");
} else {
fl_alert("转换失败,请检查输入文件!");
}
}

View File

@@ -0,0 +1,62 @@
#include "image_loader.hpp"
#include "common.hpp"
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <stdexcept>
#include <iostream>
ImageData ImageLoader::load(const std::string& path) {
ImageData data;
// 加载图像
unsigned char* pixels = stbi_load(path.c_str(),
&data.width,
&data.height,
&data.channels,
0);
if (!pixels) {
throw std::runtime_error("无法加载图像: " + std::string(stbi_failure_reason()));
}
// 验证图像数据
try {
validate_image(pixels, data.width, data.height);
} catch (...) {
stbi_image_free(pixels);
throw;
}
// 转移所有权到智能指针
data.pixels.reset(pixels);
return data;
}
bool ImageLoader::save_png(const std::string& path, const ImageData& data) {
if (!data.pixels || data.width <= 0 || data.height <= 0) {
return false;
}
return stbi_write_png(path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
data.width * data.channels);
}
bool ImageLoader::save_jpg(const std::string& path, const ImageData& data, int quality) {
if (!data.pixels || data.width <= 0 || data.height <= 0) {
return false;
}
return stbi_write_jpg(path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
quality);
}
void ImageLoader::validate_image(const unsigned char* data, int width, int height) {
if (!data || width <= 0 || height <= 0) {
throw std::runtime_error("无效的图像数据");
}
}

View File

@@ -0,0 +1,33 @@
#include "jpg_to_bmp.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <string>
bool JpgToBmpConverter::convert(const std::string& input_path,
const std::string& output_path) {
// 加载JPG图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入格式
if (!validate_input(data)) {
return false;
}
// 保存为BMP
return stbi_write_bmp(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get());
}
bool JpgToBmpConverter::validate_input(const ImageData& data) {
// 确保是有效的图像数据
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,35 @@
#include "jpg_to_png.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <string>
bool JpgToPngConverter::convert(const std::string& input_path,
const std::string& output_path,
int compression_level) {
// 加载JPG图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入格式
if (!validate_input(data)) {
return false;
}
// 保存为PNG
return stbi_write_png(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
data.width * data.channels);
}
bool JpgToPngConverter::validate_input(const ImageData& data) {
// 确保是有效的图像数据
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3);
}

View File

@@ -0,0 +1,61 @@
#include "jpg_to_tiff.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <tiffio.h>
#include <stb/stb_image.h>
#include <string>
bool JpgToTiffConverter::convert(const std::string& input_path,
const std::string& output_path) {
// 加载JPG图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入
if (!validate_input(data)) {
return false;
}
// 创建TIFF文件
TIFF* tif = TIFFOpen(output_path.c_str(), "w");
if (!tif) {
return false;
}
// 设置TIFF标签
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, data.width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, data.height);
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, data.channels);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
// 根据通道数设置PhotometricInterpretation
if (data.channels == 1) {
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
} else if (data.channels == 3 || data.channels == 4) {
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
} else {
TIFFClose(tif);
return false;
}
// 写入图像数据
tsize_t linebytes = data.width * data.channels;
unsigned char* buf = (unsigned char*)_TIFFmalloc(linebytes);
for (int y = 0; y < data.height; y++) {
memcpy(buf, &data.pixels.get()[y * linebytes], linebytes);
TIFFWriteScanline(tif, buf, y, 0);
}
_TIFFfree(buf);
TIFFClose(tif);
return true;
}
bool JpgToTiffConverter::validate_input(const ImageData& data) {
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,8 @@
#include "gui_interface.hpp"
#include <FL/Fl.H>
int main(int argc, char** argv) {
MainWindow window(400, 300, "Image Format Converter");
window.show(argc, argv);
return Fl::run();
}

View File

@@ -0,0 +1,33 @@
#include "png_to_bmp.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <string>
bool PngToBmpConverter::convert(const std::string& input_path,
const std::string& output_path) {
// 加载PNG图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入格式
if (!validate_input(data)) {
return false;
}
// 保存为BMP
return stbi_write_bmp(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get());
}
bool PngToBmpConverter::validate_input(const ImageData& data) {
// 确保是有效的图像数据
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,35 @@
#include "png_to_jpg.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>
#include <string>
bool PngToJpgConverter::convert(const std::string& input_path,
const std::string& output_path,
int quality) {
// 加载PNG图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入格式
if (!validate_input(data)) {
return false;
}
// 保存为JPG
return stbi_write_jpg(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
quality);
}
bool PngToJpgConverter::validate_input(const ImageData& data) {
// 确保是有效的图像数据
return data.width > 0 && data.height > 0 &&
(data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,61 @@
#include "png_to_tiff.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <tiffio.h>
#include <stb/stb_image.h>
#include <string>
bool PngToTiffConverter::convert(const std::string& input_path,
const std::string& output_path) {
// 加载PNG图像
ImageData data = ImageLoader::load(input_path);
if (!data.pixels) {
return false;
}
// 验证输入
if (!validate_input(data)) {
return false;
}
// 创建TIFF文件
TIFF* tif = TIFFOpen(output_path.c_str(), "w");
if (!tif) {
return false;
}
// 设置TIFF标签
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, data.width);
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, data.height);
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, data.channels);
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
// 根据通道数设置PhotometricInterpretation
if (data.channels == 1) {
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
} else if (data.channels == 3 || data.channels == 4) {
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
} else {
TIFFClose(tif);
return false;
}
// 写入图像数据
tsize_t linebytes = data.width * data.channels;
unsigned char* buf = (unsigned char*)_TIFFmalloc(linebytes);
for (int y = 0; y < data.height; y++) {
memcpy(buf, &data.pixels.get()[y * linebytes], linebytes);
TIFFWriteScanline(tif, buf, y, 0);
}
_TIFFfree(buf);
TIFFClose(tif);
return true;
}
bool PngToTiffConverter::validate_input(const ImageData& data) {
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,4 @@
#define STB_IMAGE_IMPLEMENTATION
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include <stb/stb_image.h>
#include <stb/stb_image_write.h>

View File

@@ -0,0 +1,72 @@
#include "tiff_to_bmp.hpp"
#include "common.hpp"
#include "image_loader.hpp"
#include <tiffio.h>
#include <stb/stb_image_write.h>
#include <string>
bool TiffToBmpConverter::convert(const std::string& input_path,
const std::string& output_path) {
// 使用libtiff加载TIFF图像
TIFF* tif = TIFFOpen(input_path.c_str(), "r");
if (!tif) {
return false;
}
// 获取图像信息
uint32 width, height;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &width);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &height);
// 获取TIFF格式信息
uint16 samplesperpixel, bitspersample, photometric;
TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel);
TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bitspersample);
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
// 验证TIFF格式
if (bitspersample != 8) {
TIFFClose(tif);
return false;
}
// 设置输出通道数
ImageData data;
data.width = width;
data.height = height;
data.channels = samplesperpixel;
data.pixels.reset(new unsigned char[width * height * data.channels]);
// 读取图像数据
tdata_t buf = _TIFFmalloc(TIFFScanlineSize(tif));
for (uint32 row = 0; row < height; row++) {
if (TIFFReadScanline(tif, buf, row) == -1) {
_TIFFfree(buf);
TIFFClose(tif);
return false;
}
memcpy(&data.pixels.get()[row * width * data.channels],
buf,
width * data.channels);
}
_TIFFfree(buf);
TIFFClose(tif);
// 验证输入
if (!validate_input(data)) {
return false;
}
// 保存为BMP
return stbi_write_bmp(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get());
}
bool TiffToBmpConverter::validate_input(const ImageData& data) {
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,73 @@
#include "tiff_to_jpg.hpp"
#include "common.hpp"
#include <tiffio.h>
#include <stb/stb_image_write.h>
#include <string>
bool TiffToJpgConverter::convert(const std::string& input_path,
const std::string& output_path,
int quality) {
// 使用libtiff加载TIFF图像
TIFF* tif = TIFFOpen(input_path.c_str(), "r");
if (!tif) {
return false;
}
// 获取图像信息
uint32 width, height;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &width);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &height);
// 获取TIFF格式信息
uint16 samplesperpixel, bitspersample, photometric;
TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel);
TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bitspersample);
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
// 验证TIFF格式
if (bitspersample != 8) {
TIFFClose(tif);
return false;
}
// 设置输出通道数
ImageData data;
data.width = width;
data.height = height;
data.channels = samplesperpixel;
data.pixels.reset(new unsigned char[width * height * data.channels]);
// 读取图像数据
tdata_t buf = _TIFFmalloc(TIFFScanlineSize(tif));
for (uint32 row = 0; row < height; row++) {
if (TIFFReadScanline(tif, buf, row) == -1) {
_TIFFfree(buf);
TIFFClose(tif);
return false;
}
memcpy(&data.pixels.get()[row * width * data.channels],
buf,
width * data.channels);
}
_TIFFfree(buf);
TIFFClose(tif);
// 验证输入
if (!validate_input(data)) {
return false;
}
// 保存为JPG
return stbi_write_jpg(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
quality);
}
bool TiffToJpgConverter::validate_input(const ImageData& data) {
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,73 @@
#include "tiff_to_png.hpp"
#include "common.hpp"
#include <tiffio.h>
#include <stb/stb_image_write.h>
#include <string>
bool TiffToPngConverter::convert(const std::string& input_path,
const std::string& output_path,
int compression_level) {
// 使用libtiff加载TIFF图像
TIFF* tif = TIFFOpen(input_path.c_str(), "r");
if (!tif) {
return false;
}
// 获取图像信息
uint32 width, height;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &width);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &height);
// 获取TIFF格式信息
uint16 samplesperpixel, bitspersample, photometric;
TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel);
TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bitspersample);
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
// 验证TIFF格式
if (bitspersample != 8) {
TIFFClose(tif);
return false;
}
// 设置输出通道数
ImageData data;
data.width = width;
data.height = height;
data.channels = samplesperpixel;
data.pixels.reset(new unsigned char[width * height * data.channels]);
// 读取图像数据
tdata_t buf = _TIFFmalloc(TIFFScanlineSize(tif));
for (uint32 row = 0; row < height; row++) {
if (TIFFReadScanline(tif, buf, row) == -1) {
_TIFFfree(buf);
TIFFClose(tif);
return false;
}
memcpy(&data.pixels.get()[row * width * data.channels],
buf,
width * data.channels);
}
_TIFFfree(buf);
TIFFClose(tif);
// 验证输入
if (!validate_input(data)) {
return false;
}
// 保存为PNG
return stbi_write_png(output_path.c_str(),
data.width,
data.height,
data.channels,
data.pixels.get(),
data.width * data.channels);
}
bool TiffToPngConverter::validate_input(const ImageData& data) {
return data.width > 0 && data.height > 0 &&
(data.channels == 1 || data.channels == 3 || data.channels == 4);
}

View File

@@ -0,0 +1,11 @@
#include "common.hpp"
#include <algorithm>
ImageFormat get_format_from_extension(const std::string& path) {
std::string ext = path.substr(path.find_last_of(".") + 1);
std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
if (ext == "png") return ImageFormat::PNG;
if (ext == "jpg" || ext == "jpeg") return ImageFormat::JPG;
return ImageFormat::UNKNOWN;
}

View File

@@ -0,0 +1,29 @@
# FLTK聊天室项目Makefile
CXX = g++
FLTK_CONFIG = fltk-config
CXXFLAGS = -std=c++17 -Wall -Iinclude
LDFLAGS = $(shell $(FLTK_CONFIG) --use-images --ldstaticflags) -static -lws2_32
SRC_DIR = src
OBJ_DIR = obj
INC_DIR = include
SRCS = $(wildcard $(SRC_DIR)/*.cpp)
OBJS = $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS))
TARGET = chat_room.exe
all: $(OBJ_DIR) $(TARGET)
$(OBJ_DIR):
mkdir -p $(OBJ_DIR)
$(TARGET): $(OBJS)
$(CXX) $^ -o $@ $(LDFLAGS)
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@
clean:
rm -rf $(OBJ_DIR)/*.o $(TARGET)
.PHONY: all clean

View File

@@ -0,0 +1,17 @@
#ifndef APPLICATION_HPP
#define APPLICATION_HPP
class MainWindow;
class Application {
public:
Application(int argc, char** argv);
~Application();
int run();
private:
MainWindow* mainWindow;
};
#endif // APPLICATION_HPP

View File

@@ -0,0 +1,36 @@
#ifndef CHATROOM_HPP
#define CHATROOM_HPP
#include "NetworkManager.hpp"
#include "User.hpp"
#include <string>
#include <vector>
#include <memory>
class ChatRoom {
public:
ChatRoom();
~ChatRoom();
bool createRoom(int port, const std::string& password = "");
bool joinRoom(const std::string& ip, int port, const std::string& password);
void sendChatMessage(const std::string& message);
void addUser(const std::string& username);
void removeUser(const std::string& username);
const std::vector<std::string>& getMessages() const;
const std::vector<std::shared_ptr<User>>& getUsers() const;
std::string getCurrentUsername() const;
bool isConnected() const;
NetworkManager* getNetworkManager() const;
std::string getRoomPassword() const;
std::string getLocalIP() const;
private:
std::unique_ptr<NetworkManager> network;
std::vector<std::string> messages;
std::vector<std::shared_ptr<User>> users;
std::string roomPassword;
};
#endif // CHATROOM_HPP

View File

@@ -0,0 +1,31 @@
#ifndef CHATWINDOW_HPP
#define CHATWINDOW_HPP
#include <FL/Fl_Window.H>
#include <FL/Fl_Text_Display.H>
#include <FL/Fl_Text_Buffer.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Browser.H>
#include <memory>
#include "ChatRoom.hpp"
class ChatWindow : public Fl_Window {
public:
ChatWindow(int w, int h, const char* title, std::shared_ptr<ChatRoom> chatRoom);
void appendMessage(const std::string& message);
void updateUserList();
private:
std::shared_ptr<ChatRoom> chatRoom;
Fl_Text_Display* messageDisplay;
Fl_Text_Buffer* messageBuffer;
Fl_Input* messageInput;
Fl_Button* sendButton;
Fl_Browser* userList;
static void onSendMessageCallback(Fl_Widget* w, void* data);
};
#endif // CHATWINDOW_HPP

View File

@@ -0,0 +1,22 @@
#ifndef CONFIGMANAGER_HPP
#define CONFIGMANAGER_HPP
#include <string>
#include <map>
class ConfigManager {
public:
static ConfigManager& getInstance();
void loadConfig(const std::string& filename);
void saveConfig(const std::string& filename);
std::string getValue(const std::string& key);
void setValue(const std::string& key, const std::string& value);
private:
ConfigManager() = default;
std::map<std::string, std::string> configMap;
};
#endif // CONFIGMANAGER_HPP

View File

@@ -0,0 +1,14 @@
#ifndef CONSTANTS_HPP
#define CONSTANTS_HPP
class Constants {
public:
static const int DEFAULT_PORT = 12345;
static const int MAIN_WINDOW_WIDTH = 400;
static const int MAIN_WINDOW_HEIGHT = 300;
static const int CHAT_WINDOW_WIDTH = 800;
static const int CHAT_WINDOW_HEIGHT = 600;
static const char MESSAGE_DELIMITER = '|';
};
#endif // CONSTANTS_HPP

View File

@@ -0,0 +1,45 @@
#ifndef MAINWINDOW_HPP
#define MAINWINDOW_HPP
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Output.H>
#include <memory>
#include "ChatRoom.hpp"
class MainWindow : public Fl_Window {
public:
MainWindow(int w, int h, const char* title);
~MainWindow();
void showCreateRoomDialog();
void showJoinRoomDialog();
void showUsernameDialog();
private:
Fl_Button* createRoomBtn;
Fl_Button* joinRoomBtn;
Fl_Box* titleBox;
Fl_Window* createRoomDialog;
Fl_Window* joinRoomDialog;
Fl_Window* usernameDialog;
Fl_Input* portInput;
Fl_Input* ipInput;
Fl_Input* passwordInput;
Fl_Input* usernameInput;
std::unique_ptr<ChatRoom> chatRoom;
static void onCreateRoomCallback(Fl_Widget* w, void* data);
static void onJoinRoomCallback(Fl_Widget* w, void* data);
static void onCreateRoomConfirmCallback(Fl_Widget* w, void* data);
static void onJoinRoomConfirmCallback(Fl_Widget* w, void* data);
static void onUsernameConfirmCallback(Fl_Widget* w, void* data);
};
#endif // MAINWINDOW_HPP

View File

@@ -0,0 +1,36 @@
#ifndef MESSAGE_HPP
#define MESSAGE_HPP
#include <string>
#include <chrono>
#include <memory>
#include "User.hpp"
enum class MessageType {
NORMAL, // 普通消息
SYSTEM, // 系统消息
TEXT_MESSAGE, // 文本消息
USER_JOIN, // 用户加入
USER_LEAVE, // 用户离开
AUTH // 认证消息
};
class Message {
public:
Message(const std::shared_ptr<User>& sender,
const std::string& content,
MessageType type = MessageType::NORMAL);
const std::shared_ptr<User>& getSender() const;
const std::string& getContent() const;
MessageType getType() const;
std::chrono::system_clock::time_point getTimestamp() const;
private:
std::shared_ptr<User> sender;
std::string content;
MessageType type;
std::chrono::system_clock::time_point timestamp;
};
#endif // MESSAGE_HPP

View File

@@ -0,0 +1,15 @@
#ifndef MESSAGEPROTOCOL_HPP
#define MESSAGEPROTOCOL_HPP
#include <string>
#include <vector>
#include "Message.hpp"
class MessageProtocol {
public:
static std::string encodeMessage(const Message& message);
static Message decodeMessage(const std::string& data);
static bool validateMessage(const std::string& data);
};
#endif // MESSAGEPROTOCOL_HPP

View File

@@ -0,0 +1,34 @@
#ifndef NETWORKEVENTHANDLER_HPP
#define NETWORKEVENTHANDLER_HPP
#include <memory>
#include "ChatRoom.hpp"
#include "MessageProtocol.hpp"
#include <memory>
#include <thread>
#include <atomic>
#include "ChatRoom.hpp"
#include "Message.hpp"
class NetworkEventHandler {
public:
explicit NetworkEventHandler(std::shared_ptr<ChatRoom> chatRoom);
~NetworkEventHandler();
void start();
void stop();
void onConnected();
void onMessageReceived(const std::string& message);
void onError(const std::string& error);
private:
void heartbeatCheck();
std::shared_ptr<ChatRoom> chatRoom;
std::atomic<bool> running;
std::thread heartbeatThread;
};
#endif // NETWORKEVENTHANDLER_HPP

View File

@@ -0,0 +1,38 @@
#ifndef NETWORKMANAGER_HPP
#define NETWORKMANAGER_HPP
#include <string>
#include <vector>
#include <memory>
#include <thread>
#include <mutex>
#include <functional>
#include <winsock2.h>
class NetworkManager {
public:
using MessageCallback = std::function<void(const std::string&)>;
NetworkManager();
~NetworkManager();
bool startServer(int port);
bool connectToServer(const std::string& ip, int port);
void sendMessage(const std::string& message);
std::vector<std::string> receiveMessages();
bool isConnected() const;
void setMessageCallback(MessageCallback callback) {
messageCallback = callback;
}
private:
SOCKET serverSocket;
SOCKET clientSocket;
std::vector<SOCKET> clients;
std::mutex clientsMutex;
std::thread acceptThread;
MessageCallback messageCallback;
};
#endif // NETWORKMANAGER_HPP

View File

@@ -0,0 +1,29 @@
#ifndef ROOMINFO_HPP
#define ROOMINFO_HPP
#include <string>
class RoomInfo {
public:
RoomInfo(const std::string& name,
const std::string& ip,
int port,
const std::string& password);
const std::string& getName() const;
const std::string& getIpAddress() const;
int getPort() const;
const std::string& getPassword() const;
int getUserCount() const;
void setUserCount(int count);
private:
std::string name;
std::string ipAddress;
int port;
std::string password;
int userCount;
};
#endif // ROOMINFO_HPP

View File

@@ -0,0 +1,15 @@
#ifndef STRINGUTILS_HPP
#define STRINGUTILS_HPP
#include <string>
#include <vector>
class StringUtils {
public:
static std::vector<std::string> split(const std::string& str, char delimiter);
static std::string trim(const std::string& str);
static bool startsWith(const std::string& str, const std::string& prefix);
static bool endsWith(const std::string& str, const std::string& suffix);
};
#endif // STRINGUTILS_HPP

View File

@@ -0,0 +1,22 @@
#ifndef USER_HPP
#define USER_HPP
#include <string>
#include <chrono>
class User {
public:
User(const std::string& username, const std::string& ip);
const std::string& getUsername() const;
const std::string& getIpAddress() const;
bool isActive() const;
void updateLastActive();
private:
std::string username;
std::string ipAddress;
std::chrono::system_clock::time_point lastActive;
};
#endif // USER_HPP

View File

@@ -0,0 +1,20 @@
#ifndef USERMANAGER_HPP
#define USERMANAGER_HPP
#include <algorithm>
#include <vector>
#include <memory>
#include "User.hpp"
class UserManager {
public:
void addUser(std::shared_ptr<User> user);
void removeUser(const std::string& username);
std::vector<std::shared_ptr<User>> getUsers() const;
std::shared_ptr<User> findUser(const std::string& username) const;
private:
std::vector<std::shared_ptr<User>> users;
};
#endif // USERMANAGER_HPP

View File

@@ -0,0 +1,46 @@
#include "Application.hpp"
#include "MainWindow.hpp"
#include <FL/Fl.H>
#include <iostream>
Application::Application(int argc, char** argv)
: mainWindow(nullptr) {
try {
std::cout << "正在初始化应用程序..." << std::endl;
mainWindow = new MainWindow(400, 300, "局域网聊天室");
std::cout << "主窗口创建成功" << std::endl;
} catch (const std::exception& e) {
std::cerr << "初始化失败: " << e.what() << std::endl;
}
}
int Application::run() {
std::cout << "应用程序启动..." << std::endl;
if (!mainWindow) {
std::cerr << "致命错误: 主窗口对象创建失败" << std::endl;
return 1;
}
try {
std::cout << "初始化FLTK图形界面..." << std::endl;
Fl::scheme("gtk+");
std::cout << "显示主窗口..." << std::endl;
mainWindow->show();
std::cout << "窗口尺寸: " << mainWindow->w() << "x" << mainWindow->h() << std::endl;
std::cout << "进入主事件循环..." << std::endl;
int ret = Fl::run();
std::cout << "应用程序正常退出" << std::endl;
return ret;
} catch (const std::exception& e) {
std::cerr << "运行时错误: " << e.what() << std::endl;
return 1;
}
}
Application::~Application() {
delete mainWindow;
}

View File

@@ -0,0 +1,104 @@
#include "ChatRoom.hpp"
#include "Message.hpp"
#include "MessageProtocol.hpp"
#include <iostream>
#include <algorithm>
#include <winsock2.h>
#include <ws2tcpip.h>
ChatRoom::ChatRoom() : network(std::make_unique<NetworkManager>()) {}
ChatRoom::~ChatRoom() {}
bool ChatRoom::createRoom(int port, const std::string& password) {
roomPassword = password;
if (!network->startServer(port)) {
std::cerr << "Failed to create room on port " << port << std::endl;
return false;
}
return true;
}
bool ChatRoom::joinRoom(const std::string& ip, int port, const std::string& password) {
if (!network->connectToServer(ip, port)) {
std::cerr << "Failed to connect to " << ip << ":" << port << std::endl;
return false;
}
// 发送密码验证
Message authMsg(nullptr, password, MessageType::AUTH);
network->sendMessage(MessageProtocol::encodeMessage(authMsg));
// 等待验证响应
auto response = network->receiveMessages();
if (response.empty() || response[0] != "AUTH_SUCCESS") {
return false;
}
return true;
}
std::string ChatRoom::getRoomPassword() const {
return roomPassword;
}
std::string ChatRoom::getLocalIP() const {
char host[256];
if (gethostname(host, sizeof(host)) == SOCKET_ERROR) {
return "127.0.0.1";
}
struct hostent* phe = gethostbyname(host);
if (phe == nullptr) {
return "127.0.0.1";
}
for (int i = 0; phe->h_addr_list[i] != nullptr; ++i) {
struct in_addr addr;
memcpy(&addr, phe->h_addr_list[i], sizeof(struct in_addr));
std::string ip = inet_ntoa(addr);
if (ip != "127.0.0.1") {
return ip;
}
}
return "127.0.0.1";
}
void ChatRoom::sendChatMessage(const std::string& message) {
network->sendMessage(message);
messages.push_back(message);
}
void ChatRoom::addUser(const std::string& username) {
auto user = std::make_shared<User>(username, "");
users.push_back(user);
}
void ChatRoom::removeUser(const std::string& username) {
users.erase(
std::remove_if(users.begin(), users.end(),
[&username](const std::shared_ptr<User>& user) {
return user->getUsername() == username;
}),
users.end());
}
const std::vector<std::string>& ChatRoom::getMessages() const {
return messages;
}
const std::vector<std::shared_ptr<User>>& ChatRoom::getUsers() const {
return users;
}
std::string ChatRoom::getCurrentUsername() const {
if (!users.empty()) {
return users[0]->getUsername();
}
return "";
}
NetworkManager* ChatRoom::getNetworkManager() const {
return network.get();
}

View File

@@ -0,0 +1,50 @@
#include "ChatWindow.hpp"
#include <FL/Fl.H>
#include <iostream>
ChatWindow::ChatWindow(int w, int h, const char* title, std::shared_ptr<ChatRoom> chatRoom)
: Fl_Window(w, h, title), chatRoom(chatRoom) {
// 设置消息回调
auto networkManager = chatRoom->getNetworkManager();
networkManager->setMessageCallback([this](const std::string& msg) {
this->appendMessage(msg);
});
messageBuffer = new Fl_Text_Buffer();
messageDisplay = new Fl_Text_Display(20, 20, w-220, h-70);
messageDisplay->buffer(messageBuffer);
userList = new Fl_Browser(w-190, 20, 170, h-70);
userList->type(FL_MULTI_BROWSER);
messageInput = new Fl_Input(20, h-40, w-100, 30);
sendButton = new Fl_Button(w-70, h-40, 60, 30, "发送");
sendButton->callback(onSendMessageCallback, this);
updateUserList();
}
void ChatWindow::appendMessage(const std::string& message) {
messageBuffer->append(message.c_str());
messageBuffer->append("\n");
messageDisplay->scroll(messageBuffer->count_lines(0, messageBuffer->length()), 0);
}
void ChatWindow::updateUserList() {
userList->clear();
for (const auto& user : chatRoom->getUsers()) {
userList->add(user->getUsername().c_str());
}
}
void ChatWindow::onSendMessageCallback(Fl_Widget* w, void* data) {
ChatWindow* win = static_cast<ChatWindow*>(data);
std::string message = win->messageInput->value();
if (!message.empty()) {
win->chatRoom->sendChatMessage(message);
win->messageInput->value("");
Fl::focus(win->messageInput);
}
}

View File

@@ -0,0 +1,38 @@
#include "ConfigManager.hpp"
#include <fstream>
#include <sstream>
ConfigManager& ConfigManager::getInstance() {
static ConfigManager instance;
return instance;
}
void ConfigManager::loadConfig(const std::string& filename) {
std::ifstream file(filename);
std::string line;
while (std::getline(file, line)) {
size_t pos = line.find('=');
if (pos != std::string::npos) {
std::string key = line.substr(0, pos);
std::string value = line.substr(pos + 1);
configMap[key] = value;
}
}
}
void ConfigManager::saveConfig(const std::string& filename) {
std::ofstream file(filename);
for (const auto& pair : configMap) {
file << pair.first << "=" << pair.second << "\n";
}
}
std::string ConfigManager::getValue(const std::string& key) {
return configMap[key];
}
void ConfigManager::setValue(const std::string& key, const std::string& value) {
configMap[key] = value;
}

View File

@@ -0,0 +1,140 @@
#include "MainWindow.hpp"
#include "ChatWindow.hpp"
#include <FL/Fl_Input.H>
#include <FL/Fl_Output.H>
#include <iostream>
#include <string>
MainWindow::MainWindow(int w, int h, const char* title)
: Fl_Window(w, h, title), chatRoom(std::make_unique<ChatRoom>()) {
// 初始化窗口基础属性
color(FL_WHITE);
begin();
try {
// 初始化界面组件
titleBox = new Fl_Box(w/2-100, 20, 200, 30, "局域网聊天室");
titleBox->box(FL_NO_BOX);
titleBox->labelfont(FL_BOLD);
titleBox->labelsize(20);
titleBox->labelcolor(FL_BLUE);
createRoomBtn = new Fl_Button(w/2-100, 100, 200, 40, "创建房间");
createRoomBtn->callback(onCreateRoomCallback, this);
joinRoomBtn = new Fl_Button(w/2-100, 160, 200, 40, "加入房间");
joinRoomBtn->callback(onJoinRoomCallback, this);
// 初始化对话框指针
createRoomDialog = nullptr;
joinRoomDialog = nullptr;
usernameDialog = nullptr;
end();
} catch (const std::exception& e) {
std::cerr << "窗口初始化失败: " << e.what() << std::endl;
throw;
}
}
MainWindow::~MainWindow() {
if (createRoomDialog) delete createRoomDialog;
if (joinRoomDialog) delete joinRoomDialog;
if (usernameDialog) delete usernameDialog;
}
void MainWindow::showCreateRoomDialog() {
if (createRoomDialog) return;
createRoomDialog = new Fl_Window(300, 250, "创建房间");
createRoomDialog->begin();
portInput = new Fl_Input(100, 30, 180, 30, "端口:");
passwordInput = new Fl_Input(100, 70, 180, 30, "密码:");
Fl_Button* confirmBtn = new Fl_Button(100, 120, 100, 30, "确认");
confirmBtn->callback(onCreateRoomConfirmCallback, this);
createRoomDialog->end();
createRoomDialog->show();
}
void MainWindow::showJoinRoomDialog() {
if (joinRoomDialog) return;
joinRoomDialog = new Fl_Window(300, 250, "加入房间");
joinRoomDialog->begin();
ipInput = new Fl_Input(100, 30, 180, 30, "IP地址:");
portInput = new Fl_Input(100, 70, 180, 30, "端口:");
passwordInput = new Fl_Input(100, 110, 180, 30, "密码:");
Fl_Button* confirmBtn = new Fl_Button(100, 160, 100, 30, "确认");
confirmBtn->callback(onJoinRoomConfirmCallback, this);
joinRoomDialog->end();
joinRoomDialog->show();
}
void MainWindow::showUsernameDialog() {
if (usernameDialog) return;
usernameDialog = new Fl_Window(300, 150, "输入用户名");
usernameDialog->begin();
usernameInput = new Fl_Input(100, 30, 180, 30, "用户名:");
Fl_Button* confirmBtn = new Fl_Button(100, 80, 100, 30, "确认");
confirmBtn->callback(onUsernameConfirmCallback, this);
usernameDialog->end();
usernameDialog->show();
}
void MainWindow::onCreateRoomCallback(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
win->showCreateRoomDialog();
}
void MainWindow::onJoinRoomCallback(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
win->showJoinRoomDialog();
}
void MainWindow::onCreateRoomConfirmCallback(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
int port = std::stoi(win->portInput->value());
std::string password = win->passwordInput->value();
if (win->chatRoom->createRoom(port, password)) {
win->createRoomDialog->hide();
win->showUsernameDialog();
}
}
void MainWindow::onJoinRoomConfirmCallback(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
std::string ip = win->ipInput->value();
int port = std::stoi(win->portInput->value());
std::string password = win->passwordInput->value();
if (win->chatRoom->joinRoom(ip, port, password)) {
win->joinRoomDialog->hide();
win->showUsernameDialog();
}
}
void MainWindow::onUsernameConfirmCallback(Fl_Widget* w, void* data) {
MainWindow* win = static_cast<MainWindow*>(data);
std::string username = win->usernameInput->value();
win->chatRoom->addUser(username);
win->usernameDialog->hide();
// 创建并显示聊天窗口
auto chatRoomPtr = std::shared_ptr<ChatRoom>(win->chatRoom.release());
auto chatWindow = new ChatWindow(800, 600, "聊天室", chatRoomPtr);
chatWindow->show();
// 隐藏主窗口
win->hide();
}

View File

@@ -0,0 +1,24 @@
#include "Message.hpp"
Message::Message(const std::shared_ptr<User>& sender,
const std::string& content,
MessageType type)
: sender(sender), content(content), type(type) {
timestamp = std::chrono::system_clock::now();
}
const std::shared_ptr<User>& Message::getSender() const {
return sender;
}
const std::string& Message::getContent() const {
return content;
}
MessageType Message::getType() const {
return type;
}
std::chrono::system_clock::time_point Message::getTimestamp() const {
return timestamp;
}

View File

@@ -0,0 +1,46 @@
#include "MessageProtocol.hpp"
#include <sstream>
#include "StringUtils.hpp"
std::string MessageProtocol::encodeMessage(const Message& message) {
std::ostringstream oss;
oss << static_cast<int>(message.getType()) << "|"
<< (message.getSender() ? message.getSender()->getUsername() : "") << "|"
<< message.getContent();
return oss.str();
}
Message MessageProtocol::decodeMessage(const std::string& data) {
auto parts = StringUtils::split(data, '|');
if (parts.size() < 3) {
throw std::runtime_error("Invalid message format");
}
std::shared_ptr<User> sender = nullptr;
if (!parts[1].empty()) {
sender = std::make_shared<User>(parts[1], "");
}
MessageType type = static_cast<MessageType>(std::stoi(parts[0]));
std::string content = parts[2];
if (type == MessageType::USER_JOIN || type == MessageType::USER_LEAVE) {
content = "";
}
return Message(sender, content, type);
}
bool MessageProtocol::validateMessage(const std::string& data) {
auto parts = StringUtils::split(data, '|');
if (parts.size() < 3) {
return false;
}
try {
int type = std::stoi(parts[0]);
return type >= 0 && type <= 5; // 检查消息类型是否有效(0-5对应MessageType枚举)
} catch (...) {
return false;
}
}

View File

@@ -0,0 +1,81 @@
#include "NetworkEventHandler.hpp"
#include <iostream>
#include <chrono>
#include "MessageProtocol.hpp"
NetworkEventHandler::NetworkEventHandler(std::shared_ptr<ChatRoom> chatRoom)
: chatRoom(chatRoom), running(false) {}
NetworkEventHandler::~NetworkEventHandler() {
stop();
}
void NetworkEventHandler::start() {
if (running) return;
running = true;
heartbeatThread = std::thread(&NetworkEventHandler::heartbeatCheck, this);
}
void NetworkEventHandler::stop() {
running = false;
if (heartbeatThread.joinable()) {
heartbeatThread.join();
}
}
void NetworkEventHandler::onConnected() {
auto users = chatRoom->getUsers();
if (!users.empty()) {
auto user = users[0]; // 假设第一个用户是当前用户
Message joinMsg(user, "", MessageType::USER_JOIN);
chatRoom->sendChatMessage(MessageProtocol::encodeMessage(joinMsg));
}
}
void NetworkEventHandler::onMessageReceived(const std::string& message) {
try {
if (!MessageProtocol::validateMessage(message)) {
return;
}
auto msg = MessageProtocol::decodeMessage(message);
switch (msg.getType()) {
case MessageType::TEXT_MESSAGE:
chatRoom->sendChatMessage(msg.getSender()->getUsername() + ": " + msg.getContent());
break;
case MessageType::USER_JOIN:
chatRoom->sendChatMessage(msg.getSender()->getUsername() + " 加入了聊天室");
break;
case MessageType::USER_LEAVE:
chatRoom->sendChatMessage(msg.getSender()->getUsername() + " 离开了聊天室");
break;
case MessageType::SYSTEM:
chatRoom->sendChatMessage("[系统] " + msg.getContent());
break;
case MessageType::AUTH:
if (msg.getContent() == chatRoom->getRoomPassword()) {
chatRoom->sendChatMessage("AUTH_SUCCESS");
} else {
chatRoom->sendChatMessage("AUTH_FAILED");
}
break;
default:
break;
}
} catch (const std::exception& e) {
std::cerr << "消息处理错误: " << e.what() << std::endl;
}
}
void NetworkEventHandler::onError(const std::string& error) {
chatRoom->sendChatMessage("[网络错误] " + error);
}
void NetworkEventHandler::heartbeatCheck() {
while (running) {
std::this_thread::sleep_for(std::chrono::seconds(30));
if (!chatRoom->getNetworkManager()->isConnected()) {
onError("连接已断开");
}
}
}

View File

@@ -0,0 +1,138 @@
#include "NetworkManager.hpp"
#include <winsock2.h>
#include <ws2tcpip.h>
#include <iostream>
#include <stdexcept>
#pragma comment(lib, "ws2_32.lib")
NetworkManager::NetworkManager() : serverSocket(INVALID_SOCKET), clientSocket(INVALID_SOCKET) {
WSADATA wsaData;
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
throw std::runtime_error("WSAStartup failed");
}
}
NetworkManager::~NetworkManager() {
if (serverSocket != INVALID_SOCKET) {
closesocket(serverSocket);
}
if (clientSocket != INVALID_SOCKET) {
closesocket(clientSocket);
}
WSACleanup();
}
bool NetworkManager::startServer(int port) {
serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (serverSocket == INVALID_SOCKET) {
return false;
}
sockaddr_in serverAddr;
serverAddr.sin_family = AF_INET;
serverAddr.sin_addr.s_addr = htonl(INADDR_ANY); // 监听所有网络接口
serverAddr.sin_port = htons(port);
// 设置SO_REUSEADDR选项
int opt = 1;
setsockopt(serverSocket, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
if (bind(serverSocket, (sockaddr*)&serverAddr, sizeof(serverAddr)) == SOCKET_ERROR) {
std::cerr << "绑定端口失败: " << WSAGetLastError() << std::endl;
closesocket(serverSocket);
return false;
}
if (listen(serverSocket, SOMAXCONN) == SOCKET_ERROR) {
std::cerr << "监听失败: " << WSAGetLastError() << std::endl;
closesocket(serverSocket);
return false;
}
// 启动接收线程
acceptThread = std::thread([this]() {
while (true) {
sockaddr_in clientAddr;
int addrLen = sizeof(clientAddr);
SOCKET newClient = accept(serverSocket, (sockaddr*)&clientAddr, &addrLen);
if (newClient == INVALID_SOCKET) break;
std::lock_guard<std::mutex> lock(clientsMutex);
clients.push_back(newClient);
}
});
std::cout << "服务器已启动,监听端口: " << port << std::endl;
return true;
}
bool NetworkManager::connectToServer(const std::string& ip, int port) {
clientSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (clientSocket == INVALID_SOCKET) {
return false;
}
sockaddr_in serverAddr;
serverAddr.sin_family = AF_INET;
inet_pton(AF_INET, ip.c_str(), &serverAddr.sin_addr);
serverAddr.sin_port = htons(port);
if (connect(clientSocket, (sockaddr*)&serverAddr, sizeof(serverAddr)) == SOCKET_ERROR) {
std::cerr << "连接服务器失败: " << WSAGetLastError() << std::endl;
closesocket(clientSocket);
return false;
}
std::cout << "已连接到服务器: " << ip << ":" << port << std::endl;
return true;
}
void NetworkManager::sendMessage(const std::string& message) {
// 服务器模式:广播给所有客户端
if (serverSocket != INVALID_SOCKET) {
std::lock_guard<std::mutex> lock(clientsMutex);
for (auto client : clients) {
send(client, message.c_str(), message.size(), 0);
}
}
// 客户端模式:发送到服务器
else if (clientSocket != INVALID_SOCKET) {
send(clientSocket, message.c_str(), message.size(), 0);
}
// 本地回显
if (messageCallback) {
messageCallback(message);
}
}
std::vector<std::string> NetworkManager::receiveMessages() {
std::vector<std::string> messages;
if (clientSocket == INVALID_SOCKET) {
return messages;
}
fd_set readSet;
FD_ZERO(&readSet);
FD_SET(clientSocket, &readSet);
struct timeval timeout;
timeout.tv_sec = 1;
timeout.tv_usec = 0;
if (select(clientSocket + 1, &readSet, nullptr, nullptr, &timeout) > 0) {
char buffer[1024];
int bytesReceived;
while ((bytesReceived = recv(clientSocket, buffer, sizeof(buffer), 0)) > 0) {
messages.emplace_back(buffer, bytesReceived);
}
}
return messages;
}
bool NetworkManager::isConnected() const {
return clientSocket != INVALID_SOCKET;
}

Some files were not shown because too many files have changed in this diff Show More