From 0cd6bf95a99a52e433ed0366d1b5c85ce8d4cd20 Mon Sep 17 00:00:00 2001 From: x3zF Love U Date: Wed, 15 Mar 2023 19:12:41 +0800 Subject: [PATCH] change the field name of 'EnabledAdvanced' --- .../Snap.Hutao/Model/Entity/SettingEntry.cs | 2 +- .../Resource/Localization/SH.Designer.cs | 8 ++++---- .../Snap.Hutao/Resource/Localization/SH.resx | 4 ++-- .../Snap.Hutao/Service/AppOptions.cs | 18 +++++++++--------- .../Snap.Hutao/Service/Game/GameService.cs | 2 +- .../Snap.Hutao/View/Page/LaunchGamePage.xaml | 6 +++--- .../Snap.Hutao/View/Page/SettingPage.xaml | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs index ae6b3da4..b57a6458 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs @@ -34,7 +34,7 @@ internal sealed class SettingEntry /// /// 启用高级功能 /// - public const string EnabledAdvanced = "EnabledAdvanced"; + public const string IsAdvancedLaunchOptionsEnabled = "IsAdvancedLaunchOptionsEnabled"; /// /// 实时便笺刷新时间 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index a86854c6..baecfbb4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -4203,18 +4203,18 @@ namespace Snap.Hutao.Resource.Localization { /// /// 查找类似 在完整阅读原神和胡桃工具箱用户协议后，我选择启用「启动游戏-高级功能」 的本地化字符串。 /// - internal static string ViewPageSettingEnabledAdvancedDescription { + internal static string ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription { get { - return ResourceManager.GetString("ViewPageSettingEnabledAdvancedDescription", resourceCulture); + return ResourceManager.GetString("ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription", resourceCulture); } } /// /// 查找类似 启动高级功能 的本地化字符串。 /// - internal static string ViewPageSettingEnabledAdvancedHeader { + internal static string ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader { get { - return ResourceManager.GetString("ViewPageSettingEnabledAdvancedHeader", resourceCulture); + return ResourceManager.GetString("ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader", resourceCulture); } } diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index e4d44c19..16e664c4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1497,10 +1497,10 @@ 显示 - + 在完整阅读原神和胡桃工具箱用户协议后，我选择启用「启动游戏-高级功能」 - + 启动高级功能 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs index 4e69b0ac..5632a210 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs @@ -25,7 +25,7 @@ internal sealed class AppOptions : ObservableObject, IOptions private bool? isEmptyHistoryWishVisible; private Core.Windowing.BackdropType? backdropType; private CultureInfo? currentCulture; - private bool? enabledAdvanced; + private bool? isAdvancedLaunchOptionsEnabled; /// /// 构造一个新的应用程序选项 @@ -176,32 +176,32 @@ internal sealed class AppOptions : ObservableObject, IOptions /// /// 是否启用高级功能 /// - public bool EnabledAdvanced + public bool IsAdvancedLaunchOptionsEnabled { get { - if (enabledAdvanced == null) + if (isAdvancedLaunchOptionsEnabled == null) { using (IServiceScope scope = serviceScopeFactory.CreateScope()) { AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService(); - string? value = appDbContext.Settings.SingleOrDefault(e => e.Key == SettingEntry.EnabledAdvanced)?.Value; - _ = Activation.GetElevated() == true ? enabledAdvanced = value != null && bool.Parse(value) : enabledAdvanced = false; + string? value = appDbContext.Settings.SingleOrDefault(e => e.Key == SettingEntry.IsAdvancedLaunchOptionsEnabled)?.Value; + _ = Activation.GetElevated() == true ? isAdvancedLaunchOptionsEnabled = value != null && bool.Parse(value) : IsAdvancedLaunchOptionsEnabled = false; } } - return enabledAdvanced.Value; + return isAdvancedLaunchOptionsEnabled.Value; } set { - if (SetProperty(ref enabledAdvanced, value)) + if (SetProperty(ref isAdvancedLaunchOptionsEnabled, value)) { using (IServiceScope scope = serviceScopeFactory.CreateScope()) { AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService(); - appDbContext.Settings.ExecuteDeleteWhere(e => e.Key == SettingEntry.EnabledAdvanced); - appDbContext.Settings.AddAndSave(new(SettingEntry.EnabledAdvanced, value.ToString())); + appDbContext.Settings.ExecuteDeleteWhere(e => e.Key == SettingEntry.IsAdvancedLaunchOptionsEnabled); + appDbContext.Settings.AddAndSave(new(SettingEntry.IsAdvancedLaunchOptionsEnabled, value.ToString())); } } } diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs index a8b1affe..8dfa7c1b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs @@ -301,7 +301,7 @@ internal sealed class GameService : IGameService try { Interlocked.Increment(ref runningGamesCounter); - bool isPassCheck = Activation.GetElevated() == appOptions.EnabledAdvanced ? true : false; + bool isPassCheck = Activation.GetElevated() == appOptions.IsAdvancedLaunchOptionsEnabled ? true : false; game.Start(); diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml index af0e8b08..2c285939 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml @@ -251,16 +251,16 @@ - +