Add files via upload

AboutForm.cs

@@ -4,14 +4,128 @@ using System.Windows.Forms;
 
 namespace AppStore
 {
-    public class AboutForm : Form
+    public class AboutUserControl : UserControl
     {
-        public AboutForm()
+        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);
@@ -20,47 +134,8 @@ namespace AppStore
             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);
+            var aboutControl = new AboutUserControl();
+            this.Controls.Add(aboutControl);
         }
     }
 }

AppCard.cs

@@ -23,9 +23,14 @@ namespace AppStore
 
         public AppCard()
         {
-            iconBox = new PictureBox();
-            nameLabel = new Label();
-            downloadBtn = new Button();
+            // 确保关键对象不为null
+            iconBox = new PictureBox() { SizeMode = PictureBoxSizeMode.StretchImage };
+            nameLabel = new Label() { Text = string.Empty };
+            downloadBtn = new Button() { Text = "下载" };
+            
+            // 确保DownloadManager已初始化
+            var _ = DownloadManager.Instance;
+            
             InitializeComponent();
         }
 
@@ -241,17 +246,48 @@ namespace AppStore
                 }
             }
 
-            // 应用计算好的路径
-            if (path != null)
+            // 应用计算好的路径 - 更严格的null检查和异常处理
+            try 
+            {
+                var safePath = path ?? CalculatePathFallback(Width, Height, 10);
+                // 更严格的null检查，包括路径和控件状态
+                if (safePath != null && 
+                    safePath.PointCount > 0 && 
+                    this.IsHandleCreated &&
+                    !this.IsDisposed)
                 {
                     this.Invoke((MethodInvoker)delegate {
-                    this.Region = new Region(path); // 设置控件区域
-                    this.Refresh(); // 重绘控件
+                        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);
@@ -261,6 +297,14 @@ namespace AppStore
                 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()
         {
@@ -269,20 +313,40 @@ namespace AppStore
         }
 
         private void DownloadBtn_Click(object sender, EventArgs e)
-        {
-            if (sender == null || e == null) return;
-            if (!string.IsNullOrEmpty(DownloadUrl))
         {
             try
             {
-                    string fileName = $"{AppName.Replace(" ", "_")}.exe";
+                // 更严格的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);
-                    MessageBox.Show($"已开始下载: {AppName}", "下载中", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                
+                string message = $"已开始下载: {safeAppName}";
+                this.Invoke((MethodInvoker)delegate {
+                    MessageBox.Show(this, message, "下载中", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                });
             }
             catch (Exception ex)
             {
-                    MessageBox.Show($"下载失败: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
+                Debug.WriteLine($"下载按钮点击处理失败: {ex.Message}");
+                this.Invoke((MethodInvoker)delegate {
+                    MessageBox.Show(this, "下载处理发生错误", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                });
             }
         }
     }

MainForm.cs

@@ -2,6 +2,10 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
 using AppStore;
 
 namespace AppStore
@@ -11,6 +15,106 @@ namespace AppStore
     /// </summary>
     public class MainForm : Form
     {
+        private static readonly string CacheDir = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "zsyg", "kortapp-z", ".cache");
+
+        private class AppPositionCache
+        {
+            public string AppName { get; set; } = string.Empty;
+            public int X { get; set; }
+            public int Y { get; set; }
+            public DateTime LastUpdated { get; set; } = DateTime.Now;
+        }
+
+        private static string GetPositionCacheFilePath(string appName)
+        {
+            using var md5 = MD5.Create();
+            var hash = md5.ComputeHash(Encoding.UTF8.GetBytes(appName));
+            var fileName = BitConverter.ToString(hash).Replace("-", "").ToLower() + ".json";
+            return Path.Combine(CacheDir, fileName);
+        }
+
+        private static void EnsureCacheDirectory()
+        {
+            try 
+            {
+                if (!Directory.Exists(CacheDir))
+                {
+                    Directory.CreateDirectory(CacheDir);
+                    Logger.Log($"已创建缓存目录: {CacheDir}");
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"创建缓存目录失败: {CacheDir}", ex);
+                throw;
+            }
+        }
+
+        private static bool TryReadPositionCache(string appName, out AppPositionCache? cacheData)
+        {
+            cacheData = null;
+            var cacheFile = GetPositionCacheFilePath(appName);
+            
+            if (!File.Exists(cacheFile)) 
+                return false;
+
+            try
+            {
+                var json = File.ReadAllText(cacheFile);
+                cacheData = JsonSerializer.Deserialize<AppPositionCache>(json);
+                return cacheData != null;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private static void WritePositionCache(string appName, Point position)
+        {
+            try
+            {
+                EnsureCacheDirectory();
+                var cacheFile = GetPositionCacheFilePath(appName);
+                
+                var cacheData = new AppPositionCache
+                {
+                    AppName = appName,
+                    X = position.X,
+                    Y = position.Y,
+                    LastUpdated = DateTime.Now
+                };
+
+                var json = JsonSerializer.Serialize(cacheData);
+                File.WriteAllText(cacheFile, json);
+                Logger.Log($"已保存位置缓存: {appName} ({position.X}, {position.Y})");
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"保存位置缓存失败: {appName}", ex);
+                throw;
+            }
+        }
+
+        private static bool IsPositionCacheValid(AppPositionCache cacheData)
+        {
+            // 缓存有效期设为7天
+            return (DateTime.Now - cacheData.LastUpdated).TotalDays <= 7;
+        }
+
+        private static void SaveAllCardPositions(FlowLayoutPanel flowPanel)
+        {
+            foreach (Control control in flowPanel.Controls)
+            {
+                if (control is AppCard card)
+                {
+                    WritePositionCache(card.AppName, control.Location);
+                }
+            }
+        }
+
         // 软件下载按钮
         private Button btnApps = null!;
         // 下载进度按钮
@@ -104,8 +208,7 @@ namespace AppStore
             styleButton(btnAbout);
             btnAbout.Click += (s, e) => {
                 Logger.Log("用户点击了'关于'按钮");
-                var aboutForm = new AboutForm();
-                aboutForm.ShowDialog();
+                ShowAboutView();
             };
             buttonPanel.Controls.Add(btnAbout);
             
@@ -135,8 +238,16 @@ namespace AppStore
         /// </summary>
         private void ShowSettingsView()
         {
-            var settingsForm = new SettingsForm();
-            settingsForm.ShowDialog(); // 以模态对话框形式显示设置窗口
+            contentPanel.Controls.Clear();
+            var settingsControl = new SettingsUserControl();
+            contentPanel.Controls.Add(settingsControl);
+        }
+
+        private void ShowAboutView()
+        {
+            contentPanel.Controls.Clear();
+            var aboutControl = new AboutUserControl();
+            contentPanel.Controls.Add(aboutControl);
         }
 
         /// <summary>
@@ -157,10 +268,8 @@ namespace AppStore
         {
             // 创建新的应用卡片实例
             AppCard card = new AppCard();
-            
-            // 设置卡片基本属性
-            card.AppName = appName; // 设置显示的应用名称
-            card.DownloadUrl = downloadUrl; // 设置下载链接地址
+            card.AppName = appName;
+            card.DownloadUrl = downloadUrl;
             
             try
             {
@@ -182,35 +291,163 @@ namespace AppStore
             return card;
         }
 
-        private void ShowAppsView()
+        private async void ShowAppsView()
         {
             contentPanel.Controls.Clear();
 
-            // 使用FlowLayoutPanel来组织应用卡片
+            // 同步创建并添加FlowLayoutPanel
             FlowLayoutPanel flowPanel = new FlowLayoutPanel();
             flowPanel.Dock = DockStyle.Fill;
             flowPanel.AutoScroll = true;
-            flowPanel.Padding = new Padding(15, 50, 15, 15); // 恢复原有内边距
+            flowPanel.Padding = new Padding(15, 50, 15, 15);
             flowPanel.WrapContents = true;
             flowPanel.Margin = new Padding(0);
             flowPanel.AutoSize = true;
             flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            flowPanel.AutoScrollMinSize = new Size(0, 999999); // 增加滑动距离
+            flowPanel.AutoScrollMinSize = new Size(0, 3350);
             contentPanel.Controls.Add(flowPanel);
 
-            // 添加所有应用卡片
+            // 添加窗体关闭事件处理
+            this.FormClosing += (sender, e) => {
+                SaveAllCardPositions(flowPanel);
+            };
 
+            // 确保控件已创建
+            await Task.Delay(100);
+            
+            try
+            {
+                // 异步添加卡片
+                await Task.Run(() => {
+                    if (flowPanel.IsHandleCreated)
+                    {
+                        flowPanel.Invoke((MethodInvoker)delegate {
+                            AddAllAppCards(flowPanel);
+                        });
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("渲染应用卡片时出错", ex);
+            }
+        }
+
+        private void AddAllAppCards(FlowLayoutPanel flowPanel)
+        {
+            flowPanel.Dock = DockStyle.Fill;
+            flowPanel.AutoScroll = true;
+            flowPanel.Padding = new Padding(15, 50, 15, 15);
+            flowPanel.WrapContents = true;
+            flowPanel.Margin = new Padding(0);
+            flowPanel.AutoSize = true;
+            flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
+            flowPanel.AutoScrollMinSize = new Size(0, 3350);
+            contentPanel.Controls.Add(flowPanel);
+
+            // 添加所有应用卡片并恢复位置
+            
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "XDM",
+                "https://github.com/subhra74/xdm/releases/download/7.2.11/xdm-setup.msi",
+                "img/png/XDM.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "FDM",
+                "https://files2.freedownloadmanager.org/6/latest/fdm_x64_setup.exe",
+                "img/png/FDM.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "ABDM",
+                "https://ghproxy.net/https://github.com/amir1376/ab-download-manager/releases/download/v1.6.4/ABDownloadManager_1.6.4_windows_x64.exe",
+                "img/png/ABDM.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "NDM",
+                "https://ghproxy.net/https://github.com/zs-yg/package/releases/download/v0.7/NeatDM_setup.exe",
+                "img/jpg/NDM.jpg"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "youtube-dl",
+                "https://ghproxy.net/https://github.com/ytdl-org/youtube-dl/releases/download/2021.12.17/youtube-dl.exe",
+                ""));
 
             flowPanel.Controls.Add(CreateAppCard(
                 "python3.8",
                 "https://www.python.org/ftp/python/3.8.0/python-3.8.0-amd64.exe",
                 "img/png/python.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "Oracle Java8",
+                "https://sdlc-esd.oracle.com/ESD6/JSCDL/jdk/8u451-b10/8a1589aa0fe24566b4337beee47c2d29/jre-8u451-windows-x64.exe?GroupName=JSC&FilePath=/ESD6/JSCDL/jdk/8u451-b10/8a1589aa0fe24566b4337beee47c2d29/jre-8u451-windows-x64.exe&BHost=javadl.sun.com&File=jre-8u451-windows-x64.exe&AuthParam=1750252610_4d0f61835e3392b8f0158398fd5ebd90&ext=.exe",
+                "img/png/java.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Rust",
+                "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe",
+                "img/png/rust.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Ruby",
+                "https://mirror.sjtu.edu.cn/github-release/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.4-2/rubyinstaller-devkit-3.4.4-2-x64.exe",
+                "img/png/ruby.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "D",
+                "https://downloads.dlang.org/releases/2.x/2.111.0/dmd-2.111.0.exe",
+                "img/jpg/D.jpg"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Go",
+                "https://golang.google.cn/dl/go1.24.4.windows-amd64.msi",
+                "img/png/Go.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Node.js",
+                "https://nodejs.org/dist/v22.16.0/node-v22.16.0-x64.msi",
+                "img/png/nodejs.png"));
+                
+            flowPanel.Controls.Add(CreateAppCard(
+                "mingw-64",
+                "https://ghproxy.net/https://github.com/niXman/mingw-builds-binaries/releases/download/15.1.0-rt_v12-rev0/x86_64-15.1.0-release-posix-seh-ucrt-rt_v12-rev0.7z",
+                "img/png/mingw-64.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Msys2",
+                "https://github.com/msys2/msys2-installer/releases/download/2025-02-21/msys2-x86_64-20250221.exe",
+                "img/png/MSYS2.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                ".NET SDK 8.0",
+                "https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer",
+                "img/png/.NET.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "ASP.NET Core 运行时 8.0",
+                "https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/runtime-aspnetcore-8.0.17-windows-x64-installer",
+                "img/png/.NET.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                ".NET 桌面运行时 8.0",
+                "https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/runtime-desktop-8.0.17-windows-x64-installer",
+                "img/png/.NET.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                ".NET 运行时 8.0",
+                "https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/runtime-8.0.17-windows-x64-installer",
+                "img/png/.NET.png"));
+            
             flowPanel.Controls.Add(CreateAppCard(
                 "openlist",
                 "https://ghproxy.net/https://github.com/OpenListTeam/OpenList/releases/download/beta/openlist-windows-amd64.zip",
                 "img/png/openlist.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "SpaceSniffer",
+                "https://ghproxy.net/https://github.com/zs-yg/package/releases/download/v0.8/SpaceSniffer.exe",
+                "img/png/SpaceSniffer.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "OpenSpeedy",
                 "https://ghproxy.net/https://github.com/game1024/OpenSpeedy/releases/download/v1.7.1/OpenSpeedy-v1.7.1.zip",
@@ -226,6 +463,16 @@ namespace AppStore
                 "https://vscode.download.prss.microsoft.com/dbazure/download/stable/dfaf44141ea9deb3b4096f7cd6d24e00c147a4b1/VSCodeSetup-x64-1.101.0.exe",
                 "img/png/vscode.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "vs community 2022",
+                "https://visualstudio.microsoft.com/zh-hans/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false",
+                "img/jpg/vs.jpg"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "VSCodium",
+                "https://visualstudio.microsoft.com/zh-hans/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false",
+                "img/png/codium_cnl.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "7-Zip",
                 "https://objects.githubusercontent.com/github-production-release-asset-2e65be/466446150/1645817e-3677-4207-93ff-e62de7e147be?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250613%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250613T035936Z&X-Amz-Expires=300&X-Amz-Signature=5e02d5fc34f45bd8308029c9fc78052007e9475ce0e32775619921cb8f3b83ea&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3D7z2409-x64.exe&response-content-type=application%2Foctet-stream",
@@ -236,6 +483,16 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/zs-yg/package/releases/download/v0.1/7-Zip.7z",
                 "img/png/7ziplogo.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "peazip",
+                "https://ghproxy.net/https://github.com/peazip/PeaZip/releases/download/10.4.0/peazip-10.4.0.WIN64.exe",
+                "img/jpg/peazip.jpg"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "nanazip",
+                "https://ghproxy.net/https://github.com/M2Team/NanaZip/releases/download/5.0.1263.0/NanaZip_5.0.1263.0_DebugSymbols.zip",
+                "img/png/nanazip.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "GreenShot",
                 "https://objects.githubusercontent.com/github-production-release-asset-2e65be/36756917/239aedb0-7d29-11e7-9f9c-d36ec4466ade?X-Amz-Algorithm=AWS4-HMAC-SSHA256&X-Amz-Credential=releaseassetproduction%2F20250613%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250613T041723Z&X-Amz-Expires=300&X-Amz-Signature=be1ef88a68bbc7065af5111809d11de881022933b44f6d961eb6bd6e6b7e60a8&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3DGreenshot-INSTALLER-1.2.10.6-RELEASE.exe&response-content-type=application%2Foctet-stream",
@@ -276,26 +533,26 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/mifi/lossless-cut/releases/download/v3.64.0/LosslessCut-win-x64.7z",
                 "img/png/LosslessCut.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "mingw-64",
-                "https://ghproxy.net/https://github.com/niXman/mingw-builds-binaries/releases/download/15.1.0-rt_v12-rev0/x86_64-15.1.0-release-posix-seh-ucrt-rt_v12-rev0.7z",
-                "img/png/mingw-64.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "Edge",
                 "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/cb21e6b5-3f63-4df2-bec3-a2015b80dc56/MicrosoftEdgeEnterpriseX64.msi",
                 "img/jpg/edge.jpg"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "Min",
+                "https://ghproxy.net/https://github.com/minbrowser/min/releases/download/v1.35.0/min-1.35.0-setup.exe",
+                "img/jpg/Min.jpg"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "Brave",
+                "https://ghproxy.net/https://github.com/brave/brave-browser/releases/download/v1.79.126/BraveBrowserSetup.exe",
+                "img/png/brave.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "Firefox",
                 "https://download-ssl.firefox.com.cn/releases-sha2/full/116.0/zh-CN/Firefox-full-latest-win64.exe",
                 "img/jpg/firefox.jpg"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "Msys2",
-                "https://github.com/msys2/msys2-installer/releases/download/2025-02-21/msys2-x86_64-20250221.exe",
-                "img/png/MSYS2.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "Mem Reduct",
                 "https://memreduct.org/files/memreduct-3.5.2-setup.exe",
@@ -371,11 +628,6 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/microsoft/TypeScript/releases/download/v5.8.3/typescript-5.8.3.tgz",
                 ""));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "peazip",
-                "https://ghproxy.net/https://github.com/peazip/PeaZip/releases/download/10.4.0/peazip-10.4.0.WIN64.exe",
-                "img/jpg/peazip.jpg"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "Gimp",
                 "https://mirror.nju.edu.cn/gimp/gimp/v3.0/windows/gimp-3.0.4-setup.exe",
@@ -625,21 +877,6 @@ namespace AppStore
                 "Ditto",
                 "https://ghproxy.net/https://github.com/sabrogden/Ditto/releases/download/3.24.246.0/DittoSetup_64bit_3_24_246_0.exe",
                 "img/png/Ditto.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "XDM",
-                "https://github.com/subhra74/xdm/releases/download/7.2.11/xdm-setup.msi",
-                "img/png/XDM.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "FDM",
-                "https://files2.freedownloadmanager.org/6/latest/fdm_x64_setup.exe",
-                "img/png/FDM.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "ABDM",
-                "https://ghproxy.net/https://github.com/amir1376/ab-download-manager/releases/download/v1.6.4/ABDownloadManager_1.6.4_windows_x64.exe",
-                "img/png/ABDM.png"));
         }
 
         private FlowLayoutPanel downloadsFlowPanel = new FlowLayoutPanel();

SettingsForm.cs

@@ -5,21 +5,24 @@ using System.Windows.Forms;
 
 namespace AppStore
 {
-    public class SettingsForm : Form
+    public class SettingsUserControl : UserControl
     {
         private Button btnCleanLogs;
 
-        public SettingsForm()
+        public SettingsUserControl()
         {
-            this.Text = "设置";
-            this.Size = new Size(400, 300);
-            this.StartPosition = FormStartPosition.CenterParent;
+            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(120, 100);
+            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);
         }

del.bat

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

log_cleaner.cpp

@@ -9,7 +9,23 @@ int main() {
         auto start = std::chrono::high_resolution_clock::now();
         
         // 定义日志目录路径
-        fs::path logDir = "logs";
+        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;
 

logger.cs

@@ -1,13 +1,19 @@
 using System;
 using System.IO;
 using System.Text;
+
 namespace AppStore
 {
     public static class Logger
     {
-        private static readonly string LogsDirectory = "logs";
+        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))
@@ -15,6 +21,13 @@ namespace AppStore
                     Directory.CreateDirectory(LogsDirectory);
                 }
             }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"无法创建日志目录: {LogsDirectory}, 错误: {ex.Message}");
+                throw;
+            }
+        }
+
         public static void Log(string message)
         {
             lock (LockObject)
@@ -23,6 +36,7 @@ namespace AppStore
                 {
                     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}");
@@ -35,6 +49,7 @@ namespace AppStore
                 }
             }
         }
+
         public static void LogError(string message, Exception? ex = null)
         {
             string errorMessage = $"ERROR: {message}";