diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/SystemBackdrop.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/SystemBackdrop.cs index 6bcfb048..7accfb62 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/SystemBackdrop.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/SystemBackdrop.cs @@ -41,15 +41,6 @@ internal sealed class SystemBackdrop appOptions.PropertyChanged += OnOptionsPropertyChanged; } - private void OnOptionsPropertyChanged(object? sender, PropertyChangedEventArgs e) - { - if (e.PropertyName == nameof(AppOptions.BackdropType)) - { - type = ((AppOptions)sender!).BackdropType; - Update(); - } - } - /// /// 尝试设置背景 /// @@ -106,6 +97,15 @@ internal sealed class SystemBackdrop } } + private void OnOptionsPropertyChanged(object? sender, PropertyChangedEventArgs e) + { + if (e.PropertyName == nameof(AppOptions.BackdropType)) + { + type = ((AppOptions)sender!).BackdropType; + Update(); + } + } + private void OnWindowActivated(object sender, WindowActivatedEventArgs args) { configuration!.IsInputActive = args.WindowActivationState != WindowActivationState.Deactivated; diff --git a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest index 97bf087f..543356e2 100644 --- a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest +++ b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest @@ -12,7 +12,7 @@ + Version="1.6.2.0" /> Snap Hutao diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs index b0cddecb..569a8e5f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs @@ -15,6 +15,7 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions /// 用户名 @@ -36,6 +37,11 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions public bool IsLoggedIn { get => isLoggedIn; set => SetProperty(ref isLoggedIn, value); } + /// + /// 胡桃云服务是否可用 + /// + public bool IsCloudServiceAllowed { get => isHutaoCloudServiceAllowed; set => SetProperty(ref isHutaoCloudServiceAllowed, value); } + /// public HutaoUserOptions Value { get => this; } diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs index f86e7a5a..38648cfe 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs @@ -30,10 +30,7 @@ internal sealed class HutaoUserService : IHutaoUserService, IHutaoUserServiceIni this.options = options; } - /// - /// 异步初始化 - /// - /// 任务 + /// public async ValueTask InitializeAsync() { await initializeCompletionSource.Task.ConfigureAwait(false); diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoUserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoUserService.cs index 87c42535..da497111 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoUserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoUserService.cs @@ -8,4 +8,9 @@ namespace Snap.Hutao.Service.Hutao; /// internal interface IHutaoUserService : ICastableService { + /// + /// 异步初始化 + /// + /// 任务 + ValueTask InitializeAsync(); } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml index fb5ce6fc..5d354213 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml @@ -283,36 +283,38 @@ - - -