Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

guide complete

Browse Source
This commit is contained in:
Lightczx
2023-08-29 10:45:53 +08:00
parent c2319cac68
commit c83db8695f
16 changed files with 308 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs
View File

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

20
src/Snap.Hutao/Snap.Hutao/MainWindow.xaml
View File

@@ -14,24 +14,6 @@
Height="44"
Margin="48,0,0,0"/>
<cwuc:SwitchPresenter x:Name="ContentSwitchPresenter">
<cwuc:SwitchPresenter.ContentTransitions>
<TransitionCollection>
<EntranceThemeTransition/>
</TransitionCollection>
</cwuc:SwitchPresenter.ContentTransitions>
<cwuc:Case>
<cwuc:Case.Value>
<x:Boolean>True</x:Boolean>
</cwuc:Case.Value>
<shv:WelcomeView/>
</cwuc:Case>
<cwuc:Case>
<cwuc:Case.Value>
<x:Boolean>False</x:Boolean>
</cwuc:Case.Value>
<shv:MainView/>
</cwuc:Case>
</cwuc:SwitchPresenter>
<shv:MainView/>
</Grid>
</Window>

14
src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs
View File

@@ -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<WelcomeStateCompleteMessage>
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<MainWindow>.Initialize(this, serviceProvider);
serviceProvider.GetRequiredService<IMessenger>().Register(this);
logger = serviceProvider.GetRequiredService<ILogger<MainWindow>>();
// 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);
}
/// <inheritdoc/>
public void Receive(WelcomeStateCompleteMessage message)
{
ContentSwitchPresenter.Value = false;
}
private void OnClosed(object sender, WindowEventArgs args)
{
logger.LogInformation("MainWindow Closed");

12
src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs
View File

@@ -1,12 +0,0 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
namespace Snap.Hutao.Message;
/// <summary>
/// 欢迎状态完成消息
/// </summary>
[HighQuality]
internal sealed class WelcomeStateCompleteMessage
{
}

45
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs generated
View File

@@ -2661,6 +2661,51 @@ namespace Snap.Hutao.Resource.Localization {
}
}
/// <summary>
/// 查找类似 安装完成后重启胡桃以查看是否正常生效 的本地化字符串。
/// </summary>
internal static string ViewGuideStepEnvironmentAfterInstallDescription {
get {
return ResourceManager.GetString("ViewGuideStepEnvironmentAfterInstallDescription", resourceCulture);
}
}
/// <summary>
/// 查找类似 如果上方的图标中存在乱码，请前往 的本地化字符串。
/// </summary>
internal static string ViewGuideStepEnvironmentFontDescription1 {
get {
return ResourceManager.GetString("ViewGuideStepEnvironmentFontDescription1", resourceCulture);
}
}
/// <summary>
/// 查找类似 下载并自行安装图标字体 的本地化字符串。
/// </summary>
internal static string ViewGuideStepEnvironmentFontDescription2 {
get {
return ResourceManager.GetString("ViewGuideStepEnvironmentFontDescription2", resourceCulture);
}
}
/// <summary>
/// 查找类似 若未检测到 WebView2 运行时信息，可以前往 的本地化字符串。
/// </summary>
internal static string ViewGuideStepEnvironmentWebView2Description1 {
get {
return ResourceManager.GetString("ViewGuideStepEnvironmentWebView2Description1", resourceCulture);
}
}
/// <summary>
/// 查找类似 下载并自行安装运行时 的本地化字符串。
/// </summary>
internal static string ViewGuideStepEnvironmentWebView2Description2 {
get {
return ResourceManager.GetString("ViewGuideStepEnvironmentWebView2Description2", resourceCulture);
}
}
/// <summary>
/// 查找类似 语言 的本地化字符串。
/// </summary>

15
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
View File

