From a78655662386192f479fbb4d9176111b9969c3e2 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 8 Mar 2025 23:26:37 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=A1=AB=E5=86=99=E5=AE=8Ccdk?=
 =?UTF-8?q?=E5=90=8E=E8=87=AA=E5=8A=A8=E6=A3=80=E6=9F=A5=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/UI/TaskQueueViewModel.cs       |  6 +-----
 .../ViewModels/UI/VersionUpdateViewModel.cs   | 19 +++++++++++++------
 .../VersionUpdateSettingsUserControlModel.cs  |  6 ++++++
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 2285c80380..ff7991d01c 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -469,11 +469,7 @@ namespace MaaWpfGui.ViewModels.UI
             {
                 _logger.Information($"waiting for update check: {delayTime}");
                 await Task.Delay(delayTime);
-                if (await Instances.VersionUpdateViewModel.CheckAndDownloadVersionUpdate() == VersionUpdateViewModel.CheckUpdateRetT.OK)
-                {
-                    _ = Instances.VersionUpdateViewModel.AskToRestart();
-                }
-
+                await Instances.VersionUpdateViewModel.VersionUpdateAndAskToRestartAsync();
                 await ResourceUpdater.ResourceUpdateAndReloadAsync();
 
                 _isCheckingForUpdates = false;
diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
index 85afda972b..650ddcf30c 100644
--- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
@@ -482,12 +482,7 @@ public class VersionUpdateViewModel : Screen
 
             if (!IsDebugVersion())
             {
-                var ret = await CheckAndDownloadVersionUpdate();
-                if (ret == CheckUpdateRetT.OK)
-                {
-                    _ = AskToRestart();
-                }
-
+                await VersionUpdateAndAskToRestartAsync();
                 await ResourceUpdater.ResourceUpdateAndReloadAsync();
             }
             else
@@ -499,6 +494,18 @@ public class VersionUpdateViewModel : Screen
         }
     }
 
+    /// <summary>
+    /// 检查更新并下载更新包，如果成功则提示重启。
+    /// </summary>
+    /// <returns>Task</returns>
+    public async Task VersionUpdateAndAskToRestartAsync()
+    {
+        if (await CheckAndDownloadVersionUpdate() == CheckUpdateRetT.OK)
+        {
+            _ = AskToRestart();
+        }
+    }
+
     /// <summary>
     /// 检查更新，并下载更新包。
     /// </summary>
diff --git a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
index 4a333d52b7..e326c011c2 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
@@ -274,6 +274,12 @@ public class VersionUpdateSettingsUserControlModel : PropertyChangedBase
                 return;
             }
 
+            if (value.Length == 24)
+            {
+                _ = Instances.VersionUpdateViewModel.VersionUpdateAndAskToRestartAsync();
+                _ = ResourceUpdater.ResourceUpdateAndReloadAsync();
+            }
+
             value = SimpleEncryptionHelper.Encrypt(value);
             ConfigurationHelper.SetGlobalValue(ConfigurationKeys.MirrorChyanCdk, value);
         }