From 0b9d0fbcdd2f7e101e68c3f8307f3a081d5f6763 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Thu, 7 Aug 2025 22:03:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=BC=8F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Models/ResourceUpdater.cs | 25 ++++++++++--------- .../ViewModels/UI/VersionUpdateViewModel.cs | 25 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/MaaWpfGui/Models/ResourceUpdater.cs b/src/MaaWpfGui/Models/ResourceUpdater.cs index 2d633bdbf4..d7fcb40645 100644 --- a/src/MaaWpfGui/Models/ResourceUpdater.cs +++ b/src/MaaWpfGui/Models/ResourceUpdater.cs @@ -19,6 +19,7 @@ using System.IO.Compression; using System.Net.Http; using System.Threading.Tasks; using MaaWpfGui.Constants; +using MaaWpfGui.Constants.Enums; using MaaWpfGui.Extensions; using MaaWpfGui.Helper; using MaaWpfGui.Utilities; @@ -169,30 +170,30 @@ namespace MaaWpfGui.Models return (CheckUpdateRetT.UnknownError, null, null); } - var errorCode = data["code"]?.ToObject() ?? Enums.MirrorChyanErrorCode.Undivided; - if (errorCode != Enums.MirrorChyanErrorCode.Success) + var errorCode = data["code"]?.ToObject() ?? MirrorChyanErrorCode.Undivided; + if (errorCode != MirrorChyanErrorCode.Success) { switch (errorCode) { - case Enums.MirrorChyanErrorCode.KeyExpired: + case MirrorChyanErrorCode.KeyExpired: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkExpired")); break; - case Enums.MirrorChyanErrorCode.KeyInvalid: + case MirrorChyanErrorCode.KeyInvalid: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkInvalid")); AchievementTrackerHelper.Instance.Unlock(AchievementIds.MirrorChyanCdkError); break; - case Enums.MirrorChyanErrorCode.ResourceQuotaExhausted: + case MirrorChyanErrorCode.ResourceQuotaExhausted: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkQuotaExhausted")); break; - case Enums.MirrorChyanErrorCode.KeyMismatched: + case MirrorChyanErrorCode.KeyMismatched: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkMismatched")); break; - case Enums.MirrorChyanErrorCode.InvalidParams: - case Enums.MirrorChyanErrorCode.ResourceNotFound: - case Enums.MirrorChyanErrorCode.InvalidOs: - case Enums.MirrorChyanErrorCode.InvalidArch: - case Enums.MirrorChyanErrorCode.InvalidChannel: - case Enums.MirrorChyanErrorCode.Undivided: + case MirrorChyanErrorCode.InvalidParams: + case MirrorChyanErrorCode.ResourceNotFound: + case MirrorChyanErrorCode.InvalidOs: + case MirrorChyanErrorCode.InvalidArch: + case MirrorChyanErrorCode.InvalidChannel: + case MirrorChyanErrorCode.Undivided: ToastNotification.ShowDirect(data["msg"]?.ToString() ?? LocalizationHelper.GetString("GameResourceFailed")); break; } diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs index 98844b46bd..d147bff109 100644 --- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs @@ -25,6 +25,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows; using MaaWpfGui.Constants; +using MaaWpfGui.Constants.Enums; using MaaWpfGui.Extensions; using MaaWpfGui.Helper; using MaaWpfGui.Main; @@ -1018,30 +1019,30 @@ public class VersionUpdateViewModel : Screen return CheckUpdateRetT.UnknownError; } - var errorCode = data["code"]?.ToObject() ?? Enums.MirrorChyanErrorCode.Undivided; - if (errorCode != Enums.MirrorChyanErrorCode.Success) + var errorCode = data["code"]?.ToObject() ?? MirrorChyanErrorCode.Undivided; + if (errorCode != MirrorChyanErrorCode.Success) { switch (errorCode) { - case Enums.MirrorChyanErrorCode.KeyExpired: + case MirrorChyanErrorCode.KeyExpired: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkExpired")); break; - case Enums.MirrorChyanErrorCode.KeyInvalid: + case MirrorChyanErrorCode.KeyInvalid: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkInvalid")); AchievementTrackerHelper.Instance.Unlock(AchievementIds.MirrorChyanCdkError); break; - case Enums.MirrorChyanErrorCode.ResourceQuotaExhausted: + case MirrorChyanErrorCode.ResourceQuotaExhausted: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkQuotaExhausted")); break; - case Enums.MirrorChyanErrorCode.KeyMismatched: + case MirrorChyanErrorCode.KeyMismatched: ToastNotification.ShowDirect(LocalizationHelper.GetString("MirrorChyanCdkMismatched")); break; - case Enums.MirrorChyanErrorCode.InvalidParams: - case Enums.MirrorChyanErrorCode.ResourceNotFound: - case Enums.MirrorChyanErrorCode.InvalidOs: - case Enums.MirrorChyanErrorCode.InvalidArch: - case Enums.MirrorChyanErrorCode.InvalidChannel: - case Enums.MirrorChyanErrorCode.Undivided: + case MirrorChyanErrorCode.InvalidParams: + case MirrorChyanErrorCode.ResourceNotFound: + case MirrorChyanErrorCode.InvalidOs: + case MirrorChyanErrorCode.InvalidArch: + case MirrorChyanErrorCode.InvalidChannel: + case MirrorChyanErrorCode.Undivided: ToastNotification.ShowDirect(data["msg"]?.ToString() ?? LocalizationHelper.GetString("GameResourceFailed")); break; }