@@ -1040,6 +1040,21 @@
<data name="ViewGuideStepEnvironment" xml:space="preserve">
<value>环境</value>
</data>
<data name="ViewGuideStepEnvironmentAfterInstallDescription" xml:space="preserve">
<value>安装完成后重启胡桃以查看是否正常生效</value>
</data>
<data name="ViewGuideStepEnvironmentFontDescription1" xml:space="preserve">
<value>如果上方的图标中存在乱码，请前往</value>
</data>
<data name="ViewGuideStepEnvironmentFontDescription2" xml:space="preserve">
<value>下载并自行安装图标字体</value>
</data>
<data name="ViewGuideStepEnvironmentWebView2Description1" xml:space="preserve">
<value>若未检测到 WebView2 运行时信息，可以前往</value>
</data>
<data name="ViewGuideStepEnvironmentWebView2Description2" xml:space="preserve">
<value>下载并自行安装运行时</value>
</data>
<data name="ViewGuideStepLanguage" xml:space="preserve">
<value>语言</value>
</data>

6
src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
View File

@@ -155,7 +155,6 @@
<None Remove="View\Page\WikiWeaponPage.xaml" />
<None Remove="View\TitleView.xaml" />
<None Remove="View\UserView.xaml" />
<None Remove="View\WelcomeView.xaml" />
</ItemGroup>
<!-- Analyzer Files -->
@@ -376,11 +375,6 @@
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="View\WelcomeView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="View\Page\TestPage.xaml">
<Generator>MSBuild:Compile</Generator>

224
src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml
View File

