From 71a1bdc17379779e57bc71000e9c00a7918e2132 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Mon, 2 Jan 2023 15:09:53 +0800
Subject: [PATCH 1/8] add empty page template view
---
src/Snap.Hutao/Snap.Hutao/App.xaml | 12 +-
.../Control/Markup/I18NExtension.cs | 68 --
.../Snap.Hutao/Control/Markup/I18NHelper.cs | 68 --
.../Snap.Hutao/Core/CoreEnvironment.cs | 17 +-
.../Snap.Hutao/Model/Entity/SettingEntry.cs | 5 +
.../Converter/EmotionIconConverter.cs | 30 +
.../Metadata/Converter/EquipIconConverter.cs | 2 +-
.../Snap.Hutao/Package.appxmanifest | 2 +-
.../Snap.Hutao/Properties/launchSettings.json | 2 +-
.../Resource/Icon/UI_AchievementIcon_3_3.png | Bin 0 -> 43908 bytes
.../Service/DailyNote/DailyNoteNotifier.cs | 39 +-
.../Service/DailyNote/DailyNoteService.cs | 8 +
.../Snap.Hutao/Service/Game/GameService.cs | 2 +-
src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj | 4 +-
.../EmptyCollectionToBoolConverter.cs | 22 +
.../EmptyCollectionToBoolRevertConverter.cs | 22 +
.../EmptyCollectionToVisibilityConverter.cs | 22 +
...tyCollectionToVisibilityRevertConverter.cs | 22 +
.../Converter/EmptyObjectToBoolConverter.cs | 22 +
.../EmptyObjectToBoolRevertConverter.cs | 22 +
.../EmptyObjectToVisibilityRevertConverter.cs | 22 +
.../Snap.Hutao/View/Page/AchievementPage.xaml | 399 +++---
.../View/Page/AvatarPropertyPage.xaml | 1016 ++++++++--------
.../Snap.Hutao/View/Page/CultivationPage.xaml | 558 +++++----
.../Snap.Hutao/View/Page/DailyNotePage.xaml | 9 +
.../Snap.Hutao/View/Page/GachaLogPage.xaml | 916 +++++++-------
.../View/Page/HutaoDatabasePage.xaml | 17 +-
.../View/Page/SpiralAbyssRecordPage.xaml | 64 +-
.../Snap.Hutao/View/Page/WikiAvatarPage.xaml | 1075 +++++++++--------
.../Snap.Hutao/View/Page/WikiWeaponPage.xaml | 417 ++++---
src/Snap.Hutao/Snap.Hutao/View/UserView.xaml | 243 ++--
.../ViewModel/AchievementViewModel.cs | 5 -
.../ViewModel/AnnouncementViewModel.cs | 1 -
.../ViewModel/CultivationViewModel.cs | 19 +
.../ViewModel/DailyNoteViewModel.cs | 28 +-
.../Snap.Hutao/ViewModel/GachaLogViewModel.cs | 5 -
.../Web/Bridge/MiHoYoJSInterface.cs | 4 +-
.../DynamicSecret/DynamicSecretHandler.cs | 15 +-
38 files changed, 2759 insertions(+), 2445 deletions(-)
delete mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Markup/I18NExtension.cs
delete mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Markup/I18NHelper.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_AchievementIcon_3_3.png
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolRevertConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityRevertConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToBoolRevertConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyObjectToVisibilityRevertConverter.cs
diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 75145202..7954699b 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -52,6 +52,7 @@
+
@@ -61,8 +62,14 @@
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ Margin="0,16,0,0"
+ Style="{StaticResource CaptionTextBlockStyle}"
+ Text="强化词条"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 037c1923..27aab355 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -12,9 +12,11 @@
xmlns:mxim="using:Microsoft.Xaml.Interactions.Media"
xmlns:shc="using:Snap.Hutao.Control"
xmlns:shcb="using:Snap.Hutao.Control.Behavior"
+ xmlns:shci="using:Snap.Hutao.Control.Image"
xmlns:shcm="using:Snap.Hutao.Control.Markup"
xmlns:shv="using:Snap.Hutao.ViewModel"
xmlns:shvc="using:Snap.Hutao.View.Control"
+ xmlns:wsc="using:WinUICommunity.SettingsUI.Controls"
d:DataContext="{d:DesignInstance shv:CultivationViewModel}"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
mc:Ignorable="d">
@@ -41,272 +43,334 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Width="48"
+ Height="48"
+ Icon="{Binding Icon}"
+ Quality="{Binding Quality}"/>
-
+
+ Orientation="Horizontal"
+ Visibility="Collapsed">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+ Visible
+
+
+
+
-
-
-
-
-
- Visible
-
-
-
-
+
+
+
+
+ Collapsed
+
+
+
+
+
-
-
-
-
- Collapsed
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 0ee77a01..943b3996 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -106,6 +106,15 @@
+
+
+
@@ -20,461 +21,486 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Command="{Binding ImportFromUIGFJsonCommand}"
+ Icon="{shcm:FontIcon Glyph=}"
+ Label="导入"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+ Background="{StaticResource CardBackgroundFillColorDefault}"
+ CornerRadius="{StaticResource CompatCornerRadiusSmall}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml
index 204ffe55..25e52e87 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/HutaoDatabasePage.xaml
@@ -8,6 +8,7 @@
xmlns:mxi="using:Microsoft.Xaml.Interactivity"
xmlns:shc="using:Snap.Hutao.Control"
xmlns:shcb="using:Snap.Hutao.Control.Behavior"
+ xmlns:shci="using:Snap.Hutao.Control.Image"
xmlns:shcm="using:Snap.Hutao.Control.Markup"
xmlns:shmbh="using:Snap.Hutao.Model.Binding.Hutao"
xmlns:shv="using:Snap.Hutao.ViewModel"
@@ -63,7 +64,7 @@
-
+
@@ -330,5 +331,19 @@
+
+
+
+
+
+
+
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
index 2ffceee1..93bf03be 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
@@ -22,31 +22,13 @@
-
-
-
-
-
-
-
-
-
-
+ PaneBackground="Transparent"
+ Visibility="{Binding SpiralAbyssEntries, Converter={StaticResource EmptyCollectionToVisibilityConverter}}">
@@ -57,9 +39,21 @@
-
+
-
+
+
+
+
+
+
+
@@ -163,7 +157,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index b77248aa..09467674 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -59,548 +59,565 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Margin="16"
+ Background="{StaticResource CardBackgroundFillColorDefault}"
+ BorderBrush="{StaticResource CardStrokeColorDefault}"
+ BorderThickness="1"
+ CornerRadius="{StaticResource CompatCornerRadius}">
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
+
+
+
+ Margin="16,16,0,0"
+ Style="{StaticResource BaseTextBlockStyle}"
+ Text="原料理"/>
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index 12d10525..c874f909 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -32,215 +32,230 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Margin="16"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Bottom"
+ Style="{StaticResource SubtitleTextBlockStyle}"
+ Text="{Binding Selected.Name}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
index 8c251e47..bab287f3 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
@@ -62,128 +62,135 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- Visible
-
-
-
-
+
+
+
+
-
-
-
-
- Collapsed
-
-
-
-
-
+
+
+
+
+
+ Visible
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Collapsed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
a.IsSelected == true);
-
- if (SelectedArchive == null)
- {
- infoBarService.Warning("请创建一个成就存档");
- }
}
catch (TaskCanceledException)
{
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AnnouncementViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AnnouncementViewModel.cs
index 758537d8..bd44028a 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AnnouncementViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AnnouncementViewModel.cs
@@ -74,7 +74,6 @@ internal class AnnouncementViewModel : ObservableObject, ISupportCancellation
}
catch (OperationCanceledException)
{
- logger.LogInformation($"{nameof(OpenUIAsync)} cancelled");
}
}
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/CultivationViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/CultivationViewModel.cs
index 5cb2f72c..f234a9c5 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/CultivationViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/CultivationViewModel.cs
@@ -10,6 +10,7 @@ using Snap.Hutao.Model.Entity;
using Snap.Hutao.Service.Abstraction;
using Snap.Hutao.Service.Cultivation;
using Snap.Hutao.Service.Metadata;
+using Snap.Hutao.Service.Navigation;
using Snap.Hutao.View.Dialog;
using System.Collections.ObjectModel;
@@ -58,6 +59,7 @@ internal class CultivationViewModel : ObservableObject, ISupportCancellation
RemoveEntryCommand = asyncRelayCommandFactory.Create(RemoveEntryAsync);
SaveInventoryItemCommand = new RelayCommand(SaveInventoryItem);
UpdateStatisticsItemsCommand = asyncRelayCommandFactory.Create(UpdateStatisticsItemsAsync);
+ NavigateToPageCommand = new RelayCommand(NavigateToPage);
}
///
@@ -131,6 +133,11 @@ internal class CultivationViewModel : ObservableObject, ISupportCancellation
///
public ICommand UpdateStatisticsItemsCommand { get; }
+ ///
+ /// 导航到指定的页面命令
+ ///
+ public ICommand NavigateToPageCommand { get; set; }
+
private async Task OpenUIAsync()
{
if (await metadataService.InitializeAsync().ConfigureAwait(true))
@@ -154,6 +161,9 @@ internal class CultivationViewModel : ObservableObject, ISupportCancellation
{
case ProjectAddResult.Added:
infoBarService.Success($"添加成功");
+
+ await ThreadHelper.SwitchToMainThreadAsync();
+ SelectedProject = project;
break;
case ProjectAddResult.InvalidName:
infoBarService.Information($"不能添加名称无效的计划");
@@ -228,4 +238,13 @@ internal class CultivationViewModel : ObservableObject, ISupportCancellation
}
}
}
+
+ private void NavigateToPage(string? typeString)
+ {
+ if (typeString != null)
+ {
+ Type? pageType = Type.GetType(typeString);
+ Ioc.Default.GetRequiredService().Navigate(pageType!, INavigationAwaiter.Default, true);
+ }
+ }
}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNoteViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNoteViewModel.cs
index d26eb928..31a1aa76 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNoteViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNoteViewModel.cs
@@ -44,7 +44,9 @@ internal class DailyNoteViewModel : ObservableObject, ISupportCancellation
private SettingEntry? refreshSecondsEntry;
private SettingEntry? reminderNotifyEntry;
+ private SettingEntry? silentModeEntry;
private ObservableCollection? dailyNoteEntries;
+ private bool isSilentWhenPlayingGame;
///
/// 构造一个新的实时便笺视图模型
@@ -115,6 +117,22 @@ internal class DailyNoteViewModel : ObservableObject, ISupportCancellation
}
}
+ ///
+ /// 是否开启免打扰模式
+ ///
+ public bool IsSilentWhenPlayingGame
+ {
+ get => isSilentWhenPlayingGame;
+ set
+ {
+ if (SetProperty(ref isSilentWhenPlayingGame, value))
+ {
+ silentModeEntry!.SetBoolean(value);
+ appDbContext.Settings.UpdateAndSave(silentModeEntry!);
+ }
+ }
+ }
+
///
/// 用户与角色集合
///
@@ -164,11 +182,17 @@ internal class DailyNoteViewModel : ObservableObject, ISupportCancellation
ScheduleTaskHelper.RegisterForDailyNoteRefresh(480);
OnPropertyChanged(nameof(SelectedRefreshTime));
- reminderNotifyEntry = appDbContext.Settings.SingleOrAdd(SettingEntry.DailyNoteReminderNotify, false.ToString());
+ reminderNotifyEntry = appDbContext.Settings.SingleOrAdd(SettingEntry.DailyNoteReminderNotify, SettingEntryHelper.FalseString);
isReminderNotification = reminderNotifyEntry.GetBoolean();
OnPropertyChanged(nameof(IsReminderNotification));
- DailyNoteEntries = await dailyNoteService.GetDailyNoteEntriesAsync().ConfigureAwait(true);
+ silentModeEntry = appDbContext.Settings.SingleOrAdd(SettingEntry.DailyNoteSilentWhenPlayingGame, SettingEntryHelper.FalseString);
+ isSilentWhenPlayingGame = silentModeEntry.GetBoolean();
+ OnPropertyChanged(nameof(IsSilentWhenPlayingGame));
+
+ ObservableCollection temp = await dailyNoteService.GetDailyNoteEntriesAsync().ConfigureAwait(false);
+ await ThreadHelper.SwitchToMainThreadAsync();
+ DailyNoteEntries = temp;
}
private async Task TrackRoleAsync(UserAndRole? role)
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLogViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLogViewModel.cs
index 9fe0c129..63787c63 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLogViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLogViewModel.cs
@@ -184,11 +184,6 @@ internal class GachaLogViewModel : ObservableObject, ISupportCancellation
Archives = gachaLogService.GetArchiveCollection();
SelectedArchive = Archives.SingleOrDefault(a => a.IsSelected == true);
- if (SelectedArchive == null)
- {
- infoBarService.Information("请刷新或导入祈愿记录");
- }
-
await ThreadHelper.SwitchToMainThreadAsync();
IsInitialized = true;
}
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs
index 968b0253..18b8b510 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs
@@ -124,7 +124,7 @@ public class MiHoYoJSInterface
[JsMethod("getDS")]
public virtual JsResult> GetDynamicSecrectV1(JsParam param)
{
- string salt = DynamicSecretHandler.DynamicSecrets[nameof(SaltType.LK2)];
+ string salt = Core.CoreEnvironment.DynamicSecrets[nameof(SaltType.LK2)];
long t = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
string r = GetRandomString();
string check = Md5Convert.ToHexString($"salt={salt}&t={t}&r={r}").ToLowerInvariant();
@@ -155,7 +155,7 @@ public class MiHoYoJSInterface
[JsMethod("getDS2")]
public virtual JsResult> GetDynamicSecrectV2(JsParam param)
{
- string salt = DynamicSecretHandler.DynamicSecrets[nameof(SaltType.X4)];
+ string salt = Core.CoreEnvironment.DynamicSecrets[nameof(SaltType.X4)];
long t = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
int r = GetRandom();
string b = param.Payload.Body;
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DynamicSecret/DynamicSecretHandler.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DynamicSecret/DynamicSecretHandler.cs
index e3eccc7f..d791569f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DynamicSecret/DynamicSecretHandler.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DynamicSecret/DynamicSecretHandler.cs
@@ -15,19 +15,6 @@ namespace Snap.Hutao.Web.Hoyolab.DynamicSecret;
[Injection(InjectAs.Transient)]
public class DynamicSecretHandler : DelegatingHandler
{
- ///
- /// 盐
- ///
- // https://github.com/UIGF-org/Hoyolab.Salt
- public static readonly ImmutableDictionary DynamicSecrets = new Dictionary()
- {
- [nameof(SaltType.K2)] = "jrU9ULHGZdM9Os3uGHOpjyRELYxby5cg",
- [nameof(SaltType.LK2)] = "9gaxOdeeY2W9dw5x62pywhik8cxy5TIJ",
- [nameof(SaltType.X4)] = "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs",
- [nameof(SaltType.X6)] = "t0qEgfub6cvueAPgR5m9aQWWVciEer7v",
- [nameof(SaltType.PROD)] = "JwYDpKvLj6MrMqqYU6jTKF17KNO2PXoS",
- }.ToImmutableDictionary();
-
private const string RandomRange = "abcdefghijklmnopqrstuvwxyz1234567890";
///
@@ -40,7 +27,7 @@ public class DynamicSecretHandler : DelegatingHandler
string saltType = definations[1];
bool includeChars = definations[2] == "true";
- string salt = DynamicSecrets[saltType];
+ string salt = Core.CoreEnvironment.DynamicSecrets[saltType];
long t = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
From 915b1aae32586205c5687263f81a078c9d059b3f Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Mon, 2 Jan 2023 16:50:01 +0800
Subject: [PATCH 2/8] fix pipeline
---
azure-pipelines.yml | 2 +-
src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7c5052bb..c0b1f4d6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,7 +28,7 @@ variables:
project: $(Build.SourcesDirectory)/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj'
buildPlatform: 'x64'
buildConfiguration: 'Release'
- build_date: $[ format('{0:yyyy}.{0:MM}.{0:dd}', pipeline.startTime) ]
+ build_date: $[ format('{0:yyyy}.{0:M}.{0:d}', pipeline.startTime) ]
steps:
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs
index 8a19d1a3..5c2fddbd 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/UserViewModel.cs
@@ -120,6 +120,12 @@ internal class UserViewModel : ObservableObject
switch (optionResult)
{
case UserOptionResult.Added:
+ if (Users!.Count == 1)
+ {
+ await ThreadHelper.SwitchToMainThreadAsync();
+ SelectedUser = Users.Single();
+ }
+
infoBarService.Success($"用户 [{uid}] 添加成功");
break;
case UserOptionResult.Incomplete:
From 18b3d23b1c6dce6300574bab8bf393020a48fb24 Mon Sep 17 00:00:00 2001
From: Masterain
Date: Tue, 3 Jan 2023 19:17:14 -0800
Subject: [PATCH 3/8] Update azure-pipelines.yml for Azure Pipelines
- optimize CI logic for RPs
---
azure-pipelines.yml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c0b1f4d6..1a07880d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,6 +17,16 @@ trigger:
- azure-pipelines.yml
- .github/ISSUE_TEMPLATE/*.yml
- .github/workflows/*.yml
+pr:
+ branches:
+ include:
+ - main
+ paths:
+ exclude:
+ - README.md
+ - azure-pipelines.yml
+ - .github/ISSUE_TEMPLATE/*.yml
+ - .github/workflows/*.yml
pool:
@@ -134,6 +144,7 @@ steps:
secureFile: 'Snap.Hutao.CI.cer'
- task: GitHubRelease@1
+ condition: or(eq(variables['Build.Reason'], 'Manual'), eq(variables['Build.Reason'], 'IndividualCI'), eq(variables['Build.Reason'], 'BatchedCI'))
inputs:
gitHubConnection: 'github.com_Masterain'
repositoryName: 'DGP-Studio/Snap.Hutao'
From 650b67bea0b1beaaddeb47512958460d5daf0dd1 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Sat, 7 Jan 2023 18:27:45 +0800
Subject: [PATCH 4/8] download static resource at startup
---
src/Snap.Hutao/Snap.Hutao/App.xaml | 19 ++
src/Snap.Hutao/Snap.Hutao/App.xaml.cs | 2 +-
.../Snap.Hutao/Control/Image/CachedImage.cs | 7 +-
.../Control/Image/CompositionExtensions.cs | 36 +-
.../Control/Image/CompositionImage.cs | 22 +-
.../Snap.Hutao/Control/Image/Gradient.cs | 46 ++-
.../Control/Image/GradientDirection.cs | 50 +++
.../Snap.Hutao/Control/Markup/UriExtension.cs | 31 --
.../Core/Abstraction/DisposableObject.cs | 32 ++
.../Snap.Hutao/Core/Caching/IImageCache.cs | 15 +-
.../Caching/IImageCacheFilePathOperation.cs | 18 +
.../Snap.Hutao/Core/Caching/ImageCache.cs | 238 ++++----------
.../Snap.Hutao/Core/IO/Bits/BitsJob.cs | 311 ++++++++++++++++++
.../Snap.Hutao/Core/IO/Bits/BitsManager.cs | 82 +++++
.../Core/IO/Bits/ProgressUpdateStatus.cs | 37 +++
.../Core/IO/{TemporaryFile.cs => TempFile.cs} | 14 +-
.../Snap.Hutao/Core/LifeCycle/Activation.cs | 4 +
.../Snap.Hutao/Core/Setting/SettingKeys.cs | 10 +
.../Snap.Hutao/Localization/ITranslation.cs | 17 -
.../Snap.Hutao/Localization/LanguagezhCN.cs | 111 -------
src/Snap.Hutao/Snap.Hutao/MainWindow.xaml | 16 +-
src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs | 17 +-
.../Snap.Hutao/Message/UserChangedMessage.cs | 1 -
.../Snap.Hutao/Message/ValueChangedMessage.cs | 1 -
.../Message/WelcomeStateCompleteMessage.cs | 11 +
.../Snap.Hutao/Model/Binding/User/User.cs | 11 +-
.../Snap.Hutao/Model/Entity/SettingEntry.cs | 5 +
.../Converter/AchievementIconConverter.cs | 4 +-
.../Metadata/Converter/AvatarCardConverter.cs | 7 +-
.../Metadata/Converter/AvatarIconConverter.cs | 4 +-
.../Converter/AvatarNameCardPicConverter.cs | 4 +-
.../Converter/AvatarSideIconConverter.cs | 4 +-
.../Converter/ElementNameIconConverter.cs | 7 +-
.../Converter/EmotionIconConverter.cs | 4 +-
.../Metadata/Converter/EquipIconConverter.cs | 6 +-
.../Converter/GachaAvatarIconConverter.cs | 4 +-
.../Converter/GachaAvatarImgConverter.cs | 4 +-
.../Converter/GachaEquipIconConverter.cs | 4 +-
.../Metadata/Converter/ItemIconConverter.cs | 6 +-
.../Metadata/Converter/QualityConverter.cs | 4 +-
.../Metadata/Converter/RelicIconConverter.cs | 4 +-
.../Metadata/Converter/SkillIconConverter.cs | 11 +-
.../Converter/WeaponTypeIconConverter.cs | 4 +-
src/Snap.Hutao/Snap.Hutao/NativeMethods.json | 3 +-
src/Snap.Hutao/Snap.Hutao/NativeMethods.txt | 8 +-
.../Snap.Hutao/Package.appxmanifest | 2 +-
.../Resource/WelcomeView_Background.png | Bin 0 -> 1233591 bytes
.../Service/Achievement/AchievementService.cs | 3 +-
.../Service/AvatarInfo/AvatarInfoService.cs | 2 +-
.../AvatarInfo/Factory/ElementMastery.cs | 50 +++
.../Factory/ElementMasteryCoefficient.cs | 31 ++
.../GachaLogUrlWebCacheProvider.cs | 2 +-
.../Snap.Hutao/Service/Game/GameService.cs | 2 +-
.../Game/Locator/UnityLogGameLocator.cs | 2 +-
.../Snap.Hutao/Service/Hutao/HutaoService.cs | 2 +-
.../Service/Metadata/MetadataService.cs | 7 +-
.../SpiralAbyss/ISpiralAbyssRecordService.cs | 3 +-
.../SpiralAbyss/SpiralAbyssRecordService.cs | 20 +-
src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj | 20 ++
.../Snap.Hutao/View/Control/ItemIcon.xaml | 6 +-
.../Snap.Hutao/View/Control/LoadingView.xaml | 23 ++
.../View/Control/LoadingView.xaml.cs | 20 ++
.../View/Control/StatisticsCard.xaml | 5 +-
.../EmptyCollectionToVisibilityConverter.cs | 2 +-
.../Converter/Int32ToVisibilityConverter.cs | 26 ++
.../Int32ToVisibilityRevertConverter.cs | 26 ++
.../Snap.Hutao/View/Dialog/UserDialog.xaml | 4 +-
.../Snap.Hutao/View/Page/AchievementPage.xaml | 4 +-
.../View/Page/AvatarPropertyPage.xaml | 16 +-
.../Snap.Hutao/View/Page/CultivationPage.xaml | 6 +-
.../Snap.Hutao/View/Page/GachaLogPage.xaml | 11 +-
.../View/Page/HutaoDatabasePage.xaml | 26 +-
.../Snap.Hutao/View/Page/SettingPage.xaml | 2 +-
.../View/Page/SpiralAbyssRecordPage.xaml | 17 +-
.../Snap.Hutao/View/Page/TestPage.xaml | 33 ++
.../Snap.Hutao/View/Page/TestPage.xaml.cs | 22 ++
.../Snap.Hutao/View/Page/WikiAvatarPage.xaml | 50 +--
.../Snap.Hutao/View/Page/WikiWeaponPage.xaml | 30 +-
.../Snap.Hutao/View/WelcomeView.xaml | 60 ++++
.../Snap.Hutao/View/WelcomeView.xaml.cs | 22 ++
.../ViewModel/AchievementViewModel.cs | 43 ++-
.../ExperimentalFeaturesViewModel.cs | 6 +-
.../ViewModel/LaunchGameViewModel.cs | 3 +-
.../Snap.Hutao/ViewModel/SettingViewModel.cs | 37 +--
.../ViewModel/SpiralAbyssRecordViewModel.cs | 49 ++-
.../Snap.Hutao/ViewModel/TestViewModel.cs | 127 +++++++
.../Snap.Hutao/ViewModel/WelcomeViewModel.cs | 174 ++++++++++
.../ViewModel/WikiWeaponViewModel.cs | 2 +-
src/Snap.Hutao/Snap.Hutao/Web/ApiEndpoints.cs | 12 +-
.../Snap.Hutao/Web/Enka/EnkaClient.cs | 2 +-
.../Snap.Hutao/Web/Hutao/HomaClient.cs | 24 +-
.../Snap.Hutao/Web/Hutao/HomaClient2.cs | 3 +-
.../Snap.Hutao/Web/Hutao/PatchClient.cs | 2 +-
.../Snap.Hutao/Web/HutaoEndpoints.cs | 146 ++++++++
.../Snap.Hutao/Win32/MemoryExtensions.cs | 19 +-
95 files changed, 1787 insertions(+), 675 deletions(-)
create mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Image/GradientDirection.cs
delete mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Core/Abstraction/DisposableObject.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCacheFilePathOperation.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsJob.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsManager.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/ProgressUpdateStatus.cs
rename src/Snap.Hutao/Snap.Hutao/Core/IO/{TemporaryFile.cs => TempFile.cs} (74%)
delete mode 100644 src/Snap.Hutao/Snap.Hutao/Localization/ITranslation.cs
delete mode 100644 src/Snap.Hutao/Snap.Hutao/Localization/LanguagezhCN.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/WelcomeView_Background.png
create mode 100644 src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ElementMastery.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ElementMasteryCoefficient.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Control/LoadingView.xaml
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Control/LoadingView.xaml.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityRevertConverter.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Page/TestPage.xaml.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/WelcomeView.xaml
create mode 100644 src/Snap.Hutao/Snap.Hutao/View/WelcomeView.xaml.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/ViewModel/WelcomeViewModel.cs
create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/HutaoEndpoints.cs
diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 7954699b..b8ea48cd 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -42,6 +42,23 @@
0,6,6,0
0,0,6,6
2
+
+ 212
+ 252
+ 252
+
+ https://hut.ao/features/mhy-account-switch.html#%E5%A6%82%E4%BD%95%E8%8E%B7%E5%8F%96-cookie
+ https://hut.ao/statements/bug-report.html
+ https://github.com/HolographicHat/GetToken/releases/latest
+
+ https://static.snapgenshin.com/Bg/UI_ItemIcon_None.png
+ https://static.snapgenshin.com/Bg/UI_ImgSign_ItemIcon.png
+ https://static.snapgenshin.com/AvatarCard/UI_AvatarIcon_Costume_Card.png
+ https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon25.png
+ https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon71.png
+ https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon250.png
+ https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon272.png
+ https://static.snapgenshin.com/EmotionIcon/UI_EmotionIcon293.png
@@ -70,6 +87,8 @@
+
+
@@ -33,18 +34,18 @@ public class CachedImage : ImageEx
try
{
Verify.Operation(imageUri.Host != string.Empty, "无效的Uri");
- StorageFile file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true);
+ string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true);
// check token state to determine whether the operation should be canceled.
token.ThrowIfCancellationRequested();
// BitmapImage initialize with a uri will increase image quality and loading speed.
- return new BitmapImage(new(file.Path));
+ return new BitmapImage(new(file));
}
catch (COMException)
{
// The image is corrupted, remove it.
- await imageCache.RemoveAsync(imageUri.Enumerate()).ConfigureAwait(false);
+ imageCache.Remove(imageUri.Enumerate());
return null;
}
catch (OperationCanceledException)
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionExtensions.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionExtensions.cs
index 75789f9d..62a023db 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionExtensions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionExtensions.cs
@@ -152,19 +152,17 @@ internal static class CompositionExtensions
/// 创建一个线性渐变画刷
///
/// 合成器
- /// 起点
- /// 终点
+ /// 方向
/// 锚点
/// 线性渐变画刷
public static CompositionLinearGradientBrush CompositeLinearGradientBrush(
this Compositor compositor,
- Vector2 start,
- Vector2 end,
+ GradientDirection direction,
params GradientStop[] stops)
{
CompositionLinearGradientBrush brush = compositor.CreateLinearGradientBrush();
- brush.StartPoint = start;
- brush.EndPoint = end;
+ brush.StartPoint = GetStartPointOfDirection(direction);
+ brush.EndPoint = GetEndPointOfDirection(direction);
foreach (GradientStop stop in stops)
{
@@ -193,5 +191,31 @@ internal static class CompositionExtensions
return brush;
}
+ private static Vector2 GetStartPointOfDirection(GradientDirection direction)
+ {
+ return direction switch
+ {
+ GradientDirection.BottomToTop => Vector2.UnitY,
+ GradientDirection.LeftBottomToRightTop => Vector2.UnitY,
+ GradientDirection.RightBottomToLeftTop => Vector2.One,
+ GradientDirection.RightToLeft => Vector2.UnitX,
+ GradientDirection.RightTopToLeftBottom => Vector2.UnitX,
+ _ => Vector2.Zero,
+ };
+ }
+
+ private static Vector2 GetEndPointOfDirection(GradientDirection direction)
+ {
+ return direction switch
+ {
+ GradientDirection.LeftBottomToRightTop => Vector2.UnitX,
+ GradientDirection.LeftToRight => Vector2.UnitX,
+ GradientDirection.LeftTopToRightBottom => Vector2.One,
+ GradientDirection.RightTopToLeftBottom => Vector2.UnitY,
+ GradientDirection.TopToBottom => Vector2.UnitY,
+ _ => Vector2.Zero,
+ };
+ }
+
public record struct GradientStop(float Offset, Windows.UI.Color Color);
}
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
index 02bfe636..0ce1bb7f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
@@ -9,6 +9,7 @@ using Microsoft.UI.Xaml.Media;
using Snap.Hutao.Core.Caching;
using Snap.Hutao.Extension;
using Snap.Hutao.Service.Abstraction;
+using System.IO;
using System.Net.Http;
using System.Runtime.InteropServices;
using Windows.Storage;
@@ -60,15 +61,16 @@ public abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
///
/// 异步加载图像表面
///
- /// 文件
+ /// 文件
/// 取消令牌
/// 加载的图像表面
- protected virtual async Task LoadImageSurfaceAsync(StorageFile storageFile, CancellationToken token)
+ protected virtual async Task LoadImageSurfaceAsync(string file, CancellationToken token)
{
- using (IRandomAccessStream imageStream = await storageFile.OpenAsync(FileAccessMode.Read).AsTask(token).ConfigureAwait(true))
- {
- return LoadedImageSurface.StartLoadFromStream(imageStream);
- }
+ TaskCompletionSource loadCompleteTaskSource = new();
+ LoadedImageSurface surface = LoadedImageSurface.StartLoadFromUri(new(file));
+ surface.LoadCompleted += (s, e) => loadCompleteTaskSource.TrySetResult();
+ await loadCompleteTaskSource.Task.ConfigureAwait(true);
+ return surface;
}
///
@@ -130,7 +132,7 @@ public abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
}
else
{
- StorageFile storageFile = await imageCache.GetFileFromCacheAsync(uri).ConfigureAwait(true);
+ string storageFile = await imageCache.GetFileFromCacheAsync(uri).ConfigureAwait(true);
try
{
@@ -138,7 +140,11 @@ public abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
}
catch (COMException)
{
- await imageCache.RemoveAsync(uri.Enumerate()).ConfigureAwait(true);
+ imageCache.Remove(uri.Enumerate());
+ }
+ catch (IOException)
+ {
+ imageCache.Remove(uri.Enumerate());
}
}
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/Gradient.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/Gradient.cs
index 6294fce7..98d4847a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/Gradient.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/Gradient.cs
@@ -3,7 +3,9 @@
using Microsoft.UI;
using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
+using System.IO;
using System.Numerics;
using Windows.Graphics.Imaging;
using Windows.Storage;
@@ -16,8 +18,29 @@ namespace Snap.Hutao.Control.Image;
///
public class Gradient : CompositionImage
{
+ private static readonly DependencyProperty BackgroundDirectionProperty = Property.Depend(nameof(BackgroundDirection), GradientDirection.TopToBottom);
+ private static readonly DependencyProperty ForegroundDirectionProperty = Property.Depend(nameof(ForegroundDirection), GradientDirection.TopToBottom);
+
private double imageAspectRatio;
+ ///
+ /// 背景方向
+ ///
+ public GradientDirection BackgroundDirection
+ {
+ get { return (GradientDirection)GetValue(BackgroundDirectionProperty); }
+ set { SetValue(BackgroundDirectionProperty, value); }
+ }
+
+ ///
+ /// 前景方向
+ ///
+ public GradientDirection ForegroundDirection
+ {
+ get { return (GradientDirection)GetValue(ForegroundDirectionProperty); }
+ set { SetValue(ForegroundDirectionProperty, value); }
+ }
+
///
protected override void OnUpdateVisual(SpriteVisual spriteVisual)
{
@@ -29,15 +52,22 @@ public class Gradient : CompositionImage
}
///
- protected override async Task LoadImageSurfaceAsync(StorageFile storageFile, CancellationToken token)
+ protected override async Task LoadImageSurfaceAsync(string file, CancellationToken token)
{
- using (IRandomAccessStream imageStream = await storageFile.OpenAsync(FileAccessMode.Read).AsTask(token).ConfigureAwait(true))
+ using (FileStream fileStream = new(file, FileMode.Open, FileAccess.Read, FileShare.Read))
{
- BitmapDecoder decoder = await BitmapDecoder.CreateAsync(imageStream).AsTask(token).ConfigureAwait(true);
- imageAspectRatio = decoder.PixelWidth / (double)decoder.PixelHeight;
-
- return LoadedImageSurface.StartLoadFromStream(imageStream);
+ using (IRandomAccessStream imageStream = fileStream.AsRandomAccessStream())
+ {
+ BitmapDecoder decoder = await BitmapDecoder.CreateAsync(imageStream);
+ imageAspectRatio = decoder.PixelWidth / (double)decoder.PixelHeight;
+ }
}
+
+ TaskCompletionSource loadCompleteTaskSource = new();
+ LoadedImageSurface surface = LoadedImageSurface.StartLoadFromUri(new(file));
+ surface.LoadCompleted += (s, e) => loadCompleteTaskSource.TrySetResult();
+ await loadCompleteTaskSource.Task.ConfigureAwait(true);
+ return surface;
}
///
@@ -45,8 +75,8 @@ public class Gradient : CompositionImage
{
CompositionSurfaceBrush imageSurfaceBrush = compositor.CompositeSurfaceBrush(imageSurface, stretch: CompositionStretch.UniformToFill, vRatio: 0f);
- CompositionLinearGradientBrush backgroundBrush = compositor.CompositeLinearGradientBrush(new(1f, 0), Vector2.UnitY, new(0, Colors.White), new(1, Colors.Black));
- CompositionLinearGradientBrush foregroundBrush = compositor.CompositeLinearGradientBrush(Vector2.Zero, Vector2.UnitY, new(0, Colors.White), new(0.95f, Colors.Black));
+ CompositionLinearGradientBrush backgroundBrush = compositor.CompositeLinearGradientBrush(BackgroundDirection, new(0, Colors.White), new(1, Colors.Black));
+ CompositionLinearGradientBrush foregroundBrush = compositor.CompositeLinearGradientBrush(ForegroundDirection, new(0, Colors.White), new(1, Colors.Black));
CompositionEffectBrush gradientEffectBrush = compositor.CompositeBlendEffectBrush(backgroundBrush, foregroundBrush);
CompositionEffectBrush opacityMaskEffectBrush = compositor.CompositeLuminanceToAlphaEffectBrush(gradientEffectBrush);
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/GradientDirection.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/GradientDirection.cs
new file mode 100644
index 00000000..c7ec0777
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/GradientDirection.cs
@@ -0,0 +1,50 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Control.Image;
+
+///
+/// 渐变方向
+///
+public enum GradientDirection
+{
+ ///
+ /// 下到上
+ ///
+ BottomToTop,
+
+ ///
+ /// 左下到右上
+ ///
+ LeftBottomToRightTop,
+
+ ///
+ /// 左到右
+ ///
+ LeftToRight,
+
+ ///
+ /// 左上到右下
+ ///
+ LeftTopToRightBottom,
+
+ ///
+ /// 右下到左上
+ ///
+ RightBottomToLeftTop,
+
+ ///
+ /// 右到左
+ ///
+ RightToLeft,
+
+ ///
+ /// 右上到左下
+ ///
+ RightTopToLeftBottom,
+
+ ///
+ /// 上到下
+ ///
+ TopToBottom,
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs b/src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs
deleted file mode 100644
index bc0709c9..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Markup;
-
-namespace Snap.Hutao.Control.Markup;
-
-///
-/// Uri扩展
-///
-[MarkupExtensionReturnType(ReturnType = typeof(Uri))]
-public sealed class UriExtension : MarkupExtension
-{
- ///
- /// 构造一个新的Uri扩展
- ///
- public UriExtension()
- {
- }
-
- ///
- /// 地址
- ///
- public string? Value { get; set; }
-
- ///
- protected override object ProvideValue()
- {
- return new Uri(Value ?? string.Empty);
- }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/DisposableObject.cs b/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/DisposableObject.cs
new file mode 100644
index 00000000..ff706ff5
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/DisposableObject.cs
@@ -0,0 +1,32 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Abstraction;
+
+[SuppressMessage("", "SA1600")]
+public abstract class DisposableObject : IDisposable
+{
+ public bool IsDisposed { get; private set; }
+
+ public void Dispose()
+ {
+ if (!IsDisposed)
+ {
+ GC.SuppressFinalize(this);
+ Dispose(isDisposing: true);
+ }
+ }
+
+ protected virtual void Dispose(bool isDisposing)
+ {
+ IsDisposed = true;
+ }
+
+ protected void VerifyNotDisposed()
+ {
+ if (IsDisposed)
+ {
+ throw new ObjectDisposedException(GetType().FullName);
+ }
+ }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCache.cs b/src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCache.cs
index b4152e41..4d85f390 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCache.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCache.cs
@@ -12,23 +12,20 @@ namespace Snap.Hutao.Core.Caching;
internal interface IImageCache
{
///
- /// Gets the StorageFile containing cached item for given Uri
+ /// Gets the file path containing cached item for given Uri
///
/// Uri of the item.
- /// a StorageFile
- Task GetFileFromCacheAsync(Uri uri);
+ /// a string path
+ Task GetFileFromCacheAsync(Uri uri);
///
/// Removed items based on uri list passed
///
/// Enumerable uri list
- /// awaitable Task
- Task RemoveAsync(IEnumerable uriForCachedItems);
+ void Remove(IEnumerable uriForCachedItems);
///
- /// Removes cached files that have expired
+ /// Removes invalid cached files
///
- /// Optional timespan to compute whether file has expired or not. If no value is supplied, is used.
- /// awaitable task
- Task RemoveExpiredAsync(TimeSpan? duration = null);
+ void RemoveInvalid();
}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCacheFilePathOperation.cs b/src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCacheFilePathOperation.cs
new file mode 100644
index 00000000..02c3f75f
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Caching/IImageCacheFilePathOperation.cs
@@ -0,0 +1,18 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Caching;
+
+///
+/// 图像缓存 文件路径操作
+///
+internal interface IImageCacheFilePathOperation
+{
+ ///
+ /// 从分类与文件名获取文件路径
+ ///
+ /// 分类
+ /// 文件名
+ /// 文件路径
+ string GetFilePathFromCategoryAndFileName(string category, string fileName);
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs b/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs
index dfda991c..074aec4f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs
@@ -10,7 +10,6 @@ using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
using Windows.Storage;
-using Windows.Storage.FileProperties;
namespace Snap.Hutao.Core.Caching;
@@ -20,11 +19,10 @@ namespace Snap.Hutao.Core.Caching;
///
[Injection(InjectAs.Singleton, typeof(IImageCache))]
[HttpClient(HttpClientConfigration.Default)]
-[PrimaryHttpMessageHandler(MaxConnectionsPerServer = 16)]
-[SuppressMessage("", "CA1001")]
-public class ImageCache : IImageCache
+[PrimaryHttpMessageHandler(MaxConnectionsPerServer = 8)]
+public class ImageCache : IImageCache, IImageCacheFilePathOperation
{
- private const string DateAccessedProperty = "System.DateAccessed";
+ private const string CacheFolderName = nameof(ImageCache);
private static readonly ImmutableDictionary RetryCountToDelay = new Dictionary()
{
@@ -36,17 +34,13 @@ public class ImageCache : IImageCache
[5] = TimeSpan.FromSeconds(64),
}.ToImmutableDictionary();
- private readonly List extendedPropertyNames = new() { DateAccessedProperty };
-
- private readonly SemaphoreSlim cacheFolderSemaphore = new(1);
private readonly ILogger logger;
// violate di rule
private readonly HttpClient httpClient;
- private StorageFolder? baseFolder;
- private string? cacheFolderName;
- private StorageFolder? cacheFolder;
+ private string? baseFolder;
+ private string? cacheFolder;
///
/// Initializes a new instance of the class.
@@ -57,115 +51,84 @@ public class ImageCache : IImageCache
{
this.logger = logger;
httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
-
- CacheDuration = TimeSpan.FromDays(30);
- RetryCount = 3;
}
- ///
- /// Gets or sets the life duration of every cache entry.
- ///
- public TimeSpan CacheDuration { get; }
-
- ///
- /// Gets or sets the number of retries trying to ensure the file is cached.
- ///
- public uint RetryCount { get; }
-
- ///
- /// Clears all files in the cache
- ///
- /// awaitable task
- public async Task ClearAsync()
+ ///
+ public void RemoveInvalid()
{
- StorageFolder folder = await GetCacheFolderAsync().ConfigureAwait(false);
- IReadOnlyList files = await folder.GetFilesAsync().AsTask().ConfigureAwait(false);
+ string folder = GetCacheFolder();
+ string[] files = Directory.GetFiles(folder);
- await RemoveAsync(files).ConfigureAwait(false);
- }
+ List filesToDelete = new();
- ///
- /// Removes cached files that have expired
- ///
- /// Optional timespan to compute whether file has expired or not. If no value is supplied, is used.
- /// awaitable task
- public async Task RemoveExpiredAsync(TimeSpan? duration = null)
- {
- TimeSpan expiryDuration = duration ?? CacheDuration;
-
- StorageFolder folder = await GetCacheFolderAsync().ConfigureAwait(false);
- IReadOnlyList files = await folder.GetFilesAsync().AsTask().ConfigureAwait(false);
-
- List filesToDelete = new();
-
- foreach (StorageFile file in files)
+ foreach (string file in files)
{
- if (file == null)
- {
- continue;
- }
-
- if (await IsFileOutOfDateAsync(file, expiryDuration, false).ConfigureAwait(false))
+ if (IsFileInvalid(file, false))
{
filesToDelete.Add(file);
}
}
- await RemoveAsync(filesToDelete).ConfigureAwait(false);
+ RemoveInternal(filesToDelete);
}
- ///
- /// Removed items based on uri list passed
- ///
- /// Enumerable uri list
- /// awaitable Task
- public async Task RemoveAsync(IEnumerable uriForCachedItems)
+ ///
+ public void Remove(IEnumerable uriForCachedItems)
{
if (uriForCachedItems == null || !uriForCachedItems.Any())
{
return;
}
- StorageFolder folder = await GetCacheFolderAsync().ConfigureAwait(false);
- IReadOnlyList files = await folder.GetFilesAsync().AsTask().ConfigureAwait(false);
+ string folder = GetCacheFolder();
+ string[] files = Directory.GetFiles(folder);
- List filesToDelete = new();
-
- Dictionary cachedFiles = files.ToDictionary(file => file.Name);
+ List filesToDelete = new();
foreach (Uri uri in uriForCachedItems)
{
- string fileName = GetCacheFileName(uri);
- if (cachedFiles.TryGetValue(fileName, out StorageFile? file))
+ string filePath = Path.Combine(folder, GetCacheFileName(uri));
+ if (files.Contains(filePath))
{
- filesToDelete.Add(file);
+ filesToDelete.Add(filePath);
}
}
- await RemoveAsync(filesToDelete).ConfigureAwait(false);
+ RemoveInternal(filesToDelete);
}
- ///
- /// Gets the StorageFile containing cached item for given Uri
- ///
- /// Uri of the item.
- /// a StorageFile
- public async Task GetFileFromCacheAsync(Uri uri)
+ ///
+ public async Task GetFileFromCacheAsync(Uri uri)
{
- StorageFolder folder = await GetCacheFolderAsync().ConfigureAwait(false);
+ string filePath = Path.Combine(GetCacheFolder(), GetCacheFileName(uri));
- string fileName = GetCacheFileName(uri);
-
- IStorageItem? item = await folder.TryGetItemAsync(fileName).AsTask().ConfigureAwait(false);
-
- if (item == null || (await item.GetBasicPropertiesAsync()).Size == 0)
+ if (!File.Exists(filePath) || new FileInfo(filePath).Length == 0)
{
- StorageFile baseFile = await folder.CreateFileAsync(fileName, CreationCollisionOption.ReplaceExisting).AsTask().ConfigureAwait(false);
- await DownloadFileAsync(uri, baseFile).ConfigureAwait(false);
- item = await folder.TryGetItemAsync(fileName).AsTask().ConfigureAwait(false);
+ await DownloadFileAsync(uri, filePath).ConfigureAwait(false);
}
- return Must.NotNull((item as StorageFile)!);
+ return filePath;
+ }
+
+ ///
+ public string GetFilePathFromCategoryAndFileName(string category, string fileName)
+ {
+ Uri dummyUri = new(Web.HutaoEndpoints.StaticFile(category, fileName));
+ return Path.Combine(GetCacheFolder(), GetCacheFileName(dummyUri));
+ }
+
+ private static void RemoveInternal(IEnumerable filePaths)
+ {
+ foreach (string filePath in filePaths)
+ {
+ try
+ {
+ File.Delete(filePath);
+ }
+ catch
+ {
+ }
+ }
}
private static string GetCacheFileName(Uri uri)
@@ -176,48 +139,19 @@ public class ImageCache : IImageCache
return System.Convert.ToHexString(hash);
}
- ///
- /// Override-able method that checks whether file is valid or not.
- ///
- /// storage file
- /// cache duration
- /// option to mark uninitialized file as expired
- /// bool indicate whether file has expired or not
- private async Task IsFileOutOfDateAsync(StorageFile file, TimeSpan duration, bool treatNullFileAsOutOfDate = true)
+ private static bool IsFileInvalid(string file, bool treatNullFileAsInvalid = true)
{
- if (file == null)
+ if (!File.Exists(file))
{
- return treatNullFileAsOutOfDate;
+ return treatNullFileAsInvalid;
}
// Get extended properties.
- IDictionary extraProperties = await file.Properties
- .RetrievePropertiesAsync(extendedPropertyNames)
- .AsTask()
- .ConfigureAwait(false);
-
- // Get date-accessed property.
- object? propValue = extraProperties[DateAccessedProperty];
-
- if (propValue != null)
- {
- DateTimeOffset? lastAccess = propValue as DateTimeOffset?;
-
- if (lastAccess.HasValue)
- {
- return DateTime.Now.Subtract(lastAccess.Value.DateTime) > duration;
- }
- }
-
- BasicProperties properties = await file
- .GetBasicPropertiesAsync()
- .AsTask()
- .ConfigureAwait(false);
-
- return properties.Size == 0 || DateTime.Now.Subtract(properties.DateModified.DateTime) > duration;
+ FileInfo fileInfo = new(file);
+ return fileInfo.Length == 0;
}
- private async Task DownloadFileAsync(Uri uri, StorageFile baseFile)
+ private async Task DownloadFileAsync(Uri uri, string baseFile)
{
logger.LogInformation(EventIds.FileCaching, "Begin downloading for {uri}", uri);
@@ -230,18 +164,23 @@ public class ImageCache : IImageCache
{
using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
{
- using (FileStream fileStream = File.Create(baseFile.Path))
+ using (FileStream fileStream = File.Create(baseFile))
{
await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
return;
}
}
}
+ else if (message.StatusCode == HttpStatusCode.NotFound)
+ {
+ // directly goto https://static.hut.ao
+ retryCount = 3;
+ }
else if (message.StatusCode == HttpStatusCode.TooManyRequests)
{
retryCount++;
TimeSpan delay = message.Headers.RetryAfter?.Delta ?? RetryCountToDelay[retryCount];
- logger.LogInformation("Retry after {delay}.", delay);
+ logger.LogInformation("Retry {uri} after {delay}.", uri, delay);
await Task.Delay(delay).ConfigureAwait(false);
}
else
@@ -252,61 +191,20 @@ public class ImageCache : IImageCache
if (retryCount == 3)
{
- uri = new UriBuilder(uri) { Host = "static.hut.ao", }.Uri;
+ uri = new UriBuilder(uri) { Host = Web.HutaoEndpoints.StaticHutao, }.Uri;
}
}
}
- ///
- /// Initializes with default values if user has not initialized explicitly
- ///
- /// awaitable task
- private async Task InitializeInternalAsync()
- {
- if (cacheFolder != null)
- {
- return;
- }
-
- using (await cacheFolderSemaphore.EnterAsync().ConfigureAwait(false))
- {
- baseFolder ??= ApplicationData.Current.TemporaryFolder;
-
- if (string.IsNullOrWhiteSpace(cacheFolderName))
- {
- cacheFolderName = GetType().Name;
- }
-
- cacheFolder = await baseFolder
- .CreateFolderAsync(cacheFolderName, CreationCollisionOption.OpenIfExists)
- .AsTask()
- .ConfigureAwait(false);
- }
- }
-
- private async Task GetCacheFolderAsync()
+ private string GetCacheFolder()
{
if (cacheFolder == null)
{
- await InitializeInternalAsync().ConfigureAwait(false);
+ baseFolder ??= ApplicationData.Current.LocalCacheFolder.Path;
+ DirectoryInfo info = Directory.CreateDirectory(Path.Combine(baseFolder, CacheFolderName));
+ cacheFolder = info.FullName;
}
- return Must.NotNull(cacheFolder!);
- }
-
- private async Task RemoveAsync(IEnumerable files)
- {
- foreach (StorageFile file in files)
- {
- try
- {
- logger.LogInformation(EventIds.CacheRemoveFile, "Removing file {file}", file.Path);
- await file.DeleteAsync().AsTask().ConfigureAwait(false);
- }
- catch
- {
- logger.LogError(EventIds.CacheException, "Failed to delete file: {file}", file.Path);
- }
- }
+ return cacheFolder!;
}
}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsJob.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsJob.cs
new file mode 100644
index 00000000..bcaf7447
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsJob.cs
@@ -0,0 +1,311 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.Extensions.DependencyInjection;
+using Snap.Hutao.Core.Abstraction;
+using System.IO;
+using System.Runtime.InteropServices;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Networking.BackgroundIntelligentTransferService;
+
+namespace Snap.Hutao.Core.IO.Bits;
+
+///
+/// BITS Job
+///
+[SuppressMessage("", "SA1600")]
+internal class BitsJob : DisposableObject, IBackgroundCopyCallback
+{
+ private const uint BitsEngineNoProgressTimeout = 120;
+ private const int MaxResumeAttempts = 10;
+
+ private readonly string displayName;
+ private readonly ILogger log;
+ private readonly object lockObj = new();
+
+ private IBackgroundCopyJob? nativeJob;
+ private System.Exception? jobException;
+ private BG_JOB_PROGRESS progress;
+ private BG_JOB_STATE state;
+ private bool isJobComplete;
+ private int resumeAttempts;
+
+ private BitsJob(IServiceProvider serviceProvider, string displayName, IBackgroundCopyJob job)
+ {
+ this.displayName = displayName;
+ nativeJob = job;
+ log = serviceProvider.GetRequiredService>();
+ }
+
+ public HRESULT ErrorCode { get; private set; }
+
+ public static BitsJob CreateJob(IServiceProvider serviceProvider, IBackgroundCopyManager backgroundCopyManager, Uri uri, string filePath)
+ {
+ ILogger service = serviceProvider.GetRequiredService>();
+ string text = $"BitsDownloadJob - {uri}";
+ IBackgroundCopyJob ppJob;
+ try
+ {
+ backgroundCopyManager.CreateJob(text, BG_JOB_TYPE.BG_JOB_TYPE_DOWNLOAD, out Guid _, out ppJob);
+ ppJob.SetNotifyFlags(11u);
+ ppJob.SetNoProgressTimeout(BitsEngineNoProgressTimeout);
+ ppJob.SetPriority(BG_JOB_PRIORITY.BG_JOB_PRIORITY_FOREGROUND);
+ ppJob.SetProxySettings(BG_JOB_PROXY_USAGE.BG_JOB_PROXY_USAGE_AUTODETECT, null, null);
+ }
+ catch (COMException ex)
+ {
+ service.LogInformation("Failed to create job. {message}", ex.Message);
+ throw;
+ }
+
+ BitsJob bitsJob = new(serviceProvider, text, ppJob);
+ bitsJob.InitJob(uri.AbsoluteUri, filePath);
+ return bitsJob;
+ }
+
+ public void JobTransferred(IBackgroundCopyJob job)
+ {
+ try
+ {
+ UpdateProgress();
+ UpdateJobState();
+ CompleteOrCancel();
+ }
+ catch (System.Exception ex)
+ {
+ log.LogInformation("Failed to job transfer: {message}", ex.Message);
+ }
+ }
+
+ public void JobError(IBackgroundCopyJob job, IBackgroundCopyError error)
+ {
+ IBackgroundCopyError error2 = error;
+ try
+ {
+ log.LogInformation("Failed job: {message}", displayName);
+ UpdateJobState();
+ BG_ERROR_CONTEXT errorContext = BG_ERROR_CONTEXT.BG_ERROR_CONTEXT_NONE;
+ HRESULT returnCode = new(0);
+
+ Invoke(() => error2.GetError(out errorContext, out returnCode), "GetError", throwOnFailure: false);
+ ErrorCode = returnCode;
+ jobException = new IOException(string.Format("Error context: {0}, Error code: {1}", errorContext, returnCode));
+ CompleteOrCancel();
+ log.LogInformation(jobException, "Job Exception:");
+ }
+ catch (System.Exception ex)
+ {
+ log?.LogInformation("Failed to handle job error: {message}", ex.Message);
+ }
+ }
+
+ public void JobModification(IBackgroundCopyJob job, uint reserved)
+ {
+ try
+ {
+ UpdateJobState();
+ if (state == BG_JOB_STATE.BG_JOB_STATE_TRANSIENT_ERROR)
+ {
+ HRESULT errorCode = GetErrorCode(job);
+ if (errorCode == -2145844944)
+ {
+ ErrorCode = errorCode;
+ CompleteOrCancel();
+ return;
+ }
+
+ resumeAttempts++;
+ if (resumeAttempts <= MaxResumeAttempts)
+ {
+ Resume();
+ return;
+ }
+
+ log.LogInformation("Max resume attempts for job '{name}' exceeded. Canceling.", displayName);
+ CompleteOrCancel();
+ }
+ else if (IsProgressingState(state))
+ {
+ UpdateProgress();
+ }
+ else if (state == BG_JOB_STATE.BG_JOB_STATE_CANCELLED || state == BG_JOB_STATE.BG_JOB_STATE_ERROR)
+ {
+ CompleteOrCancel();
+ }
+ }
+ catch (System.Exception ex)
+ {
+ log.LogInformation(ex, "message");
+ }
+ }
+
+ public void Cancel()
+ {
+ log.LogInformation("Canceling job {name}", displayName);
+ lock (lockObj)
+ {
+ if (!isJobComplete)
+ {
+ Invoke(() => nativeJob?.Cancel(), "Bits Cancel");
+ jobException = new OperationCanceledException();
+ isJobComplete = true;
+ }
+ }
+ }
+
+ public void WaitForCompletion(Action callback, CancellationToken cancellationToken)
+ {
+ CancellationTokenRegistration cancellationTokenRegistration = cancellationToken.Register(Cancel);
+ int noProgressSeconds = 0;
+ try
+ {
+ UpdateJobState();
+ while (IsProgressingState(state) || state == BG_JOB_STATE.BG_JOB_STATE_QUEUED)
+ {
+ if (noProgressSeconds > BitsEngineNoProgressTimeout)
+ {
+ jobException = new TimeoutException($"Timeout reached for job {displayName} whilst in state {state}");
+ break;
+ }
+
+ cancellationToken.ThrowIfCancellationRequested();
+ UpdateJobState();
+ UpdateProgress();
+
+ if (state is BG_JOB_STATE.BG_JOB_STATE_TRANSFERRING or BG_JOB_STATE.BG_JOB_STATE_TRANSFERRED or BG_JOB_STATE.BG_JOB_STATE_ACKNOWLEDGED)
+ {
+ noProgressSeconds = 0;
+ callback(new ProgressUpdateStatus((long)progress.BytesTransferred, (long)progress.BytesTotal));
+ }
+
+ // Refresh every seconds.
+ Thread.Sleep(1000);
+ ++noProgressSeconds;
+ }
+ }
+ finally
+ {
+ cancellationTokenRegistration.Dispose();
+ CompleteOrCancel();
+ }
+
+ if (jobException != null)
+ {
+ throw jobException;
+ }
+ }
+
+ protected override void Dispose(bool isDisposing)
+ {
+ UpdateJobState();
+ CompleteOrCancel();
+ nativeJob = null;
+
+ base.Dispose(isDisposing);
+ }
+
+ private static bool IsProgressingState(BG_JOB_STATE state)
+ {
+ if (state != BG_JOB_STATE.BG_JOB_STATE_CONNECTING && state != BG_JOB_STATE.BG_JOB_STATE_TRANSIENT_ERROR)
+ {
+ return state == BG_JOB_STATE.BG_JOB_STATE_TRANSFERRING;
+ }
+
+ return true;
+ }
+
+ private void CompleteOrCancel()
+ {
+ if (isJobComplete)
+ {
+ return;
+ }
+
+ lock (lockObj)
+ {
+ if (isJobComplete)
+ {
+ return;
+ }
+
+ if (state == BG_JOB_STATE.BG_JOB_STATE_TRANSFERRED)
+ {
+ log.LogInformation("Completing job '{name}'.", displayName);
+ Invoke(() => nativeJob?.Complete(), "Bits Complete");
+ while (state == BG_JOB_STATE.BG_JOB_STATE_TRANSFERRED)
+ {
+ Thread.Sleep(50);
+ UpdateJobState();
+ }
+ }
+ else
+ {
+ log.LogInformation("Canceling job '{name}'.", displayName);
+ Invoke(() => nativeJob?.Cancel(), "Bits Cancel");
+ }
+
+ isJobComplete = true;
+ }
+ }
+
+ private void UpdateJobState()
+ {
+ if (nativeJob is IBackgroundCopyJob job)
+ {
+ Invoke(() => job.GetState(out state), "GetState");
+ }
+ }
+
+ private void UpdateProgress()
+ {
+ if (!isJobComplete)
+ {
+ Invoke(() => nativeJob?.GetProgress(out progress), "GetProgress");
+ }
+ }
+
+ private void Resume()
+ {
+ Invoke(() => nativeJob?.Resume(), "Bits Resume");
+ }
+
+ private void Invoke(Action action, string displayName, bool throwOnFailure = true)
+ {
+ try
+ {
+ action();
+ }
+ catch (System.Exception ex)
+ {
+ log.LogInformation("{name} failed. {exception}", displayName, ex);
+ if (throwOnFailure)
+ {
+ throw;
+ }
+ }
+ }
+
+ private void InitJob(string remoteUrl, string filePath)
+ {
+ nativeJob?.AddFile(remoteUrl, filePath);
+ nativeJob?.SetNotifyInterface(this);
+ Resume();
+ }
+
+ private HRESULT GetErrorCode(IBackgroundCopyJob job)
+ {
+ IBackgroundCopyJob job2 = job;
+ IBackgroundCopyError? error = null;
+
+ Invoke(() => job2.GetError(out error), "GetError", false);
+ if (error != null)
+ {
+ HRESULT returnCode = new(0);
+ Invoke(() => error.GetError(out _, out returnCode), "GetError", false);
+ return returnCode;
+ }
+
+ return new(0);
+ }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsManager.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsManager.cs
new file mode 100644
index 00000000..7f52a8cf
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/BitsManager.cs
@@ -0,0 +1,82 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.Extensions.DependencyInjection;
+using Snap.Hutao.Core.IO;
+using System.IO;
+using System.Runtime.InteropServices;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Networking.BackgroundIntelligentTransferService;
+
+namespace Snap.Hutao.Core.IO.Bits;
+
+///
+/// BITS 管理器
+///
+[Injection(InjectAs.Singleton)]
+internal class BitsManager
+{
+ private readonly Lazy lazyBackgroundCopyManager = new(() => (IBackgroundCopyManager)new BackgroundCopyManager());
+ private readonly IServiceProvider serviceProvider;
+ private readonly ILogger logger;
+
+ ///
+ /// 构造一个新的 BITS 管理器
+ ///
+ /// 服务提供器
+ public BitsManager(IServiceProvider serviceProvider)
+ {
+ this.serviceProvider = serviceProvider;
+ logger = serviceProvider.GetRequiredService>();
+ }
+
+ ///
+ /// 异步下载文件
+ ///
+ /// 文件uri
+ /// 进度
+ /// 取消令牌
+ /// 是否下载成功，以及创建的文件
+ public async Task> DownloadAsync(Uri uri, IProgress progress, CancellationToken token = default)
+ {
+ TempFile tempFile = new(true);
+ bool result = await Task.Run(() => DownloadCore(uri, tempFile.Path, progress.Report, token), token).ConfigureAwait(false);
+ return new(result, tempFile);
+ }
+
+ private bool DownloadCore(Uri uri, string tempFile, Action progress, CancellationToken token)
+ {
+ IBackgroundCopyManager value;
+
+ try
+ {
+ value = lazyBackgroundCopyManager.Value;
+ }
+ catch (System.Exception ex)
+ {
+ logger?.LogWarning("BITS download engine not supported: {message}", ex.Message);
+ return false;
+ }
+
+ using (BitsJob bitsJob = BitsJob.CreateJob(serviceProvider, value, uri, tempFile))
+ {
+ try
+ {
+ bitsJob.WaitForCompletion(progress, token);
+ }
+ catch (System.Exception ex)
+ {
+ logger?.LogWarning(ex, "BITS download failed:");
+ return false;
+ }
+
+ if (bitsJob.ErrorCode != 0)
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/ProgressUpdateStatus.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/ProgressUpdateStatus.cs
new file mode 100644
index 00000000..8c3ec78f
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/Bits/ProgressUpdateStatus.cs
@@ -0,0 +1,37 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.IO.Bits;
+
+///
+/// 进度更新状态
+///
+public class ProgressUpdateStatus
+{
+ ///
+ /// 构造一个新的进度更新状态
+ ///
+ /// 接收字节数
+ /// 总字节数
+ public ProgressUpdateStatus(long bytesRead, long totalBytes)
+ {
+ BytesRead = bytesRead;
+ TotalBytes = totalBytes;
+ }
+
+ ///
+ /// 接收字节数
+ ///
+ public long BytesRead { get; private set; }
+
+ ///
+ /// 总字节数
+ ///
+ public long TotalBytes { get; private set; }
+
+ ///
+ public override string ToString()
+ {
+ return $"{BytesRead}/{TotalBytes}";
+ }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/TemporaryFile.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs
similarity index 74%
rename from src/Snap.Hutao/Snap.Hutao/Core/IO/TemporaryFile.cs
rename to src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs
index 698e8f9c..598283b2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/TemporaryFile.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs
@@ -8,14 +8,20 @@ namespace Snap.Hutao.Core.IO;
///
/// 封装一个临时文件
///
-internal sealed class TemporaryFile : IDisposable
+internal sealed class TempFile : IDisposable
{
///
/// 构造一个新的临时文件
///
- public TemporaryFile()
+ /// 是否在创建时删除文件
+ public TempFile(bool delete = false)
{
Path = System.IO.Path.GetTempFileName();
+
+ if (delete)
+ {
+ File.Delete(Path);
+ }
}
///
@@ -28,9 +34,9 @@ internal sealed class TemporaryFile : IDisposable
///
/// 源文件
/// 临时文件
- public static TemporaryFile? CreateFromFileCopy(string file)
+ public static TempFile? CreateFromFileCopy(string file)
{
- TemporaryFile temporaryFile = new();
+ TempFile temporaryFile = new();
try
{
File.Copy(file, temporaryFile.Path, true);
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs
index 6449ff8d..2b0b1b9d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs
@@ -4,6 +4,7 @@
using CommunityToolkit.WinUI.Notifications;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Windows.AppLifecycle;
+using Snap.Hutao.Core.Setting;
using Snap.Hutao.Extension;
using Snap.Hutao.Service.Abstraction;
using Snap.Hutao.Service.DailyNote;
@@ -123,6 +124,9 @@ internal static class Activation
{
case "":
{
+ // Increase launch times
+ LocalSetting.Set(SettingKeys.LaunchTimes, LocalSetting.Get(SettingKeys.LaunchTimes, 0) + 1);
+
await WaitMainWindowAsync().ConfigureAwait(false);
break;
}
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs b/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs
index c40bcefa..d6a01a1a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs
@@ -17,4 +17,14 @@ internal static class SettingKeys
/// 导航侧栏是否展开
///
public const string IsNavPaneOpen = "IsNavPaneOpen";
+
+ ///
+ /// 启动次数
+ ///
+ public const string LaunchTimes = "LaunchTimes";
+
+ ///
+ /// 静态资源合约V1
+ ///
+ public const string StaticResourceV1Contract = "StaticResourceV1Contract";
}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Localization/ITranslation.cs b/src/Snap.Hutao/Snap.Hutao/Localization/ITranslation.cs
deleted file mode 100644
index fb2a8f32..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Localization/ITranslation.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Localization;
-
-///
-/// 翻译
-///
-internal interface ITranslation
-{
- ///
- /// 获取对应键的值
- ///
- /// 键
- /// 对应的值
- string this[string key] { get; }
-}
diff --git a/src/Snap.Hutao/Snap.Hutao/Localization/LanguagezhCN.cs b/src/Snap.Hutao/Snap.Hutao/Localization/LanguagezhCN.cs
deleted file mode 100644
index e6a8d926..00000000
--- a/src/Snap.Hutao/Snap.Hutao/Localization/LanguagezhCN.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Localization;
-
-///
-/// 中文翻译 zh-CN
-///
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-internal class LanguagezhCN : ITranslation
-{
- private readonly Dictionary translations = new()
- {
- ["AppName"] = "胡桃",
-
- ["NavigationViewItem_Activity"] = "活动",
- ["NavigationViewItem_Achievement"] = "成就",
- ["NavigationViewItem_Wiki_Avatar"] = "角色",
- ["NavigationViewItem_GachaLog"] = "祈愿记录",
-
- ["UserPanel_Account"] = "账号",
- ["UserPanel_Add_Account"] = "添加新账号",
- ["UserPanel_GameRole"] = "角色",
-
- ["Achievement_Search_PlaceHolder"] = "搜索成就名称，描述或编号",
- ["Achievement_Create_Archive"] = "创建新存档",
- ["Achievement_Delete_Archive"] = "删除当前存档",
- ["Achievement_Import"] = "导入",
- ["Achievement_Import_From_Clipboard"] = "从剪贴板导入",
- ["Achievement_Import_From_File"] = "从 UIAF 文件导入",
- ["Achievement_IncompleteItemFirst"] = "优先未完成",
-
- ["Wiki_Avatar_Filter"] = "筛选",
- ["Wiki_Avatar_Filter_Element"] = "元素",
- ["Wiki_Avatar_Filter_Association"] = "所属",
- ["Wiki_Avatar_Filter_Weapon"] = "武器",
- ["Wiki_Avatar_Filter_Quality"] = "星级",
- ["Wiki_Avatar_Filter_Body"] = "体型",
- ["Wiki_Avatar_Fetter_Native"] = "所属",
- ["Wiki_Avatar_Fetter_Constellation"] = "命之座",
- ["Wiki_Avatar_Fetter_Birth"] = "生日",
- ["Wiki_Avatar_Fetter_CvChinese"] = "汉语 CV",
- ["Wiki_Avatar_Fetter_CvJapanese"] = "日语 CV",
- ["Wiki_Avatar_Fetter_CvEnglish"] = "英语 CV",
- ["Wiki_Avatar_Fetter_CvKorean"] = "韩语 CV",
- ["Wiki_Avatar_Subtitle_Skill"] = "天赋",
- ["Wiki_Avatar_Subtitle_Talent"] = "命之座",
- ["Wiki_Avatar_Subtitle_Other"] = "其他",
- ["Wiki_Avatar_Expander_Costumes"] = "衣装",
- ["Wiki_Avatar_Expander_Fetters"] = "资料",
- ["Wiki_Avatar_Expander_FetterStories"] = "故事",
-
- ["DescParamComboBox_Level"] = "等级",
-
- ["GachaLog_Refresh"] = "刷新",
- ["GachaLog_Refresh_WebCache"] = "从缓存刷新",
- ["GachaLog_Refresh_ManualInput"] = "手动输入Url",
- ["GachaLog_Refresh_Aggressive"] = "全量刷新",
- ["GachaLog_Import"] = "导入",
- ["GachaLog_Import_UIGFJ"] = "从 UIGF Json 文件导入",
- ["GachaLog_Import_UIGFW"] = "从 UIGF Excel 文件导入",
- ["GachaLog_Export"] = "导出",
- ["GachaLog_Export_UIGFJ"] = "导出到 UIGF Json 文件",
- ["GachaLog_Export_UIGFW"] = "导出到 UIGF Excel 文件",
- ["GachaLog_PivotItem_Summary"] = "总览",
- ["GachaLog_PivotItem_History"] = "历史",
- ["GachaLog_PivotItem_Avatar"] = "角色",
- ["GachaLog_PivotItem_Weapon"] = "武器",
-
- ["StatisticsCard_Guarantee"] = "保底",
- ["StatisticsCard_Up"] = "保底",
- ["StatisticsCard_Pull"] = "抽",
- ["StatisticsCard_Orange"] = "五星",
- ["StatisticsCard_Purple"] = "四星",
- ["StatisticsCard_Blue"] = "三星",
- ["StatisticsCard_OrangeAverage"] = "五星平均抽数",
- ["StatisticsCard_UpOrangeAverage"] = "UP 平均抽数",
-
- ["Setting_Group_AboutHutao"] = "关于 胡桃",
- ["Setting_HutaoIcon_Description_Part1"] = "胡桃 图标由 ",
- ["Setting_HutaoIcon_Description_Part2"] = "纸绘，并由 ",
- ["Setting_HutaoIcon_Description_Part3"] = " 后期处理后，授权使用。",
- ["Setting_Feedback_Header"] = "反馈",
- ["Setting_Feedback_Description"] = "只处理在 Github 上反馈的问题",
- ["Setting_Feedback_Hyperlink"] = "只处理在 Github 上反馈的问题",
- ["Setting_UpdateCheck_Header"] = "检查更新",
- ["Setting_UpdateCheck_Description"] = "根本没有检查更新选项",
- ["Setting_UpdateCheck_Info"] = "都说了没有了",
- ["Setting_Group_Experimental"] = "测试功能",
- ["Setting_DataFolder_Header"] = "打开 数据 文件夹",
- ["Setting_DataFolder_Description"] = "用户数据/日志/元数据在此处存放",
- ["Setting_DataFolder_Action"] = "打开",
- ["Setting_CacheFolder_Header"] = "打开 缓存 文件夹",
- ["Setting_CacheFolder_Description"] = "图片缓存在此处存放",
- ["Setting_CacheFolder_Action"] = "打开",
- };
-
- ///
- public string this[string key]
- {
- get
- {
- if (translations.TryGetValue(key, out string? result))
- {
- return result;
- }
-
- return string.Empty;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml
index e8cd5ce7..83a02393 100644
--- a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml
@@ -2,6 +2,7 @@
x:Class="Snap.Hutao.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ 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:shv="using:Snap.Hutao.View"
@@ -13,6 +14,19 @@
Height="44"
Margin="48,0,0,0"/>
-
+
+
+
+ False
+
+
+
+
+
+ True
+
+
+
+
diff --git a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs
index 421099a8..fadd4954 100644
--- a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs
@@ -1,8 +1,11 @@
// 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.Graphics;
using Windows.Win32.UI.WindowsAndMessaging;
@@ -13,7 +16,7 @@ namespace Snap.Hutao;
///
[Injection(InjectAs.Singleton)]
[SuppressMessage("", "CA1001")]
-public sealed partial class MainWindow : Window, IExtendedWindowSource
+public sealed partial class MainWindow : Window, IExtendedWindowSource, IRecipient
{
private const int MinWidth = 848;
private const int MinHeight = 524;
@@ -27,6 +30,12 @@ public sealed partial class MainWindow : Window, IExtendedWindowSource
ExtendedWindow.Initialize(this);
IsPresent = true;
Closed += (s, e) => IsPresent = false;
+
+ Ioc.Default.GetRequiredService().Register(this);
+
+ // Query the StaticResourceV1Contract.
+ // If not complete we should present the welcome view.
+ ContentSwitchPresenter.Value = !LocalSetting.Get(SettingKeys.StaticResourceV1Contract, false);
}
///
@@ -49,4 +58,10 @@ public sealed partial class MainWindow : Window, IExtendedWindowSource
pInfo->ptMinTrackSize.X = (int)Math.Max(MinWidth * scalingFactor, pInfo->ptMinTrackSize.X);
pInfo->ptMinTrackSize.Y = (int)Math.Max(MinHeight * scalingFactor, pInfo->ptMinTrackSize.Y);
}
+
+ ///
+ public void Receive(WelcomeStateCompleteMessage message)
+ {
+ ContentSwitchPresenter.Value = false;
+ }
}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Message/UserChangedMessage.cs b/src/Snap.Hutao/Snap.Hutao/Message/UserChangedMessage.cs
index 57d1165f..91ab6b2e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Message/UserChangedMessage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Message/UserChangedMessage.cs
@@ -8,7 +8,6 @@ namespace Snap.Hutao.Message;
///
/// 用户切换消息
///
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
internal class UserChangedMessage : ValueChangedMessage
{
}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Message/ValueChangedMessage.cs b/src/Snap.Hutao/Snap.Hutao/Message/ValueChangedMessage.cs
index 4bd83669..3a922a5e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Message/ValueChangedMessage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Message/ValueChangedMessage.cs
@@ -7,7 +7,6 @@ namespace Snap.Hutao.Message;
/// 值变化消息
///
/// 值的类型
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
internal abstract class ValueChangedMessage
where TValue : class
{
diff --git a/src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs b/src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs
new file mode 100644
index 00000000..7c1e2722
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Message/WelcomeStateCompleteMessage.cs
@@ -0,0 +1,11 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Message;
+
+///
+/// 欢迎状态完成消息
+///
+public class WelcomeStateCompleteMessage
+{
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs b/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs
index 59345dbb..fca5edcc 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs
@@ -2,6 +2,7 @@
// Licensed under the MIT license.
using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Extensions.DependencyInjection;
using Snap.Hutao.Extension;
using Snap.Hutao.Web.Hoyolab;
@@ -48,7 +49,15 @@ public class User : ObservableObject
public UserGameRole? SelectedUserGameRole
{
get => selectedUserGameRole;
- set => SetProperty(ref selectedUserGameRole, value);
+ set
+ {
+ if (SetProperty(ref selectedUserGameRole, value))
+ {
+ Ioc.Default
+ .GetRequiredService()
+ .Send(new Message.UserChangedMessage() { OldValue = this, NewValue = this });
+ }
+ }
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs
index b062b1aa..96deba05 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.cs
@@ -45,6 +45,11 @@ public class SettingEntry
///
public const string DailyNoteSilentWhenPlayingGame = "DailyNote.SilentWhenPlayingGame";
+ ///
+ /// 启动游戏 独占全屏
+ ///
+ public const string LaunchIsExclusive = "Launch.IsExclusive";
+
///
/// 启动游戏 全屏
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs
index a9e564a4..cfe13d8a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class AchievementIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/AchievementIcon/{0}.png";
-
///
/// 名称转Uri
///
@@ -19,7 +17,7 @@ internal class AchievementIconConverter : ValueConverterBase
/// 链接
public static Uri IconNameToUri(string name)
{
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("AchievementIcon", $"{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs
index 53b2638f..398cc893 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarCardConverter.cs
@@ -10,9 +10,8 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class AvatarCardConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/AvatarCard/{0}_Card.png";
-
- private static readonly Uri UIAvatarIconCostumeCard = new("https://static.snapgenshin.com/AvatarCard/UI_AvatarIcon_Costume_Card.png");
+ private const string CostumeCard = "UI_AvatarIcon_Costume_Card.png";
+ private static readonly Uri UIAvatarIconCostumeCard = new(Web.HutaoEndpoints.StaticFile("AvatarCard", CostumeCard));
///
/// 名称转Uri
@@ -26,7 +25,7 @@ internal class AvatarCardConverter : ValueConverterBase
return UIAvatarIconCostumeCard;
}
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("AvatarCard", $"{name}_Card.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs
index 15157f8f..1940d121 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class AvatarIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/AvatarIcon/{0}.png";
-
///
/// 名称转Uri
///
@@ -19,7 +17,7 @@ internal class AvatarIconConverter : ValueConverterBase
/// 链接
public static Uri IconNameToUri(string name)
{
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("AvatarIcon", $"{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs
index c9558c31..f18fea57 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class AvatarNameCardPicConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/NameCardPic/UI_NameCardPic_{0}_P.png";
-
///
/// 从角色转换到名片
///
@@ -25,7 +23,7 @@ internal class AvatarNameCardPicConverter : ValueConverterBase
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs
index 1ad2ccee..2c8d8447 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class AvatarSideIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/AvatarIcon/{0}.png";
-
///
/// 名称转Uri
///
@@ -19,7 +17,7 @@ internal class AvatarSideIconConverter : ValueConverterBase
/// 链接
public static Uri IconNameToUri(string name)
{
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("AvatarIcon", $"{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs
index f4988703..758e174b 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs
@@ -12,9 +12,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class ElementNameIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/IconElement/UI_Icon_Element_{0}.png";
- private static readonly Uri UIIconNone = new("https://static.snapgenshin.com/Bg/UI_Icon_None.png");
-
///
/// 将中文元素名称转换为图标链接
///
@@ -35,8 +32,8 @@ internal class ElementNameIconConverter : ValueConverterBase
};
return string.IsNullOrEmpty(element)
- ? UIIconNone
- : new Uri(string.Format(BaseUrl, element));
+ ? Web.HutaoEndpoints.UIIconNone
+ : new Uri(Web.HutaoEndpoints.StaticFile("IconElement", $"UI_Icon_Element_{element}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs
index c5365119..0c14473f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EmotionIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class EmotionIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/EmotionIcon/{0}.png";
-
///
/// 名称转Uri
///
@@ -19,7 +17,7 @@ internal class EmotionIconConverter : ValueConverterBase
/// 链接
public static Uri IconNameToUri(string name)
{
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("EmotionIcon", $"{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs
index 295ee201..15bb711a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class EquipIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/EquipIcon/{0}.png";
-
///
/// 名称转Uri
///
@@ -19,7 +17,7 @@ internal class EquipIconConverter : ValueConverterBase
/// 链接
public static Uri IconNameToUri(string name)
{
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("EquipIcon", $"{name}.png"));
}
///
@@ -27,4 +25,4 @@ internal class EquipIconConverter : ValueConverterBase
{
return IconNameToUri(from);
}
-}
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs
index cc31af11..eec7b9f4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class GachaAvatarIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/GachaAvatarIcon/UI_Gacha_AvatarIcon_{0}.png";
-
///
/// 名称转Uri
///
@@ -20,7 +18,7 @@ internal class GachaAvatarIconConverter : ValueConverterBase
public static Uri IconNameToUri(string name)
{
name = name["UI_AvatarIcon_".Length..];
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("GachaAvatarIcon", $"UI_Gacha_AvatarIcon_{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs
index 5062adf2..4aec126d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaAvatarImgConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class GachaAvatarImgConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/GachaAvatarImg/UI_Gacha_AvatarImg_{0}.png";
-
///
/// 名称转Uri
///
@@ -20,7 +18,7 @@ internal class GachaAvatarImgConverter : ValueConverterBase
public static Uri IconNameToUri(string name)
{
name = name["UI_AvatarIcon_".Length..];
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("GachaAvatarImg", $"UI_Gacha_AvatarImg_{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs
index f65fb0a5..c9be600a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/GachaEquipIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class GachaEquipIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/GachaEquipIcon/UI_Gacha_{0}.png";
-
///
/// 名称转Uri
///
@@ -20,7 +18,7 @@ internal class GachaEquipIconConverter : ValueConverterBase
public static Uri IconNameToUri(string name)
{
name = name["UI_".Length..];
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("GachaEquipIcon", $"UI_Gacha_{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs
index 643c4c03..2c08b1d8 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ItemIconConverter.cs
@@ -10,10 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class ItemIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/ItemIcon/{0}.png";
-
- private static readonly Uri UIItemIconNone = new("https://static.snapgenshin.com/Bg/UI_ItemIcon_None.png");
-
///
/// 名称转Uri
///
@@ -21,7 +17,7 @@ internal class ItemIconConverter : ValueConverterBase
/// 链接
public static Uri IconNameToUri(string name)
{
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("ItemIcon", $"{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs
index 96144f09..20d629b2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs
@@ -11,8 +11,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class QualityConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/Bg/UI_{0}.png";
-
///
public override Uri Convert(ItemQuality from)
{
@@ -22,6 +20,6 @@ internal class QualityConverter : ValueConverterBase
name = "QUALITY_RED";
}
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("Bg", $"UI_{name}.png"));
}
}
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs
index 4b33193e..ece404ec 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs
@@ -10,8 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class RelicIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/RelicIcon/{0}.png";
-
///
/// 名称转Uri
///
@@ -19,7 +17,7 @@ internal class RelicIconConverter : ValueConverterBase
/// 链接
public static Uri IconNameToUri(string name)
{
- return new Uri(string.Format(BaseUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("RelicIcon", $"{name}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs
index d12b3321..6b57ffbe 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs
@@ -10,11 +10,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class SkillIconConverter : ValueConverterBase
{
- private const string SkillUrl = "https://static.snapgenshin.com/Skill/{0}.png";
- private const string TalentUrl = "https://static.snapgenshin.com/Talent/{0}.png";
-
- private static readonly Uri UIIconNone = new("https://static.snapgenshin.com/Bg/UI_Icon_None.png");
-
///
/// 名称转Uri
///
@@ -24,16 +19,16 @@ internal class SkillIconConverter : ValueConverterBase
{
if (string.IsNullOrWhiteSpace(name))
{
- return UIIconNone;
+ return Web.HutaoEndpoints.UIIconNone;
}
if (name.StartsWith("UI_Talent_"))
{
- return new Uri(string.Format(TalentUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("Talent", $"{name}.png"));
}
else
{
- return new Uri(string.Format(SkillUrl, name));
+ return new Uri(Web.HutaoEndpoints.StaticFile("Skill", $"{name}.png"));
}
}
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs
index a595d55e..3574e50d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs
@@ -11,8 +11,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
///
internal class WeaponTypeIconConverter : ValueConverterBase
{
- private const string BaseUrl = "https://static.snapgenshin.com/Skill/Skill_A_{0}.png";
-
///
/// 将武器类型转换为图标链接
///
@@ -30,7 +28,7 @@ internal class WeaponTypeIconConverter : ValueConverterBase
_ => throw Must.NeverHappen(),
};
- return new Uri(string.Format(BaseUrl, element));
+ return new Uri(Web.HutaoEndpoints.StaticFile("Skill", $"Skill_A_{element}.png"));
}
///
diff --git a/src/Snap.Hutao/Snap.Hutao/NativeMethods.json b/src/Snap.Hutao/Snap.Hutao/NativeMethods.json
index 2afb2c81..1694d869 100644
--- a/src/Snap.Hutao/Snap.Hutao/NativeMethods.json
+++ b/src/Snap.Hutao/Snap.Hutao/NativeMethods.json
@@ -1,6 +1,5 @@
{
"$schema": "https://aka.ms/CsWin32.schema.json",
"allowMarshaling": true,
- "public": true,
- "emitSingleFile": true
+ "public": true
}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt b/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
index 0c64a13b..89ba4790 100644
--- a/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
+++ b/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
@@ -6,7 +6,6 @@ WM_NCRBUTTONUP
// Type definition
CWMO_FLAGS
-HRESULT
MINMAXINFO
// COMCTL32
@@ -30,5 +29,12 @@ CoWaitForMultipleObjects
FindWindowEx
GetDpiForWindow
+// COM BITS
+BackgroundCopyManager
+IBackgroundCopyCallback
+IBackgroundCopyFile5
+IBackgroundCopyJobHttpOptions
+IBackgroundCopyManager
+
// WinRT
IMemoryBufferByteAccess
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest
index b4397463..cb7c495b 100644
--- a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest
+++ b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest
@@ -12,7 +12,7 @@
+ Version="1.3.4.0" />
胡桃
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/WelcomeView_Background.png b/src/Snap.Hutao/Snap.Hutao/Resource/WelcomeView_Background.png
new file mode 100644
index 0000000000000000000000000000000000000000..745b639549570cdc9a16f98addf5de46e36ab582
GIT binary patch
literal 1233591
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
z