Add files via upload

AboutForm.cs

@@ -1,66 +1,141 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class AboutForm : Form
-    {
-        public AboutForm()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            this.Text = "关于 kortapp-z";
-            this.Size = new Size(500, 400);
-            this.StartPosition = FormStartPosition.CenterScreen;
-            this.FormBorderStyle = FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-
-            // 添加应用图标
-            PictureBox logo = new PictureBox();
-            try
-            {
-                logo.Image = Image.FromFile("img/png/kortapp-z.png");
-                logo.SizeMode = PictureBoxSizeMode.Zoom;
-                logo.Width = 200;
-                logo.Height = 200;
-                logo.Location = new Point((this.Width - logo.Width) / 2, 30);
-                this.Controls.Add(logo);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"无法加载应用图标: {ex.Message}");
-            }
-
-            // 添加应用信息
-            Label infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 0.9.5\n一个简单、开源的应用商店\nkortapp-z是完全免费的基于.NET8和C++的软件";
-            infoLabel.Font = new Font("Microsoft YaHei", 12);
-            infoLabel.AutoSize = false;
-            infoLabel.Width = this.ClientSize.Width - 40;
-            infoLabel.Height = 100;
-            infoLabel.TextAlign = ContentAlignment.MiddleCenter;
-            infoLabel.Location = new Point(
-                20,
-                logo.Bottom + 20
-            );
-            this.Controls.Add(infoLabel);
-
-            // 添加关闭按钮
-            Button closeButton = new Button();
-            closeButton.Text = "关闭";
-            closeButton.Width = 100;
-            closeButton.Height = 40;
-            closeButton.Location = new Point(
-                (this.Width - closeButton.Width) / 2,
-                infoLabel.Bottom + 30
-            );
-            closeButton.Click += (s, e) => this.Close();
-            this.Controls.Add(closeButton);
-        }
-    }
-}
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class AboutUserControl : UserControl
+    {
+        private PictureBox logo = null!;
+        private Label infoLabel = null!;
+
+        public AboutUserControl()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            this.Dock = DockStyle.Fill;
+            this.BackColor = Color.White;
+            this.Padding = new Padding(20);
+
+            // 创建主布局面板
+            TableLayoutPanel mainLayout = new TableLayoutPanel();
+            mainLayout.Dock = DockStyle.Fill;
+            mainLayout.ColumnCount = 1;
+            mainLayout.RowCount = 2;
+            mainLayout.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.Padding = new Padding(0, 20, 0, 20);
+
+            // 初始化并添加应用图标
+            logo = new PictureBox();
+            try
+            {
+                logo.Image = Image.FromFile("img/png/kortapp-z.png");
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"无法加载应用图标: {ex.Message}");
+                logo.Image = SystemIcons.Application.ToBitmap();
+            }
+            logo.SizeMode = PictureBoxSizeMode.Zoom;
+            logo.Width = 200;
+            logo.Height = 200;
+            logo.Anchor = AnchorStyles.None;
+            logo.Margin = new Padding(0, 0, 0, 20);
+            mainLayout.Controls.Add(logo, 0, 0);
+
+            // 初始化并添加应用信息
+            infoLabel = new Label();
+            infoLabel.Text = "kortapp-z\n版本: 1.0.0\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C++的软件";
+            infoLabel.Font = new Font("Microsoft YaHei", 12);
+            infoLabel.AutoSize = false;
+            infoLabel.Width = 300;
+            infoLabel.Height = 130;  // 增加高度确保文字完整显示
+            infoLabel.TextAlign = ContentAlignment.MiddleCenter;
+            infoLabel.Anchor = AnchorStyles.None;
+            mainLayout.Controls.Add(infoLabel, 0, 1);
+
+            // 调整主布局为3行
+            mainLayout.RowCount = 3;
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+
+            // 在底部添加GitHub链接区域
+            TableLayoutPanel githubPanel = new TableLayoutPanel();
+            githubPanel.Dock = DockStyle.Bottom;
+            githubPanel.Height = 60;
+            githubPanel.ColumnCount = 3;
+            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
+            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.AutoSize));
+            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
+            githubPanel.RowCount = 1;
+            githubPanel.Padding = new Padding(10);
+            
+            // 添加GitHub图标
+            PictureBox githubIcon = new PictureBox();
+            try
+            {
+                githubIcon.Image = Image.FromFile("img/jpg/github.jpg");
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"无法加载GitHub图标: {ex.Message}");
+                githubIcon.Image = SystemIcons.Application.ToBitmap();
+            }
+            githubIcon.SizeMode = PictureBoxSizeMode.Zoom;
+            githubIcon.Width = 30;
+            githubIcon.Height = 30;
+            githubIcon.Cursor = Cursors.Hand;
+            githubIcon.Click += (s, e) => {
+                System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
+                {
+                    FileName = "https://github.com/zs-yg/kortapp-z",
+                    UseShellExecute = true
+                });
+            };
+            
+            // 添加文字说明
+            Label githubLabel = new Label();
+            githubLabel.Text = "🤗🤗🤗开源地址 🌟 欢迎点star和提交pr 🚀";
+            githubLabel.Font = new Font("Microsoft YaHei", 10);
+            githubLabel.AutoSize = true;
+            githubLabel.Margin = new Padding(10, 0, 0, 0);
+            
+            // 创建包含图标和文字的面板
+            Panel linkPanel = new Panel();
+            linkPanel.AutoSize = true;
+            linkPanel.Controls.Add(githubIcon);
+            linkPanel.Controls.Add(githubLabel);
+            githubIcon.Location = new Point(0, 0);
+            githubLabel.Location = new Point(githubIcon.Width + 10, 5);
+            
+            // 将链接面板添加到中间列
+            githubPanel.Controls.Add(linkPanel, 1, 0);
+            
+            this.Controls.Add(mainLayout);
+            this.Controls.Add(githubPanel);
+        }
+    }
+
+    // 保留原AboutForm作为容器(可选)
+    public class AboutForm : Form
+    {
+        public AboutForm()
+        {
+            this.Text = "关于 kortapp-z";
+            this.Size = new Size(500, 400);
+            this.StartPosition = FormStartPosition.CenterScreen;
+            this.FormBorderStyle = FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            
+            var aboutControl = new AboutUserControl();
+            this.Controls.Add(aboutControl);
+        }
+    }
+}