@@ -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 @@
<RowDefinition/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<cwuc:SwitchPresenter Value="{Binding State, Mode=OneWay}">
<cwuc:Case Value="{shcm:UInt32 Value=0}">
<cwc:SwitchPresenter Value="{Binding State, Mode=OneWay}">
<cwc:Case Value="{shcm:UInt32 Value=0}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<GridView
Grid.Row="0"
ItemsSource="{Binding AppOptions.Cultures}"
SelectedItem="{Binding SelectedCulture, Mode=TwoWay}"
SelectionMode="Single">
@@ -39,80 +39,160 @@
</GridView.ItemTemplate>
</GridView>
</Grid>
</cwuc:Case>
<cwuc:Case Value="{shcm:UInt32 Value=1}">
<Grid>
<Grid
HorizontalAlignment="Center"
</cwc:Case>
<cwc:Case Value="{shcm:UInt32 Value=1}">
<Grid
HorizontalAlignment="Center"
VerticalAlignment="Center"
ColumnSpacing="16">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Image
Grid.Column="0"
Height="152"
Source="ms-appx:///Assets/Square44x44Logo.targetsize-256.png"/>
<StackPanel
Grid.Column="2"
VerticalAlignment="Center"
ColumnSpacing="16">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Image
Grid.Column="0"
Height="152"
Source="ms-appx:///Assets/Square44x44Logo.targetsize-256.png"/>
Spacing="8">
<CheckBox IsChecked="{Binding IsTermOfServiceAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://hut.ao/statements/tos.html">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementTermOfService}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
<CheckBox IsChecked="{Binding IsPrivacyPolicyAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://hut.ao/statements/privacy-notice.html">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementPrivacyPolicy}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
<CheckBox IsChecked="{Binding IsIssueReportAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://hut.ao/statements/bug-report.html">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIssueReport}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
<CheckBox IsChecked="{Binding IsOpenSourceLicenseAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://github.com/DGP-Studio/Snap.Hutao/blob/main/LICENSE">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementOpenSourceLicense}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
</StackPanel>
</Grid>
</cwc:Case>
<cwc:Case Value="{shcm:UInt32 Value=2}">
<Grid>
<StackPanel
Margin="16"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock
Margin="1,0,0,5"
Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
Text="Segoe Fluent Icons"/>
<StackPanel
Grid.Column="2"
VerticalAlignment="Center"
Margin="0,8"
Orientation="Horizontal"
Spacing="8">
<CheckBox IsChecked="{Binding IsTermOfServiceAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://hut.ao/statements/tos.html">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementTermOfService}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
<CheckBox IsChecked="{Binding IsPrivacyPolicyAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://hut.ao/statements/privacy-notice.html">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementPrivacyPolicy}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
<CheckBox IsChecked="{Binding IsIssueReportAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://hut.ao/statements/bug-report.html">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIssueReport}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
<CheckBox IsChecked="{Binding IsOpenSourceLicenseAgreed, Mode=TwoWay}">
<TextBlock>
<TextBlock.Inlines>
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementIHaveReadText}"/>
<Hyperlink NavigateUri="https://github.com/DGP-Studio/Snap.Hutao/blob/main/LICENSE">
<Run Text="{shcm:ResourceString Name=ViewGuideStepAgreementOpenSourceLicense}"/>
</Hyperlink>
</TextBlock.Inlines>
</TextBlock>
</CheckBox>
<!-- PUA E700-E900 -->
<FontIcon FontSize="{StaticResource SubtitleTextBlockFontSize}" Glyph="&#xE8DF;"/>
<!-- PUA EA00-EC00 -->
<FontIcon FontSize="{StaticResource SubtitleTextBlockFontSize}" Glyph="&#xEF58;"/>
<!-- PUA ED00-EF00 -->
<FontIcon FontSize="{StaticResource SubtitleTextBlockFontSize}" Glyph="&#xED56;"/>
<!-- PUA F000-F200 -->
<FontIcon FontSize="{StaticResource SubtitleTextBlockFontSize}" Glyph="&#xF012;"/>
<!-- PUA F300-F500 -->
<FontIcon FontSize="{StaticResource SubtitleTextBlockFontSize}" Glyph="&#xF439;"/>
<!-- PUA F600-F800 -->
<FontIcon FontSize="{StaticResource SubtitleTextBlockFontSize}" Glyph="&#xF6A9;"/>
</StackPanel>
</Grid>
<TextBlock>
<Run Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentFontDescription1}"/>
<Hyperlink NavigateUri="https://aka.ms/SegoeFluentIcons">
<Run Text="Microsoft"/>
</Hyperlink>
<Run Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentFontDescription2}"/>
</TextBlock>
<TextBlock Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentAfterInstallDescription}"/>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
<TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{Binding RuntimeOptions.WebView2Version}"/>
<TextBlock>
<Run Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentWebView2Description1}"/>
<Hyperlink NavigateUri="https://go.microsoft.com/fwlink/p/?LinkId=2124703">
<Run Text="Microsoft"/>
</Hyperlink>
<Run Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentWebView2Description2}"/>
</TextBlock>
<TextBlock Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentAfterInstallDescription}"/>
</StackPanel>
</Grid>
</cwuc:Case>
<cwuc:Case Value="{shcm:UInt32 Value=2}">
<Grid>
<TextBlock Text="2"/>
</Grid>
</cwuc:Case>
<cwuc:Case Value="{shcm:UInt32 Value=3}">
<Grid>
<TextBlock Text="3"/>
</Grid>
</cwuc:Case>
</cwuc:SwitchPresenter>
</cwc:Case>
<cwc:Case Value="{shcm:UInt32 Value=3}">
<StackPanel Margin="32,0" HorizontalAlignment="Left">
<TextBlock
Margin="1,16,0,5"
Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewWelcomeBase}"/>
<ScrollViewer>
<ItemsControl
Margin="0,0,-4,0"
HorizontalAlignment="Center"
ItemsPanel="{StaticResource WrapPanelTemplate}"
ItemsSource="{Binding DownloadSummaries}">
<ItemsControl.ItemContainerTransitions>
<TransitionCollection>
<AddDeleteThemeTransition/>
<ContentThemeTransition/>
<ReorderThemeTransition/>
<EntranceThemeTransition IsStaggeringEnabled="False"/>
</TransitionCollection>
</ItemsControl.ItemContainerTransitions>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border
Width="180"
Margin="0,0,4,4"
Style="{StaticResource BorderCardStyle}">
<StackPanel Margin="8">
<TextBlock Text="{Binding DisplayName}"/>
<ProgressBar
Margin="0,4,0,0"
Maximum="1"
Value="{Binding ProgressValue}"/>
<TextBlock
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Description}"/>
</StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
</StackPanel>
</cwc:Case>
</cwc:SwitchPresenter>
<Grid Grid.Row="1">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<cwc:Segmented Margin="16" SelectedIndex="{Binding State, Mode=TwoWay}">

