From 29fcd2758586163d2e9ead1122135d1ec3d528d4 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Thu, 9 Mar 2023 08:30:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20x64=20=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=20arm64=20=E7=9A=84=20ota=20=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Main/VersionUpdateViewModel.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs index 344a11850c..ea581cb400 100644 --- a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs +++ b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs @@ -155,6 +155,16 @@ namespace MaaWpfGui } } + /// + /// Gets the OS architecture. + /// + public static string OSArchitecture => RuntimeInformation.OSArchitecture.ToString().ToLower(); + + /// + /// Gets a value indicating whether the OS is arm. + /// + public static bool IsArm => OSArchitecture.StartsWith("arm"); + private const string RequestUrl = "repos/MaaAssistantArknights/MaaRelease/releases"; private const string StableRequestUrl = "repos/MaaAssistantArknights/MaaAssistantArknights/releases/latest"; private const string MaaReleaseRequestUrlByTag = "repos/MaaAssistantArknights/MaaRelease/releases/tags/"; @@ -641,7 +651,14 @@ namespace MaaWpfGui if (name.Contains("ota") && name.Contains("win") && name.Contains($"{_curVersion}_{_latestVersion}")) { _assetsObject = curAssets as JObject; - break; + if (IsArm ^ name.Contains("arm")) + { + continue; // 兼容旧版本，以前 ota 不区分指令集架构 + } + else + { + break; + } } }