From 1e3d5f28bd89d33725ff1790acd51fbfba7148b9 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Mon, 17 Feb 2025 16:30:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20StartupUpdateCheck=20=E4=B8=8D=E7=94=9F?=
=?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/MaaWpfGui/Constants/ConfigurationKeys.cs | 2 +-
src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 2 +-
src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs | 5 +++++
.../Settings/VersionUpdateSettingsUserControlModel.cs | 10 +++++-----
.../Settings/VersionUpdateSettingsUserControl.xaml | 2 +-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/MaaWpfGui/Constants/ConfigurationKeys.cs b/src/MaaWpfGui/Constants/ConfigurationKeys.cs
index 811a8b8dae..678bb72338 100644
--- a/src/MaaWpfGui/Constants/ConfigurationKeys.cs
+++ b/src/MaaWpfGui/Constants/ConfigurationKeys.cs
@@ -200,7 +200,7 @@ namespace MaaWpfGui.Constants
// MirrorChyanCdk 迁到新配置的话就直接叫 UpdateSource,现在本体更新也加上了 MirrorChyan
public const string UpdateSource = "VersionUpdate.ResourceUpdateSource";
public const string MirrorChyanCdk = "VersionUpdate.ResourceUpdateSource.MirrorChyanCdk";
- public const string UpdateCheck = "VersionUpdate.UpdateCheck";
+ public const string StartupUpdateCheck = "VersionUpdate.StartupUpdateCheck";
public const string UpdateAutoCheck = "VersionUpdate.ScheduledUpdateCheck";
public const string ResourceApi = "VersionUpdate.ResourceApi";
public const string AllowNightlyUpdates = "VersionUpdate.AllowNightlyUpdates";
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 5bdf14e205..f3fe905e34 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -222,7 +222,7 @@
该选项仅生效一次
该选项右键选中时仅生效一次
该选项不会自动导航至对应关卡
- 自动检查更新
+ 启动时检查更新
定时检查更新
自动下载更新包
自动安装更新包
diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
index 0bbb41d0f0..17f2bda8cf 100644
--- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
@@ -474,6 +474,11 @@ public class VersionUpdateViewModel : Screen
}
else
{
+ if (!SettingsViewModel.VersionUpdateSettings.StartupUpdateCheck)
+ {
+ return;
+ }
+
if (!IsDebugVersion())
{
var ret = await CheckAndDownloadVersionUpdate();
diff --git a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
index b6cb9f2e57..71cb1bc13a 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/Settings/VersionUpdateSettingsUserControlModel.cs
@@ -269,18 +269,18 @@ public class VersionUpdateSettingsUserControlModel : PropertyChangedBase
}
}
- private bool _updateCheck = Convert.ToBoolean(ConfigurationHelper.GetGlobalValue(ConfigurationKeys.UpdateCheck, bool.TrueString));
+ private bool _startupUpdateCheck = Convert.ToBoolean(ConfigurationHelper.GetGlobalValue(ConfigurationKeys.StartupUpdateCheck, bool.TrueString));
///
/// Gets or sets a value indicating whether to check update.
///
- public bool UpdateCheck
+ public bool StartupUpdateCheck
{
- get => _updateCheck;
+ get => _startupUpdateCheck;
set
{
- SetAndNotify(ref _updateCheck, value);
- ConfigurationHelper.SetGlobalValue(ConfigurationKeys.UpdateCheck, value.ToString());
+ SetAndNotify(ref _startupUpdateCheck, value);
+ ConfigurationHelper.SetGlobalValue(ConfigurationKeys.StartupUpdateCheck, value.ToString());
}
}
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
index be760b0474..d12de49ca7 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
@@ -43,7 +43,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="{DynamicResource StartupUpdateCheck}"
- IsChecked="{Binding UpdateCheck}"
+ IsChecked="{Binding StartupUpdateCheck}"
IsEnabled="False" />