2
src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
View File

@@ -148,7 +148,7 @@
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGeetestVerificationHeader}"/>
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
ActionIcon="{shcm:FontIcon Glyph=&#xF32A;}"
ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlAction}"
Command="{Binding ConfigureGeetestUrlCommand}"
Description="{shcm:ResourceString Name=ViewPageSettingGeetestCustomUrlDescription}"

8
src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
View File

@@ -58,13 +58,9 @@
</FlyoutBase.AttachedFlyout>
</cwc:SettingsCard>
<cwc:SettingsCard Header="RestartTest">
<cwc:SettingsCard Header="ResetGuideState">
<StackPanel Orientation="Horizontal">
<ToggleSwitch Name="ElevatedSwitch" Style="{StaticResource DefaultToggleSwitchStyle}"/>
<Button
Command="{Binding RestartAppCommand}"
CommandParameter="{Binding ElementName=ElevatedSwitch, Path=IsOn}"
Content="Restart"/>
<Button Command="{Binding ResetGuideStateCommand}" Content="Reset(No restart)"/>
</StackPanel>
</cwc:SettingsCard>
</StackPanel>

74
src/Snap.Hutao/Snap.Hutao/View/WelcomeView.xaml
View File

@@ -1,74 +0,0 @@
<UserControl
x:Class="Snap.Hutao.View.WelcomeView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mxi="using:Microsoft.Xaml.Interactivity"
xmlns:shcb="using:Snap.Hutao.Control.Behavior"
xmlns:shcm="using:Snap.Hutao.Control.Markup"
xmlns:shv="using:Snap.Hutao.ViewModel"
d:DataContext="{d:DesignInstance shv:WelcomeViewModel}"
Unloaded="OnUnloaded"
mc:Ignorable="d">
<mxi:Interaction.Behaviors>
<shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
</mxi:Interaction.Behaviors>
<Grid Margin="0,44,0,0">
<ScrollViewer>
<StackPanel Margin="32,0" HorizontalAlignment="Left">
<TextBlock Style="{StaticResource TitleTextBlockStyle}" Text="{shcm:ResourceString Name=ViewWelcomeTitle}"/>
<TextBlock
Margin="0,8,0,0"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewWelcomeSubtitle}"/>
<TextBlock
Margin="0,8,0,0"
Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewWelcomeBase}"/>
<TextBlock
Margin="0,0,0,8"
Style="{StaticResource BodyTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewWelcomeBody}"/>
<ItemsControl
Width="256"
Margin="0,0,0,32"
HorizontalAlignment="Left"
ItemsSource="{Binding DownloadSummaries}">
<ItemsControl.ItemContainerTransitions>
<TransitionCollection>
<AddDeleteThemeTransition/>
<ContentThemeTransition/>
<ReorderThemeTransition/>
<EntranceThemeTransition IsStaggeringEnabled="False"/>
</TransitionCollection>
</ItemsControl.ItemContainerTransitions>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border Margin="0,4,0,0" Style="{StaticResource BorderCardStyle}">
<StackPanel Margin="8">
<TextBlock Text="{Binding DisplayName}"/>
<ProgressBar
Margin="0,4,0,0"
Maximum="1"
Value="{Binding ProgressValue}"/>
<TextBlock
Opacity="0.6"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Description}"/>
</StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</ScrollViewer>
<Image
MaxWidth="640"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Source="ms-appx:///Resource/WelcomeView_Background.png"/>
</Grid>
</UserControl>

32
src/Snap.Hutao/Snap.Hutao/View/WelcomeView.xaml.cs
View File

