From ba42a1e6c9c003f53b3546b92d4dba0cbf8de707 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Sat, 26 Jul 2025 12:02:58 +0800 Subject: [PATCH] =?UTF-8?q?improve:=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/Helpers/AutoUpdateHelper.cs | 48 ++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/Ink Canvas/Helpers/AutoUpdateHelper.cs b/Ink Canvas/Helpers/AutoUpdateHelper.cs index c01e4dd4..9999c75a 100644 --- a/Ink Canvas/Helpers/AutoUpdateHelper.cs +++ b/Ink Canvas/Helpers/AutoUpdateHelper.cs @@ -62,6 +62,11 @@ namespace Ink_Canvas.Helpers { GroupName = "智教联盟", DownloadUrlFormat = "https://get.smart-teach.cn/d/Ningbo-S3/shared/jiangling/community/InkCanvasForClass.CE.{0}.zip", + }, + new UpdateLineGroup + { + GroupName = "inkeys", + DownloadUrlFormat = "https://iccce.inkeys.top/Release/InkCanvasForClass.CE.{0}.zip", } } }, @@ -92,6 +97,11 @@ namespace Ink_Canvas.Helpers { GroupName = "智教联盟", DownloadUrlFormat = "https://get.smart-teach.cn/d/Ningbo-S3/shared/jiangling/community-beta/InkCanvasForClass.CE.{0}.zip", + }, + new UpdateLineGroup + { + GroupName = "inkeys", + DownloadUrlFormat = "https://iccce.inkeys.top/Beta/InkCanvasForClass.CE.{0}.zip", } } } @@ -169,10 +179,10 @@ namespace Ink_Canvas.Helpers foreach (var group in groups) { - // 跳过“智教联盟”线路组,不参与延迟检测和排序 - if (group.GroupName == "智教联盟") + // 跳过"智教联盟"和"inkeys"线路组,不参与延迟检测和排序 + if (group.GroupName == "智教联盟" || group.GroupName == "inkeys") { - LogHelper.WriteLogToFile($"AutoUpdate | 跳过智教联盟线路组延迟检测"); + LogHelper.WriteLogToFile($"AutoUpdate | 跳过{group.GroupName}线路组延迟检测"); continue; } LogHelper.WriteLogToFile($"AutoUpdate | 检测线路组: {group.GroupName} ({group.VersionUrl})"); @@ -194,7 +204,7 @@ namespace Ink_Canvas.Helpers .Select(x => x.group) .ToList(); - // 将“智教联盟”线路组插入到最前面(如果存在) + // 将"智教联盟"线路组插入到最前面(如果存在) var zhiJiaoGroup = groups.FirstOrDefault(g => g.GroupName == "智教联盟"); if (zhiJiaoGroup != null) { @@ -202,6 +212,14 @@ namespace Ink_Canvas.Helpers LogHelper.WriteLogToFile($"AutoUpdate | 智教联盟线路组已插入到首位"); } + // 将"inkeys"线路组插入到第二位(如果存在) + var inkeysGroup = groups.FirstOrDefault(g => g.GroupName == "inkeys"); + if (inkeysGroup != null) + { + orderedGroups.Insert(1, inkeysGroup); + LogHelper.WriteLogToFile($"AutoUpdate | inkeys线路组已插入到第二位"); + } + if (orderedGroups.Count > 0) { LogHelper.WriteLogToFile($"AutoUpdate | 找到 {orderedGroups.Count} 个可用线路组,按延迟排序:"); @@ -547,10 +565,21 @@ namespace Ink_Canvas.Helpers // 优先尝试“智教联盟”线路组 var zhiJiaoGroup = groups.FirstOrDefault(g => g.GroupName == "智教联盟"); - if (zhiJiaoGroup != null) + var inkeysGroup = groups.FirstOrDefault(g => g.GroupName == "inkeys"); + if (zhiJiaoGroup != null || inkeysGroup != null) { - groups = new List { zhiJiaoGroup }.Concat(groups.Where(g => g.GroupName != "智教联盟")).ToList(); - LogHelper.WriteLogToFile($"AutoUpdate | 下载时优先尝试智教联盟线路组"); + var priorityGroups = new List(); + if (zhiJiaoGroup != null) + { + priorityGroups.Add(zhiJiaoGroup); + LogHelper.WriteLogToFile($"AutoUpdate | 下载时优先尝试智教联盟线路组"); + } + if (inkeysGroup != null) + { + priorityGroups.Add(inkeysGroup); + LogHelper.WriteLogToFile($"AutoUpdate | 下载时优先尝试inkeys线路组"); + } + groups = priorityGroups.Concat(groups.Where(g => g.GroupName != "智教联盟" && g.GroupName != "inkeys")).ToList(); } // 依次尝试每个线路组 @@ -571,6 +600,11 @@ namespace Ink_Canvas.Helpers url = realUrl; LogHelper.WriteLogToFile($"AutoUpdate | 智教联盟真实下载地址: {url}"); } + // inkeys线路组直接使用下载地址,无需特殊处理 + else if (group.GroupName == "inkeys") + { + LogHelper.WriteLogToFile($"AutoUpdate | 使用inkeys线路组下载地址: {url}"); + } LogHelper.WriteLogToFile($"AutoUpdate | 尝试从线路组 {group.GroupName} 下载: {url}"); bool downloadSuccess = await DownloadFile(url, zipFilePath, progressCallback);