fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

rft: rename VersionUpdateDataContext to VersionUpdateSettings

Browse Source
This commit is contained in:
status102
2024-11-18 16:59:52 +08:00
parent 12bfe03c58
commit 37bf2841b4
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Models/ResourceUpdater.cs
View File

@@ -232,7 +232,7 @@ namespace MaaWpfGui.Models
OutputDownloadProgress(LocalizationHelper.GetString("GameResourceUpdated"));
// 现在用的和自动安装服更新包一个逻辑，看看有没有必要分开
if (SettingsViewModel.VersionUpdateDataContext.AutoInstallUpdatePackage)
if (SettingsViewModel.VersionUpdateSettings.AutoInstallUpdatePackage)
{
await Bootstrapper.RestartAfterIdleAsync();
}

4
src/MaaWpfGui/Services/Web/HttpService.cs
View File

@@ -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}";
}
}

2
src/MaaWpfGui/ViewModels/UI/RootViewModel.cs
View File

@@ -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"));
}

24
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -110,7 +110,7 @@ namespace MaaWpfGui.ViewModels.UI
/// <summary>
/// Gets 软件更新model
/// </summary>
public static VersionUpdateSettingsUserControlModel VersionUpdateDataContext { get; } = new();
public static VersionUpdateSettingsUserControlModel VersionUpdateSettings { get; } = new();
/// <summary>
/// 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;
}
/// <summary>
@@ -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}";

6
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -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;

14
src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
View File

@@ -447,11 +447,11 @@ public class VersionUpdateViewModel : Screen
public async Task<CheckUpdateRetT> 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();

2
src/MaaWpfGui/ViewModels/UserControl/Settings/StartSettingsUserControlModel.cs
View File

@@ -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();

2
src/MaaWpfGui/Views/UI/SettingsView.xaml
View File

@@ -93,7 +93,7 @@
<settingsViews:VersionUpdateSettingsUserControl
Margin="0,20"
HorizontalAlignment="Center"
DataContext="{Binding VersionUpdateDataContext}" />
DataContext="{Binding VersionUpdateSettings}" />
<hc:Divider Content="{Binding ListTitle[11]}" />
<userControl:AboutUserControl Margin="0,20" HorizontalAlignment="Center" />

2
src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml.cs
View File

@@ -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)