@@ -1,32 +0,0 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Microsoft.UI.Xaml.Controls;
using Snap.Hutao.ViewModel.Guide;
namespace Snap.Hutao.View;
/// <summary>
/// 欢迎视图
/// </summary>
[HighQuality]
internal sealed partial class WelcomeView : UserControl
{
private readonly IServiceScope serviceScope;
/// <summary>
/// 构造一个新的欢迎视图
/// </summary>
public WelcomeView()
{
InitializeComponent();
serviceScope = Ioc.Default.CreateScope();
DataContext = serviceScope.ServiceProvider.GetRequiredService<WelcomeViewModel>();
}
private void OnUnloaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
{
DataContext = null;
serviceScope.Dispose();
}
}

84
src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/GuideViewModel.cs
View File

@@ -1,10 +1,14 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.Mvvm.Messaging;
using CommunityToolkit.WinUI.Notifications;
using Microsoft.Windows.AppLifecycle;
using Snap.Hutao.Core;
using Snap.Hutao.Core.Setting;
using Snap.Hutao.Model;
using Snap.Hutao.Service;
using System.Collections.ObjectModel;
using System.Globalization;
namespace Snap.Hutao.ViewModel.Guide;
@@ -13,10 +17,14 @@ namespace Snap.Hutao.ViewModel.Guide;
/// 指引视图模型
/// </summary>
[ConstructorGenerated]
[Injection(InjectAs.Transient)]
[Injection(InjectAs.Singleton)]
internal sealed partial class GuideViewModel : Abstraction.ViewModel
{
private readonly IServiceProvider serviceProvider;
private readonly ITaskContext taskContext;
private readonly AppOptions appOptions;
private readonly RuntimeOptions runtimeOptions;
private string nextOrCompleteButtonText = SH.ViewModelGuideActionNext;
private bool isNextOrCompleteButtonEnabled = true;
private NameValue<string>? selectedCulture;
@@ -24,6 +32,7 @@ internal sealed partial class GuideViewModel : Abstraction.ViewModel
private bool isPrivacyPolicyAgreed;
private bool isIssueReportAgreed;
private bool isOpenSourceLicenseAgreed;
private ObservableCollection<DownloadSummary>? downloadSummaries;
public uint State
{
@@ -43,6 +52,7 @@ internal sealed partial class GuideViewModel : Abstraction.ViewModel
else if (state is GuideState.StaticResourceBegin)
{
(NextOrCompleteButtonText, IsNextOrCompleteButtonEnabled) = (SH.ViewModelGuideActionStaticResourceBegin, false);
DownloadStaticResourceAsync().SafeForget();
}
else if (state is GuideState.Completed)
{
@@ -69,6 +79,8 @@ internal sealed partial class GuideViewModel : Abstraction.ViewModel
public AppOptions AppOptions { get => appOptions; }
public RuntimeOptions RuntimeOptions { get => runtimeOptions; }
public NameValue<string>? SelectedCulture
{
get => selectedCulture ??= AppOptions.Cultures.FirstOrDefault(c => c.Value == AppOptions.CurrentCulture.Name);
@@ -127,6 +139,11 @@ internal sealed partial class GuideViewModel : Abstraction.ViewModel
}
}
/// <summary>
/// 下载信息
/// </summary>
public ObservableCollection<DownloadSummary>? DownloadSummaries { get => downloadSummaries; set => SetProperty(ref downloadSummaries, value); }
protected override ValueTask<bool> InitializeUIAsync()
{
return ValueTask.FromResult(true);
@@ -135,7 +152,6 @@ internal sealed partial class GuideViewModel : Abstraction.ViewModel
[Command("NextOrCompleteCommand")]
private void NextOrComplete()
{
GuideState previousState = (GuideState)State;
++State;
}
@@ -143,4 +159,68 @@ internal sealed partial class GuideViewModel : Abstraction.ViewModel
{
IsNextOrCompleteButtonEnabled = IsTermOfServiceAgreed && IsPrivacyPolicyAgreed && IsIssueReportAgreed && IsOpenSourceLicenseAgreed;
}
private async ValueTask DownloadStaticResourceAsync()
{
IEnumerable<DownloadSummary> downloadSummaries = GenerateStaticResourceDownloadTasks();
DownloadSummaries = downloadSummaries.ToObservableCollection();
await Parallel.ForEachAsync(downloadSummaries, async (summary, token) =>
{
if (await summary.DownloadAndExtractAsync().ConfigureAwait(false))
{
taskContext.InvokeOnMainThread(() => DownloadSummaries.Remove(summary));
}
}).ConfigureAwait(false);
StaticResource.FulfillAllContracts();
LocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, (uint)GuideState.Completed);
AppInstance.Restart(string.Empty);
}
private IEnumerable<DownloadSummary> GenerateStaticResourceDownloadTasks()
{
Dictionary<string, DownloadSummary> downloadSummaries = new();
if (StaticResource.IsContractUnfulfilled(StaticResource.V1Contract))
{
downloadSummaries.TryAdd("Bg", new(serviceProvider, "Bg"));
downloadSummaries.TryAdd("AvatarIcon", new(serviceProvider, "AvatarIcon"));
downloadSummaries.TryAdd("GachaAvatarIcon", new(serviceProvider, "GachaAvatarIcon"));
downloadSummaries.TryAdd("GachaAvatarImg", new(serviceProvider, "GachaAvatarImg"));
downloadSummaries.TryAdd("EquipIcon", new(serviceProvider, "EquipIcon"));
downloadSummaries.TryAdd("GachaEquipIcon", new(serviceProvider, "GachaEquipIcon"));
downloadSummaries.TryAdd("NameCardPic", new(serviceProvider, "NameCardPic"));
downloadSummaries.TryAdd("Skill", new(serviceProvider, "Skill"));
downloadSummaries.TryAdd("Talent", new(serviceProvider, "Talent"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V2Contract))
{
downloadSummaries.TryAdd("AchievementIcon", new(serviceProvider, "AchievementIcon"));
downloadSummaries.TryAdd("ItemIcon", new(serviceProvider, "ItemIcon"));
downloadSummaries.TryAdd("IconElement", new(serviceProvider, "IconElement"));
downloadSummaries.TryAdd("RelicIcon", new(serviceProvider, "RelicIcon"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V3Contract))
{
downloadSummaries.TryAdd("Skill", new(serviceProvider, "Skill"));
downloadSummaries.TryAdd("Talent", new(serviceProvider, "Talent"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V4Contract))
{
downloadSummaries.TryAdd("AvatarIcon", new(serviceProvider, "AvatarIcon"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V5Contract))
{
downloadSummaries.TryAdd("MonsterIcon", new(serviceProvider, "MonsterIcon"));
}
return downloadSummaries.Select(x => x.Value);
}
}

101
src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/WelcomeViewModel.cs
View File

@@ -1,101 +0,0 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Messaging;
using CommunityToolkit.WinUI.Notifications;
using Snap.Hutao.Core.Setting;
using System.Collections.ObjectModel;
namespace Snap.Hutao.ViewModel.Guide;
/// <summary>
/// 欢迎视图模型
/// </summary>
[HighQuality]
[ConstructorGenerated]
[Injection(InjectAs.Scoped)]
internal sealed partial class WelcomeViewModel : ObservableObject
{
[SuppressMessage("", "SH301")]
private readonly IServiceProvider serviceProvider;
private readonly ITaskContext taskContext;
private readonly IMessenger messenger;
private ObservableCollection<DownloadSummary>? downloadSummaries;
/// <summary>
/// 下载信息
/// </summary>
public ObservableCollection<DownloadSummary>? DownloadSummaries { get => downloadSummaries; set => SetProperty(ref downloadSummaries, value); }
[Command("OpenUICommand")]
private async Task OpenUIAsync()
{
IEnumerable<DownloadSummary> downloadSummaries = GenerateStaticResourceDownloadTasks();
DownloadSummaries = downloadSummaries.ToObservableCollection();
await Parallel.ForEachAsync(downloadSummaries, async (summary, token) =>
{
if (await summary.DownloadAndExtractAsync().ConfigureAwait(false))
{
taskContext.InvokeOnMainThread(() => DownloadSummaries.Remove(summary));
}
}).ConfigureAwait(false);
StaticResource.FulfillAllContracts();
await taskContext.SwitchToMainThreadAsync();
messenger.Send(new Message.WelcomeStateCompleteMessage());
new ToastContentBuilder()
.AddText(SH.ViewModelWelcomeDownloadCompleteTitle)
.AddText(SH.ViewModelWelcomeDownloadCompleteMessage)
.Show();
}
private IEnumerable<DownloadSummary> GenerateStaticResourceDownloadTasks()
{
Dictionary<string, DownloadSummary> downloadSummaries = new();
if (StaticResource.IsContractUnfulfilled(StaticResource.V1Contract))
{
downloadSummaries.TryAdd("Bg", new(serviceProvider, "Bg"));
downloadSummaries.TryAdd("AvatarIcon", new(serviceProvider, "AvatarIcon"));
downloadSummaries.TryAdd("GachaAvatarIcon", new(serviceProvider, "GachaAvatarIcon"));
downloadSummaries.TryAdd("GachaAvatarImg", new(serviceProvider, "GachaAvatarImg"));
downloadSummaries.TryAdd("EquipIcon", new(serviceProvider, "EquipIcon"));
downloadSummaries.TryAdd("GachaEquipIcon", new(serviceProvider, "GachaEquipIcon"));
downloadSummaries.TryAdd("NameCardPic", new(serviceProvider, "NameCardPic"));
downloadSummaries.TryAdd("Skill", new(serviceProvider, "Skill"));
downloadSummaries.TryAdd("Talent", new(serviceProvider, "Talent"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V2Contract))
{
downloadSummaries.TryAdd("AchievementIcon", new(serviceProvider, "AchievementIcon"));
downloadSummaries.TryAdd("ItemIcon", new(serviceProvider, "ItemIcon"));
downloadSummaries.TryAdd("IconElement", new(serviceProvider, "IconElement"));
downloadSummaries.TryAdd("RelicIcon", new(serviceProvider, "RelicIcon"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V3Contract))
{
downloadSummaries.TryAdd("Skill", new(serviceProvider, "Skill"));
downloadSummaries.TryAdd("Talent", new(serviceProvider, "Talent"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V4Contract))
{
downloadSummaries.TryAdd("AvatarIcon", new(serviceProvider, "AvatarIcon"));
}
if (StaticResource.IsContractUnfulfilled(StaticResource.V5Contract))
{
downloadSummaries.TryAdd("MonsterIcon", new(serviceProvider, "MonsterIcon"));
}
return downloadSummaries.Select(x => x.Value);
}
}

2
src/Snap.Hutao/Snap.Hutao/ViewModel/SettingViewModel.cs
View File

@@ -19,6 +19,7 @@ using Snap.Hutao.Service.Navigation;
using Snap.Hutao.Service.Notification;
using Snap.Hutao.Service.User;
using Snap.Hutao.View.Dialog;
using Snap.Hutao.ViewModel.Guide;
using System.Globalization;
using System.IO;
using System.Runtime.InteropServices;
@@ -99,6 +100,7 @@ internal sealed partial class SettingViewModel : Abstraction.ViewModel
private static void ResetStaticResource()
{
StaticResource.FailAllContracts();
LocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, (uint)GuideState.StaticResourceBegin);
AppInstance.Restart(string.Empty);
}

10
src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
View File

@@ -1,7 +1,8 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Microsoft.Windows.AppLifecycle;
using Snap.Hutao.Core.Setting;
using Snap.Hutao.ViewModel.Guide;
namespace Snap.Hutao.ViewModel;
@@ -19,9 +20,10 @@ internal sealed partial class TestViewModel : Abstraction.ViewModel
return Task.CompletedTask;
}
[Command("RestartAppCommand")]
private static void RestartApp(bool elevated)
[Command("ResetGuideStateCommand")]
private static void ResetGuideState()
{
AppInstance.Restart(string.Empty);
LocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, (uint)GuideState.Language);
}
}