AppCard.cs

@@ -1,289 +1,353 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using System.IO;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Collections.Concurrent;
-
-namespace AppStore
-{
-    public class AppCard : UserControl
-    {
-        private PictureBox iconBox;
-        private Label nameLabel;
-        private Button downloadBtn;
-        private static readonly ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath> PathCache = 
-            new ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath>();
-
-        public string AppName { get; set; } = string.Empty;
-        public Image AppIcon { get; set; } = SystemIcons.Application.ToBitmap();
-        public string DownloadUrl { get; set; } = string.Empty;
-
-        public AppCard()
-        {
-            iconBox = new PictureBox();
-            nameLabel = new Label();
-            downloadBtn = new Button();
-            InitializeComponent();
-        }
-
-        private static readonly ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath> BorderCache = 
-            new ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath>();
-
-        private void InitializeComponent()
-        {
-            this.Size = new Size(240, 200);
-            this.BackColor = Color.White;
-            this.Padding = new Padding(10);
-            
-            // 异步初始化卡片路径和边框
-            Task.Run(() => {
-                InitializeCardPath();
-                InitializeBorder();
-            });
-
-            // 应用图标
-            iconBox = new PictureBox();
-            iconBox.Size = new Size(80, 80);
-            iconBox.Location = new Point((Width - 80) / 2, 15);
-            iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
-            this.Controls.Add(iconBox);
-
-            // 应用名称
-            nameLabel = new Label();
-            nameLabel.AutoSize = false;
-            nameLabel.Size = new Size(Width - 20, 40);
-            nameLabel.Location = new Point(10, 100);
-            nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
-            nameLabel.TextAlign = ContentAlignment.MiddleCenter;
-            this.Controls.Add(nameLabel);
-
-            // 下载按钮
-            downloadBtn = new Button();
-            downloadBtn.Text = "下载";
-            downloadBtn.Size = new Size(100, 32);
-            downloadBtn.Location = new Point((Width - 100) / 2, 150);
-            downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-            downloadBtn.ForeColor = Color.White;
-            downloadBtn.FlatStyle = FlatStyle.Flat;
-            downloadBtn.FlatAppearance.BorderSize = 0;
-            downloadBtn.Cursor = Cursors.Hand;
-            downloadBtn.Font = new Font("Microsoft YaHei", 9);
-            
-            // 按钮悬停效果
-            downloadBtn.MouseEnter += (s, e) => {
-                downloadBtn.BackColor = Color.FromArgb(0, 150, 255);
-            };
-            
-            downloadBtn.MouseLeave += (s, e) => {
-                downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-            };
-            
-            downloadBtn.Click += DownloadBtn_Click;
-            this.Controls.Add(downloadBtn);
-        }
-
-        /// <summary>
-        /// 初始化卡片边框路径
-        /// 使用C++程序计算高性能边框路径并缓存结果
-        /// </summary>
-        private void InitializeBorder()
-        {
-            // 使用卡片尺寸作为缓存键
-            string cacheKey = $"{Width}_{Height}_10";
-            
-            // 检查缓存中是否已有路径
-            if (!BorderCache.TryGetValue(cacheKey, out var borderPath))
-            {
-                // 创建临时文件存储路径数据
-                string tempFile = Path.GetTempFileName();
-                try 
-                {
-                    // 配置C++程序启动参数
-                    ProcessStartInfo startInfo = new ProcessStartInfo 
-                    {
-                        FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
-                        Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
-                        UseShellExecute = false, // 不显示命令行窗口
-                        CreateNoWindow = true    // 静默运行
-                    };
-
-                    // 启动C++程序计算路径
-                    using (var process = Process.Start(startInfo)) 
-                    {
-                        process.WaitForExit();
-                        
-                        // 检查计算结果
-                        if (process.ExitCode == 0 && File.Exists(tempFile)) 
-                        {
-                            // 读取C++程序生成的路径点
-                            var lines = File.ReadAllLines(tempFile);
-                            PointF[] points = lines.Select(line => {
-                                var parts = line.Split(','); // 解析坐标点
-                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                            }).ToArray();
-                            
-                            // 创建GraphicsPath对象
-                            borderPath = new System.Drawing.Drawing2D.GraphicsPath();
-                            borderPath.AddLines(points); // 添加路径点
-                            
-                            // 缓存路径对象
-                            BorderCache.TryAdd(cacheKey, borderPath);
-                        }
-                    }
-                }
-                finally 
-                {
-                    // 确保临时文件被删除
-                    if (File.Exists(tempFile)) 
-                    {
-                        File.Delete(tempFile);
-                    }
-                }
-            }
-        }
-
-        // 边框和阴影效果
-        protected override void OnPaint(PaintEventArgs e)
-        {
-            base.OnPaint(e);
-            
-            // 绘制背景
-            using (var brush = new SolidBrush(this.BackColor)) {
-                e.Graphics.FillRectangle(brush, this.ClientRectangle);
-            }
-
-            string cacheKey = $"{Width}_{Height}_10";
-            if (BorderCache.TryGetValue(cacheKey, out var borderPath))
-            {
-                try 
-                {
-                    // 绘制阴影
-                    using (var shadowBrush = new SolidBrush(Color.FromArgb(20, 0, 0, 0))) {
-                        e.Graphics.FillPath(shadowBrush, borderPath);
-                    }
-
-                    // 绘制边框（调整为蓝色系）
-                    using (var pen = new Pen(Color.FromArgb(70, 130, 200), 4)) {
-                        e.Graphics.DrawPath(pen, borderPath);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine($"边框绘制错误: {ex.Message}");
-                    // 回退到简单矩形边框
-                    using (var pen = new Pen(Color.FromArgb(100, 150, 220), 2)) {
-                        e.Graphics.DrawRectangle(pen, new Rectangle(0, 0, Width-1, Height-1));
-                    }
-                }
-            }
-            else
-            {
-                // 缓存未命中时绘制默认边框
-                using (var pen = new Pen(Color.FromArgb(100, 150, 220), 2)) {
-                    e.Graphics.DrawRectangle(pen, new Rectangle(0, 0, Width-1, Height-1));
-                }
-            }
-        }
-
-        /// <summary>
-        /// 初始化卡片形状路径
-        /// 使用C++程序计算圆角矩形路径并缓存结果
-        /// </summary>
-        private void InitializeCardPath()
-        {
-            int radius = 10; // 圆角半径
-            string cacheKey = $"{Width}_{Height}_{radius}"; // 缓存键
-            
-            // 检查缓存
-            if (!PathCache.TryGetValue(cacheKey, out var path)) 
-            {
-                string tempFile = Path.GetTempFileName(); // 临时文件路径
-                
-                try {
-                    // 配置C++程序启动参数
-                    ProcessStartInfo startInfo = new ProcessStartInfo {
-                        FileName = Path.Combine(Application.StartupPath, "resource", "card_calculator.exe"),
-                        Arguments = $"{Width} {Height} {radius} {tempFile}", // 传递宽高半径和输出文件
-                        UseShellExecute = false, // 不显示命令行窗口
-                        CreateNoWindow = true    // 静默运行
-                    };
-
-                    // 启动C++程序计算路径
-                    using (var process = Process.Start(startInfo)) {
-                        process.WaitForExit();
-                        
-                        // 检查计算结果
-                        if (process.ExitCode == 0 && File.Exists(tempFile)) {
-                            // 读取生成的路径点
-                            var lines = File.ReadAllLines(tempFile);
-                            PointF[] points = lines.Select(line => {
-                                var parts = line.Split(','); // 解析坐标
-                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                            }).ToArray();
-                            
-                            // 创建并缓存路径对象
-                            path = new System.Drawing.Drawing2D.GraphicsPath();
-                            path.AddLines(points);
-                            PathCache.TryAdd(cacheKey, path);
-                        }
-                    }
-                } catch {
-                    // C++程序失败时使用C#回退方案
-                    path = CalculatePathFallback(Width, Height, radius);
-                } finally {
-                    // 确保删除临时文件
-                    if (File.Exists(tempFile)) {
-                        File.Delete(tempFile);
-                    }
-                }
-            }
-
-            // 应用计算好的路径
-            if (path != null)
-            {
-                this.Invoke((MethodInvoker)delegate {
-                    this.Region = new Region(path); // 设置控件区域
-                    this.Refresh(); // 重绘控件
-                });
-            }
-        }
-
-        private System.Drawing.Drawing2D.GraphicsPath CalculatePathFallback(int width, int height, int radius)
-        {
-            var path = new System.Drawing.Drawing2D.GraphicsPath();
-            path.AddArc(0, 0, radius * 2, radius * 2, 180, 90);
-            path.AddArc(width - radius * 2, 0, radius * 2, radius * 2, 270, 90);
-            path.AddArc(width - radius * 2, height - radius * 2, radius * 2, radius * 2, 0, 90);
-            path.AddArc(0, height - radius * 2, radius * 2, radius * 2, 90, 90);
-            path.CloseFigure();
-            return path;
-        }
-
-        public void UpdateDisplay()
-        {
-            nameLabel.Text = AppName;
-            iconBox.Image = AppIcon;
-        }
-
-        private void DownloadBtn_Click(object sender, EventArgs e)
-        {
-            if (sender == null || e == null) return;
-            if (!string.IsNullOrEmpty(DownloadUrl))
-            {
-                try
-                {
-                    string fileName = $"{AppName.Replace(" ", "_")}.exe";
-                    DownloadManager.Instance.StartDownload(fileName, DownloadUrl);
-                    MessageBox.Show($"已开始下载: {AppName}", "下载中", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"下载失败: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.IO;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Concurrent;
+
+namespace AppStore
+{
+    public class AppCard : UserControl
+    {
+        private PictureBox iconBox;
+        private Label nameLabel;
+        private Button downloadBtn;
+        private static readonly ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath> PathCache = 
+            new ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath>();
+
+        public string AppName { get; set; } = string.Empty;
+        public Image AppIcon { get; set; } = SystemIcons.Application.ToBitmap();
+        public string DownloadUrl { get; set; } = string.Empty;
+
+        public AppCard()
+        {
+            // 确保关键对象不为null
+            iconBox = new PictureBox() { SizeMode = PictureBoxSizeMode.StretchImage };
+            nameLabel = new Label() { Text = string.Empty };
+            downloadBtn = new Button() { Text = "下载" };
+            
+            // 确保DownloadManager已初始化
+            var _ = DownloadManager.Instance;
+            
+            InitializeComponent();
+        }
+
+        private static readonly ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath> BorderCache = 
+            new ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath>();
+
+        private void InitializeComponent()
+        {
+            this.Size = new Size(240, 200);
+            this.BackColor = Color.White;
+            this.Padding = new Padding(10);
+            
+            // 异步初始化卡片路径和边框
+            Task.Run(() => {
+                InitializeCardPath();
+                InitializeBorder();
+            });
+
+            // 应用图标
+            iconBox = new PictureBox();
+            iconBox.Size = new Size(80, 80);
+            iconBox.Location = new Point((Width - 80) / 2, 15);
+            iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
+            this.Controls.Add(iconBox);
+
+            // 应用名称
+            nameLabel = new Label();
+            nameLabel.AutoSize = false;
+            nameLabel.Size = new Size(Width - 20, 40);
+            nameLabel.Location = new Point(10, 100);
+            nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
+            nameLabel.TextAlign = ContentAlignment.MiddleCenter;
+            this.Controls.Add(nameLabel);
+
+            // 下载按钮
+            downloadBtn = new Button();
+            downloadBtn.Text = "下载";
+            downloadBtn.Size = new Size(100, 32);
+            downloadBtn.Location = new Point((Width - 100) / 2, 150);
+            downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
+            downloadBtn.ForeColor = Color.White;
+            downloadBtn.FlatStyle = FlatStyle.Flat;
+            downloadBtn.FlatAppearance.BorderSize = 0;
+            downloadBtn.Cursor = Cursors.Hand;
+            downloadBtn.Font = new Font("Microsoft YaHei", 9);
+            
+            // 按钮悬停效果
+            downloadBtn.MouseEnter += (s, e) => {
+                downloadBtn.BackColor = Color.FromArgb(0, 150, 255);
+            };
+            
+            downloadBtn.MouseLeave += (s, e) => {
+                downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
+            };
+            
+            downloadBtn.Click += DownloadBtn_Click;
+            this.Controls.Add(downloadBtn);
+        }
+
+        /// <summary>
+        /// 初始化卡片边框路径
+        /// 使用C++程序计算高性能边框路径并缓存结果
+        /// </summary>
+        private void InitializeBorder()
+        {
+            // 使用卡片尺寸作为缓存键
+            string cacheKey = $"{Width}_{Height}_10";
+            
+            // 检查缓存中是否已有路径
+            if (!BorderCache.TryGetValue(cacheKey, out var borderPath))
+            {
+                // 创建临时文件存储路径数据
+                string tempFile = Path.GetTempFileName();
+                try 
+                {
+                    // 配置C++程序启动参数
+                    ProcessStartInfo startInfo = new ProcessStartInfo 
+                    {
+                        FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
+                        Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
+                        UseShellExecute = false, // 不显示命令行窗口
+                        CreateNoWindow = true    // 静默运行
+                    };
+
+                    // 启动C++程序计算路径
+                    using (var process = Process.Start(startInfo)) 
+                    {
+                        process.WaitForExit();
+                        
+                        // 检查计算结果
+                        if (process.ExitCode == 0 && File.Exists(tempFile)) 
+                        {
+                            // 读取C++程序生成的路径点
+                            var lines = File.ReadAllLines(tempFile);
+                            PointF[] points = lines.Select(line => {
+                                var parts = line.Split(','); // 解析坐标点
+                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
+                            }).ToArray();
+                            
+                            // 创建GraphicsPath对象
+                            borderPath = new System.Drawing.Drawing2D.GraphicsPath();
+                            borderPath.AddLines(points); // 添加路径点
+                            
+                            // 缓存路径对象
+                            BorderCache.TryAdd(cacheKey, borderPath);
+                        }
+                    }
+                }
+                finally 
+                {
+                    // 确保临时文件被删除
+                    if (File.Exists(tempFile)) 
+                    {
+                        File.Delete(tempFile);
+                    }
+                }
+            }
+        }
+
+        // 边框和阴影效果
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            
+            // 绘制背景
+            using (var brush = new SolidBrush(this.BackColor)) {
+                e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+
+            string cacheKey = $"{Width}_{Height}_10";
+            if (BorderCache.TryGetValue(cacheKey, out var borderPath))
+            {
+                try 
+                {
+                    // 绘制阴影
+                    using (var shadowBrush = new SolidBrush(Color.FromArgb(20, 0, 0, 0))) {
+                        e.Graphics.FillPath(shadowBrush, borderPath);
+                    }
+
+                    // 绘制边框（调整为蓝色系）
+                    using (var pen = new Pen(Color.FromArgb(70, 130, 200), 4)) {
+                        e.Graphics.DrawPath(pen, borderPath);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"边框绘制错误: {ex.Message}");
+                    // 回退到简单矩形边框
+                    using (var pen = new Pen(Color.FromArgb(100, 150, 220), 2)) {
+                        e.Graphics.DrawRectangle(pen, new Rectangle(0, 0, Width-1, Height-1));
+                    }
+                }
+            }
+            else
+            {
+                // 缓存未命中时绘制默认边框
+                using (var pen = new Pen(Color.FromArgb(100, 150, 220), 2)) {
+                    e.Graphics.DrawRectangle(pen, new Rectangle(0, 0, Width-1, Height-1));
+                }
+            }
+        }
+
+        /// <summary>
+        /// 初始化卡片形状路径
+        /// 使用C++程序计算圆角矩形路径并缓存结果
+        /// </summary>
+        private void InitializeCardPath()
+        {
+            int radius = 10; // 圆角半径
+            string cacheKey = $"{Width}_{Height}_{radius}"; // 缓存键
+            
+            // 检查缓存
+            if (!PathCache.TryGetValue(cacheKey, out var path)) 
+            {
+                string tempFile = Path.GetTempFileName(); // 临时文件路径
+                
+                try {
+                    // 配置C++程序启动参数
+                    ProcessStartInfo startInfo = new ProcessStartInfo {
+                        FileName = Path.Combine(Application.StartupPath, "resource", "card_calculator.exe"),
+                        Arguments = $"{Width} {Height} {radius} {tempFile}", // 传递宽高半径和输出文件
+                        UseShellExecute = false, // 不显示命令行窗口
+                        CreateNoWindow = true    // 静默运行
+                    };
+
+                    // 启动C++程序计算路径
+                    using (var process = Process.Start(startInfo)) {
+                        process.WaitForExit();
+                        
+                        // 检查计算结果
+                        if (process.ExitCode == 0 && File.Exists(tempFile)) {
+                            // 读取生成的路径点
+                            var lines = File.ReadAllLines(tempFile);
+                            PointF[] points = lines.Select(line => {
+                                var parts = line.Split(','); // 解析坐标
+                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
+                            }).ToArray();
+                            
+                            // 创建并缓存路径对象
+                            path = new System.Drawing.Drawing2D.GraphicsPath();
+                            path.AddLines(points);
+                            PathCache.TryAdd(cacheKey, path);
+                        }
+                    }
+                } catch {
+                    // C++程序失败时使用C#回退方案
+                    path = CalculatePathFallback(Width, Height, radius);
+                } finally {
+                    // 确保删除临时文件
+                    if (File.Exists(tempFile)) {
+                        File.Delete(tempFile);
+                    }
+                }
+            }
+
+            // 应用计算好的路径 - 更严格的null检查和异常处理
+            try 
+            {
+                var safePath = path ?? CalculatePathFallback(Width, Height, 10);
+                // 更严格的null检查，包括路径和控件状态
+                if (safePath != null && 
+                    safePath.PointCount > 0 && 
+                    this.IsHandleCreated &&
+                    !this.IsDisposed)
+                {
+                    this.Invoke((MethodInvoker)delegate {
+                        try 
+                        {
+                            // 委托内部再次验证safePath
+                            if (safePath != null && safePath.PointCount > 0)
+                            {
+                                var validPath = safePath; // 确保非null
+                                using (var region = new Region(validPath))
+                                {
+                                    this.Region = region;
+                                    this.Refresh();
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            Debug.WriteLine($"创建Region失败: {ex.Message}");
+                            this.Region = null;
+                            this.Refresh();
+                        }
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"初始化卡片路径失败: {ex.Message}");
+            }
+        }
+
+        private System.Drawing.Drawing2D.GraphicsPath CalculatePathFallback(int width, int height, int radius)
+        {
+            try 
+            {
+                var path = new System.Drawing.Drawing2D.GraphicsPath();
+                path.AddArc(0, 0, radius * 2, radius * 2, 180, 90);
+                path.AddArc(width - radius * 2, 0, radius * 2, radius * 2, 270, 90);
+                path.AddArc(width - radius * 2, height - radius * 2, radius * 2, radius * 2, 0, 90);
+                path.AddArc(0, height - radius * 2, radius * 2, radius * 2, 90, 90);
+                path.CloseFigure();
+                return path;
+            }
+            catch
+            {
+                // 绝对回退方案 - 返回最小有效路径
+                var path = new System.Drawing.Drawing2D.GraphicsPath();
+                path.AddRectangle(new Rectangle(0, 0, width, height));
+                return path;
+            }
+        }
+
+        public void UpdateDisplay()
+        {
+            nameLabel.Text = AppName;
+            iconBox.Image = AppIcon;
+        }
+
+        private void DownloadBtn_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                // 更严格的null检查
+                // 更严格的null检查，包括DownloadManager.Instance和其方法
+                // 全面的null和状态检查
+                if (sender == null || e == null || 
+                    string.IsNullOrWhiteSpace(DownloadUrl) || 
+                    string.IsNullOrWhiteSpace(AppName) ||
+                    !this.IsHandleCreated ||
+                    this.IsDisposed ||
+                    DownloadManager.Instance == null ||
+                    DownloadManager.Instance.DownloadItems == null ||
+                    DownloadManager.Instance.StartDownload == null)
+                {
+                    return;
+                }
+
+                string safeAppName = AppName ?? "未知应用";
+                string fileName = $"{safeAppName.Replace(" ", "_")}.exe";
+                
+                DownloadManager.Instance.StartDownload(fileName, DownloadUrl);
+                
+                string message = $"已开始下载: {safeAppName}";
+                this.Invoke((MethodInvoker)delegate {
+                    MessageBox.Show(this, message, "下载中", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                });
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"下载按钮点击处理失败: {ex.Message}");
+                this.Invoke((MethodInvoker)delegate {
+                    MessageBox.Show(this, "下载处理发生错误", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                });
+            }
+        }
+    }
+}

SettingsForm.cs

@@ -1,50 +1,53 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class SettingsForm : Form
-    {
-        private Button btnCleanLogs;
-
-        public SettingsForm()
-        {
-            this.Text = "设置";
-            this.Size = new Size(400, 300);
-            this.StartPosition = FormStartPosition.CenterParent;
-
-            btnCleanLogs = new Button();
-            btnCleanLogs.Text = "清理日志";
-            btnCleanLogs.Size = new Size(150, 40);
-            btnCleanLogs.Location = new Point(120, 100);
-            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
-            btnCleanLogs.Click += (s, e) => CleanLogs();
-            this.Controls.Add(btnCleanLogs);
-        }
-
-        private void CleanLogs()
-        {
-            try
-            {
-                string logCleanerPath = Path.Combine("resource", "log_cleaner.exe");
-                
-                if (File.Exists(logCleanerPath))
-                {
-                    Process.Start(logCleanerPath);
-                    MessageBox.Show("日志清理程序已启动", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                else
-                {
-                    MessageBox.Show("日志清理程序未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("清理日志时出错", ex);
-                MessageBox.Show($"清理日志时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-    }
-}
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class SettingsUserControl : UserControl
+    {
+        private Button btnCleanLogs;
+
+        public SettingsUserControl()
+        {
+            this.Dock = DockStyle.Fill;
+            this.BackColor = Color.White;
+            
+            // 设置顶部内边距
+            this.Padding = new Padding(0, 30, 0, 0);
+            
+            btnCleanLogs = new Button();
+            btnCleanLogs.Text = "清理日志";
+            btnCleanLogs.Size = new Size(150, 40);
+            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 50); // 调整Y坐标为50靠近顶部
+            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
+            btnCleanLogs.Anchor = AnchorStyles.Top; // 添加顶部锚点
+            btnCleanLogs.Click += (s, e) => CleanLogs();
+            this.Controls.Add(btnCleanLogs);
+        }
+
+        private void CleanLogs()
+        {
+            try
+            {
+                string logCleanerPath = Path.Combine("resource", "log_cleaner.exe");
+                
+                if (File.Exists(logCleanerPath))
+                {
+                    Process.Start(logCleanerPath);
+                    MessageBox.Show("日志清理程序已启动", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("日志清理程序未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("清理日志时出错", ex);
+                MessageBox.Show($"清理日志时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}

del.bat

@@ -1,4 +1,2 @@
 rmdir bin /s /q
-rmdir obj /s /q
-rmdir logs /s /q
-mkdir logs
+rmdir obj /s /q

log_cleaner.cpp

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

logger.cs

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