diff --git a/src/MaaWpfGui/Models/ResourceUpdater.cs b/src/MaaWpfGui/Models/ResourceUpdater.cs index d6ed710236..bed86ee18f 100644 --- a/src/MaaWpfGui/Models/ResourceUpdater.cs +++ b/src/MaaWpfGui/Models/ResourceUpdater.cs @@ -232,7 +232,7 @@ namespace MaaWpfGui.Models OutputDownloadProgress(LocalizationHelper.GetString("GameResourceUpdated")); // 现在用的和自动安装服更新包一个逻辑，看看有没有必要分开 - if (SettingsViewModel.VersionUpdateDataContext.AutoInstallUpdatePackage) + if (SettingsViewModel.VersionUpdateSettings.AutoInstallUpdatePackage) { await Bootstrapper.RestartAfterIdleAsync(); } diff --git a/src/MaaWpfGui/Services/Web/HttpService.cs b/src/MaaWpfGui/Services/Web/HttpService.cs index 74d51651d2..c95d2069e0 100755 --- a/src/MaaWpfGui/Services/Web/HttpService.cs +++ b/src/MaaWpfGui/Services/Web/HttpService.cs @@ -37,13 +37,13 @@ namespace MaaWpfGui.Services.Web { get { - var proxy = SettingsViewModel.VersionUpdateDataContext.Proxy; + var proxy = SettingsViewModel.VersionUpdateSettings.Proxy; if (string.IsNullOrEmpty(proxy)) { return string.Empty; } - return proxy.Contains("://") ? proxy : SettingsViewModel.VersionUpdateDataContext.ProxyType + $"://{proxy}"; + return proxy.Contains("://") ? proxy : SettingsViewModel.VersionUpdateSettings.ProxyType + $"://{proxy}"; } } diff --git a/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs b/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs index 7a94941283..b9bd0394d9 100644 --- a/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs @@ -42,7 +42,7 @@ namespace MaaWpfGui.ViewModels.UI InitViewModels(); InitProxy(); - if (SettingsViewModel.VersionUpdateDataContext.UpdateNightly && !SettingsViewModel.VersionUpdateDataContext.HasAcknowledgedNightlyWarning) + if (SettingsViewModel.VersionUpdateSettings.UpdateNightly && !SettingsViewModel.VersionUpdateSettings.HasAcknowledgedNightlyWarning) { MessageBoxHelper.Show(LocalizationHelper.GetString("NightlyWarning")); } diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index baedce9b04..de22e18362 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -110,7 +110,7 @@ namespace MaaWpfGui.ViewModels.UI /// /// Gets 软件更新model /// - public static VersionUpdateSettingsUserControlModel VersionUpdateDataContext { get; } = new(); + public static VersionUpdateSettingsUserControlModel VersionUpdateSettings { get; } = new(); /// /// Gets 外部通知model @@ -278,9 +278,9 @@ namespace MaaWpfGui.ViewModels.UI private void InitVersionUpdate() { - if (VersionUpdateDataContext.VersionType == VersionUpdateSettingsUserControlModel.UpdateVersionType.Nightly && !VersionUpdateDataContext.AllowNightlyUpdates) + if (VersionUpdateSettings.VersionType == VersionUpdateSettingsUserControlModel.UpdateVersionType.Nightly && !VersionUpdateSettings.AllowNightlyUpdates) { - VersionUpdateDataContext.VersionType = VersionUpdateSettingsUserControlModel.UpdateVersionType.Beta; + VersionUpdateSettings.VersionType = VersionUpdateSettingsUserControlModel.UpdateVersionType.Beta; } } @@ -544,9 +544,9 @@ namespace MaaWpfGui.ViewModels.UI { SetAndNotify(ref _clientType, value); ConfigurationHelper.SetValue(ConfigurationKeys.ClientType, value); - VersionUpdateDataContext.ResourceInfo = VersionUpdateSettingsUserControlModel.GetResourceVersionByClientType(_clientType); - VersionUpdateDataContext.ResourceVersion = VersionUpdateDataContext.ResourceInfo.VersionName; - VersionUpdateDataContext.ResourceDateTime = VersionUpdateDataContext.ResourceInfo.DateTime; + VersionUpdateSettings.ResourceInfo = VersionUpdateSettingsUserControlModel.GetResourceVersionByClientType(_clientType); + VersionUpdateSettings.ResourceVersion = VersionUpdateSettings.ResourceInfo.VersionName; + VersionUpdateSettings.ResourceDateTime = VersionUpdateSettings.ResourceInfo.DateTime; Instances.SettingsViewModel.UpdateWindowTitle(); // 每次修改客户端时更新WindowTitle Instances.TaskQueueViewModel.UpdateStageList(); Instances.TaskQueueViewModel.UpdateDatePrompt(); @@ -3389,7 +3389,7 @@ namespace MaaWpfGui.ViewModels.UI // ReSharper disable once UnusedMember.Global public void SetAcknowledgedNightlyWarning() { - VersionUpdateDataContext.HasAcknowledgedNightlyWarning = true; + VersionUpdateSettings.HasAcknowledgedNightlyWarning = true; } /// @@ -3440,13 +3440,13 @@ namespace MaaWpfGui.ViewModels.UI } } - string resourceVersion = !string.IsNullOrEmpty(VersionUpdateDataContext.ResourceVersion) + string resourceVersion = !string.IsNullOrEmpty(VersionUpdateSettings.ResourceVersion) ? LocalizationHelper.CustomCultureInfo.Name.ToLowerInvariant() switch { - "zh-cn" => $" - {VersionUpdateDataContext.ResourceVersion}{VersionUpdateDataContext.ResourceDateTime:#MMdd}", - "zh-tw" => $" - {VersionUpdateDataContext.ResourceVersion}{VersionUpdateDataContext.ResourceDateTime:#MMdd}", - "en-us" => $" - {VersionUpdateDataContext.ResourceDateTime:dd/MM} {VersionUpdateDataContext.ResourceVersion}", - _ => $" - {VersionUpdateDataContext.ResourceDateTime.ToString(LocalizationHelper.CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {VersionUpdateDataContext.ResourceVersion}", + "zh-cn" => $" - {VersionUpdateSettings.ResourceVersion}{VersionUpdateSettings.ResourceDateTime:#MMdd}", + "zh-tw" => $" - {VersionUpdateSettings.ResourceVersion}{VersionUpdateSettings.ResourceDateTime:#MMdd}", + "en-us" => $" - {VersionUpdateSettings.ResourceDateTime:dd/MM} {VersionUpdateSettings.ResourceVersion}", + _ => $" - {VersionUpdateSettings.ResourceDateTime.ToString(LocalizationHelper.CustomCultureInfo.DateTimeFormat.ShortDatePattern.Replace("yyyy", string.Empty).Trim('/', '.'))} {VersionUpdateSettings.ResourceVersion}", } : string.Empty; rvm.WindowTitle = $"{prefix}MAA{currentConfiguration} - {VersionUpdateSettingsUserControlModel.CoreVersion}{resourceVersion}{connectConfigName}{connectAddress}{clientName}"; diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 5d16ec0353..9f829a1a43 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -410,7 +410,7 @@ namespace MaaWpfGui.ViewModels.UI return; } - if (!SettingsViewModel.VersionUpdateDataContext.UpdateAutoCheck) + if (!SettingsViewModel.VersionUpdateSettings.UpdateAutoCheck) { return; } @@ -420,7 +420,7 @@ namespace MaaWpfGui.ViewModels.UI _ = Task.Run(async () => { await Task.Delay(delayTime); - await SettingsViewModel.VersionUpdateDataContext.ManualUpdate(); + await SettingsViewModel.VersionUpdateSettings.ManualUpdate(); _isCheckingForUpdates = false; }); } @@ -1173,7 +1173,7 @@ namespace MaaWpfGui.ViewModels.UI ClearLog(); var buildDateTimeLong = VersionUpdateSettingsUserControlModel.BuildDateTimeCurrentCultureString; - var resourceDateTimeLong = SettingsViewModel.VersionUpdateDataContext.ResourceDateTimeCurrentCultureString; + var resourceDateTimeLong = SettingsViewModel.VersionUpdateSettings.ResourceDateTimeCurrentCultureString; AddLog($"Build Time:\n{buildDateTimeLong}\nResource Time:\n{resourceDateTimeLong}"); var uiVersion = VersionUpdateSettingsUserControlModel.UiVersion; diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs index 35940a1514..f062195dcd 100644 --- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs @@ -447,11 +447,11 @@ public class VersionUpdateViewModel : Screen public async Task CheckAndDownloadUpdate() { - SettingsViewModel.VersionUpdateDataContext.IsCheckingForUpdates = true; + SettingsViewModel.VersionUpdateSettings.IsCheckingForUpdates = true; var ret = await CheckAndDownloadVersionUpdate(); if (ret == CheckUpdateRetT.OK) { - SettingsViewModel.VersionUpdateDataContext.IsCheckingForUpdates = false; + SettingsViewModel.VersionUpdateSettings.IsCheckingForUpdates = false; return ret; } @@ -465,7 +465,7 @@ public class VersionUpdateViewModel : Screen } */ - SettingsViewModel.VersionUpdateDataContext.IsCheckingForUpdates = false; + SettingsViewModel.VersionUpdateSettings.IsCheckingForUpdates = false; return ret; } @@ -507,7 +507,7 @@ public class VersionUpdateViewModel : Screen UpdateUrl = _latestJson?["html_url"]?.ToString() ?? string.Empty; bool otaFound = _assetsObject != null; - bool goDownload = otaFound && SettingsViewModel.VersionUpdateDataContext.AutoDownloadUpdatePackage; + bool goDownload = otaFound && SettingsViewModel.VersionUpdateSettings.AutoDownloadUpdatePackage; (string text, Action action) = ( LocalizationHelper.GetString("NewVersionFoundButtonGoWebpage"), () => @@ -672,7 +672,7 @@ public class VersionUpdateViewModel : Screen public async void AskToRestart() { - if (SettingsViewModel.VersionUpdateDataContext.AutoInstallUpdatePackage) + if (SettingsViewModel.VersionUpdateSettings.AutoInstallUpdatePackage) { await Bootstrapper.RestartAfterIdleAsync(); return; @@ -731,12 +731,12 @@ public class VersionUpdateViewModel : Screen string? latestVersion; string? detailUrl; - if (SettingsViewModel.VersionUpdateDataContext.UpdateNightly) + if (SettingsViewModel.VersionUpdateSettings.UpdateNightly) { latestVersion = json["alpha"]?["version"]?.ToString(); detailUrl = json["alpha"]?["detail"]?.ToString(); } - else if (SettingsViewModel.VersionUpdateDataContext.UpdateBeta) + else if (SettingsViewModel.VersionUpdateSettings.UpdateBeta) { latestVersion = json["beta"]?["version"]?.ToString(); detailUrl = json["beta"]?["detail"]?.ToString(); diff --git a/src/MaaWpfGui/ViewModels/UserControl/Settings/StartSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/Settings/StartSettingsUserControlModel.cs index fc07f5800b..425af3b5e6 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/Settings/StartSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/Settings/StartSettingsUserControlModel.cs @@ -45,7 +45,7 @@ public class StartSettingsUserControlModel : PropertyChangedBase private static ConnectSettingsUserControlModel ConnectSettings => SettingsViewModel.ConnectSettings; - private static VersionUpdateSettingsUserControlModel VersionUpdateSettings => SettingsViewModel.VersionUpdateDataContext; + private static VersionUpdateSettingsUserControlModel VersionUpdateSettings => SettingsViewModel.VersionUpdateSettings; private bool _startSelf = AutoStart.CheckStart(); diff --git a/src/MaaWpfGui/Views/UI/SettingsView.xaml b/src/MaaWpfGui/Views/UI/SettingsView.xaml index 9bc04ab91e..8890904cba 100644 --- a/src/MaaWpfGui/Views/UI/SettingsView.xaml +++ b/src/MaaWpfGui/Views/UI/SettingsView.xaml @@ -93,7 +93,7 @@ + DataContext="{Binding VersionUpdateSettings}" /> diff --git a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml.cs index 33d7cfe505..916b45727b 100644 --- a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml.cs @@ -68,7 +68,7 @@ namespace MaaWpfGui.Views.UserControl.Settings private void ResourceVersionClick(object sender, MouseButtonEventArgs e) { - CopyToClipboardAsync($"Resource Version: {SettingsViewModel.VersionUpdateDataContext.ResourceVersion}\nResource Time: {SettingsViewModel.VersionUpdateDataContext.ResourceDateTimeCurrentCultureString}"); + CopyToClipboardAsync($"Resource Version: {SettingsViewModel.VersionUpdateSettings.ResourceVersion}\nResource Time: {SettingsViewModel.VersionUpdateSettings.ResourceDateTimeCurrentCultureString}"); } private static void CopyToClipboardAsync(string text)