From c83db8695f8b6ca8f1cd3d3b02a7347f30ef0576 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Tue, 29 Aug 2023 10:45:53 +0800 Subject: [PATCH] guide complete --- .../Snap.Hutao/Core/LifeCycle/Activation.cs | 2 +- src/Snap.Hutao/Snap.Hutao/MainWindow.xaml | 20 +- src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs | 14 +- .../Message/WelcomeStateCompleteMessage.cs | 12 - .../Resource/Localization/SH.Designer.cs | 45 ++++ .../Snap.Hutao/Resource/Localization/SH.resx | 15 ++ src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj | 6 - .../Snap.Hutao/View/Guide/GuideView.xaml | 224 ++++++++++++------ .../Snap.Hutao/View/Page/SettingPage.xaml | 2 +- .../Snap.Hutao/View/Page/TestPage.xaml | 8 +- .../Snap.Hutao/View/WelcomeView.xaml | 74 ------ .../Snap.Hutao/View/WelcomeView.xaml.cs | 32 --- .../ViewModel/Guide/GuideViewModel.cs | 84 ++++++- .../ViewModel/Guide/WelcomeViewModel.cs | 101 -------- .../Snap.Hutao/ViewModel/SettingViewModel.cs | 2 + .../Snap.Hutao/ViewModel/TestViewModel.cs | 10 +- 16 files changed, 308 insertions(+), 343 deletions(-) delete mode 100644 src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/WelcomeView.xaml delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/WelcomeView.xaml.cs delete mode 100644 src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/WelcomeViewModel.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs index f352e24c..284d7711 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs @@ -150,7 +150,7 @@ internal sealed class Activation : IActivation // Increase launch times LocalSetting.Set(SettingKeys.LaunchTimes, LocalSetting.Get(SettingKeys.LaunchTimes, 0) + 1); - if (true && LocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, (uint)GuideState.Language) < (uint)GuideState.Completed) + if (LocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, (uint)GuideState.Language) < (uint)GuideState.Completed) { await taskContext.SwitchToMainThreadAsync(); serviceProvider.GetRequiredService(); diff --git a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml index 6701fd55..872ad4f9 100644 --- a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml +++ b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml @@ -14,24 +14,6 @@ Height="44" Margin="48,0,0,0"/> - - - - - - - - - True - - - - - - False - - - - + diff --git a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs index a2be57a4..fb7927b9 100644 --- a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs @@ -1,11 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using CommunityToolkit.Mvvm.Messaging; using Microsoft.UI.Xaml; -using Snap.Hutao.Core.Setting; using Snap.Hutao.Core.Windowing; -using Snap.Hutao.Message; using Windows.Foundation; using Windows.Win32.UI.WindowsAndMessaging; @@ -17,7 +14,7 @@ namespace Snap.Hutao; [HighQuality] [Injection(InjectAs.Singleton)] [SuppressMessage("", "CA1001")] -internal sealed partial class MainWindow : Window, IWindowOptionsSource, IRecipient +internal sealed partial class MainWindow : Window, IWindowOptionsSource { private const int MinWidth = 848; private const int MinHeight = 524; @@ -35,11 +32,8 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource, IRecipi InitializeComponent(); windowOptions = new(this, TitleBarView.DragArea, new(1200, 741), true); ExtendedWindow.Initialize(this, serviceProvider); - serviceProvider.GetRequiredService().Register(this); logger = serviceProvider.GetRequiredService>(); - // If not complete we should present the welcome view. - ContentSwitchPresenter.Value = StaticResource.IsAnyUnfulfilledContractPresent(); closedEventHander = OnClosed; Closed += closedEventHander; } @@ -54,12 +48,6 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource, IRecipi pInfo->ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, pInfo->ptMinTrackSize.Y); } - /// - public void Receive(WelcomeStateCompleteMessage message) - { - ContentSwitchPresenter.Value = false; - } - private void OnClosed(object sender, WindowEventArgs args) { logger.LogInformation("MainWindow Closed"); diff --git a/src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs b/src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs deleted file mode 100644 index 001e2ef6..00000000 --- a/src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) DGP Studio. All rights reserved. -// Licensed under the MIT license. - -namespace Snap.Hutao.Message; - -/// -/// 欢迎状态完成消息 -/// -[HighQuality] -internal sealed class WelcomeStateCompleteMessage -{ -} \ No newline at end of file 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 85118cec..991e90cc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -2661,6 +2661,51 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 安装完成后重启胡桃以查看是否正常生效 的本地化字符串。 + /// + internal static string ViewGuideStepEnvironmentAfterInstallDescription { + get { + return ResourceManager.GetString("ViewGuideStepEnvironmentAfterInstallDescription", resourceCulture); + } + } + + /// + /// 查找类似 如果上方的图标中存在乱码,请前往 的本地化字符串。 + /// + internal static string ViewGuideStepEnvironmentFontDescription1 { + get { + return ResourceManager.GetString("ViewGuideStepEnvironmentFontDescription1", resourceCulture); + } + } + + /// + /// 查找类似 下载并自行安装图标字体 的本地化字符串。 + /// + internal static string ViewGuideStepEnvironmentFontDescription2 { + get { + return ResourceManager.GetString("ViewGuideStepEnvironmentFontDescription2", resourceCulture); + } + } + + /// + /// 查找类似 若未检测到 WebView2 运行时信息,可以前往 的本地化字符串。 + /// + internal static string ViewGuideStepEnvironmentWebView2Description1 { + get { + return ResourceManager.GetString("ViewGuideStepEnvironmentWebView2Description1", resourceCulture); + } + } + + /// + /// 查找类似 下载并自行安装运行时 的本地化字符串。 + /// + internal static string ViewGuideStepEnvironmentWebView2Description2 { + get { + return ResourceManager.GetString("ViewGuideStepEnvironmentWebView2Description2", resourceCulture); + } + } + /// /// 查找类似 语言 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 2aff6904..a07e5886 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1040,6 +1040,21 @@ 环境 + + 安装完成后重启胡桃以查看是否正常生效 + + + 如果上方的图标中存在乱码,请前往 + + + 下载并自行安装图标字体 + + + 若未检测到 WebView2 运行时信息,可以前往 + + + 下载并自行安装运行时 + 语言 diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj index e3f7cf2c..74551643 100644 --- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj +++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj @@ -155,7 +155,6 @@ - @@ -376,11 +375,6 @@ MSBuild:Compile - - - MSBuild:Compile - - MSBuild:Compile diff --git a/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml b/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml index d7dbc423..d8f462bc 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml @@ -3,7 +3,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cwc="using:CommunityToolkit.WinUI.Controls" - xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mxi="using:Microsoft.Xaml.Interactivity" @@ -22,10 +21,11 @@ - - + + @@ -39,80 +39,160 @@ - - - - + + + + + + + + - - - - - + Spacing="8"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml index a484918d..30902c3f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml @@ -148,7 +148,7 @@ - + - -