From 1e92edca63613dcd412d4f2e13ad56208e41c4a8 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Fri, 18 Aug 2023 11:48:06 +0800 Subject: [PATCH 01/43] Improve AnnouncementContentViewer DarkMode speed --- .../Control/AnnouncementContentViewer.xaml.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs index efbbd466..bd047906 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs @@ -7,6 +7,7 @@ using Microsoft.Web.WebView2.Core; using Snap.Hutao.Control; using Snap.Hutao.Control.Theme; using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement; +using System.Text; using System.Text.RegularExpressions; using Windows.Foundation; using Windows.System; @@ -85,15 +86,15 @@ internal sealed partial class AnnouncementContentViewer : UserControl if (isDarkMode) { - // TODO: rewrite with Span IndexOfAny - content = content - .Replace(DarkColor5, LightColor5, StringComparison.Ordinal) - .Replace(DarkColor4, LightColor4, StringComparison.Ordinal) - .Replace(DarkColor3, LightColor3, StringComparison.Ordinal) - .Replace(DarkColor2, LightColor2, StringComparison.Ordinal) - .Replace(DarkColor1, LightColor1, StringComparison.Ordinal) - .Replace(DarkAccentColor2, LightAccentColor2, StringComparison.Ordinal) - .Replace(DarkAccentColor1, LightAccentColor1, StringComparison.Ordinal); + StringBuilder contentBuilder = new StringBuilder(content) + .Replace(DarkColor5, LightColor5) + .Replace(DarkColor4, LightColor4) + .Replace(DarkColor3, LightColor3) + .Replace(DarkColor2, LightColor2) + .Replace(DarkColor1, LightColor1) + .Replace(DarkAccentColor2, LightAccentColor2) + .Replace(DarkAccentColor1, LightAccentColor1); + content = contentBuilder.ToString(); } string document = $$""" From 0ea85ae26b0d33f98deca0f7e675b8b7d1637aaf Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Fri, 18 Aug 2023 16:41:11 +0800 Subject: [PATCH 02/43] Prepare Announcement Regex --- .../Resource/Localization/SH.Designer.cs | 54 +++++++++++++++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 18 +++++++ .../Announcement/AnnouncementContent.cs | 2 +- .../Common/Announcement/AnnouncementRegex.cs | 19 +++++++ 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index de9dfcf7..75bafa99 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -5478,6 +5478,51 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 (?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放 的本地化字符串。 + /// + internal static string WebAnnouncementMatchPermanentActivityTime { + get { + return ResourceManager.GetString("WebAnnouncementMatchPermanentActivityTime", resourceCulture); + } + } + + /// + /// 查找类似 〓活动时间〓.*?\d\.\d版本期间持续开放 的本地化字符串。 + /// + internal static string WebAnnouncementMatchPersistentActivityTime { + get { + return ResourceManager.GetString("WebAnnouncementMatchPersistentActivityTime", resourceCulture); + } + } + + /// + /// 查找类似 (?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后|\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt; 的本地化字符串。 + /// + internal static string WebAnnouncementMatchTransientActivityTime { + get { + return ResourceManager.GetString("WebAnnouncementMatchTransientActivityTime", resourceCulture); + } + } + + /// + /// 查找类似 〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt; 的本地化字符串。 + /// + internal static string WebAnnouncementMatchVersionUpdateTime { + get { + return ResourceManager.GetString("WebAnnouncementMatchVersionUpdateTime", resourceCulture); + } + } + + /// + /// 查找类似 \d\.\d版本更新说明 的本地化字符串。 + /// + internal static string WebAnnouncementMatchVersionUpdateTitle { + get { + return ResourceManager.GetString("WebAnnouncementMatchVersionUpdateTitle", resourceCulture); + } + } + /// /// 查找类似 {0} 天后开始 的本地化字符串。 /// @@ -5828,5 +5873,14 @@ namespace Snap.Hutao.Resource.Localization { return ResourceManager.GetString("WebResponseRequestExceptionFormat", resourceCulture); } } + + /// + /// 查找类似 (?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后|\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt; 的本地化字符串。 + /// + internal static string 活动时间祈愿时间上架时间DD版本更新后D4D2D2D2D2D2LtTClass { + get { + return ResourceManager.GetString("活动时间祈愿时间上架时间DD版本更新后D4D2D2D2D2D2LtTClass", resourceCulture); + } + } } } diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index a64d1819..dcd54d3e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1979,6 +1979,21 @@ 武器资料 + + (?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放 + + + 〓活动时间〓.*?\d\.\d版本期间持续开放 + + + (?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后|\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt; + + + 〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt; + + + \d\.\d版本更新说明 + {0} 天后开始 @@ -2096,4 +2111,7 @@ [{0}] 中的 [{1}] 网络请求异常，请稍后再试 + + (?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后|\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt; + \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementContent.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementContent.cs index d668bfe0..c0c24cb3 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementContent.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementContent.cs @@ -45,4 +45,4 @@ internal class AnnouncementContent /// [JsonPropertyName("lang")] public string Lang { get; set; } = default!; -} +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs new file mode 100644 index 00000000..a77d3741 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs @@ -0,0 +1,19 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using System.Text.RegularExpressions; + +namespace Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement; + +internal static class AnnouncementRegex +{ + public static readonly Regex VersionUpdateTitleRegex = new(SH.WebAnnouncementMatchVersionUpdateTitle, RegexOptions.Compiled); + + public static readonly Regex VersionUpdateTimeRegex = new(SH.WebAnnouncementMatchVersionUpdateTime, RegexOptions.Compiled); + + public static readonly Regex TransientActivityTimeRegex = new(SH.WebAnnouncementMatchTransientActivityTime, RegexOptions.Compiled); + + public static readonly Regex PersistentActivityTimeRegex = new(SH.WebAnnouncementMatchPersistentActivityTime, RegexOptions.Compiled); + + public static readonly Regex PermanentActivityTimeRegex = new(SH.WebAnnouncementMatchPermanentActivityTime, RegexOptions.Compiled); +} \ No newline at end of file From 7e5a536119def412d6757aae528fffc60898b574 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Fri, 18 Aug 2023 16:43:41 +0800 Subject: [PATCH 03/43] remove incorrect i18n resource --- .../Snap.Hutao/Resource/Localization/SH.Designer.cs | 9 --------- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx | 3 --- 2 files changed, 12 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 75bafa99..e5e68acb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -5873,14 +5873,5 @@ namespace Snap.Hutao.Resource.Localization { return ResourceManager.GetString("WebResponseRequestExceptionFormat", resourceCulture); } } - - /// - /// 查找类似 (?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后|\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt; 的本地化字符串。 - /// - internal static string 活动时间祈愿时间上架时间DD版本更新后D4D2D2D2D2D2LtTClass { - get { - return ResourceManager.GetString("活动时间祈愿时间上架时间DD版本更新后D4D2D2D2D2D2LtTClass", resourceCulture); - } - } } } diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index dcd54d3e..09b35f8a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -2111,7 +2111,4 @@ [{0}] 中的 [{1}] 网络请求异常，请稍后再试 - - (?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后|\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt; - \ No newline at end of file From 674002ee8d4625b0b36a5fa8a3d90a152b634a7b Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 16:40:22 +0800 Subject: [PATCH 04/43] fix #841 --- .../ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs index 69c3cc1a..bdfe1195 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs @@ -153,12 +153,16 @@ internal sealed partial class SpiralAbyssRecordViewModel : Abstraction.ViewModel SimpleRecord? record = await spiralAbyssClient.GetPlayerRecordAsync(userAndUid).ConfigureAwait(false); if (record is not null) { - Web.Response.Response response = await spiralAbyssClient.UploadRecordAsync(record).ConfigureAwait(false); + Web.Response.Response response = await spiralAbyssClient.UploadRecordAsync(record).ConfigureAwait(false); - if (response.IsOk()) + if (response is { ReturnCode: 0 }) { infoBarService.Success(response.Message); } + else + { + infoBarService.Warning(response.Message); + } } } else From 282eb228d912ec746e450c8e172a783ac119ae24 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 17:15:46 +0800 Subject: [PATCH 05/43] improve cachedimage performance --- src/Snap.Hutao/Snap.Hutao/App.xaml | 79 +++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml index d23235df..447b603c 100644 --- a/src/Snap.Hutao/Snap.Hutao/App.xaml +++ b/src/Snap.Hutao/Snap.Hutao/App.xaml @@ -5,6 +5,7 @@ xmlns:cwcw="using:CommunityToolkit.WinUI.Controls" xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Converters" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" + xmlns:shci="using:Snap.Hutao.Control.Image" xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter" xmlns:shvc="using:Snap.Hutao.View.Converter"> @@ -493,7 +494,83 @@ - + From cb06949e608a47aa190695aa66d4372276d4b185 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 18:16:42 +0800 Subject: [PATCH 06/43] fix gachalog refresh crash --- .../Core/Threading/DispatcherQueueProgress.cs | 46 +++++++++++++++++++ ...n.cs => DispatcherQueueSwitchOperation.cs} | 6 +-- .../Snap.Hutao/Core/Threading/ITaskContext.cs | 4 +- .../Snap.Hutao/Core/Threading/TaskContext.cs | 12 +++-- .../Service/GachaLog/GachaLogFetchStatus.cs | 10 ++++ .../Dialog/GachaLogRefreshProgressDialog.xaml | 18 ++++---- .../GachaLogRefreshProgressDialog.xaml.cs | 27 ++--------- .../ViewModel/GachaLog/GachaLogViewModel.cs | 2 +- 8 files changed, 84 insertions(+), 41 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs rename src/Snap.Hutao/Snap.Hutao/Core/Threading/{DispatherQueueSwitchOperation.cs => DispatcherQueueSwitchOperation.cs} (83%) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs new file mode 100644 index 00000000..c4b9b1b1 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs @@ -0,0 +1,46 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Core.Threading; + +internal class DispatcherQueueProgress : IProgress +{ + private readonly SynchronizationContext synchronizationContext; + private readonly Action? handler; + private readonly SendOrPostCallback invokeHandlers; + + public DispatcherQueueProgress(Action handler, SynchronizationContext synchronizationContext) + { + this.synchronizationContext = synchronizationContext; + invokeHandlers = new SendOrPostCallback(InvokeHandlers); + + ArgumentNullException.ThrowIfNull(handler); + + this.handler = handler; + } + + public event EventHandler? ProgressChanged; + + [SuppressMessage("", "VSTHRD001")] + public void Report(T value) + { + Action? handler = this.handler; + EventHandler? changedEvent = ProgressChanged; + if (handler is not null || changedEvent is not null) + { + synchronizationContext.Post(invokeHandlers, value); + } + } + + [SuppressMessage("", "SH007")] + private void InvokeHandlers(object? state) + { + T value = (T)state!; + + Action? handler = this.handler; + EventHandler? changedEvent = ProgressChanged; + + handler?.Invoke(value); + changedEvent?.Invoke(this, value); + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatherQueueSwitchOperation.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueSwitchOperation.cs similarity index 83% rename from src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatherQueueSwitchOperation.cs rename to src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueSwitchOperation.cs index f600a20d..0f68e4df 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatherQueueSwitchOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueSwitchOperation.cs @@ -11,7 +11,7 @@ namespace Snap.Hutao.Core.Threading; /// 等待此类型对象后上下文会被切换至主线程 /// [HighQuality] -internal readonly struct DispatherQueueSwitchOperation : IAwaitable, ICriticalAwaiter +internal readonly struct DispatcherQueueSwitchOperation : IAwaitable, ICriticalAwaiter { private readonly DispatcherQueue dispatherQueue; @@ -19,7 +19,7 @@ internal readonly struct DispatherQueueSwitchOperation : IAwaitable /// 调度器队列 - public DispatherQueueSwitchOperation(DispatcherQueue dispatherQueue) + public DispatcherQueueSwitchOperation(DispatcherQueue dispatherQueue) { this.dispatherQueue = dispatherQueue; } @@ -31,7 +31,7 @@ internal readonly struct DispatherQueueSwitchOperation : IAwaitable - public DispatherQueueSwitchOperation GetAwaiter() + public DispatcherQueueSwitchOperation GetAwaiter() { return this; } diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/ITaskContext.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/ITaskContext.cs index e2c7b8f0..ab389d0e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/ITaskContext.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/ITaskContext.cs @@ -8,6 +8,8 @@ namespace Snap.Hutao.Core.Threading; /// internal interface ITaskContext { + IProgress CreateProgressForMainThread(Action handler); + /// /// 在主线程上同步等待执行操作 /// @@ -26,5 +28,5 @@ internal interface ITaskContext /// /// 使用 异步切换到 后台线程 /// 等待体 - DispatherQueueSwitchOperation SwitchToMainThreadAsync(); + DispatcherQueueSwitchOperation SwitchToMainThreadAsync(); } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskContext.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskContext.cs index 5ae43f2c..5462d81f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskContext.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskContext.cs @@ -11,6 +11,7 @@ namespace Snap.Hutao.Core.Threading; [Injection(InjectAs.Singleton, typeof(ITaskContext))] internal sealed class TaskContext : ITaskContext { + private readonly DispatcherQueueSynchronizationContext dispatcherQueueSynchronizationContext; private readonly DispatcherQueue dispatcherQueue; /// @@ -19,8 +20,8 @@ internal sealed class TaskContext : ITaskContext public TaskContext() { dispatcherQueue = DispatcherQueue.GetForCurrentThread(); - DispatcherQueueSynchronizationContext context = new(dispatcherQueue); - SynchronizationContext.SetSynchronizationContext(context); + dispatcherQueueSynchronizationContext = new(dispatcherQueue); + SynchronizationContext.SetSynchronizationContext(dispatcherQueueSynchronizationContext); } /// @@ -30,7 +31,7 @@ internal sealed class TaskContext : ITaskContext } /// - public DispatherQueueSwitchOperation SwitchToMainThreadAsync() + public DispatcherQueueSwitchOperation SwitchToMainThreadAsync() { return new(dispatcherQueue); } @@ -47,4 +48,9 @@ internal sealed class TaskContext : ITaskContext dispatcherQueue.Invoke(action); } } + + public IProgress CreateProgressForMainThread(Action handler) + { + return new DispatcherQueueProgress(handler, dispatcherQueueSynchronizationContext); + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchStatus.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchStatus.cs index 118f5221..c77de33c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchStatus.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchStatus.cs @@ -34,4 +34,14 @@ internal sealed class GachaLogFetchStatus /// 当前获取的物品 /// public List Items { get; set; } = new(20); + + public string Header + { + get + { + return AuthKeyTimeout + ? SH.ViewDialogGachaLogRefreshProgressAuthkeyTimeout + : SH.ViewDialogGachaLogRefreshProgressDescription.Format(ConfigType.GetLocalizedDescription()); + } + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml index 546a0bd0..7f552aac 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml @@ -7,27 +7,27 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:shcm="using:Snap.Hutao.Control.Markup" xmlns:shvc="using:Snap.Hutao.View.Control" + xmlns:shvh="using:Snap.Hutao.View.Helper" Title="{shcm:ResourceString Name=ViewDialogGachaLogRefreshProgressTitle}" Style="{StaticResource DefaultContentDialogStyle}" mc:Ignorable="d"> - - - + + + ItemTemplate="{StaticResource GachaItemDataTemplate}" + ItemsSource="{x:Bind Status.Items, Mode=OneWay}"> /// 接收进度更新 /// - /// 状态 - public void OnReport(GachaLogFetchStatus state) + /// 状态 + public void OnReport(GachaLogFetchStatus status) { - Status = state; - - // TODO: test new binding approach - GachaItemsPresenter.Header = state.AuthKeyTimeout - ? SH.ViewDialogGachaLogRefreshProgressAuthkeyTimeout - : SH.ViewDialogGachaLogRefreshProgressDescription.Format(state.ConfigType.GetLocalizedDescription()); - - // Binding not working here. - GachaItemsPresenter.Items.Clear(); - - // System.InvalidOperationException: Collection was modified; enumeration operation may not execute. - foreach (Item item in state.Items.ToList()) - { - GachaItemsPresenter.Items.Add(new ItemIcon - { - Width = 60, - Height = 60, - Quality = item.Quality, - Icon = item.Icon, - Badge = item.Badge, - }); - } + Status = status; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs index ceb29fbe..6eac70f1 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs @@ -160,7 +160,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel GachaLogRefreshProgressDialog dialog = await contentDialogFactory.CreateInstanceAsync().ConfigureAwait(false); ContentDialogHideToken hideToken = await dialog.BlockAsync(taskContext).ConfigureAwait(false); - Progress progress = new(dialog.OnReport); + IProgress progress = taskContext.CreateProgressForMainThread(dialog.OnReport); bool authkeyValid; try From 79cf2839e611c1d9e931abb601781306584fefde Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 18:21:24 +0800 Subject: [PATCH 07/43] fix gachalog import crash --- src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs b/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs index 3716ee64..f63e4e66 100644 --- a/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs @@ -68,12 +68,12 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory where TContentDialog : ContentDialog { await taskContext.SwitchToMainThreadAsync(); - return serviceProvider.CreateInstance(); + return serviceProvider.CreateInstance(parameters); } public TContentDialog CreateInstance(params object[] parameters) where TContentDialog : ContentDialog { - return serviceProvider.CreateInstance(); + return serviceProvider.CreateInstance(parameters); } } \ No newline at end of file From 75938c3edeb4b5e3ccf9da9398446e1a1fe054eb Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 20:07:02 +0800 Subject: [PATCH 08/43] fix gachalog initialization & improve loading speed --- .../ViewModel/GachaLog/GachaLogViewModel.cs | 42 ++++++------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs index 6eac70f1..595fdd59 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs @@ -54,7 +54,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel public GachaArchive? SelectedArchive { get => selectedArchive; - set => SetSelectedArchiveAndUpdateStatistics(value); + set => SetSelectedArchiveAndUpdateStatisticsAsync(value).SafeForget(); } /// @@ -103,9 +103,8 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel await taskContext.SwitchToMainThreadAsync(); Archives = archives; - SetSelectedArchiveAndUpdateStatistics(Archives.SelectedOrDefault(), true); - HutaoCloudViewModel.RetrieveCommand = RetrieveFromCloudCommand; + await SetSelectedArchiveAndUpdateStatisticsAsync(Archives.SelectedOrDefault(), true).ConfigureAwait(false); return true; } } @@ -188,7 +187,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel await taskContext.SwitchToMainThreadAsync(); if (authkeyValid) { - SetSelectedArchiveAndUpdateStatistics(gachaLogService.CurrentArchive, true); + await SetSelectedArchiveAndUpdateStatisticsAsync(gachaLogService.CurrentArchive, true).ConfigureAwait(false); await hideToken.DisposeAsync().ConfigureAwait(false); } else @@ -276,7 +275,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel // reselect first archive await taskContext.SwitchToMainThreadAsync(); - SelectedArchive = Archives.FirstOrDefault(); + await SetSelectedArchiveAndUpdateStatisticsAsync(Archives.FirstOrDefault(), false).ConfigureAwait(false); } } } @@ -293,42 +292,25 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel { await taskContext.SwitchToMainThreadAsync(); Archives?.AddIfNotContains(archive); - SetSelectedArchiveAndUpdateStatistics(archive, true); + await SetSelectedArchiveAndUpdateStatisticsAsync(archive, true).ConfigureAwait(false); } } } - /// - /// 设置当前的祈愿存档 - /// 需要从主线程调用 - /// - /// 存档 - /// 强制刷新，即使Uid相同也刷新该 Uid 的记录 - private void SetSelectedArchiveAndUpdateStatistics(GachaArchive? archive, bool forceUpdate = false) + private async ValueTask SetSelectedArchiveAndUpdateStatisticsAsync(GachaArchive? archive, bool forceUpdate = false) { - bool changed = false; - if (selectedArchive != archive) - { - selectedArchive = archive; - changed = true; - } + bool changed = SetProperty(ref selectedArchive, archive, nameof(SelectedArchive)); if (changed) { gachaLogService.CurrentArchive = archive; - OnPropertyChanged(nameof(SelectedArchive)); } if (forceUpdate || changed) { - if (archive is null) + if (archive is not null) { - // no gacha log - IsInitialized = true; - } - else - { - UpdateStatisticsAsync(archive).SafeForget(); + await UpdateStatisticsAsync(archive).ConfigureAwait(false); } } } @@ -337,10 +319,10 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel { try { - GachaStatistics? temp = await gachaLogService.GetStatisticsAsync(archive).ConfigureAwait(false); + GachaStatistics? statistics = await gachaLogService.GetStatisticsAsync(archive).ConfigureAwait(false); await taskContext.SwitchToMainThreadAsync(); - Statistics = temp; + Statistics = statistics; IsInitialized = true; } catch (UserdataCorruptedException ex) @@ -375,7 +357,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel infoBarService.Success(SH.ViewModelGachaLogImportComplete); await taskContext.SwitchToMainThreadAsync(); - SetSelectedArchiveAndUpdateStatistics(gachaLogService.CurrentArchive, true); + await SetSelectedArchiveAndUpdateStatisticsAsync(gachaLogService.CurrentArchive, true).ConfigureAwait(false); return true; } else From 6f1c7b250e8679cc3cbc375fda400d42426304b0 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 20:23:30 +0800 Subject: [PATCH 09/43] fix achievement archive creation --- .../Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs index 76ef8dea..4ffa0ff2 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs @@ -187,7 +187,7 @@ internal sealed partial class AchievementViewModel : Abstraction.ViewModel, INav [Command("AddArchiveCommand")] private async Task AddArchiveAsync() { - if (Archives is null) + if (Archives is not null) { AchievementArchiveCreateDialog dialog = await contentDialogFactory.CreateInstanceAsync().ConfigureAwait(false); (bool isOk, string name) = await dialog.GetInputAsync().ConfigureAwait(false); From baee72a2fa25088214a0fcf09b30460bb3faeaf4 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 20:33:32 +0800 Subject: [PATCH 10/43] fix gachastatistics pullprediction infobar spam --- .../Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs index dfe63e32..80df0613 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs @@ -28,9 +28,9 @@ internal sealed class PullPrediction await context.TaskContext.SwitchToBackgroundAsync(); Response response = await context.GetGachaDistributionAsync().ConfigureAwait(false); - if (response.IsOk()) + if (response is { ReturnCode: 0, Data: GachaDistribution data }) { - PredictResult result = PredictCore(response.Data.Distribution, typedWishSummary); + PredictResult result = PredictCore(data.Distribution, typedWishSummary); await barrier.SignalAndWaitAsync().ConfigureAwait(false); await context.TaskContext.SwitchToMainThreadAsync(); From 368d0bfbd73fa17bbf718b3a1f333268e27eabad Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 19 Aug 2023 20:56:27 +0800 Subject: [PATCH 11/43] fix avatarproperty ordering --- src/Snap.Hutao/Snap.Hutao/App.xaml | 1 + .../Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml index 447b603c..1f3b166d 100644 --- a/src/Snap.Hutao/Snap.Hutao/App.xaml +++ b/src/Snap.Hutao/Snap.Hutao/App.xaml @@ -52,6 +52,7 @@ 180 + 64 0.2 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs index 955ff6ad..16428011 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs @@ -38,7 +38,7 @@ internal sealed partial class SummaryFactory : ISummaryFactory .Where(a => !AvatarIds.IsPlayer(a.AvatarId)) .Select(a => new SummaryAvatarFactory(metadataContext, a).Create()) .OrderByDescending(a => a.LevelNumber) - .ThenByDescending(a => a.Name) + .ThenBy(a => a.Name) .ToList(), // .ThenByDescending(a => a.Quality) From f2fea5a0e6a89cea7bf6cecff30f90b11ea08f22 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sun, 20 Aug 2023 21:50:39 +0800 Subject: [PATCH 12/43] fix game package convert --- src/Snap.Hutao/Snap.Hutao/App.xaml | 8 +-- .../Snap.Hutao/Core/IO/DirectoryOperation.cs | 5 +- .../Snap.Hutao/Core/RuntimeOptions.cs | 4 +- .../Resource/Localization/SH.Designer.cs | 27 +++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 9 +++ .../Snap.Hutao/Service/Game/GameService.cs | 4 +- .../Service/Game/LaunchScheme.KnownSchemes.cs | 10 +++ .../Service/Game/Package/PackageConverter.cs | 70 +++++++++++-------- .../Game/Package/PackageReplaceStatus.cs | 33 +++++---- .../LaunchGamePackageConvertDialog.xaml | 21 ++++-- .../ViewModel/Game/LaunchGameViewModel.cs | 4 +- 11 files changed, 138 insertions(+), 57 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml index 1f3b166d..fd4bf633 100644 --- a/src/Snap.Hutao/Snap.Hutao/App.xaml +++ b/src/Snap.Hutao/Snap.Hutao/App.xaml @@ -44,14 +44,12 @@ 0,6,6,0 0,0,6,6 2 - - 212 - - 304 + 288 + 212 + 304 180 - 64 0.2 diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/DirectoryOperation.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/DirectoryOperation.cs index c881bb77..39132ba2 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/IO/DirectoryOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/DirectoryOperation.cs @@ -1,6 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using Microsoft.VisualBasic.FileIO; using System.IO; namespace Snap.Hutao.Core.IO; @@ -14,7 +15,7 @@ internal static class DirectoryOperation return false; } - Directory.Move(sourceDirName, destDirName); + FileSystem.MoveDirectory(sourceDirName, destDirName, true); return true; } -} \ No newline at end of file +} diff --git a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs index ad3a4916..30aa3f95 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs @@ -131,15 +131,13 @@ internal sealed class RuntimeOptions : IOptions private static bool GetElevated() { -#if DEBUG_AS_FAKE_ELEVATED return true; -#else + using (WindowsIdentity identity = WindowsIdentity.GetCurrent()) { WindowsPrincipal principal = new(identity); return principal.IsInRole(WindowsBuiltInRole.Administrator); } -#endif } private void DetectWebView2Environment(ref string webView2Version, ref bool isWebView2Supported) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index e5e68acb..368a76a5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -1473,6 +1473,33 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 备份：{0} 的本地化字符串。 + /// + internal static string ServiceGamePackageConvertMoveFileBackupFormat { + get { + return ResourceManager.GetString("ServiceGamePackageConvertMoveFileBackupFormat", resourceCulture); + } + } + + /// + /// 查找类似 重命名：{0} 到：{1} 的本地化字符串。 + /// + internal static string ServiceGamePackageConvertMoveFileRenameFormat { + get { + return ResourceManager.GetString("ServiceGamePackageConvertMoveFileRenameFormat", resourceCulture); + } + } + + /// + /// 查找类似 替换：{0} 的本地化字符串。 + /// + internal static string ServiceGamePackageConvertMoveFileRestoreFormat { + get { + return ResourceManager.GetString("ServiceGamePackageConvertMoveFileRestoreFormat", resourceCulture); + } + } + /// /// 查找类似 重命名数据文件夹名称失败 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 09b35f8a..5f8b287a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -644,6 +644,15 @@ 在 Unity 日志文件中找不到游戏路径 + + 备份：{0} + + + 重命名：{0} 到：{1} + + + 替换：{0} + 重命名数据文件夹名称失败 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs index 2ce14a2f..8a0cea37 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs @@ -163,7 +163,7 @@ internal sealed partial class GameService : IGameService } } - return changed; + return changed || !LaunchSchemeMatchesExecutable(scheme, Path.GetFileName(gamePath)); } /// @@ -244,7 +244,7 @@ internal sealed partial class GameService : IGameService } string gamePath = appOptions.GamePath; - ArgumentNullException.ThrowIfNullOrEmpty(gamePath); + ArgumentException.ThrowIfNullOrEmpty(gamePath); using (Process game = ProcessInterop.InitializeGameProcess(launchOptions, gamePath)) { diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchScheme.KnownSchemes.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchScheme.KnownSchemes.cs index 99833640..4527cb62 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchScheme.KnownSchemes.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchScheme.KnownSchemes.cs @@ -18,6 +18,15 @@ internal sealed partial class LaunchScheme private const string SdkStaticLauncherBilibiliKey = "KAtdSsoQ"; private const string SdkStaticLauncherGlobalKey = "gcStgarh"; + private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelDefault = new() + { + LauncherId = SdkStaticLauncherChineseId, + Key = SdkStaticLauncherChineseKey, + Channel = ChannelType.Official, + SubChannel = SubChannelType.Default, + IsOversea = false, + }; + private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelOfficial = new() { LauncherId = SdkStaticLauncherChineseId, @@ -81,6 +90,7 @@ internal sealed partial class LaunchScheme return new List() { // 官服 + ServerChineseChannelOfficialSubChannelDefault, ServerChineseChannelOfficialSubChannelOfficial, ServerChineseChannelOfficialSubChannelNoTapTap, diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageConverter.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageConverter.cs index 7321a6f5..a01a8f22 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageConverter.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageConverter.cs @@ -27,6 +27,7 @@ internal sealed partial class PackageConverter private readonly JsonSerializerOptions options; private readonly RuntimeOptions runtimeOptions; private readonly HttpClient httpClient; + private readonly ILogger logger; /// /// 异步检查替换游戏资源 @@ -253,7 +254,9 @@ internal sealed partial class PackageConverter } // Cache no matching item, download - Directory.CreateDirectory(context.ServerCacheTargetFolder); + string? directory = Path.GetDirectoryName(cacheFile); + ArgumentException.ThrowIfNullOrEmpty(directory); + Directory.CreateDirectory(directory); using (FileStream fileStream = File.Create(cacheFile)) { string remoteUrl = context.GetScatteredFilesUrl(remoteName); @@ -288,24 +291,10 @@ internal sealed partial class PackageConverter private async ValueTask ReplaceGameResourceAsync(List operations, PackageConvertContext context, IProgress progress) { - // 重命名 _Data 目录 - try - { - DirectoryOperation.Move(context.FromDataFolder, context.ToDataFolder); - } - catch (IOException ex) - { - // Access to the path is denied. - // When user install the game in special folder like 'Program Files' - throw ThrowHelper.GameFileOperation(SH.ServiceGamePackageRenameDataFolderFailed, ex); - } - // 执行下载与移动操作 foreach (ItemOperationInfo info in operations) { - progress.Report(new($"{info.Remote}")); - - (bool backup, bool target) = info.Type switch + (bool moveToBackup, bool moveToTarget) = info.Type switch { ItemOperationType.Backup => (true, false), ItemOperationType.Replace => (true, true), @@ -313,27 +302,52 @@ internal sealed partial class PackageConverter _ => (false, false), }; - if (backup) + // 先备份 + if (moveToBackup) { - string localFileName = info.Local.RelativePath.Format(context.FromDataFolder); + string localFileName = info.Local.RelativePath.Format(context.FromDataFolderName); + progress.Report(new(SH.ServiceGamePackageConvertMoveFileBackupFormat.Format(localFileName))); + string localFilePath = context.GetGameFolderFilePath(localFileName); - string? directory = Path.GetDirectoryName(localFilePath); - ArgumentException.ThrowIfNullOrEmpty(directory); - Directory.CreateDirectory(directory); - File.Move(localFilePath, context.GetServerCacheBackupFilePath(localFileName), true); + string cacheFilePath = context.GetServerCacheBackupFilePath(localFileName); + string? cacheFileDirectory = Path.GetDirectoryName(cacheFilePath); + ArgumentException.ThrowIfNullOrEmpty(cacheFileDirectory); + Directory.CreateDirectory(cacheFileDirectory); + + logger.LogInformation("Backing file from:{Src} to:{Dst}", localFilePath, cacheFilePath); + FileOperation.Move(localFilePath, cacheFilePath, true); } - if (target) + // 后替换 + if (moveToTarget) { - string targetFileName = info.Remote.RelativePath.Format(context.ToDataFolder); + string targetFileName = info.Remote.RelativePath.Format(context.ToDataFolderName); + progress.Report(new(SH.ServiceGamePackageConvertMoveFileRestoreFormat.Format(targetFileName))); + string targetFilePath = context.GetGameFolderFilePath(targetFileName); - string? directory = Path.GetDirectoryName(targetFilePath); - ArgumentException.ThrowIfNullOrEmpty(directory); - Directory.CreateDirectory(directory); - File.Move(context.GetServerCacheTargetFilePath(targetFileName), targetFilePath, true); + string? targetFileDirectory = Path.GetDirectoryName(targetFilePath); + string cacheFilePath = context.GetServerCacheTargetFilePath(targetFileName); + ArgumentException.ThrowIfNullOrEmpty(targetFileDirectory); + Directory.CreateDirectory(targetFileDirectory); + + logger.LogInformation("Restoring file from:{Src} to:{Dst}", cacheFilePath, targetFilePath); + FileOperation.Move(cacheFilePath, targetFilePath, true); } } + // 重命名 _Data 目录 + try + { + progress.Report(new(SH.ServiceGamePackageConvertMoveFileRenameFormat.Format(context.FromDataFolderName, context.ToDataFolderName))); + DirectoryOperation.Move(context.FromDataFolder, context.ToDataFolder); + } + catch (IOException ex) + { + // Access to the path is denied. + // When user install the game in special folder like 'Program Files' + throw ThrowHelper.GameFileOperation(SH.ServiceGamePackageRenameDataFolderFailed, ex); + } + // 重新下载所有 *pkg_version 文件 await ReplacePackageVersionFilesAsync(context).ConfigureAwait(false); return true; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageReplaceStatus.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageReplaceStatus.cs index 0e49cfa2..1998f152 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageReplaceStatus.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageReplaceStatus.cs @@ -14,11 +14,11 @@ internal sealed class PackageReplaceStatus : ICloneable /// /// 构造一个新的包更新状态 /// - /// 描述 - public PackageReplaceStatus(string description) + /// 描述 + public PackageReplaceStatus(string name) { - Name = default!; - Description = description; + Name = name; + Description = default!; } /// @@ -34,23 +34,27 @@ internal sealed class PackageReplaceStatus : ICloneable Description = $"{Converters.ToFileSizeString(bytesRead)}/{Converters.ToFileSizeString(totalBytes)}"; } - public string Name { get; set; } + private PackageReplaceStatus() + { + } + + public string Name { get; set; } = default!; /// /// 描述 /// - public string Description { get; set; } - - /// - /// 是否有进度 - /// - public bool IsIndeterminate { get => Percent < 0; } + public string Description { get; set; } = default!; /// /// 进度 /// public double Percent { get; set; } = -1; + /// + /// 是否有进度 + /// + public bool IsIndeterminate { get => Percent < 0; } + /// /// 克隆 /// @@ -58,6 +62,11 @@ internal sealed class PackageReplaceStatus : ICloneable public PackageReplaceStatus Clone() { // 进度需要在主线程上创建 - return new(Description) { Percent = Percent }; + return new() + { + Name = Name, + Description = Description, + Percent = Percent, + }; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml index c8bca679..9118449b 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml @@ -21,9 +21,22 @@ IsIndeterminate="{Binding State.IsIndeterminate}" Maximum="1" Value="{Binding State.Percent}"/> - + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs index 6e6fb91d..85487db3 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs @@ -10,6 +10,7 @@ using Snap.Hutao.Factory.Abstraction; using Snap.Hutao.Model.Entity; using Snap.Hutao.Service; using Snap.Hutao.Service.Game; +using Snap.Hutao.Service.Game.Package; using Snap.Hutao.Service.Navigation; using Snap.Hutao.Service.Notification; using Snap.Hutao.Service.User; @@ -188,7 +189,7 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel { // Channel changed, we need to change local file. LaunchGamePackageConvertDialog dialog = await contentDialogFactory.CreateInstanceAsync().ConfigureAwait(false); - Progress progress = new(state => dialog.State = state.Clone()); + IProgress progress = taskContext.CreateProgressForMainThread(state => dialog.State = state/*.Clone()*/); using (await dialog.BlockAsync(taskContext).ConfigureAwait(false)) { if (!await gameService.EnsureGameResourceAsync(SelectedScheme, progress).ConfigureAwait(false)) @@ -212,6 +213,7 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel } catch (Exception ex) { + System.Diagnostics.Debug.WriteLine(ExceptionFormat.Format(ex)); infoBarService.Error(ex); } } From e347694a0bb99efe6acb6473baaa90b2437aefc3 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Mon, 21 Aug 2023 15:52:20 +0800 Subject: [PATCH 13/43] Update dependabot.yml --- .github/dependabot.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fc08c96d..15bf4c04 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,9 +7,10 @@ version: 2 updates: - package-ecosystem: "nuget" directory: "/src/Snap.Hutao" # Snap.Hutao.csproj + target-branch: "develop" schedule: interval: "weekly" groups: - main-dependencies: + packages: patterns: - "*" \ No newline at end of file From 23feb78f051334fc24e116b15d5551e9225c7eda Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Mon, 21 Aug 2023 22:51:33 +0800 Subject: [PATCH 14/43] fix user collection initialization race condition --- .../Snap.Hutao/Control/BoxedValues.cs | 15 -------- .../Snap.Hutao/Core/RuntimeOptions.cs | 2 -- .../Snap.Hutao/Core/Threading/Throttler.cs | 19 ++++++++++ src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs | 11 ++++++ .../Snap.Hutao/Service/User/UserService.cs | 28 ++++++++------- .../LaunchGamePackageConvertDialog.xaml | 5 +-- .../Web/Hutao/HomaGachaLogClient.cs | 36 ++++++++++--------- .../Web/Hutao/HomaPassportClient.cs | 4 +-- 8 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Core/Threading/Throttler.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Control/BoxedValues.cs b/src/Snap.Hutao/Snap.Hutao/Control/BoxedValues.cs index f705497a..15e7d2ba 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/BoxedValues.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/BoxedValues.cs @@ -9,21 +9,6 @@ namespace Snap.Hutao.Control; [HighQuality] internal static class BoxedValues { - /// - /// 0 - /// - public static readonly object DoubleZero = 0D; - - /// - /// 1 - /// - public static readonly object DoubleOne = 1D; - - /// - /// 0 - /// - public static readonly object Int32Zero = 0; - /// /// /// diff --git a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs index 30aa3f95..3ae76131 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs @@ -131,8 +131,6 @@ internal sealed class RuntimeOptions : IOptions private static bool GetElevated() { - return true; - using (WindowsIdentity identity = WindowsIdentity.GetCurrent()) { WindowsPrincipal principal = new(identity); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/Throttler.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Throttler.cs new file mode 100644 index 00000000..1b12e79e --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Throttler.cs @@ -0,0 +1,19 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using System.Collections.Concurrent; +using System.Runtime.CompilerServices; + +namespace Snap.Hutao.Core.Threading; + +internal sealed class Throttler +{ + private readonly ConcurrentDictionary methodSemaphoreMap = new(); + + public ValueTask ThrottleAsync(CancellationToken token = default, [CallerMemberName] string callerName = default!, [CallerLineNumber] int callerLine = 0) + { + string key = $"{callerName}L{callerLine}"; + SemaphoreSlim semaphore = methodSemaphoreMap.GetOrAdd(key, name => new SemaphoreSlim(1)); + return semaphore.EnterAsync(token); + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs index 35186dab..a2be57a4 100644 --- a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs @@ -6,6 +6,7 @@ using Microsoft.UI.Xaml; using Snap.Hutao.Core.Setting; using Snap.Hutao.Core.Windowing; using Snap.Hutao.Message; +using Windows.Foundation; using Windows.Win32.UI.WindowsAndMessaging; namespace Snap.Hutao; @@ -22,6 +23,8 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource, IRecipi private const int MinHeight = 524; private readonly WindowOptions windowOptions; + private readonly ILogger logger; + private readonly TypedEventHandler closedEventHander; /// /// 构造一个新的主窗体 @@ -33,9 +36,12 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource, IRecipi windowOptions = new(this, TitleBarView.DragArea, new(1200, 741), true); ExtendedWindow.Initialize(this, serviceProvider); serviceProvider.GetRequiredService().Register(this); + logger = serviceProvider.GetRequiredService>(); // If not complete we should present the welcome view. ContentSwitchPresenter.Value = StaticResource.IsAnyUnfulfilledContractPresent(); + closedEventHander = OnClosed; + Closed += closedEventHander; } /// @@ -53,4 +59,9 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource, IRecipi { ContentSwitchPresenter.Value = false; } + + private void OnClosed(object sender, WindowEventArgs args) + { + logger.LogInformation("MainWindow Closed"); + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs index d2b81738..2d05c00f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs @@ -25,6 +25,8 @@ namespace Snap.Hutao.Service.User; [Injection(InjectAs.Singleton, typeof(IUserService))] internal sealed partial class UserService : IUserService, IUserServiceUnsafe { + private readonly Throttler throttler = new(); + private readonly ScopedDbCurrent dbCurrent; private readonly IUserInitializationService userInitializationService; private readonly IServiceProvider serviceProvider; @@ -67,20 +69,22 @@ internal sealed partial class UserService : IUserService, IUserServiceUnsafe /// public async ValueTask> GetUserCollectionAsync() { - await taskContext.SwitchToBackgroundAsync(); - if (userCollection is null) + using (await throttler.ThrottleAsync().ConfigureAwait(false)) { - List entities = await userDbService.GetUserListAsync().ConfigureAwait(false); - List users = await entities.SelectListAsync(userInitializationService.ResumeUserAsync, default).ConfigureAwait(false); - userCollection = users.ToObservableCollection(); + if (userCollection is null) + { + List entities = await userDbService.GetUserListAsync().ConfigureAwait(false); + List users = await entities.SelectListAsync(userInitializationService.ResumeUserAsync, default).ConfigureAwait(false); + userCollection = users.ToObservableCollection(); - try - { - Current = users.SelectedOrDefault(); - } - catch (InvalidOperationException ex) - { - ThrowHelper.UserdataCorrupted(SH.ServiceUserCurrentMultiMatched, ex); + try + { + Current = users.SelectedOrDefault(); + } + catch (InvalidOperationException ex) + { + ThrowHelper.UserdataCorrupted(SH.ServiceUserCurrentMultiMatched, ex); + } } } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml index 9118449b..38fcd88d 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml @@ -1,7 +1,4 @@ - - - - /// 胡桃祈愿记录API客户端 /// +[ConstructorGenerated(ResolveHttpClient = true)] [HttpClient(HttpClientConfiguration.Default)] -internal sealed class HomaGachaLogClient +internal sealed partial class HomaGachaLogClient { private readonly HttpClient httpClient; private readonly JsonSerializerOptions options; private readonly ILogger logger; - - /// - /// 构造一个新的胡桃祈愿记录API客户端 - /// - /// http客户端 - /// 服务提供器 - public HomaGachaLogClient(HttpClient httpClient, IServiceProvider serviceProvider) - { - options = serviceProvider.GetRequiredService(); - logger = serviceProvider.GetRequiredService>(); - - this.httpClient = httpClient; - - HutaoUserOptions hutaoUserOptions = serviceProvider.GetRequiredService(); - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); - } + private readonly HutaoUserOptions hutaoUserOptions; /// /// 异步获取祈愿统计信息 @@ -42,6 +28,8 @@ internal sealed class HomaGachaLogClient /// 祈愿统计信息 public async ValueTask> GetGachaEventStatisticsAsync(CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + Response? resp = await httpClient .TryCatchGetFromJsonAsync>(HutaoEndpoints.GachaLogStatisticsCurrentEvents, options, logger, token) .ConfigureAwait(false); @@ -57,6 +45,8 @@ internal sealed class HomaGachaLogClient /// 祈愿分布 public async ValueTask> GetGachaDistributionAsync(GachaDistributionType distributionType, CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + Response? resp = await httpClient .TryCatchGetFromJsonAsync>(HutaoEndpoints.GachaLogStatisticsDistribution(distributionType), options, logger, token) .ConfigureAwait(false); @@ -72,6 +62,8 @@ internal sealed class HomaGachaLogClient [Obsolete("Use GetGachaEntriesAsync instead")] public async ValueTask>> GetUidsAsync(CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + Response>? resp = await httpClient .TryCatchGetFromJsonAsync>>(HutaoEndpoints.GachaLogUids, options, logger, token) .ConfigureAwait(false); @@ -86,6 +78,8 @@ internal sealed class HomaGachaLogClient /// Uid 列表 public async ValueTask>> GetGachaEntriesAsync(CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + Response>? resp = await httpClient .TryCatchGetFromJsonAsync>>(HutaoEndpoints.GachaLogEntries, options, logger, token) .ConfigureAwait(false); @@ -101,6 +95,8 @@ internal sealed class HomaGachaLogClient /// 末尾Id public async ValueTask> GetEndIdsAsync(string uid, CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + Response? resp = await httpClient .TryCatchGetFromJsonAsync>(HutaoEndpoints.GachaLogEndIds(uid), options, logger, token) .ConfigureAwait(false); @@ -117,6 +113,8 @@ internal sealed class HomaGachaLogClient /// 云端祈愿记录 public async ValueTask>> RetrieveGachaItemsAsync(string uid, EndIds endIds, CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + UidAndEndIds uidAndEndIds = new(uid, endIds); Response>? resp = await httpClient @@ -135,6 +133,8 @@ internal sealed class HomaGachaLogClient /// 响应 public async ValueTask UploadGachaItemsAsync(string uid, List gachaItems, CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + UidAndItems uidAndItems = new(uid, gachaItems); Response.Response? resp = await httpClient @@ -152,6 +152,8 @@ internal sealed class HomaGachaLogClient /// 响应 public async ValueTask DeleteGachaItemsAsync(string uid, CancellationToken token = default) { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + Response.Response? resp = await httpClient .TryCatchGetFromJsonAsync>>(HutaoEndpoints.GachaLogDelete(uid), options, logger, token) .ConfigureAwait(false); diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs index d572bc6c..91ba4658 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs @@ -151,10 +151,10 @@ internal sealed partial class HomaPassportClient private static string Encrypt(string text) { byte[] plaintextBytes = Encoding.UTF8.GetBytes(text); - using (RSACryptoServiceProvider rsa = new(2048)) + using (RSA rsa = RSA.Create(2048)) { rsa.ImportFromPem(PublicKey); - byte[] encryptedBytes = rsa.Encrypt(plaintextBytes, true); + byte[] encryptedBytes = rsa.Encrypt(plaintextBytes, RSAEncryptionPadding.OaepSHA1); return Convert.ToBase64String(encryptedBytes); } } From f4f32425469b9cebdd79d151524b2b53a7aeec99 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Mon, 21 Aug 2023 23:16:23 +0800 Subject: [PATCH 15/43] fix game resouce latest package no path --- .../Web/Hoyolab/SdkStatic/Hk4e/Launcher/Game.cs | 2 +- .../Hoyolab/SdkStatic/Hk4e/Launcher/LatestPackage.cs | 10 ++++++++++ .../Web/Hoyolab/SdkStatic/Hk4e/Launcher/Package.cs | 2 -- .../Hoyolab/SdkStatic/Hk4e/Launcher/PackageSegment.cs | 11 +++++++++++ .../Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs | 8 ++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/LatestPackage.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/PackageSegment.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Game.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Game.cs index bbd56619..0fe77bbe 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Game.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Game.cs @@ -13,7 +13,7 @@ internal sealed class Game /// 最新客户端 /// [JsonPropertyName("latest")] - public Package Latest { get; set; } = default!; + public LatestPackage Latest { get; set; } = default!; /// /// 相对于当前版本的之前版本的差异文件（非预下载） diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/LatestPackage.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/LatestPackage.cs new file mode 100644 index 00000000..b737ac49 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/LatestPackage.cs @@ -0,0 +1,10 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher; + +internal sealed class LatestPackage : Package +{ + [JsonPropertyName("segments")] + public List Segments { get; set; } = default!; +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Package.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Package.cs index 821e67f5..200522f5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Package.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Package.cs @@ -45,8 +45,6 @@ internal class Package : PathMd5 [JsonPropertyName("decompressed_path")] public string DecompressedPath { get; set; } = default!; - // We don't want to support `segments` downloading - /// /// 包大小 bytes /// diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/PackageSegment.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/PackageSegment.cs new file mode 100644 index 00000000..77acd3a4 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/PackageSegment.cs @@ -0,0 +1,11 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher; + +internal sealed class PackageSegment : PathMd5 +{ + [JsonPropertyName("package_size")] + [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)] + public long PackageSize { get; set; } = default!; +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs index 9fe44584..03e2d4fb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs @@ -4,6 +4,7 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; using Snap.Hutao.Service.Game; using Snap.Hutao.Web.Response; +using System.IO; using System.Net.Http; namespace Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher; @@ -36,6 +37,13 @@ internal sealed partial class ResourceClient .TryCatchGetFromJsonAsync>(url, options, logger, token) .ConfigureAwait(false); + // 补全缺失的信息 + if (response is { Data.Game.Latest: LatestPackage latest }) + { + latest.Path = latest.Segments[0].Path[..^4]; + latest.Name = Path.GetFileName(latest.Path); + } + return Response.Response.DefaultIfNull(response); } } \ No newline at end of file From 704113cacdf46899ff21b4b7f7f16b6cbdbcedca Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Tue, 22 Aug 2023 23:32:03 +0800 Subject: [PATCH 16/43] geetest verify --- .../ExceptionService/ExceptionRecorder.cs | 2 +- .../{ => GachaLog}/HomaGachaLogClient.cs | 2 +- .../Web/Hutao/Geetest/GeetestData.cs | 19 +++++++++++ .../Web/Hutao/Geetest/GeetestResponse.cs | 19 +++++++++++ .../Web/Hutao/Geetest/HomaGeetestClient.cs | 32 +++++++++++++++++++ .../Hutao/{ => Log}/HomaLogUploadClient.cs | 2 +- .../Snap.Hutao/Web/HutaoEndpoints.cs | 7 ++++ 7 files changed, 80 insertions(+), 3 deletions(-) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{ => GachaLog}/HomaGachaLogClient.cs (99%) create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestData.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestResponse.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{ => Log}/HomaLogUploadClient.cs (97%) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs b/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs index db38e8d7..dbd49257 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionRecorder.cs @@ -34,7 +34,7 @@ internal sealed partial class ExceptionRecorder #if RELEASE #pragma warning disable VSTHRD002 serviceProvider - .GetRequiredService() + .GetRequiredService() .UploadLogAsync(serviceProvider, e.Exception) .GetAwaiter() .GetResult(); diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaGachaLogClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs similarity index 99% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaGachaLogClient.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs index 34eb1601..b7c97272 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaGachaLogClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs @@ -7,7 +7,7 @@ using Snap.Hutao.Web.Hutao.GachaLog; using Snap.Hutao.Web.Response; using System.Net.Http; -namespace Snap.Hutao.Web.Hutao; +namespace Snap.Hutao.Web.Hutao.GachaLog; /// /// 胡桃祈愿记录API客户端 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestData.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestData.cs new file mode 100644 index 00000000..7b76147d --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestData.cs @@ -0,0 +1,19 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hutao.Geetest; + +internal sealed class GeetestData +{ + [JsonPropertyName("gt")] + public string Gt { get; set; } = default!; + + [JsonPropertyName("challenge")] + public string Challenge { get; set; } = default!; + + [JsonPropertyName("validate")] + public string Validate { get; set; } = default!; + + [JsonPropertyName("type")] + public string Type { get; set; } = default!; +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestResponse.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestResponse.cs new file mode 100644 index 00000000..9881e435 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/GeetestResponse.cs @@ -0,0 +1,19 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hutao.Geetest; + +internal sealed class GeetestResponse +{ + [JsonPropertyName("code")] + public int Code { get; set; } + + [JsonPropertyName("info")] + public string Info { get; set; } = default!; + + [JsonPropertyName("data")] + public GeetestData Data { get; set; } = default!; + + [JsonPropertyName("times")] + public int Times { get; set; } = default!; +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs new file mode 100644 index 00000000..ad585add --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs @@ -0,0 +1,32 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; +using Snap.Hutao.Service.Hutao; +using Snap.Hutao.Web.Hutao.GachaLog; +using Snap.Hutao.Web.Response; +using System.Net.Http; + +namespace Snap.Hutao.Web.Hutao.Geetest; + +[ConstructorGenerated(ResolveHttpClient = true)] +[HttpClient(HttpClientConfiguration.Default)] +internal sealed partial class HomaGeetestClient +{ + private readonly HttpClient httpClient; + private readonly JsonSerializerOptions options; + private readonly ILogger logger; + private readonly HutaoUserOptions hutaoUserOptions; + + public async ValueTask VerifyAsync(string gt, string challenge, CancellationToken token) + { + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + + GeetestResponse? resp = await httpClient + .TryCatchGetFromJsonAsync(HutaoEndpoints.GeetestVerify(gt,challenge), options, logger, token) + .ConfigureAwait(false); + + ArgumentNullException.ThrowIfNull(resp); + return resp; + } +} diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaLogUploadClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs similarity index 97% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaLogUploadClient.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs index 50d79f6c..c362905c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaLogUploadClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs @@ -7,7 +7,7 @@ using Snap.Hutao.Web.Hutao.Log; using Snap.Hutao.Web.Response; using System.Net.Http; -namespace Snap.Hutao.Web.Hutao; +namespace Snap.Hutao.Web.Hutao.Log; /// /// 胡桃日志客户端 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/HutaoEndpoints.cs b/src/Snap.Hutao/Snap.Hutao/Web/HutaoEndpoints.cs index a02cefae..5f88e515 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/HutaoEndpoints.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/HutaoEndpoints.cs @@ -18,6 +18,13 @@ internal static class HutaoEndpoints /// public const string StaticHutao = "static.hut.ao"; + #region + public static string GeetestVerify(string gt, string challenge) + { + return $"{HomaSnapGenshinApi}/Geetest/Verify?gt={gt}&challenge={challenge}"; + } + #endregion + #region GachaLog /// From b6080c45c2934c0f5923489c59e2b7dd3fddb1f8 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Wed, 23 Aug 2023 20:21:32 +0800 Subject: [PATCH 17/43] fix #823 --- .../Factory/GachaStatisticsFactory.cs | 8 ++-- .../Snap.Hutao/Service/Hutao/HutaoCache.cs | 2 +- .../Snap.Hutao/Service/Hutao/HutaoService.cs | 2 +- .../Service/Hutao/HutaoUserOptions.cs | 23 +++++++--- .../Service/Hutao/HutaoUserService.cs | 8 +++- .../Snap.Hutao/Service/Hutao/IHutaoCache.cs | 2 +- .../Snap.Hutao/Service/Hutao/IHutaoService.cs | 2 +- .../Service/Hutao/ObjectCacheDbService.cs | 2 +- .../Complex/HutaoDatabaseViewModel.cs | 2 +- .../ViewModel/Complex/ReliquarySetView.cs | 2 +- .../Snap.Hutao/ViewModel/Complex/Team.cs | 2 +- .../ViewModel/Complex/TeamAppearanceView.cs | 2 +- .../SpiralAbyss/SpiralAbyssRecordViewModel.cs | 3 +- .../Snap.Hutao/Web/Geetest/GeetestClient.cs | 1 + .../Hoyolab/Takumi/GameRecord/CardClient.cs | 1 + .../Takumi/GameRecord/GameRecordClient.cs | 5 ++- .../Verification/HomaGeetestCardVerifier.cs | 43 +++++++++++++++++++ .../Verification/IGeetestCardVerifier.cs | 11 +++++ .../SlientGeetestCardVerifier.cs} | 8 ++-- .../Verification/VerificationRegistration.cs | 2 +- .../Verification/VerificationResult.cs | 2 +- .../Web/Hutao/GachaLog/HomaGachaLogClient.cs | 17 ++++---- ...assportHttpClientAuthorizationExtension.cs | 16 +++++++ .../Web/Hutao/Geetest/HomaGeetestClient.cs | 4 +- .../Web/Hutao/HomaPassportClient.cs | 2 +- .../AvatarAppearanceRank.cs | 2 +- .../{Model => SpiralAbyss}/AvatarBuild.cs | 2 +- .../AvatarCollocation.cs | 2 +- .../AvatarConstellationInfo.cs | 2 +- .../{Model => SpiralAbyss}/AvatarUsageRank.cs | 2 +- .../Converter/ReliquarySetsConverter.cs | 2 +- .../HomaSpiralAbyssClient.cs | 8 ++-- .../Hutao/{Model => SpiralAbyss}/ItemRate.cs | 2 +- .../Hutao/{Model => SpiralAbyss}/Overview.cs | 2 +- .../Post/SimpleAvatar.cs | 2 +- .../Post/SimpleBattle.cs | 2 +- .../Post/SimpleFloor.cs | 2 +- .../Post/SimpleLevel.cs | 2 +- .../{Model => SpiralAbyss}/Post/SimpleRank.cs | 2 +- .../Post/SimpleRecord.cs | 4 +- .../Post/SimpleSpiralAbyss.cs | 4 +- .../Hutao/{Model => SpiralAbyss}/RankInfo.cs | 2 +- .../Hutao/{Model => SpiralAbyss}/RankValue.cs | 2 +- .../{Model => SpiralAbyss}/ReliquarySet.cs | 2 +- .../{Model => SpiralAbyss}/ReliquarySets.cs | 4 +- .../Web/Hutao/{Model => SpiralAbyss}/Team.cs | 2 +- .../{Model => SpiralAbyss}/TeamAppearance.cs | 2 +- .../Hutao/{Model => SpiralAbyss}/UserInfo.cs | 2 +- .../{Model => SpiralAbyss}/WeaponBuild.cs | 2 +- .../WeaponCollocation.cs | 2 +- 50 files changed, 161 insertions(+), 73 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/IGeetestCardVerifier.cs rename src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/{CardVerifier.cs => Verification/SlientGeetestCardVerifier.cs} (85%) create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaPassportHttpClientAuthorizationExtension.cs rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/AvatarAppearanceRank.cs (90%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/AvatarBuild.cs (88%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/AvatarCollocation.cs (93%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/AvatarConstellationInfo.cs (91%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/AvatarUsageRank.cs (90%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Converter/ReliquarySetsConverter.cs (95%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{ => SpiralAbyss}/HomaSpiralAbyssClient.cs (97%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/ItemRate.cs (94%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Overview.cs (98%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Post/SimpleAvatar.cs (95%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Post/SimpleBattle.cs (93%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Post/SimpleFloor.cs (94%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Post/SimpleLevel.cs (94%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Post/SimpleRank.cs (95%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Post/SimpleRecord.cs (91%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Post/SimpleSpiralAbyss.cs (91%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/RankInfo.cs (90%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/RankValue.cs (95%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/ReliquarySet.cs (95%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/ReliquarySets.cs (83%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/Team.cs (92%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/TeamAppearance.cs (92%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/UserInfo.cs (90%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/WeaponBuild.cs (88%) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{Model => SpiralAbyss}/WeaponCollocation.cs (89%) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs index ae20b701..1212a10b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs @@ -9,7 +9,7 @@ using Snap.Hutao.Model.Metadata.Avatar; using Snap.Hutao.Model.Metadata.Weapon; using Snap.Hutao.Service.Metadata; using Snap.Hutao.ViewModel.GachaLog; -using Snap.Hutao.Web.Hutao; +using Snap.Hutao.Web.Hutao.GachaLog; using System.Runtime.InteropServices; namespace Snap.Hutao.Service.GachaLog.Factory; @@ -28,7 +28,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory private readonly AppOptions options; /// - public async ValueTask CreateAsync(List items, GachaLogServiceMetadataContext context) + public async ValueTask CreateAsync(List items, GachaLogServiceMetadataContext context) { await taskContext.SwitchToBackgroundAsync(); List gachaEvents = await metadataService.GetGachaEventsAsync().ConfigureAwait(false); @@ -40,7 +40,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory private static GachaStatistics CreateCore( ITaskContext taskContext, HomaGachaLogClient gachaLogClient, - List items, + List items, List historyWishBuilders, in GachaLogServiceMetadataContext context, bool isEmptyHistoryWishVisible) @@ -62,7 +62,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory // Items are ordered by precise time, first is oldest // 'ref' is not allowed here because we have lambda below - foreach (GachaItem item in CollectionsMarshal.AsSpan(items)) + foreach (Model.Entity.GachaItem item in CollectionsMarshal.AsSpan(items)) { // Find target history wish to operate. HistoryWishBuilder? targetHistoryWishBuilder = historyWishBuilders diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoCache.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoCache.cs index 47360271..0e44e587 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoCache.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoCache.cs @@ -8,7 +8,7 @@ using Snap.Hutao.Model.Metadata.Weapon; using Snap.Hutao.Model.Primitive; using Snap.Hutao.Service.Metadata; using Snap.Hutao.ViewModel.Complex; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; namespace Snap.Hutao.Service.Hutao; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs index 5f5c6814..5ae45ac0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs @@ -6,7 +6,7 @@ using Snap.Hutao.Core.Database; using Snap.Hutao.Model.Entity; using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Web.Hutao; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; using Snap.Hutao.Web.Response; namespace Snap.Hutao.Service.Hutao; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs index e6e510aa..4a68d8b0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs @@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.Extensions.Options; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; using System.Text.RegularExpressions; namespace Snap.Hutao.Service.Hutao; @@ -14,6 +14,7 @@ namespace Snap.Hutao.Service.Hutao; [Injection(InjectAs.Singleton)] internal sealed class HutaoUserOptions : ObservableObject, IOptions { + private readonly TaskCompletionSource initializedTaskCompletionSource = new(); private string? userName = SH.ViewServiceHutaoUserLoginOrRegisterHint; private string? token; private bool isLoggedIn; @@ -31,11 +32,6 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions public string? ActualUserName { get => IsLoggedIn ? UserName : null; } - /// - /// 访问令牌 - /// - public string? Token { get => token; set => SetProperty(ref token, value); } - /// /// 是否已登录 /// @@ -67,8 +63,9 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions @@ -77,6 +74,12 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions @@ -89,4 +92,10 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions DateTimeOffset.Now; } + + public async ValueTask GetTokenAsync() + { + await initializedTaskCompletionSource.Task.ConfigureAwait(false); + return token; + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs index f443bda2..4adcb51f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Core.Setting; using Snap.Hutao.Web.Hutao; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; namespace Snap.Hutao.Service.Hutao; @@ -35,7 +35,11 @@ internal sealed partial class HutaoUserService : IHutaoUserService, IHutaoUserSe string userName = LocalSetting.Get(SettingKeys.PassportUserName, string.Empty); string passport = LocalSetting.Get(SettingKeys.PassportPassword, string.Empty); - if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(passport)) + if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(passport)) + { + options.SkipLogin(); + } + else { Web.Response.Response response = await passportClient.LoginAsync(userName, passport, token).ConfigureAwait(false); diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoCache.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoCache.cs index 79741833..13f191cc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoCache.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoCache.cs @@ -4,7 +4,7 @@ using Snap.Hutao.Model.Binding.Hutao; using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.Complex; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; namespace Snap.Hutao.Service.Hutao; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoService.cs index 7f37e7a0..f21d11d0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoService.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; namespace Snap.Hutao.Service.Hutao; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs index cb9e8631..5350410b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs @@ -8,7 +8,7 @@ using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Model.Entity; using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Web.Hutao; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; using Snap.Hutao.Web.Response; namespace Snap.Hutao.Service.Hutao; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/HutaoDatabaseViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/HutaoDatabaseViewModel.cs index e9616e1c..7a291a07 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/HutaoDatabaseViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/HutaoDatabaseViewModel.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Binding.Hutao; using Snap.Hutao.Service.Hutao; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; namespace Snap.Hutao.ViewModel.Complex; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs index b9ce59fa..b108fc67 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Metadata.Converter; using Snap.Hutao.Model.Primitive; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs index 457cf592..4340042c 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Primitives; using Snap.Hutao.Model.Metadata.Avatar; using Snap.Hutao.Model.Primitive; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; using System.Globalization; namespace Snap.Hutao.ViewModel.Complex; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs index be1eb0b8..c914b6ed 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Metadata.Avatar; using Snap.Hutao.Model.Primitive; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; namespace Snap.Hutao.ViewModel.Complex; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs index bdfe1195..6d76281c 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs @@ -12,7 +12,8 @@ using Snap.Hutao.Service.SpiralAbyss; using Snap.Hutao.Service.User; using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hutao; -using Snap.Hutao.Web.Hutao.Model.Post; +using Snap.Hutao.Web.Hutao.SpiralAbyss; +using Snap.Hutao.Web.Hutao.SpiralAbyss.Post; using System.Collections.ObjectModel; namespace Snap.Hutao.ViewModel.SpiralAbyss; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs index 980a58e1..21f45783 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs @@ -3,6 +3,7 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; +using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; using System.Net.Http; namespace Snap.Hutao.Web.Geetest; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/CardClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/CardClient.cs index af7d1417..b1ab1bc1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/CardClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/CardClient.cs @@ -5,6 +5,7 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; using Snap.Hutao.Model.Entity; using Snap.Hutao.Web.Hoyolab.Annotation; using Snap.Hutao.Web.Hoyolab.DynamicSecret; +using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; using Snap.Hutao.Web.Response; using System.Net.Http; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/GameRecordClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/GameRecordClient.cs index 78da7a3d..8c295996 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/GameRecordClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/GameRecordClient.cs @@ -6,6 +6,7 @@ using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hoyolab.Annotation; using Snap.Hutao.Web.Hoyolab.DynamicSecret; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; +using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; using Snap.Hutao.Web.Response; using System.Net.Http; @@ -46,9 +47,9 @@ internal sealed partial class GameRecordClient : IGameRecordClient { // Replace message resp.Message = SH.WebDailyNoteVerificationFailed; - CardVerifier cardVerifier = serviceProvider.GetRequiredService(); + IGeetestCardVerifier verifier = serviceProvider.GetRequiredService(); - if (await cardVerifier.TryGetXrpcChallengeAsync(userAndUid.User, token).ConfigureAwait(false) is { } challenge) + if (await verifier.TryValidateXrpcChallengeAsync(userAndUid.User, token).ConfigureAwait(false) is { } challenge) { resp = await httpClient .SetUser(userAndUid.User, CookieType.Cookie) diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs new file mode 100644 index 00000000..ff59fec2 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs @@ -0,0 +1,43 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Model.Entity; +using Snap.Hutao.Web.Geetest; +using Snap.Hutao.Web.Hutao.Geetest; + +namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; + +[ConstructorGenerated] +[Injection(InjectAs.Transient)] +internal sealed partial class HomaGeetestCardVerifier : IGeetestCardVerifier +{ + private readonly CardClient cardClient; + private readonly HomaGeetestClient homaGeetestClient; + + public async ValueTask TryValidateXrpcChallengeAsync(User user, CancellationToken token) + { + Response.Response registrationResponse = await cardClient.CreateVerificationAsync(user, token).ConfigureAwait(false); + if (registrationResponse.IsOk()) + { + VerificationRegistration registration = registrationResponse.Data; + + GeetestResponse response = await homaGeetestClient.VerifyAsync(registration.Gt, registration.Challenge, token).ConfigureAwait(false); + + if (response is { Code: 0, Data.Validate: string validate }) + { + Response.Response verifyResponse = await cardClient.VerifyVerificationAsync(registration.Challenge, validate, token).ConfigureAwait(false); + if (verifyResponse.IsOk()) + { + VerificationResult result = verifyResponse.Data; + + if (result.Challenge is not null) + { + return result.Challenge; + } + } + } + } + + return default; + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/IGeetestCardVerifier.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/IGeetestCardVerifier.cs new file mode 100644 index 00000000..1ffc505f --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/IGeetestCardVerifier.cs @@ -0,0 +1,11 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Model.Entity; + +namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; + +internal interface IGeetestCardVerifier +{ + ValueTask TryValidateXrpcChallengeAsync(User user, CancellationToken token); +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/CardVerifier.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/SlientGeetestCardVerifier.cs similarity index 85% rename from src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/CardVerifier.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/SlientGeetestCardVerifier.cs index 9db52add..25c774c0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/CardVerifier.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/SlientGeetestCardVerifier.cs @@ -4,14 +4,14 @@ using Snap.Hutao.Model.Entity; using Snap.Hutao.Web.Geetest; -namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; +namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; /// /// CardApi验证器 /// [HighQuality] [Injection(InjectAs.Transient)] -internal sealed class CardVerifier +internal sealed class SlientGeetestCardVerifier : IGeetestCardVerifier { private readonly CardClient cardClient; private readonly GeetestClient geetestClient; @@ -21,7 +21,7 @@ internal sealed class CardVerifier /// /// card客户端 /// 极验客户端 - public CardVerifier(CardClient cardClient, GeetestClient geetestClient) + public SlientGeetestCardVerifier(CardClient cardClient, GeetestClient geetestClient) { this.cardClient = cardClient; this.geetestClient = geetestClient; @@ -33,7 +33,7 @@ internal sealed class CardVerifier /// 用户 /// 取消令牌 /// 流水号 - public async ValueTask TryGetXrpcChallengeAsync(User user, CancellationToken token) + public async ValueTask TryValidateXrpcChallengeAsync(User user, CancellationToken token) { Response.Response registrationResponse = await cardClient.CreateVerificationAsync(user, token).ConfigureAwait(false); if (registrationResponse.IsOk()) diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationRegistration.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationRegistration.cs index f273a19b..8efcf680 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationRegistration.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationRegistration.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; +namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; /// /// 验证注册 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationResult.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationResult.cs index 45e5fc63..2c346bb4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationResult.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/VerificationResult.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; +namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; /// /// 验证结果 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs index b7c97272..455c0628 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs @@ -6,6 +6,7 @@ using Snap.Hutao.Service.Hutao; using Snap.Hutao.Web.Hutao.GachaLog; using Snap.Hutao.Web.Response; using System.Net.Http; +using System.Runtime.CompilerServices; namespace Snap.Hutao.Web.Hutao.GachaLog; @@ -28,7 +29,7 @@ internal sealed partial class HomaGachaLogClient /// 祈愿统计信息 public async ValueTask> GetGachaEventStatisticsAsync(CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); Response? resp = await httpClient .TryCatchGetFromJsonAsync>(HutaoEndpoints.GachaLogStatisticsCurrentEvents, options, logger, token) @@ -45,7 +46,7 @@ internal sealed partial class HomaGachaLogClient /// 祈愿分布 public async ValueTask> GetGachaDistributionAsync(GachaDistributionType distributionType, CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); Response? resp = await httpClient .TryCatchGetFromJsonAsync>(HutaoEndpoints.GachaLogStatisticsDistribution(distributionType), options, logger, token) @@ -62,7 +63,7 @@ internal sealed partial class HomaGachaLogClient [Obsolete("Use GetGachaEntriesAsync instead")] public async ValueTask>> GetUidsAsync(CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); Response>? resp = await httpClient .TryCatchGetFromJsonAsync>>(HutaoEndpoints.GachaLogUids, options, logger, token) @@ -78,7 +79,7 @@ internal sealed partial class HomaGachaLogClient /// Uid 列表 public async ValueTask>> GetGachaEntriesAsync(CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); Response>? resp = await httpClient .TryCatchGetFromJsonAsync>>(HutaoEndpoints.GachaLogEntries, options, logger, token) @@ -95,7 +96,7 @@ internal sealed partial class HomaGachaLogClient /// 末尾Id public async ValueTask> GetEndIdsAsync(string uid, CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); Response? resp = await httpClient .TryCatchGetFromJsonAsync>(HutaoEndpoints.GachaLogEndIds(uid), options, logger, token) @@ -113,7 +114,7 @@ internal sealed partial class HomaGachaLogClient /// 云端祈愿记录 public async ValueTask>> RetrieveGachaItemsAsync(string uid, EndIds endIds, CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); UidAndEndIds uidAndEndIds = new(uid, endIds); @@ -133,7 +134,7 @@ internal sealed partial class HomaGachaLogClient /// 响应 public async ValueTask UploadGachaItemsAsync(string uid, List gachaItems, CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); UidAndItems uidAndItems = new(uid, gachaItems); @@ -152,7 +153,7 @@ internal sealed partial class HomaGachaLogClient /// 响应 public async ValueTask DeleteGachaItemsAsync(string uid, CancellationToken token = default) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); Response.Response? resp = await httpClient .TryCatchGetFromJsonAsync>>(HutaoEndpoints.GachaLogDelete(uid), options, logger, token) diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaPassportHttpClientAuthorizationExtension.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaPassportHttpClientAuthorizationExtension.cs new file mode 100644 index 00000000..bc15ebbd --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaPassportHttpClientAuthorizationExtension.cs @@ -0,0 +1,16 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Service.Hutao; +using System.Net.Http; + +namespace Snap.Hutao.Web.Hutao.GachaLog; + +internal static class HomaPassportHttpClientAuthorizationExtension +{ + public static async ValueTask TrySetTokenAsync(this HttpClient httpClient, HutaoUserOptions hutaoUserOptions) + { + string? token = await hutaoUserOptions.GetTokenAsync().ConfigureAwait(false); + httpClient.DefaultRequestHeaders.Authorization = new("Bearer", token); + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs index ad585add..4710abcc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs @@ -20,10 +20,10 @@ internal sealed partial class HomaGeetestClient public async ValueTask VerifyAsync(string gt, string challenge, CancellationToken token) { - httpClient.DefaultRequestHeaders.Authorization = new("Bearer", hutaoUserOptions.Token); + await httpClient.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false); GeetestResponse? resp = await httpClient - .TryCatchGetFromJsonAsync(HutaoEndpoints.GeetestVerify(gt,challenge), options, logger, token) + .TryCatchGetFromJsonAsync(HutaoEndpoints.GeetestVerify(gt, challenge), options, logger, token) .ConfigureAwait(false); ArgumentNullException.ThrowIfNull(resp); diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs index 91ba4658..3e1741c5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; -using Snap.Hutao.Web.Hutao.Model; +using Snap.Hutao.Web.Hutao.SpiralAbyss; using Snap.Hutao.Web.Response; using System.Net.Http; using System.Security.Cryptography; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarAppearanceRank.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarAppearanceRank.cs similarity index 90% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarAppearanceRank.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarAppearanceRank.cs index c2c37248..3e2c3525 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarAppearanceRank.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarAppearanceRank.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Primitive; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 出场率 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarBuild.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarBuild.cs similarity index 88% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarBuild.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarBuild.cs index 493710aa..802f42c4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarBuild.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarBuild.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Primitive; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 角色相关构筑 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarCollocation.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarCollocation.cs similarity index 93% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarCollocation.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarCollocation.cs index 2cfa44ed..3f4cdbe4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarCollocation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarCollocation.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Primitive; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 角色搭配 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarConstellationInfo.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarConstellationInfo.cs similarity index 91% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarConstellationInfo.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarConstellationInfo.cs index c0ac00d5..e19493eb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarConstellationInfo.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarConstellationInfo.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 角色命座信息 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarUsageRank.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarUsageRank.cs similarity index 90% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarUsageRank.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarUsageRank.cs index a6bd71ed..86cb2ca9 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/AvatarUsageRank.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/AvatarUsageRank.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Primitive; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 使用率 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Converter/ReliquarySetsConverter.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Converter/ReliquarySetsConverter.cs similarity index 95% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Converter/ReliquarySetsConverter.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Converter/ReliquarySetsConverter.cs index 422c9289..3dd9235b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Converter/ReliquarySetsConverter.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Converter/ReliquarySetsConverter.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Primitives; -namespace Snap.Hutao.Web.Hutao.Model.Converter; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Converter; /// /// 圣遗物套装转换器 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs similarity index 97% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs index 8f3f678f..b420e7c8 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs @@ -9,12 +9,12 @@ using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -using Snap.Hutao.Web.Hutao.Model; -using Snap.Hutao.Web.Hutao.Model.Post; +using Snap.Hutao.Web.Hutao.SpiralAbyss; +using Snap.Hutao.Web.Hutao.SpiralAbyss.Post; using Snap.Hutao.Web.Response; using System.Net.Http; -namespace Snap.Hutao.Web.Hutao; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 胡桃API客户端 @@ -190,7 +190,7 @@ internal sealed partial class HomaSpiralAbyssClient if (charactersResponse.IsOk()) { - Response spiralAbyssResponse = await gameRecordClient + Response spiralAbyssResponse = await gameRecordClient .GetSpiralAbyssAsync(userAndUid, SpiralAbyssSchedule.Current, token) .ConfigureAwait(false); diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ItemRate.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ItemRate.cs similarity index 94% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ItemRate.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ItemRate.cs index 4a609275..e818ec33 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ItemRate.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ItemRate.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 物品与率 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Overview.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Overview.cs similarity index 98% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Overview.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Overview.cs index 07c250e6..207cb629 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Overview.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Overview.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 统计数据 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleAvatar.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleAvatar.cs similarity index 95% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleAvatar.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleAvatar.cs index 241714cf..6455a3d5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleAvatar.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleAvatar.cs @@ -4,7 +4,7 @@ using Snap.Hutao.Model.Primitive; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; -namespace Snap.Hutao.Web.Hutao.Model.Post; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// /// 角色详情 角色 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleBattle.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleBattle.cs similarity index 93% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleBattle.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleBattle.cs index a0263152..2766682f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleBattle.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleBattle.cs @@ -4,7 +4,7 @@ using Snap.Hutao.Model.Primitive; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -namespace Snap.Hutao.Web.Hutao.Model.Post; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// /// 上下半信息 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleFloor.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleFloor.cs similarity index 94% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleFloor.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleFloor.cs index 81246adb..479d9af8 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleFloor.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleFloor.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -namespace Snap.Hutao.Web.Hutao.Model.Post; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// /// 层信息 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleLevel.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleLevel.cs similarity index 94% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleLevel.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleLevel.cs index 6951cabc..02bfae2c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleLevel.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleLevel.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -namespace Snap.Hutao.Web.Hutao.Model.Post; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// /// 间信息 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleRank.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRank.cs similarity index 95% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleRank.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRank.cs index 1ec227c2..07b94b24 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleRank.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRank.cs @@ -4,7 +4,7 @@ using Snap.Hutao.Model.Primitive; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -namespace Snap.Hutao.Web.Hutao.Model.Post; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// /// 数值 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleRecord.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs similarity index 91% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleRecord.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs index 1e96e5f6..f6583560 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleRecord.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs @@ -4,7 +4,7 @@ using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -namespace Snap.Hutao.Web.Hutao.Model.Post; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// /// 记录 @@ -19,7 +19,7 @@ internal sealed class SimpleRecord /// 详细的角色信息 /// 深渊信息 /// 用户名 - public SimpleRecord(string uid, List characters, SpiralAbyss spiralAbyss, string? reservedUserName) + public SimpleRecord(string uid, List characters, Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss spiralAbyss, string? reservedUserName) { Uid = uid; Identity = "Snap Hutao"; // hardcoded Identity name diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleSpiralAbyss.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs similarity index 91% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleSpiralAbyss.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs index 01fcfc38..1c12b855 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleSpiralAbyss.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -namespace Snap.Hutao.Web.Hutao.Model.Post; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// /// 深渊数据 @@ -15,7 +15,7 @@ internal sealed class SimpleSpiralAbyss /// 构造一个新的深渊信息 /// /// 深渊信息 - public SimpleSpiralAbyss(SpiralAbyss spiralAbyss) + public SimpleSpiralAbyss(Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss spiralAbyss) { ScheduleId = spiralAbyss.ScheduleId; TotalBattleTimes = spiralAbyss.TotalBattleTimes; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/RankInfo.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/RankInfo.cs similarity index 90% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/RankInfo.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/RankInfo.cs index b51c9002..6bbe1d2e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/RankInfo.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/RankInfo.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 排行包装 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/RankValue.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/RankValue.cs similarity index 95% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/RankValue.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/RankValue.cs index 7618a493..2c7826e0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/RankValue.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/RankValue.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 伤害值 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ReliquarySet.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ReliquarySet.cs similarity index 95% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ReliquarySet.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ReliquarySet.cs index 4a2dd9f2..bb3f114b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ReliquarySet.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ReliquarySet.cs @@ -4,7 +4,7 @@ using Snap.Hutao.Model.Primitive; using System.Globalization; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 圣遗物套装 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ReliquarySets.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ReliquarySets.cs similarity index 83% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ReliquarySets.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ReliquarySets.cs index fd17b486..2d5e6d6b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/ReliquarySets.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/ReliquarySets.cs @@ -1,9 +1,9 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Web.Hutao.Model.Converter; +using Snap.Hutao.Web.Hutao.SpiralAbyss.Converter; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 包装圣遗物套装 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Team.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Team.cs similarity index 92% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Team.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Team.cs index 2b125778..adc9a949 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Team.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Team.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Core.Json.Converter; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 队伍 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/TeamAppearance.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/TeamAppearance.cs similarity index 92% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/TeamAppearance.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/TeamAppearance.cs index 59023dce..809bca0f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/TeamAppearance.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/TeamAppearance.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 队伍出场次数 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/UserInfo.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/UserInfo.cs similarity index 90% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/UserInfo.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/UserInfo.cs index 50d7fea3..e8d2383c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/UserInfo.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/UserInfo.cs @@ -1,7 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 用户信息 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/WeaponBuild.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/WeaponBuild.cs similarity index 88% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/WeaponBuild.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/WeaponBuild.cs index 9e81c3a5..3ac7dcd6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/WeaponBuild.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/WeaponBuild.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Primitive; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 武器相关构筑 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/WeaponCollocation.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/WeaponCollocation.cs similarity index 89% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/WeaponCollocation.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/WeaponCollocation.cs index 0d170e95..97dccd90 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/WeaponCollocation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/WeaponCollocation.cs @@ -3,7 +3,7 @@ using Snap.Hutao.Model.Primitive; -namespace Snap.Hutao.Web.Hutao.Model; +namespace Snap.Hutao.Web.Hutao.SpiralAbyss; /// /// 武器搭配 From 9259f173b529c403ec892d24b5e56e5a2eabef6d Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Wed, 23 Aug 2023 22:54:54 +0800 Subject: [PATCH 18/43] refine dailynote UI & fix transformer not obtained desc --- .../Resource/Localization/SH.Designer.cs | 18 + .../Snap.Hutao/Resource/Localization/SH.resx | 6 + .../Snap.Hutao/Service/User/IUserService.cs | 8 +- .../Service/User/IUserServiceUnsafe.cs | 9 + .../Snap.Hutao/Service/User/UserService.cs | 13 +- .../Snap.Hutao/View/Page/DailyNotePage.xaml | 616 +++++++++--------- .../ViewModel/Guide/WelcomeViewModel.cs | 22 +- .../Web/Bridge/MiHoYoJSInterface.cs | 86 ++- .../Web/Bridge/SignInJSInterfaceOversea.cs | 2 +- .../Web/Bridge/SignInJsInterface.cs | 2 +- .../GameRecord/DailyNote/Transformer.cs | 10 + 11 files changed, 444 insertions(+), 348 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Service/User/IUserServiceUnsafe.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 368a76a5..2491d882 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -5730,6 +5730,24 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 尚未获得 的本地化字符串。 + /// + internal static string WebDailyNoteTransformerNotObtained { + get { + return ResourceManager.GetString("WebDailyNoteTransformerNotObtained", resourceCulture); + } + } + + /// + /// 查找类似 尚未获得参量质变仪 的本地化字符串。 + /// + internal static string WebDailyNoteTransformerNotObtainedDetail { + get { + return ResourceManager.GetString("WebDailyNoteTransformerNotObtainedDetail", resourceCulture); + } + } + /// /// 查找类似 冷却中 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 5f8b287a..7d9526b5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -2063,6 +2063,12 @@ {0} 分 + + 尚未获得 + + + 尚未获得参量质变仪 + 冷却中 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs index 4d389a79..82db4e00 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs @@ -1,6 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using Snap.Hutao.Model.Entity; using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Takumi.Binding; @@ -57,15 +58,12 @@ internal interface IUserService /// 是否刷新成功 ValueTask RefreshCookieTokenAsync(BindingUser user); + ValueTask RefreshCookieTokenAsync(Model.Entity.User user); + /// /// 异步移除用户 /// /// 待移除的用户 /// 任务 ValueTask RemoveUserAsync(BindingUser user); -} - -internal interface IUserServiceUnsafe -{ - ValueTask UnsafeRemoveUsersAsync(); } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserServiceUnsafe.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserServiceUnsafe.cs new file mode 100644 index 00000000..6ba659b6 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserServiceUnsafe.cs @@ -0,0 +1,9 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Service.User; + +internal interface IUserServiceUnsafe +{ + ValueTask UnsafeRemoveUsersAsync(); +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs index 2d05c00f..27cef0f8 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs @@ -161,13 +161,18 @@ internal sealed partial class UserService : IUserService, IUserServiceUnsafe } /// - public async ValueTask RefreshCookieTokenAsync(BindingUser user) + public ValueTask RefreshCookieTokenAsync(BindingUser user) + { + return RefreshCookieTokenAsync(user.Entity); + } + + public async ValueTask RefreshCookieTokenAsync(Model.Entity.User user) { // TODO: 提醒其他组件此用户的Cookie已更改 Response cookieTokenResponse = await serviceProvider .GetRequiredService>() - .Create(user.Entity.IsOversea) - .GetCookieAccountInfoBySTokenAsync(user.Entity) + .Create(user.IsOversea) + .GetCookieAccountInfoBySTokenAsync(user) .ConfigureAwait(false); if (cookieTokenResponse.IsOk()) @@ -179,7 +184,7 @@ internal sealed partial class UserService : IUserService, IUserServiceUnsafe // Sync ui and database user.CookieToken[Cookie.COOKIE_TOKEN] = cookieToken; - await userDbService.UpdateUserAsync(user.Entity).ConfigureAwait(false); + await userDbService.UpdateUserAsync(user).ConfigureAwait(false); return true; } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml index cec89c4c..36b2c255 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml @@ -103,334 +103,362 @@ - - - - - - - - - - - - - - - - - 0 - 0 - 0 - - - - - - - - - - - - - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + - - - - - - Visible - - - - + + + + + + Visible + + + + - - - - - Collapsed - - - - - + + + + + Collapsed + + + + + - - - - - - - - + + + + + + + + - - - - - - - - [HighQuality] [SuppressMessage("", "CA1001")] +[SuppressMessage("", "CA1308")] internal class MiHoYoJSInterface { private const string InitializeJsInterfaceScript2 = """ @@ -43,18 +48,27 @@ internal class MiHoYoJSInterface private readonly ILogger logger; private readonly SemaphoreSlim webMessageSemaphore = new(1); - public MiHoYoJSInterface(IServiceProvider serviceProvider, CoreWebView2 webView, UserAndUid userAndUid) + private readonly TypedEventHandler webMessageReceivedEventHandler; + private readonly TypedEventHandler domContentLoadedEventHandler; + private readonly TypedEventHandler navigationStartingEventHandler; + + public MiHoYoJSInterface(CoreWebView2 webView, UserAndUid userAndUid) { - this.serviceProvider = serviceProvider; + // 由于Webview2 的作用域特殊性，我们在此处直接使用根服务 + serviceProvider = Ioc.Default; this.webView = webView; this.userAndUid = userAndUid; taskContext = serviceProvider.GetRequiredService(); logger = serviceProvider.GetRequiredService>(); - webView.WebMessageReceived += OnWebMessageReceived; - webView.DOMContentLoaded += OnDOMContentLoaded; - webView.NavigationStarting += OnNavigationStarting; + webMessageReceivedEventHandler = OnWebMessageReceived; + domContentLoadedEventHandler = OnDOMContentLoaded; + navigationStartingEventHandler = OnNavigationStarting; + + webView.WebMessageReceived += webMessageReceivedEventHandler; + webView.DOMContentLoaded += domContentLoadedEventHandler; + webView.NavigationStarting += navigationStartingEventHandler; } public event Action? ClosePageRequested; @@ -98,6 +112,7 @@ internal class MiHoYoJSInterface public virtual JsResult> GetCookieInfo(JsParam param) { ArgumentNullException.ThrowIfNull(userAndUid.User.LToken); + return new() { Data = new() @@ -114,12 +129,12 @@ internal class MiHoYoJSInterface /// /// 参数 /// 响应 - [SuppressMessage("", "CA1308")] public virtual JsResult> GetDynamicSecrectV1(JsParam param) { string salt = HoyolabOptions.Salts[SaltType.LK2]; long t = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); string r = GetRandomString(); + string check = Core.Convert.ToMd5HexString($"salt={salt}&t={t}&r={r}").ToLowerInvariant(); return new() { Data = new() { ["DS"] = $"{t},{r},{check}", }, }; @@ -145,7 +160,6 @@ internal class MiHoYoJSInterface /// /// 参数 /// 响应 - [SuppressMessage("", "CA1308")] public virtual JsResult> GetDynamicSecrectV2(JsParam param) { string salt = HoyolabOptions.Salts[SaltType.X4]; @@ -169,22 +183,33 @@ internal class MiHoYoJSInterface /// /// 参数 /// 响应 - public virtual JsResult> GetUserInfo(JsParam param) + public virtual async ValueTask>> GetUserInfoAsync(JsParam param) { - User user = serviceProvider.GetRequiredService().Current!; - UserInfo info = user.UserInfo!; + Response response = await serviceProvider + .GetRequiredService>() + .Create(userAndUid.User.IsOversea) + .GetUserFullInfoAsync(userAndUid.User) + .ConfigureAwait(false); - return new() + if (response.IsOk()) { - Data = new() + UserInfo info = response.Data.UserInfo; + return new() { - ["id"] = info.Uid, - ["gender"] = info.Gender, - ["nickname"] = info.Nickname, - ["introduce"] = info.Introduce, - ["avatar_url"] = info.AvatarUrl, - }, - }; + Data = new() + { + ["id"] = info.Uid, + ["gender"] = info.Gender, + ["nickname"] = info.Nickname, + ["introduce"] = info.Introduce, + ["avatar_url"] = info.AvatarUrl, + }, + }; + } + else + { + return new(); + } } /// @@ -195,15 +220,16 @@ internal class MiHoYoJSInterface public virtual async ValueTask>> GetCookieTokenAsync(JsParam param) { IUserService userService = serviceProvider.GetRequiredService(); - User user = userService.Current!; if (param.Payload.ForceRefresh) { - await userService.RefreshCookieTokenAsync(user).ConfigureAwait(false); + await userService.RefreshCookieTokenAsync(userAndUid.User).ConfigureAwait(false); } await taskContext.SwitchToMainThreadAsync(); - webView.SetCookie(user.CookieToken, user.LToken); - return new() { Data = new() { [Cookie.COOKIE_TOKEN] = user.CookieToken![Cookie.COOKIE_TOKEN] } }; + webView.SetCookie(userAndUid.User.CookieToken, userAndUid.User.LToken); + + ArgumentNullException.ThrowIfNull(userAndUid.User.CookieToken); + return new() { Data = new() { [Cookie.COOKIE_TOKEN] = userAndUid.User.CookieToken[Cookie.COOKIE_TOKEN] } }; } /// @@ -260,14 +286,13 @@ internal class MiHoYoJSInterface /// 语言与时区 public virtual JsResult> GetCurrentLocale(JsParam param) { - AppOptions appOptions = serviceProvider.GetRequiredService(); + MetadataOptions metadataOptions = serviceProvider.GetRequiredService(); return new() { Data = new() { - // TODO: replace with metadata options value - ["language"] = appOptions.PreviousCulture.Name.ToLowerInvariant(), + ["language"] = metadataOptions.LanguageCode, ["timeZone"] = "GMT+8", }, }; @@ -331,7 +356,7 @@ internal class MiHoYoJSInterface .Append('"') .Append(callback) .Append('"') - .AppendIf(payload != null, ',') + .AppendIf(!string.IsNullOrEmpty(payload), ',') .Append(payload) .Append(')') .ToString(); @@ -356,14 +381,15 @@ internal class MiHoYoJSInterface { string message = args.TryGetWebMessageAsString(); logger.LogInformation("[OnRawMessage]\n{message}", message); - JsParam param = JsonSerializer.Deserialize(message)!; + JsParam? param = JsonSerializer.Deserialize(message); + ArgumentNullException.ThrowIfNull(param); logger.LogInformation("[OnMessage]\nMethod : {method}\nPayload : {payload}\nCallback: {callback}", param.Method, param.Payload, param.Callback); using (await webMessageSemaphore.EnterAsync().ConfigureAwait(false)) { IJsResult? result = await TryGetJsResultFromJsParamAsync(param).ConfigureAwait(false); - if (result != null && param.Callback != null) + if (result is not null && param.Callback is not null) { await ExecuteCallbackScriptAsync(param.Callback, result.ToJson()).ConfigureAwait(false); } @@ -394,7 +420,7 @@ internal class MiHoYoJSInterface "getDS2" => GetDynamicSecrectV2(param), "getHTTPRequestHeaders" => GetHttpRequestHeader(param), "getStatusBarHeight" => GetStatusBarHeight(param), - "getUserInfo" => GetUserInfo(param), + "getUserInfo" => await GetUserInfoAsync(param).ConfigureAwait(false), "hideLoading" => null, "login" => null, "pushPage" => await PushPageAsync(param).ConfigureAwait(false), diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJSInterfaceOversea.cs b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJSInterfaceOversea.cs index 51a5b999..17e632f0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJSInterfaceOversea.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJSInterfaceOversea.cs @@ -23,7 +23,7 @@ internal sealed class SignInJSInterfaceOversea : MiHoYoJSInterface /// public SignInJSInterfaceOversea(CoreWebView2 webView, IServiceProvider serviceProvider, UserAndUid userAndUid) - : base(serviceProvider, webView, userAndUid) + : base(webView, userAndUid) { logger = serviceProvider.GetRequiredService>(); webView.DOMContentLoaded += OnDOMContentLoaded; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJsInterface.cs b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJsInterface.cs index 5dc5c0b4..829958b2 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJsInterface.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/SignInJsInterface.cs @@ -16,7 +16,7 @@ internal sealed class SignInJsInterface : MiHoYoJSInterface { /// public SignInJsInterface(CoreWebView2 webView, IServiceProvider serviceProvider, UserAndUid userAndUid) - : base(serviceProvider, webView, userAndUid) + : base(webView, userAndUid) { } diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/Transformer.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/Transformer.cs index 2726db0c..a222d44b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/Transformer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/Transformer.cs @@ -22,6 +22,16 @@ internal sealed class Transformer [JsonPropertyName("recovery_time")] public RecoveryTime? RecoveryTime { get; set; } + public string ObtainedAndReachedFormatted + { + get => Obtained ? RecoveryTime.ReachedFormatted : SH.WebDailyNoteTransformerNotObtained; + } + + public string ObtainedAndTimeFormatted + { + get => Obtained ? RecoveryTime.TimeFormatted : SH.WebDailyNoteTransformerNotObtainedDetail; + } + /// /// Wiki链接 /// From 8bd831a16d43fb0193eb306a7cdd7141161259c0 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 24 Aug 2023 10:56:36 +0800 Subject: [PATCH 19/43] code style --- .../Snap.Hutao/Control/Image/CompositionImage.cs | 1 - src/Snap.Hutao/Snap.Hutao/Control/Media/Rgba32.cs | 2 -- .../Control/Text/DescriptionTextBlock.cs | 2 -- .../Snap.Hutao/Core/Caching/ImageCache.cs | 14 +++++++------- src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs | 1 - .../Snap.Hutao/Core/Windowing/Persistence.cs | 1 - .../Snap.Hutao/Core/Windowing/WindowSubclass.cs | 1 - .../Snap.Hutao/Factory/ContentDialogFactory.cs | 1 - .../Snap.Hutao/Model/Entity/DailyNoteEntry.cs | 2 -- .../Snap.Hutao/Model/Entity/GachaArchive.cs | 5 ----- .../Snap.Hutao/Model/Entity/GachaItem.cs | 1 - .../Snap.Hutao/Model/Metadata/Avatar/FetterInfo.cs | 1 - .../Snap.Hutao/Model/Metadata/Item/Materials.cs | 2 -- .../Achievement/AchievementService.Archive.cs | 1 - .../Achievement/AchievementService.Interchange.cs | 1 - .../Service/Achievement/AchievementService.cs | 2 -- .../Achievement/AchievementStatisticsService.cs | 1 - .../Service/AvatarInfo/Factory/SummaryFactory.cs | 4 ++-- .../GameRecordCharacterAvatarInfoTransformer.cs | 1 - .../Service/Cultivation/CultivationService.cs | 3 --- .../DailyNote/DailyNoteNotificationOperation.cs | 3 --- .../Service/DailyNote/DailyNoteService.cs | 4 ---- .../GachaLog/Factory/GachaStatisticsFactory.cs | 1 - .../Service/GachaLog/Factory/PullPrediction.cs | 1 - .../GachaLog/Factory/TypedWishSummaryBuilder.cs | 1 - .../Factory/TypedWishSummaryBuilderContext.cs | 1 - .../Service/GachaLog/GachaItemSaveContext.cs | 1 - .../Service/GachaLog/GachaLogFetchContext.cs | 1 - .../Service/GachaLog/GachaLogHutaoCloudService.cs | 3 --- .../GachaLog/GachaLogServiceMetadataContext.cs | 2 -- .../QueryProvider/GachaLogQueryWebCacheProvider.cs | 1 - .../Service/GachaLog/UIGFExportService.cs | 1 - .../Service/Game/Locator/IGameLocator.cs | 2 -- .../Snap.Hutao/Service/Hutao/HutaoService.cs | 4 ---- .../Service/Hutao/ObjectCacheDbService.cs | 5 ----- .../Snap.Hutao/Service/Metadata/LocaleNames.cs | 4 ---- .../Snap.Hutao/Service/Metadata/MetadataOptions.cs | 1 - .../Service/Metadata/MetadataService.Indexing.cs | 1 - .../Snap.Hutao/Service/User/IUserService.cs | 1 - .../Snap.Hutao/Service/User/UserDbService.cs | 11 ----------- .../Snap.Hutao/Service/User/UserService.cs | 2 -- .../View/Control/AnnouncementContentViewer.xaml.cs | 1 - .../View/Control/BaseValueSlider.xaml.cs | 1 - .../View/Control/BottomTextControl.xaml.cs | 1 - .../View/Control/BottomTextSmallControl.xaml.cs | 2 -- .../View/Control/DescParamComboBox.xaml.cs | 1 - .../Snap.Hutao/View/Control/ItemIcon.xaml.cs | 1 - .../Snap.Hutao/View/Control/SkillPivot.xaml.cs | 1 - .../Snap.Hutao/View/Control/StatisticsCard.xaml.cs | 1 - .../Converter/Int32ToGradientColorConverter.cs | 1 - .../View/Dialog/AchievementImportDialog.xaml.cs | 1 - .../Dialog/CultivatePromotionDeltaDialog.xaml.cs | 1 - .../View/Dialog/GachaLogImportDialog.xaml.cs | 1 - .../Dialog/GachaLogRefreshProgressDialog.xaml.cs | 3 --- .../Dialog/LaunchGamePackageConvertDialog.xaml.cs | 1 - .../View/Helper/FrameworkElementHelper.cs | 2 -- src/Snap.Hutao/Snap.Hutao/View/Helper/NavHelper.cs | 1 - src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml.cs | 1 - src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs | 1 - .../Achievement/AchievementFinishPercent.cs | 1 - .../ViewModel/Complex/ReliquarySetView.cs | 1 - .../ViewModel/DailyNote/DailyNoteViewModelSlim.cs | 1 - .../ViewModel/Game/LaunchGameViewModel.cs | 2 -- .../Snap.Hutao/ViewModel/Guide/DownloadSummary.cs | 5 ----- .../Snap.Hutao/ViewModel/Guide/WelcomeViewModel.cs | 11 ++--------- .../Snap.Hutao/ViewModel/HutaoPassportViewModel.cs | 1 - .../SpiralAbyss/SpiralAbyssRecordViewModel.cs | 1 - .../Snap.Hutao/ViewModel/TestViewModel.cs | 1 - src/Snap.Hutao/Snap.Hutao/ViewModel/User/User.cs | 3 --- .../Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs | 1 - .../Snap.Hutao/Web/Geetest/GeetestClient.cs | 1 - .../Hoyolab/Takumi/Event/Calculate/Calculable.cs | 2 -- .../Hoyolab/Takumi/GameRecord/IGameRecordClient.cs | 1 - .../Verification/HomaGeetestCardVerifier.cs | 1 - .../Snap.Hutao/Web/Hutao/GachaLog/EndIds.cs | 3 --- .../Web/Hutao/GachaLog/HomaGachaLogClient.cs | 2 -- .../Web/Hutao/Geetest/HomaGeetestClient.cs | 1 - .../Web/Hutao/Log/HomaLogUploadClient.cs | 1 - .../Converter/ReliquarySetsConverter.cs | 2 +- .../Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs | 2 -- .../Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs | 1 - .../Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs | 2 -- 82 files changed, 12 insertions(+), 155 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs index 7ffe983a..73edd26f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs @@ -10,7 +10,6 @@ using Snap.Hutao.Control.Animation; using Snap.Hutao.Control.Extension; using Snap.Hutao.Core.Caching; using Snap.Hutao.Service.Notification; -using System.Globalization; using System.IO; using System.Net.Http; using System.Runtime.InteropServices; diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Media/Rgba32.cs b/src/Snap.Hutao/Snap.Hutao/Control/Media/Rgba32.cs index 2bacfaad..ea714a86 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Media/Rgba32.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Media/Rgba32.cs @@ -3,9 +3,7 @@ // Some part of this file came from: // https://github.com/xunkong/desktop/tree/main/src/Desktop/Desktop/Pages/CharacterInfoPage.xaml.cs -using CommunityToolkit.WinUI; using System.Buffers.Binary; -using System.Runtime.InteropServices; using Windows.UI; namespace Snap.Hutao.Control.Media; diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs index 5b3c0368..9c596a85 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs @@ -1,8 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using CommunityToolkit.WinUI; -using CommunityToolkit.WinUI.Helpers; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Documents; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs b/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs index 44003343..76bb8fc1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs @@ -196,13 +196,13 @@ internal sealed class ImageCache : IImageCache, IImageCacheFilePathOperation retryCount += 3; break; case HttpStatusCode.TooManyRequests: - { - retryCount++; - TimeSpan delay = message.Headers.RetryAfter?.Delta ?? RetryCountToDelay[retryCount]; - logger.LogInformation("Retry {Uri} after {Delay}.", uri, delay); - await Task.Delay(delay).ConfigureAwait(false); - break; - } + { + retryCount++; + TimeSpan delay = message.Headers.RetryAfter?.Delta ?? RetryCountToDelay[retryCount]; + logger.LogInformation("Retry {Uri} after {Delay}.", uri, delay); + await Task.Delay(delay).ConfigureAwait(false); + break; + } default: return; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs index 3ae76131..7e2238c6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs @@ -8,7 +8,6 @@ using Snap.Hutao.Core.Setting; using System.IO; using System.Security.Principal; using Windows.ApplicationModel; -using Windows.Foundation.Metadata; using Windows.Storage; namespace Snap.Hutao.Core; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs index 2166a613..e2575923 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs @@ -7,7 +7,6 @@ using Snap.Hutao.Core.Setting; using Snap.Hutao.Win32; using System.Runtime.CompilerServices; using Windows.Graphics; -using Windows.Win32.Foundation; using Windows.Win32.UI.WindowsAndMessaging; using static Windows.Win32.PInvoke; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs index a24a8d98..bcc2e814 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using System.Runtime.InteropServices; using Microsoft.UI.Xaml; using Windows.Win32.Foundation; using Windows.Win32.UI.Shell; diff --git a/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs b/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs index f63e4e66..c6fc6374 100644 --- a/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml.Controls; using Snap.Hutao.Factory.Abstraction; -using System.Security.Authentication; namespace Snap.Hutao.Factory; diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs index 8e585c96..cccc6a22 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs @@ -4,10 +4,8 @@ using CommunityToolkit.Mvvm.ComponentModel; using Snap.Hutao.Core.Abstraction; using Snap.Hutao.ViewModel.User; -using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Takumi.Binding; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.DailyNote; -using Snap.Hutao.Web.Request.QueryString; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaArchive.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaArchive.cs index da25d846..c3203fcd 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaArchive.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaArchive.cs @@ -1,13 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Microsoft.Data.Sqlite; -using Microsoft.EntityFrameworkCore; using Snap.Hutao.Core.Abstraction; using Snap.Hutao.Core.Database; -using Snap.Hutao.Core.ExceptionService; -using Snap.Hutao.Service.GachaLog; -using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaItem.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaItem.cs index 0da36891..cf7407b5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaItem.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaItem.cs @@ -3,7 +3,6 @@ using Snap.Hutao.Model.Entity.Abstraction; using Snap.Hutao.Model.InterChange.GachaLog; -using Snap.Hutao.Model.Metadata.Abstraction; using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/FetterInfo.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/FetterInfo.cs index bea90e4d..49c8ac12 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/FetterInfo.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/FetterInfo.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Core.Json.Annotation; using Snap.Hutao.Model.Intrinsic; namespace Snap.Hutao.Model.Metadata.Avatar; diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs index 49a4959f..5c3725dd 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Item/Materials.cs @@ -1,9 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Primitive; -using Snap.Hutao.ViewModel.Cultivation; using System.Collections.Immutable; namespace Snap.Hutao.Model.Metadata.Item; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Archive.cs b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Archive.cs index e3626613..a2dd6936 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Archive.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Archive.cs @@ -3,7 +3,6 @@ using Snap.Hutao.Core.Database; using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using System.Collections.ObjectModel; namespace Snap.Hutao.Service.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Interchange.cs b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Interchange.cs index 1a028dda..7ffa0fa9 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Interchange.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Interchange.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Model.InterChange.Achievement; using EntityAchievement = Snap.Hutao.Model.Entity.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.cs index 109e4be2..d7a22a94 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.cs @@ -3,9 +3,7 @@ using Snap.Hutao.Core; using Snap.Hutao.Core.Database; -using Snap.Hutao.Core.Diagnostics; using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.Achievement; using EntityAchievement = Snap.Hutao.Model.Entity.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs index 13d91fe7..57968a34 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.Achievement; using EntityAchievement = Snap.Hutao.Model.Entity.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs index 16428011..ff899c70 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs @@ -41,8 +41,8 @@ internal sealed partial class SummaryFactory : ISummaryFactory .ThenBy(a => a.Name) .ToList(), - // .ThenByDescending(a => a.Quality) - // .ThenByDescending(a => a.ActivatedConstellationCount) + // .ThenByDescending(a => a.Quality) + // .ThenByDescending(a => a.ActivatedConstellationCount) }; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Transformer/GameRecordCharacterAvatarInfoTransformer.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Transformer/GameRecordCharacterAvatarInfoTransformer.cs index ed36557c..137be4c0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Transformer/GameRecordCharacterAvatarInfoTransformer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Transformer/GameRecordCharacterAvatarInfoTransformer.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Intrinsic; -using Snap.Hutao.Model.Primitive; using Snap.Hutao.Web.Enka.Model; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs index 18da87ea..2a2e61e0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs @@ -1,16 +1,13 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Microsoft.EntityFrameworkCore; using Snap.Hutao.Core.Database; -using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Model; using Snap.Hutao.Model.Entity; using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Model.Entity.Primitive; using Snap.Hutao.Model.Metadata.Item; using Snap.Hutao.Model.Primitive; -using Snap.Hutao.Service.Metadata; using Snap.Hutao.ViewModel.Cultivation; using System.Collections.ObjectModel; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs index e8d58cf2..281ff93d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs @@ -6,12 +6,9 @@ using Snap.Hutao.Core; using Snap.Hutao.Core.LifeCycle; using Snap.Hutao.Model.Entity; using Snap.Hutao.Service.Game; -using Snap.Hutao.Web.Hoyolab.Takumi.Auth; using Snap.Hutao.Web.Hoyolab.Takumi.Binding; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.DailyNote; using Snap.Hutao.Web.Response; -using System.Runtime.InteropServices; -using Windows.Foundation.Metadata; namespace Snap.Hutao.Service.DailyNote; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs index 8e3ef6e9..00c6c077 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs @@ -2,13 +2,9 @@ // Licensed under the MIT license. using CommunityToolkit.Mvvm.Messaging; -using Microsoft.EntityFrameworkCore; -using Snap.Hutao.Core.Database; using Snap.Hutao.Core.DependencyInjection.Abstraction; using Snap.Hutao.Message; using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; -using Snap.Hutao.Service.Notification; using Snap.Hutao.Service.User; using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hoyolab; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs index 1212a10b..99c464b7 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Core.ExceptionService; -using Snap.Hutao.Model.Entity; using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Metadata; using Snap.Hutao.Model.Metadata.Avatar; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs index 80df0613..b1dbefdd 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.ViewModel.GachaLog; -using Snap.Hutao.Web.Hutao; using Snap.Hutao.Web.Hutao.GachaLog; using Snap.Hutao.Web.Response; using System.Runtime.InteropServices; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilder.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilder.cs index 36d3da52..917583f1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilder.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilder.cs @@ -6,7 +6,6 @@ using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Metadata.Abstraction; using Snap.Hutao.ViewModel.GachaLog; using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; -using Snap.Hutao.Web.Hutao; namespace Snap.Hutao.Service.GachaLog.Factory; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilderContext.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilderContext.cs index cd778b05..de01bb6f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilderContext.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilderContext.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; -using Snap.Hutao.Web.Hutao; using Snap.Hutao.Web.Hutao.GachaLog; using Snap.Hutao.Web.Response; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaItemSaveContext.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaItemSaveContext.cs index d62231a8..bd8a88e5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaItemSaveContext.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaItemSaveContext.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Microsoft.EntityFrameworkCore; using Snap.Hutao.Model.Entity; namespace Snap.Hutao.Service.GachaLog; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchContext.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchContext.cs index 2aaaa057..756d04b4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchContext.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchContext.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Service.GachaLog.QueryProvider; using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; using System.Collections.ObjectModel; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogHutaoCloudService.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogHutaoCloudService.cs index cd9cf702..99525856 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogHutaoCloudService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogHutaoCloudService.cs @@ -1,9 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Core.Database; using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Model.Metadata; using Snap.Hutao.Model.Metadata.Avatar; using Snap.Hutao.Model.Metadata.Weapon; @@ -12,7 +10,6 @@ using Snap.Hutao.Service.GachaLog.Factory; using Snap.Hutao.Service.Metadata; using Snap.Hutao.ViewModel.GachaLog; using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; -using Snap.Hutao.Web.Hutao; using Snap.Hutao.Web.Hutao.GachaLog; using Snap.Hutao.Web.Response; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogServiceMetadataContext.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogServiceMetadataContext.cs index 0a9edc5a..d783f5b9 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogServiceMetadataContext.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogServiceMetadataContext.cs @@ -2,13 +2,11 @@ // Licensed under the MIT license. using Snap.Hutao.Model; -using Snap.Hutao.Model.Entity; using Snap.Hutao.Model.Metadata.Abstraction; using Snap.Hutao.Model.Metadata.Avatar; using Snap.Hutao.Model.Metadata.Weapon; using Snap.Hutao.Model.Primitive; using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; -using System.Collections.ObjectModel; namespace Snap.Hutao.Service.GachaLog; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs index 6a7e74fd..4a1400a2 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs @@ -5,7 +5,6 @@ using Snap.Hutao.Core.IO; using Snap.Hutao.Service.Game; using Snap.Hutao.Service.Metadata; using Snap.Hutao.Web.Request.QueryString; -using System.Globalization; using System.IO; using System.Text; using System.Text.RegularExpressions; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFExportService.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFExportService.cs index 21d420b6..d0374cd7 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFExportService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFExportService.cs @@ -3,7 +3,6 @@ using Snap.Hutao.Core; using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Model.InterChange.GachaLog; using Snap.Hutao.Service.Metadata; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Locator/IGameLocator.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Locator/IGameLocator.cs index a3b5ed9f..835f51a7 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Locator/IGameLocator.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Locator/IGameLocator.cs @@ -1,8 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Core.DependencyInjection.Abstraction; - namespace Snap.Hutao.Service.Game.Locator; /// diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs index 5ae45ac0..9abb49dc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs @@ -2,10 +2,6 @@ // Licensed under the MIT license. using Microsoft.Extensions.Caching.Memory; -using Snap.Hutao.Core.Database; -using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; -using Snap.Hutao.Web.Hutao; using Snap.Hutao.Web.Hutao.SpiralAbyss; using Snap.Hutao.Web.Response; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs index 5350410b..8e61bf18 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs @@ -2,14 +2,9 @@ // Licensed under the MIT license. using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Caching.Memory; using Snap.Hutao.Core.Database; using Snap.Hutao.Core.ExceptionService; -using Snap.Hutao.Model.Entity; using Snap.Hutao.Model.Entity.Database; -using Snap.Hutao.Web.Hutao; -using Snap.Hutao.Web.Hutao.SpiralAbyss; -using Snap.Hutao.Web.Response; namespace Snap.Hutao.Service.Hutao; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/LocaleNames.cs b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/LocaleNames.cs index 03077deb..e86b1b2f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/LocaleNames.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/LocaleNames.cs @@ -1,11 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Microsoft.Extensions.Options; -using Snap.Hutao.Core; using System.Collections.Immutable; -using System.Globalization; -using System.IO; namespace Snap.Hutao.Service.Metadata; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataOptions.cs index 168d9731..4cc8e4a8 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataOptions.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Options; using Snap.Hutao.Core; -using System.Collections.Immutable; using System.Globalization; using System.IO; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataService.Indexing.cs b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataService.Indexing.cs index 43326358..2276cd28 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataService.Indexing.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataService.Indexing.cs @@ -9,7 +9,6 @@ using Snap.Hutao.Model.Metadata.Item; using Snap.Hutao.Model.Metadata.Reliquary; using Snap.Hutao.Model.Metadata.Weapon; using Snap.Hutao.Model.Primitive; -using System.Runtime.CompilerServices; namespace Snap.Hutao.Service.Metadata; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs index 82db4e00..e814d7d1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserService.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Model.Entity; using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Takumi.Binding; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserDbService.cs index 2f11d931..a407fac6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserDbService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserDbService.cs @@ -1,20 +1,9 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using CommunityToolkit.Mvvm.Messaging; using Microsoft.EntityFrameworkCore; using Snap.Hutao.Core.Database; -using Snap.Hutao.Core.DependencyInjection.Abstraction; -using Snap.Hutao.Core.ExceptionService; -using Snap.Hutao.Message; using Snap.Hutao.Model.Entity.Database; -using Snap.Hutao.ViewModel.User; -using Snap.Hutao.Web.Hoyolab; -using Snap.Hutao.Web.Hoyolab.Passport; -using Snap.Hutao.Web.Hoyolab.Takumi.Binding; -using Snap.Hutao.Web.Response; -using System.Collections.ObjectModel; -using BindingUser = Snap.Hutao.ViewModel.User.User; namespace Snap.Hutao.Service.User; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs index 27cef0f8..4abe839d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs @@ -2,12 +2,10 @@ // Licensed under the MIT license. using CommunityToolkit.Mvvm.Messaging; -using Microsoft.EntityFrameworkCore; using Snap.Hutao.Core.Database; using Snap.Hutao.Core.DependencyInjection.Abstraction; using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Message; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Passport; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs index bd047906..fa5f6b70 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs @@ -4,7 +4,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.Web.WebView2.Core; -using Snap.Hutao.Control; using Snap.Hutao.Control.Theme; using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement; using System.Text; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml.cs index 14c49b1b..a90b8a48 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using Snap.Hutao.ViewModel.Wiki; namespace Snap.Hutao.View.Control; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml.cs index 927bbbdc..169b6f4f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml.cs @@ -5,7 +5,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Markup; using Microsoft.UI.Xaml.Media; -using Snap.Hutao.Control; namespace Snap.Hutao.View.Control; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs index 2d2e8718..0a027c33 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs @@ -4,8 +4,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Markup; -using Microsoft.UI.Xaml.Media; -using Windows.UI; namespace Snap.Hutao.View.Control; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml.cs index addab035..9f76e5aa 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using Snap.Hutao.Model.Metadata; namespace Snap.Hutao.View.Control; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml.cs index 021d3406..40737b8d 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/ItemIcon.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using Snap.Hutao.Model.Intrinsic; namespace Snap.Hutao.View.Control; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml.cs index 01fc79e2..deb26f50 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using System.Collections; namespace Snap.Hutao.View.Control; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml.cs index a7ee521a..673bb1d6 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; namespace Snap.Hutao.View.Control; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToGradientColorConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToGradientColorConverter.cs index 5afcec24..d1126db3 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToGradientColorConverter.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToGradientColorConverter.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Data; using Snap.Hutao.Control; using Snap.Hutao.Win32; using System.Runtime.CompilerServices; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs index 913bb2cd..a4e76bbc 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using Snap.Hutao.Model.InterChange.Achievement; using Snap.Hutao.Service.Achievement; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs index 55647e7c..cd94d87e 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using Snap.Hutao.Model.Calculable; using Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs index ca82e98e..25134cdb 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using Snap.Hutao.Model.InterChange.GachaLog; namespace Snap.Hutao.View.Dialog; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs index de30d3f1..c67cf741 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs @@ -3,10 +3,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; -using Snap.Hutao.Model; using Snap.Hutao.Service.GachaLog; -using Snap.Hutao.View.Control; namespace Snap.Hutao.View.Dialog; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs index 642120bd..9fed4ba4 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; using Snap.Hutao.Service.Game.Package; namespace Snap.Hutao.View.Dialog; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Helper/FrameworkElementHelper.cs b/src/Snap.Hutao/Snap.Hutao/View/Helper/FrameworkElementHelper.cs index 2507e4ab..db88a48e 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Helper/FrameworkElementHelper.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Helper/FrameworkElementHelper.cs @@ -2,8 +2,6 @@ // Licensed under the MIT license. using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; namespace Snap.Hutao.View.Helper; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Helper/NavHelper.cs b/src/Snap.Hutao/Snap.Hutao/View/Helper/NavHelper.cs index 77e5ecaa..39a6e52f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Helper/NavHelper.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Helper/NavHelper.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Snap.Hutao.Control; namespace Snap.Hutao.View.Helper; diff --git a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml.cs index abc04977..18c3f8f2 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml.cs @@ -4,7 +4,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; -using Snap.Hutao.Control; using Snap.Hutao.Core.Setting; using Snap.Hutao.Service.Notification; using System.Collections.ObjectModel; diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs index 70c213d8..63ba33c4 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml.Controls; using Snap.Hutao.Service.Navigation; -using Snap.Hutao.Service.Notification; using Snap.Hutao.View.Page; namespace Snap.Hutao.View; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementFinishPercent.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementFinishPercent.cs index 9da382d4..57bfc0af 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementFinishPercent.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementFinishPercent.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using CommunityToolkit.WinUI.UI; using Snap.Hutao.Model.Primitive; using System.Runtime.InteropServices; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs index b108fc67..541345c1 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/ReliquarySetView.cs @@ -4,7 +4,6 @@ using Snap.Hutao.Model.Metadata.Converter; using Snap.Hutao.Model.Primitive; using Snap.Hutao.Web.Hutao.SpiralAbyss; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModelSlim.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModelSlim.cs index e2173d99..07fc74b3 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModelSlim.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModelSlim.cs @@ -4,7 +4,6 @@ using Snap.Hutao.Model.Entity; using Snap.Hutao.Service.DailyNote; using Snap.Hutao.Service.Notification; -using Snap.Hutao.Service.User; using System.Collections.ObjectModel; namespace Snap.Hutao.ViewModel.DailyNote; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs index 85487db3..0980a3d7 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Caching.Memory; using Snap.Hutao.Control.Extension; using Snap.Hutao.Core; using Snap.Hutao.Core.ExceptionService; -using Snap.Hutao.Core.LifeCycle; using Snap.Hutao.Factory.Abstraction; using Snap.Hutao.Model.Entity; using Snap.Hutao.Service; @@ -16,7 +15,6 @@ using Snap.Hutao.Service.Notification; using Snap.Hutao.Service.User; using Snap.Hutao.View.Dialog; using Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher; -using Snap.Hutao.Web.Hoyolab.Takumi.Binding; using System.Collections.ObjectModel; using System.IO; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/DownloadSummary.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/DownloadSummary.cs index c94c215a..25ec43a2 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/DownloadSummary.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/DownloadSummary.cs @@ -3,17 +3,12 @@ using CommunityToolkit.Common; using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.Messaging; -using CommunityToolkit.WinUI.Notifications; using Snap.Hutao.Core; using Snap.Hutao.Core.Caching; using Snap.Hutao.Core.IO; -using Snap.Hutao.Core.Setting; -using System.Collections.ObjectModel; using System.IO; using System.IO.Compression; using System.Net.Http; -using System.Runtime.InteropServices; namespace Snap.Hutao.ViewModel.Guide; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/WelcomeViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/WelcomeViewModel.cs index f52d8f5a..a2017d6e 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/WelcomeViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/WelcomeViewModel.cs @@ -1,19 +1,11 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using CommunityToolkit.Common; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.WinUI.Notifications; -using Snap.Hutao.Core; -using Snap.Hutao.Core.Caching; -using Snap.Hutao.Core.IO; using Snap.Hutao.Core.Setting; using System.Collections.ObjectModel; -using System.IO; -using System.IO.Compression; -using System.Net.Http; -using System.Runtime.InteropServices; namespace Snap.Hutao.ViewModel.Guide; @@ -52,10 +44,11 @@ internal sealed partial class WelcomeViewModel : ObservableObject } }).ConfigureAwait(false); - messenger.Send(new Message.WelcomeStateCompleteMessage()); StaticResource.FulfillAllContracts(); await taskContext.SwitchToMainThreadAsync(); + messenger.Send(new Message.WelcomeStateCompleteMessage()); + new ToastContentBuilder() .AddText(SH.ViewModelWelcomeDownloadCompleteTitle) .AddText(SH.ViewModelWelcomeDownloadCompleteMessage) diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/HutaoPassportViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/HutaoPassportViewModel.cs index 92de3945..45a022da 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/HutaoPassportViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/HutaoPassportViewModel.cs @@ -8,7 +8,6 @@ using Snap.Hutao.Service.Navigation; using Snap.Hutao.Service.Notification; using Snap.Hutao.Web.Hutao; using Snap.Hutao.Web.Response; -using System.Text.RegularExpressions; namespace Snap.Hutao.ViewModel; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs index 6d76281c..a81297e3 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs @@ -11,7 +11,6 @@ using Snap.Hutao.Service.Notification; using Snap.Hutao.Service.SpiralAbyss; using Snap.Hutao.Service.User; using Snap.Hutao.ViewModel.User; -using Snap.Hutao.Web.Hutao; using Snap.Hutao.Web.Hutao.SpiralAbyss; using Snap.Hutao.Web.Hutao.SpiralAbyss.Post; using System.Collections.ObjectModel; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs index 84a54a8d..830370f6 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Microsoft.Windows.AppLifecycle; -using Snap.Hutao.View.Dialog; namespace Snap.Hutao.ViewModel; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/User.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/User.cs index 48d626f0..329b227a 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/User.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/User.cs @@ -5,13 +5,10 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; using Snap.Hutao.Core.Abstraction; using Snap.Hutao.Core.Database; -using Snap.Hutao.Core.DependencyInjection.Abstraction; using Snap.Hutao.Model; using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Bbs.User; -using Snap.Hutao.Web.Hoyolab.Passport; using Snap.Hutao.Web.Hoyolab.Takumi.Binding; -using Snap.Hutao.Web.Response; using EntityUser = Snap.Hutao.Model.Entity.User; namespace Snap.Hutao.ViewModel.User; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs index 7513f188..d2b510b0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs @@ -3,7 +3,6 @@ using Microsoft.Web.WebView2.Core; using Snap.Hutao.Core.DependencyInjection.Abstraction; -using Snap.Hutao.Service; using Snap.Hutao.Service.Metadata; using Snap.Hutao.Service.User; using Snap.Hutao.ViewModel.User; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs index 21f45783..f603ba23 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Geetest/GeetestClient.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; -using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; using System.Net.Http; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/Calculable.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/Calculable.cs index 411b6c73..6120b957 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/Calculable.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/Calculable.cs @@ -1,8 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Model.Primitive; - namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate; /// diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/IGameRecordClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/IGameRecordClient.cs index ef7cf1d3..d7dba61c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/IGameRecordClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/IGameRecordClient.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Core.DependencyInjection.Abstraction; using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; using Snap.Hutao.Web.Response; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs index ff59fec2..634c73ec 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/Verification/HomaGeetestCardVerifier.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Entity; -using Snap.Hutao.Web.Geetest; using Snap.Hutao.Web.Hutao.Geetest; namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Verification; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/EndIds.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/EndIds.cs index 95180270..bfdb4578 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/EndIds.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/EndIds.cs @@ -1,9 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Microsoft.EntityFrameworkCore; -using Snap.Hutao.Model.Entity; -using Snap.Hutao.Model.Entity.Database; using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo; namespace Snap.Hutao.Web.Hutao.GachaLog; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs index 455c0628..6da0d54e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/HomaGachaLogClient.cs @@ -3,10 +3,8 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; using Snap.Hutao.Service.Hutao; -using Snap.Hutao.Web.Hutao.GachaLog; using Snap.Hutao.Web.Response; using System.Net.Http; -using System.Runtime.CompilerServices; namespace Snap.Hutao.Web.Hutao.GachaLog; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs index 4710abcc..decd4b02 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs @@ -4,7 +4,6 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; using Snap.Hutao.Service.Hutao; using Snap.Hutao.Web.Hutao.GachaLog; -using Snap.Hutao.Web.Response; using System.Net.Http; namespace Snap.Hutao.Web.Hutao.Geetest; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs index c362905c..adafc1e5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs @@ -3,7 +3,6 @@ using Snap.Hutao.Core; using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; -using Snap.Hutao.Web.Hutao.Log; using Snap.Hutao.Web.Response; using System.Net.Http; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Converter/ReliquarySetsConverter.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Converter/ReliquarySetsConverter.cs index 3dd9235b..9627299a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Converter/ReliquarySetsConverter.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Converter/ReliquarySetsConverter.cs @@ -21,7 +21,7 @@ internal sealed class ReliquarySetsConverter : JsonConverter List sets = new(); foreach (StringSegment segment in new StringTokenizer(source, Separator.ToArray())) { - if (segment is { HasValue: true, Length: >0 }) + if (segment is { HasValue: true, Length: > 0 }) { sets.Add(new(segment.Value)); } diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs index b420e7c8..86155ddf 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/HomaSpiralAbyssClient.cs @@ -8,8 +8,6 @@ using Snap.Hutao.ViewModel.User; using Snap.Hutao.Web.Hoyolab; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord; using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; -using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; -using Snap.Hutao.Web.Hutao.SpiralAbyss; using Snap.Hutao.Web.Hutao.SpiralAbyss.Post; using Snap.Hutao.Web.Response; using System.Net.Http; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs index f6583560..87c7b3bc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleRecord.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.Avatar; -using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs index 1c12b855..b1d70c8d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/SpiralAbyss/Post/SimpleSpiralAbyss.cs @@ -1,8 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.SpiralAbyss; - namespace Snap.Hutao.Web.Hutao.SpiralAbyss.Post; /// From b09a16079cc00f508fc419bdd39da8d9f0419a58 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 24 Aug 2023 11:13:07 +0800 Subject: [PATCH 20/43] source generation code style --- .../Automation/CommandGenerator.cs | 3 --- .../Automation/ConstructorGenerator.cs | 5 ++--- .../DependencyInjection/HttpClientGenerator.cs | 1 - .../DependencyInjection/ServiceAnalyzer.cs | 8 +++++--- .../Enum/LocalizedEnumGenerator.cs | 2 +- .../Primitive/GeneratorSyntaxContextExtension.cs | 2 +- .../Snap.Hutao.SourceGeneration/UniversalAnalyzer.cs | 5 ++--- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/CommandGenerator.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/CommandGenerator.cs index ae9c406a..3bc345e8 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/CommandGenerator.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/CommandGenerator.cs @@ -2,13 +2,10 @@ // Licensed under the MIT license. using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Snap.Hutao.SourceGeneration.Primitive; -using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using System.Text; using System.Threading; namespace Snap.Hutao.SourceGeneration.Automation; diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/ConstructorGenerator.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/ConstructorGenerator.cs index db19e586..cc6535c1 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/ConstructorGenerator.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Automation/ConstructorGenerator.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Snap.Hutao.SourceGeneration.Primitive; using System.Collections.Generic; @@ -75,7 +74,7 @@ internal sealed class ConstructorGenerator : IIncrementalGenerator [global::System.CodeDom.Compiler.GeneratedCodeAttribute("{{nameof(ConstructorGenerator)}}", "1.0.0.0")] partial class {{context2.Symbol.ToDisplayString(SymbolDisplayFormats.QualifiedNonNullableFormat)}} { - public {{context2.Symbol.Name}}(System.IServiceProvider serviceProvider{{httpclient}}){{(options.CallBaseConstructor? " : base(serviceProvider)" : string.Empty)}} + public {{context2.Symbol.Name}}(System.IServiceProvider serviceProvider{{httpclient}}){{(options.CallBaseConstructor ? " : base(serviceProvider)" : string.Empty)}} { """); @@ -180,7 +179,7 @@ internal sealed class ConstructorGenerator : IIncrementalGenerator public FieldValueAssignmentOptions(bool resolveHttpClient, bool callBaseConstructor) { - ResolveHttpClient = resolveHttpClient; + ResolveHttpClient = resolveHttpClient; CallBaseConstructor = callBaseConstructor; } } diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/HttpClientGenerator.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/HttpClientGenerator.cs index 0a6931ed..59bb2527 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/HttpClientGenerator.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/HttpClientGenerator.cs @@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Snap.Hutao.SourceGeneration.Primitive; -using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/ServiceAnalyzer.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/ServiceAnalyzer.cs index 8f494096..f655f151 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/ServiceAnalyzer.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/ServiceAnalyzer.cs @@ -3,7 +3,6 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Diagnostics; using Snap.Hutao.SourceGeneration.Primitive; -using System; using System.Collections.Immutable; using System.Linq; @@ -15,11 +14,14 @@ internal class ServiceAnalyzer : DiagnosticAnalyzer private static readonly DiagnosticDescriptor NonSingletonUseServiceProviderDescriptor = new("SH301", "Non Singleton service should avoid direct use of IServiceProvider", "Non Singleton service should avoid direct use of IServiceProvider", "Quality", DiagnosticSeverity.Info, true); private static readonly DiagnosticDescriptor SingletonServiceCaptureNonSingletonServiceDescriptor = new("SH302", "Singleton service should avoid keep reference of non singleton service", "Singleton service should avoid keep reference of non singleton service", "Quality", DiagnosticSeverity.Info, true); - public override ImmutableArray SupportedDiagnostics { get => new DiagnosticDescriptor[] + public override ImmutableArray SupportedDiagnostics + { + get => new DiagnosticDescriptor[] { NonSingletonUseServiceProviderDescriptor, SingletonServiceCaptureNonSingletonServiceDescriptor, - }.ToImmutableArray(); } + }.ToImmutableArray(); + } public override void Initialize(AnalysisContext context) { diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Enum/LocalizedEnumGenerator.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Enum/LocalizedEnumGenerator.cs index 381bdb41..1235b404 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Enum/LocalizedEnumGenerator.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Enum/LocalizedEnumGenerator.cs @@ -116,7 +116,7 @@ internal class LocalizedEnumGenerator : IIncrementalGenerator .Where(m => m.Kind == SymbolKind.Field) .Cast(); - foreach(IFieldSymbol fieldSymbol in fields) + foreach (IFieldSymbol fieldSymbol in fields) { AttributeData? localizationKeyInfo = fieldSymbol.GetAttributes() .SingleOrDefault(data => data.AttributeClass!.ToDisplayString() == LocalizationKeyName); diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Primitive/GeneratorSyntaxContextExtension.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Primitive/GeneratorSyntaxContextExtension.cs index 8c05c653..216f3ff7 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Primitive/GeneratorSyntaxContextExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/Primitive/GeneratorSyntaxContextExtension.cs @@ -9,7 +9,7 @@ namespace Snap.Hutao.SourceGeneration.Primitive; internal static class GeneratorSyntaxContextExtension { - public static bool TryGetDeclaredSymbol(this GeneratorSyntaxContext context, System.Threading.CancellationToken token,[NotNullWhen(true)] out TSymbol? symbol) + public static bool TryGetDeclaredSymbol(this GeneratorSyntaxContext context, System.Threading.CancellationToken token, [NotNullWhen(true)] out TSymbol? symbol) where TSymbol : class, ISymbol { symbol = context.SemanticModel.GetDeclaredSymbol(context.Node, token) as TSymbol; diff --git a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/UniversalAnalyzer.cs b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/UniversalAnalyzer.cs index a8ad8607..2c8d6f77 100644 --- a/src/Snap.Hutao/Snap.Hutao.SourceGeneration/UniversalAnalyzer.cs +++ b/src/Snap.Hutao/Snap.Hutao.SourceGeneration/UniversalAnalyzer.cs @@ -3,7 +3,6 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Diagnostics; using Snap.Hutao.SourceGeneration.Primitive; -using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; @@ -129,7 +128,7 @@ internal sealed class UniversalAnalyzer : DiagnosticAnalyzer } // ICommand can only use Task or Task - if (methodSymbol.GetAttributes().Any(attr=>attr.AttributeClass!.ToDisplayString() == Automation.CommandGenerator.AttributeName)) + if (methodSymbol.GetAttributes().Any(attr => attr.AttributeClass!.ToDisplayString() == Automation.CommandGenerator.AttributeName)) { return; } @@ -241,7 +240,7 @@ internal sealed class UniversalAnalyzer : DiagnosticAnalyzer Diagnostic diagnostic = Diagnostic.Create(useIsNotNullPatternMatchingDescriptor, location); context.ReportDiagnostic(diagnostic); } - else if(syntax.IsKind(SyntaxKind.EqualsExpression) && syntax.Right.IsKind(SyntaxKind.NullLiteralExpression)) + else if (syntax.IsKind(SyntaxKind.EqualsExpression) && syntax.Right.IsKind(SyntaxKind.NullLiteralExpression)) { Location location = syntax.OperatorToken.GetLocation(); Diagnostic diagnostic = Diagnostic.Create(useIsNullPatternMatchingDescriptor, location); From 2df292f1b88a9855deed97a087b22969e4c7352d Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 24 Aug 2023 14:06:47 +0800 Subject: [PATCH 21/43] style tag zero width negative look ahead --- .../Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs index fa5f6b70..fff01a3a 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs @@ -127,7 +127,7 @@ internal sealed partial class AnnouncementContentViewer : UserControl return document; } - [GeneratedRegex("style=\".*?vertical-align:middle;\"")] + [GeneratedRegex(" style=\"(?!\")*?vertical-align:middle;\"")] private static partial Regex StyleRegex(); private void OnLoaded(object sender, RoutedEventArgs e) From 67d17cf23fb80c63e674b8214744a55167837a82 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 24 Aug 2023 15:16:57 +0800 Subject: [PATCH 22/43] fix #596 incorrect announcement time --- .../Snap.Hutao/Service/AnnouncementService.cs | 98 +++++++++++++++---- .../Control/AnnouncementContentViewer.xaml.cs | 4 +- .../Common/Announcement/AnnouncementRegex.cs | 9 +- 3 files changed, 91 insertions(+), 20 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs index 29efe104..f8e2c30a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Caching.Memory; using Snap.Hutao.Service.Abstraction; using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement; using Snap.Hutao.Web.Response; +using System.Globalization; using System.Runtime.InteropServices; using System.Text.RegularExpressions; @@ -55,8 +56,7 @@ internal sealed partial class AnnouncementService : IAnnouncementService // 将活动公告置于前方 wrapper.List.Reverse(); - // 将公告内容联入公告列表 - JoinAnnouncements(contentMap, wrapper.List); + PreprocessAnnouncements(contentMap, wrapper.List); return memoryCache.Set(CacheKey, wrapper, TimeSpan.FromMinutes(30)); } @@ -65,29 +65,93 @@ internal sealed partial class AnnouncementService : IAnnouncementService return default!; } - private static void JoinAnnouncements(Dictionary contentMap, List announcementListWrappers) + private static void PreprocessAnnouncements(Dictionary contentMap, List announcementListWrappers) { - Regex timeTagRegex = XmlTagRegex(); + // 将公告内容联入公告列表 + foreach (ref AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers)) + { + foreach (ref Announcement item in CollectionsMarshal.AsSpan(listWrapper.List)) + { + contentMap.TryGetValue(item.AnnId, out string? rawContent); + item.Content = rawContent ?? string.Empty; + } + } + + AdjustAnnouncementTime(announcementListWrappers); foreach (ref AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers)) { foreach (ref Announcement item in CollectionsMarshal.AsSpan(listWrapper.List)) { - if (contentMap.TryGetValue(item.AnnId, out string? rawContent)) - { - // remove tag - rawContent = timeTagRegex.Replace(rawContent, x => x.Groups[1].Value); - } - - item.Content = rawContent ?? string.Empty; + item.Content = AnnouncementRegex.XmlTimeTagRegex.Replace(item.Content, x => x.Groups[1].Value); } } } - /// - /// 匹配特殊的时间格式: (.*?) - /// - /// 正则 - [GeneratedRegex("<t class=\"t_(?:gl|lc)\".*?>(.*?)</t>", RegexOptions.Multiline)] - private static partial Regex XmlTagRegex(); + private static void AdjustAnnouncementTime(List announcementListWrappers) + { + // 活动公告 + List activities = announcementListWrappers + .Single(wrapper => wrapper.TypeId == 1) + .List; + + // 更新公告 + Announcement versionUpdate = announcementListWrappers + .Single(wrapper => wrapper.TypeId == 2) + .List + .Single(ann => AnnouncementRegex.VersionUpdateTitleRegex.IsMatch(ann.Title)); + + if (AnnouncementRegex.VersionUpdateTimeRegex.Match(versionUpdate.Content) is { Success: true } match) + { + DateTimeOffset versionUpdateTime = DateTimeOffset.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture); + _ = 1; + foreach (ref readonly Announcement announcement in CollectionsMarshal.AsSpan(activities)) + { + if (AnnouncementRegex.PermanentActivityTimeRegex.Match(announcement.Content) is { Success: true } permanent) + { + + announcement.StartTime = versionUpdateTime; + continue; + } + + if (AnnouncementRegex.PersistentActivityTimeRegex.Match(announcement.Content) is { Success: true } persistent) + { + announcement.StartTime = versionUpdateTime; + announcement.EndTime = versionUpdateTime + TimeSpan.FromDays(42); + continue; + } + + if (AnnouncementRegex.TransientActivityTimeRegex.Match(announcement.Content) is { Success: true } transient) + { + announcement.StartTime = versionUpdateTime; + announcement.EndTime = DateTimeOffset.Parse(transient.Groups[2].ValueSpan, CultureInfo.InvariantCulture); + continue; + } + + MatchCollection matches = AnnouncementRegex.XmlTimeTagRegex.Matches(announcement.Content); + if (matches.Count >= 2) + { + List dateTimes = matches.Select(match => DateTimeOffset.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture)).ToList(); + DateTimeOffset min = DateTimeOffset.MaxValue; + DateTimeOffset max = DateTimeOffset.MinValue; + + foreach (DateTimeOffset time in dateTimes) + { + if (time < min) + { + min = time; + } + + if (time > max) + { + max = time; + } + } + + announcement.StartTime = min; + announcement.EndTime = max; + } + } + } + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs index fff01a3a..c157f682 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/AnnouncementContentViewer.xaml.cs @@ -35,8 +35,8 @@ internal sealed partial class AnnouncementContentViewer : UserControl private const string DarkColor3 = "color:rgba(51,51,51,1)"; private const string DarkColor4 = "color:rgba(57,59,64,1)"; private const string DarkColor5 = "color:rgba(85,85,85,1)"; - private const string DarkAccentColor1 = "background-color: rgb(255, 215, 185);"; - private const string DarkAccentColor2 = "background-color: rgb(254, 245, 231);"; + private const string DarkAccentColor1 = "background-color: rgb(255, 215, 185)"; + private const string DarkAccentColor2 = "background-color: rgb(254, 245, 231)"; // support click open browser. private const string MihoyoSDKDefinition = """ diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs index a77d3741..d8cff857 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementRegex.cs @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; namespace Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement; -internal static class AnnouncementRegex +internal static partial class AnnouncementRegex { public static readonly Regex VersionUpdateTitleRegex = new(SH.WebAnnouncementMatchVersionUpdateTitle, RegexOptions.Compiled); @@ -16,4 +16,11 @@ internal static class AnnouncementRegex public static readonly Regex PersistentActivityTimeRegex = new(SH.WebAnnouncementMatchPersistentActivityTime, RegexOptions.Compiled); public static readonly Regex PermanentActivityTimeRegex = new(SH.WebAnnouncementMatchPermanentActivityTime, RegexOptions.Compiled); + + public static readonly Regex XmlTimeTagRegex = XmlTimeTagRegexInner ??= XmlTagRegex(); + + private static readonly Regex? XmlTimeTagRegexInner; + + [GeneratedRegex("<t class=\"t_(?:gl|lc)\".*?>(.*?)</t>", RegexOptions.Multiline)] + private static partial Regex XmlTagRegex(); } \ No newline at end of file From 39db32a48b997b2b85e1bae0b3139ea985dc3e6b Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 24 Aug 2023 16:19:17 +0800 Subject: [PATCH 23/43] fix #656 listviewbase selected item sync --- .../Control/Behavior/AutoHeightBehavior.cs | 7 +++--- .../Control/Behavior/AutoWidthBehavior.cs | 6 +++-- ...dsContentIntoTitleBarWorkaroundBehavior.cs | 8 +++---- .../Behavior/SelectedItemInViewBehavior.cs | 22 +++++++++++++++++++ .../Extension/EnumerableExtension.cs | 14 ------------ .../Snap.Hutao/Service/AnnouncementService.cs | 1 - .../Snap.Hutao/View/Page/WikiMonsterPage.xaml | 15 +++++-------- 7 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoHeightBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoHeightBehavior.cs index 5ed39429..a5bc4497 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoHeightBehavior.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoHeightBehavior.cs @@ -22,17 +22,18 @@ internal sealed partial class AutoHeightBehavior : BehaviorBase - protected override void OnAssociatedObjectLoaded() + protected override bool Initialize() { UpdateElement(); AssociatedObject.SizeChanged += sizeChangedEventHandler; + return true; } /// - protected override void OnDetaching() + protected override bool Uninitialize() { AssociatedObject.SizeChanged -= sizeChangedEventHandler; - base.OnDetaching(); + return true; } private void OnSizeChanged(object sender, SizeChangedEventArgs e) diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs index fa65c4b5..1767b354 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs @@ -22,17 +22,19 @@ internal sealed partial class AutoWidthBehavior : BehaviorBase } /// - protected override void OnAssociatedObjectLoaded() + protected override bool Initialize() { UpdateElement(); AssociatedObject.SizeChanged += sizeChangedEventHandler; + return true; } /// - protected override void OnDetaching() + protected override bool Uninitialize() { AssociatedObject.SizeChanged -= sizeChangedEventHandler; base.OnDetaching(); + return true; } private void OnSizeChanged(object sender, SizeChangedEventArgs e) diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/ComboBoxExtendsContentIntoTitleBarWorkaroundBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/ComboBoxExtendsContentIntoTitleBarWorkaroundBehavior.cs index 57b1ee6c..2f940eb7 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/ComboBoxExtendsContentIntoTitleBarWorkaroundBehavior.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/ComboBoxExtendsContentIntoTitleBarWorkaroundBehavior.cs @@ -28,19 +28,19 @@ internal sealed class ComboBoxExtendsContentIntoTitleBarWorkaroundBehavior : Beh } /// - protected override void OnAssociatedObjectLoaded() + protected override bool Initialize() { AssociatedObject.DropDownOpened += dropDownOpenedHandler; AssociatedObject.DropDownClosed += dropDownClosedHandler; + return true; } /// - protected override void OnDetaching() + protected override bool Uninitialize() { AssociatedObject.DropDownOpened -= dropDownOpenedHandler; AssociatedObject.DropDownClosed -= dropDownClosedHandler; - - base.OnDetaching(); + return true; } private void OnDropDownOpened(object? sender, object e) diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs new file mode 100644 index 00000000..74df6403 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs @@ -0,0 +1,22 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using CommunityToolkit.WinUI.Behaviors; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; + +namespace Snap.Hutao.Control.Behavior; + +internal sealed class SelectedItemInViewBehavior : BehaviorBase +{ + protected override bool Initialize() + { + if (AssociatedObject.SelectedItem is { } item) + { + AssociatedObject.ScrollIntoView(item); + } + + return true; + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs index e18b653b..c4976887 100644 --- a/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs @@ -94,18 +94,4 @@ internal static partial class EnumerableExtension string result = string.Join(separator, collection); return result.Length > 0 ? result : string.Empty; } - - /// - /// Concatenates each element from the collection into single string. - /// - /// Type of array elements. - /// Collection to convert. Cannot be . - /// Delimiter between elements in the final string. - /// A string to be returned if collection has no elements. - /// Converted collection into string. - public static string ToString(this IEnumerable collection, char separator, string defaultValue) - { - string result = string.Join(separator, collection); - return result.Length > 0 ? result : defaultValue; - } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs index f8e2c30a..154894e5 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs @@ -109,7 +109,6 @@ internal sealed partial class AnnouncementService : IAnnouncementService { if (AnnouncementRegex.PermanentActivityTimeRegex.Match(announcement.Content) is { Success: true } permanent) { - announcement.StartTime = versionUpdateTime; continue; } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml index bc5989d3..3b0eaaa7 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml @@ -68,15 +68,9 @@ ItemsSource="{Binding Monsters}" SelectedItem="{Binding Selected, Mode=TwoWay}" SelectionMode="Single"> - - - - - - - - - + + + @@ -188,6 +182,9 @@ ItemsSource="{Binding Monsters}" SelectedItem="{Binding Selected, Mode=TwoWay}" SelectionMode="Single"> + + + From 5a952d8b41628f69c819aa94ae90c9757b2c529e Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Thu, 24 Aug 2023 17:30:38 +0800 Subject: [PATCH 24/43] refreshtime for dailynote --- .../Control/Behavior/AutoWidthBehavior.cs | 1 - ...AddRefreshTimeOnDailyNoteEntry.Designer.cs | 537 ++++++++++++++++++ ...24084447_AddRefreshTimeOnDailyNoteEntry.cs | 30 + .../Migrations/AppDbContextModelSnapshot.cs | 49 +- .../Snap.Hutao/Model/Entity/DailyNoteEntry.cs | 6 +- .../Service/DailyNote/DailyNoteService.cs | 7 +- .../View/Control/StatisticsCard.xaml | 8 +- 7 files changed, 609 insertions(+), 29 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.Designer.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs index 1767b354..4829479a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/AutoWidthBehavior.cs @@ -33,7 +33,6 @@ internal sealed partial class AutoWidthBehavior : BehaviorBase protected override bool Uninitialize() { AssociatedObject.SizeChanged -= sizeChangedEventHandler; - base.OnDetaching(); return true; } diff --git a/src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.Designer.cs new file mode 100644 index 00000000..18cab921 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.Designer.cs @@ -0,0 +1,537 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Snap.Hutao.Model.Entity.Database; + +#nullable disable + +namespace Snap.Hutao.Migrations +{ + [DbContext(typeof(AppDbContext))] + [Migration("20230824084447_AddRefreshTimeOnDailyNoteEntry")] + partial class AddRefreshTimeOnDailyNoteEntry + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.10"); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ArchiveId") + .HasColumnType("TEXT"); + + b.Property("Current") + .HasColumnType("INTEGER"); + + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("Status") + .HasColumnType("INTEGER"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ArchiveId"); + + b.ToTable("achievements"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.AchievementArchive", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("achievement_archives"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.AvatarInfo", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Info") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("avatar_infos"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateEntry", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("cultivate_entries"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateItem", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("EntryId") + .HasColumnType("TEXT"); + + b.Property("IsFinished") + .HasColumnType("INTEGER"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.HasIndex("EntryId"); + + b.ToTable("cultivate_items"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateProject", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AttachedUid") + .HasColumnType("TEXT"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("cultivate_projects"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.DailyNoteEntry", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("DailyNote") + .HasColumnType("TEXT"); + + b.Property("DailyTaskNotify") + .HasColumnType("INTEGER"); + + b.Property("DailyTaskNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("ExpeditionNotify") + .HasColumnType("INTEGER"); + + b.Property("ExpeditionNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("HomeCoinNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("HomeCoinNotifyThreshold") + .HasColumnType("INTEGER"); + + b.Property("RefreshTime") + .HasColumnType("TEXT"); + + b.Property("ResinNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("ResinNotifyThreshold") + .HasColumnType("INTEGER"); + + b.Property("TransformerNotify") + .HasColumnType("INTEGER"); + + b.Property("TransformerNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("UserId"); + + b.ToTable("daily_notes"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaArchive", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("gacha_archives"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaItem", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ArchiveId") + .HasColumnType("TEXT"); + + b.Property("GachaType") + .HasColumnType("INTEGER"); + + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("QueryType") + .HasColumnType("INTEGER"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ArchiveId"); + + b.ToTable("gacha_items"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GameAccount", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AttachUid") + .HasColumnType("TEXT"); + + b.Property("MihoyoSDK") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.ToTable("game_accounts"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryItem", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("inventory_items"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryReliquary", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AppendPropIdList") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("Level") + .HasColumnType("INTEGER"); + + b.Property("MainPropId") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("inventory_reliquaries"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryWeapon", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("Level") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.Property("PromoteLevel") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("inventory_weapons"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.ObjectCacheEntry", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("ExpireTime") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("object_cache"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.SettingEntry", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("settings"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.SpiralAbyssEntry", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ScheduleId") + .HasColumnType("INTEGER"); + + b.Property("SpiralAbyss") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("spiral_abysses"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.User", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Aid") + .HasColumnType("TEXT"); + + b.Property("CookieToken") + .HasColumnType("TEXT"); + + b.Property("IsOversea") + .HasColumnType("INTEGER"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("LToken") + .HasColumnType("TEXT") + .HasColumnName("Ltoken"); + + b.Property("Mid") + .HasColumnType("TEXT"); + + b.Property("SToken") + .HasColumnType("TEXT") + .HasColumnName("Stoken"); + + b.HasKey("InnerId"); + + b.ToTable("users"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b => + { + b.HasOne("Snap.Hutao.Model.Entity.AchievementArchive", "Archive") + .WithMany() + .HasForeignKey("ArchiveId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Archive"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateEntry", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateItem", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateEntry", "Entry") + .WithMany() + .HasForeignKey("EntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.DailyNoteEntry", b => + { + b.HasOne("Snap.Hutao.Model.Entity.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaItem", b => + { + b.HasOne("Snap.Hutao.Model.Entity.GachaArchive", "Archive") + .WithMany() + .HasForeignKey("ArchiveId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Archive"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryItem", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryReliquary", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryWeapon", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.cs new file mode 100644 index 00000000..2ea4734d --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Migrations/20230824084447_AddRefreshTimeOnDailyNoteEntry.cs @@ -0,0 +1,30 @@ +// +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Snap.Hutao.Migrations +{ + /// + public partial class AddRefreshTimeOnDailyNoteEntry : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "RefreshTime", + table: "daily_notes", + type: "TEXT", + nullable: false, + defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0))); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "RefreshTime", + table: "daily_notes"); + } + } +} diff --git a/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs b/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs index 0e896111..dac00816 100644 --- a/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs +++ b/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs @@ -15,7 +15,7 @@ namespace Snap.Hutao.Migrations protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "7.0.5"); + modelBuilder.HasAnnotation("ProductVersion", "7.0.10"); modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b => { @@ -26,10 +26,10 @@ namespace Snap.Hutao.Migrations b.Property("ArchiveId") .HasColumnType("TEXT"); - b.Property("Current") + b.Property("Current") .HasColumnType("INTEGER"); - b.Property("Id") + b.Property("Id") .HasColumnType("INTEGER"); b.Property("Status") @@ -42,7 +42,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("ArchiveId"); - b.ToTable("achievements", (string)null); + b.ToTable("achievements"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.AchievementArchive", b => @@ -60,7 +60,7 @@ namespace Snap.Hutao.Migrations b.HasKey("InnerId"); - b.ToTable("achievement_archives", (string)null); + b.ToTable("achievement_archives"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.AvatarInfo", b => @@ -79,7 +79,7 @@ namespace Snap.Hutao.Migrations b.HasKey("InnerId"); - b.ToTable("avatar_infos", (string)null); + b.ToTable("avatar_infos"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateEntry", b => @@ -88,7 +88,7 @@ namespace Snap.Hutao.Migrations .ValueGeneratedOnAdd() .HasColumnType("TEXT"); - b.Property("Id") + b.Property("Id") .HasColumnType("INTEGER"); b.Property("ProjectId") @@ -101,7 +101,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("ProjectId"); - b.ToTable("cultivate_entries", (string)null); + b.ToTable("cultivate_entries"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateItem", b => @@ -126,7 +126,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("EntryId"); - b.ToTable("cultivate_items", (string)null); + b.ToTable("cultivate_items"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateProject", b => @@ -147,7 +147,7 @@ namespace Snap.Hutao.Migrations b.HasKey("InnerId"); - b.ToTable("cultivate_projects", (string)null); + b.ToTable("cultivate_projects"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.DailyNoteEntry", b => @@ -177,6 +177,9 @@ namespace Snap.Hutao.Migrations b.Property("HomeCoinNotifyThreshold") .HasColumnType("INTEGER"); + b.Property("RefreshTime") + .HasColumnType("TEXT"); + b.Property("ResinNotifySuppressed") .HasColumnType("INTEGER"); @@ -200,7 +203,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("UserId"); - b.ToTable("daily_notes", (string)null); + b.ToTable("daily_notes"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaArchive", b => @@ -218,7 +221,7 @@ namespace Snap.Hutao.Migrations b.HasKey("InnerId"); - b.ToTable("gacha_archives", (string)null); + b.ToTable("gacha_archives"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaItem", b => @@ -236,7 +239,7 @@ namespace Snap.Hutao.Migrations b.Property("Id") .HasColumnType("INTEGER"); - b.Property("ItemId") + b.Property("ItemId") .HasColumnType("INTEGER"); b.Property("QueryType") @@ -249,7 +252,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("ArchiveId"); - b.ToTable("gacha_items", (string)null); + b.ToTable("gacha_items"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.GameAccount", b => @@ -274,7 +277,7 @@ namespace Snap.Hutao.Migrations b.HasKey("InnerId"); - b.ToTable("game_accounts", (string)null); + b.ToTable("game_accounts"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryItem", b => @@ -286,7 +289,7 @@ namespace Snap.Hutao.Migrations b.Property("Count") .HasColumnType("INTEGER"); - b.Property("ItemId") + b.Property("ItemId") .HasColumnType("INTEGER"); b.Property("ProjectId") @@ -296,7 +299,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("ProjectId"); - b.ToTable("inventory_items", (string)null); + b.ToTable("inventory_items"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryReliquary", b => @@ -325,7 +328,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("ProjectId"); - b.ToTable("inventory_reliquaries", (string)null); + b.ToTable("inventory_reliquaries"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryWeapon", b => @@ -350,7 +353,7 @@ namespace Snap.Hutao.Migrations b.HasIndex("ProjectId"); - b.ToTable("inventory_weapons", (string)null); + b.ToTable("inventory_weapons"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.ObjectCacheEntry", b => @@ -366,7 +369,7 @@ namespace Snap.Hutao.Migrations b.HasKey("Key"); - b.ToTable("object_cache", (string)null); + b.ToTable("object_cache"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.SettingEntry", b => @@ -379,7 +382,7 @@ namespace Snap.Hutao.Migrations b.HasKey("Key"); - b.ToTable("settings", (string)null); + b.ToTable("settings"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.SpiralAbyssEntry", b => @@ -401,7 +404,7 @@ namespace Snap.Hutao.Migrations b.HasKey("InnerId"); - b.ToTable("spiral_abysses", (string)null); + b.ToTable("spiral_abysses"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.User", b => @@ -435,7 +438,7 @@ namespace Snap.Hutao.Migrations b.HasKey("InnerId"); - b.ToTable("users", (string)null); + b.ToTable("users"); }); modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b => diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs index cccc6a22..0c7822e1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs @@ -52,7 +52,10 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom public DailyNote? DailyNote { get; set; } - // TODO: Add RefreshTime + /// + /// 刷新时间 + /// + public DateTimeOffset RefreshTime { get; set; } /// /// 树脂提醒阈值 @@ -127,6 +130,7 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom e.UserId == entry.UserId && e.Uid == entry.Uid)?.UpdateDailyNote(dailyNote); - // database + // 发送通知 await dailyNoteNotificationOperation.SendAsync(entry).ConfigureAwait(false); - entry.DailyNote = dailyNote; + + // database + entry.UpdateDailyNote(dailyNote); await dailyNoteDbService.UpdateDailyNoteEntryAsync(entry).ConfigureAwait(false); } } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml index 892c5fb6..5a86442d 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml @@ -2,6 +2,7 @@ x:Class="Snap.Hutao.View.Control.StatisticsCard" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:clws="using:CommunityToolkit.Labs.WinUI" xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Converters" xmlns:cwucont="using:CommunityToolkit.WinUI.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" @@ -276,8 +277,11 @@ - - + + From b3de8b11a1cde63b9e764164d7f5a842e8b39bb7 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Thu, 24 Aug 2023 21:22:52 +0800 Subject: [PATCH 25/43] add dailynote refresh time hint --- .../Snap.Hutao/Model/Entity/DailyNoteEntry.cs | 3 ++ .../Resource/Localization/SH.Designer.cs | 18 ++++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 6 +++ .../Snap.Hutao/View/Card/DailyNoteCard.xaml | 46 ++++++++++++++----- .../Snap.Hutao/View/Page/DailyNotePage.xaml | 7 +++ .../Takumi/GameRecord/DailyNote/DailyNote.cs | 2 +- 6 files changed, 69 insertions(+), 13 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs index 0c7822e1..0ae56cf3 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs @@ -57,6 +57,9 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom public DateTimeOffset RefreshTime { get; set; } + [NotMapped] + public string RefreshTimeFormatted { get => SH.ModelEntityDailyNoteRefreshTimeFormat.Format(RefreshTime); } + /// /// 树脂提醒阈值 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 2491d882..cf082503 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -420,6 +420,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 刷新于 {0:yyyy/MM/dd HH:mm:ss} 的本地化字符串。 + /// + internal static string ModelEntityDailyNoteRefreshTimeFormat { + get { + return ResourceManager.GetString("ModelEntityDailyNoteRefreshTimeFormat", resourceCulture); + } + } + /// /// 查找类似 第 {0} 期 的本地化字符串。 /// @@ -5640,6 +5649,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 尚未解锁洞天 的本地化字符串。 + /// + internal static string WebDailyNoteHomeLocked { + get { + return ResourceManager.GetString("WebDailyNoteHomeLocked", resourceCulture); + } + } + /// /// 查找类似 今天 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 7d9526b5..52cfd5c1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -237,6 +237,9 @@ 网络异常 + + 刷新于 {0:yyyy/MM/dd HH:mm:ss} + 第 {0} 期 @@ -2033,6 +2036,9 @@ 预计 {0} {1:HH:mm} 达到存储上限 + + 尚未解锁洞天 + 今天 diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml index 6f7fa4f7..001788db 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml @@ -30,22 +30,38 @@ Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}"> - + - - - - - - + + + + + + + + + @@ -65,7 +81,10 @@ - + @@ -108,7 +127,10 @@ - + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml index 36b2c255..c8971635 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml @@ -168,6 +168,7 @@ + @@ -453,6 +454,12 @@ + diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs index 9e2aed5f..4c026e62 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs @@ -111,7 +111,7 @@ internal sealed class DailyNote : DailyNoteCommon [JsonIgnore] public string HomeCoinFormatted { - get => $"{CurrentHomeCoin}/{MaxHomeCoin}"; + get => MaxHomeCoin == 0 ? SH.WebDailyNoteHomeLocked : $"{CurrentHomeCoin}/{MaxHomeCoin}"; } /// From 5f37b6bd6d4179dac19148172f7f5f0e0bcc4893 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Thu, 24 Aug 2023 22:46:36 +0800 Subject: [PATCH 26/43] add setting for dailynote auto refresh --- .../Core/Shell/IScheduleTaskInterop.cs | 4 + .../Core/Shell/ScheduleTaskInterop.cs | 40 ++++++-- .../Resource/Localization/SH.Designer.cs | 36 +++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 12 +++ .../Service/DailyNote/DailyNoteOptions.cs | 21 +++++ .../Service/DailyNote/DailyNoteService.cs | 58 +++++++----- .../Service/DailyNote/IDailyNoteService.cs | 6 +- .../Snap.Hutao/View/Page/DailyNotePage.xaml | 94 ++++++++++++------- .../ViewModel/DailyNote/DailyNoteViewModel.cs | 5 +- 9 files changed, 208 insertions(+), 68 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Shell/IScheduleTaskInterop.cs b/src/Snap.Hutao/Snap.Hutao/Core/Shell/IScheduleTaskInterop.cs index 9a7627a5..3bf419d4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Shell/IScheduleTaskInterop.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Shell/IScheduleTaskInterop.cs @@ -8,6 +8,8 @@ namespace Snap.Hutao.Core.Shell; /// internal interface IScheduleTaskInterop { + bool IsDailyNoteRefreshEnabled(); + /// /// 注册实时便笺刷新任务 /// @@ -20,4 +22,6 @@ internal interface IScheduleTaskInterop /// /// 是否卸载成功 bool UnregisterAllTasks(); + + bool UnregisterForDailyNoteRefresh(); } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs b/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs index b43d6a58..635b7f4e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Shell/ScheduleTaskInterop.cs @@ -16,6 +16,7 @@ namespace Snap.Hutao.Core.Shell; internal sealed class ScheduleTaskInterop : IScheduleTaskInterop { private const string DailyNoteRefreshTaskName = "SnapHutaoDailyNoteRefreshTask"; + private const string DailyNoteRefreshScriptName = "DailyNoteRefresh"; /// /// 注册实时便笺刷新任务 @@ -30,7 +31,7 @@ internal sealed class ScheduleTaskInterop : IScheduleTaskInterop task.RegistrationInfo.Description = SH.CoreScheduleTaskHelperDailyNoteRefreshTaskDescription; task.Triggers.Add(new TimeTrigger() { Repetition = new(TimeSpan.FromSeconds(interval), TimeSpan.Zero), }); - string scriptPath = EnsureWScriptCreated("DailyNoteRefresh", "hutao://DailyNote/Refresh"); + string scriptPath = EnsureWScriptCreated(DailyNoteRefreshScriptName, "hutao://DailyNote/Refresh"); task.Actions.Add("wscript", $@"/b ""{scriptPath}"""); TaskService.Instance.RootFolder.RegisterTaskDefinition(DailyNoteRefreshTaskName, task); @@ -42,6 +43,29 @@ internal sealed class ScheduleTaskInterop : IScheduleTaskInterop } } + public bool UnregisterForDailyNoteRefresh() + { + try + { + TaskService.Instance.RootFolder.DeleteTask(DailyNoteRefreshTaskName, false); + if (WScriptExists(DailyNoteRefreshScriptName, out string fullPath)) + { + File.Delete(fullPath); + } + + return true; + } + catch (Exception) + { + return false; + } + } + + public bool IsDailyNoteRefreshEnabled() + { + return WScriptExists(DailyNoteRefreshScriptName, out _); + } + /// /// 卸载全部注册的任务 /// @@ -65,18 +89,22 @@ internal sealed class ScheduleTaskInterop : IScheduleTaskInterop private static string EnsureWScriptCreated(string name, string url, bool forceCreate = false) { - string tempFolder = ApplicationData.Current.TemporaryFolder.Path; - string fullName = Path.Combine(tempFolder, "Script", $"{name}.vbs"); - - if (File.Exists(fullName) && !forceCreate) + if (WScriptExists(name, out string fullName) && !forceCreate) { return fullName; } - Directory.CreateDirectory(Path.Combine(tempFolder, "Script")); string script = $"""CreateObject("WScript.Shell").Run "cmd /c start {url}", 0, False"""; File.WriteAllText(fullName, script); return fullName; } + + private static bool WScriptExists(string name, out string fullName) + { + string tempFolder = ApplicationData.Current.TemporaryFolder.Path; + fullName = Path.Combine(tempFolder, "Script", $"{name}.vbs"); + Directory.CreateDirectory(Path.Combine(tempFolder, "Script")); + return File.Exists(fullName); + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index cf082503..8096554c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -3498,6 +3498,42 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 自动刷新 的本地化字符串。 + /// + internal static string ViewPageDailyNoteSettingAutoRefresh { + get { + return ResourceManager.GetString("ViewPageDailyNoteSettingAutoRefresh", resourceCulture); + } + } + + /// + /// 查找类似 间隔选定的时间后刷新添加的实时便笺 的本地化字符串。 + /// + internal static string ViewPageDailyNoteSettingAutoRefreshDescription { + get { + return ResourceManager.GetString("ViewPageDailyNoteSettingAutoRefreshDescription", resourceCulture); + } + } + + /// + /// 查找类似 这些选项仅允许在非管理员模式下更改 的本地化字符串。 + /// + internal static string ViewPageDailyNoteSettingRefreshElevatedHint { + get { + return ResourceManager.GetString("ViewPageDailyNoteSettingRefreshElevatedHint", resourceCulture); + } + } + + /// + /// 查找类似 刷新 的本地化字符串。 + /// + internal static string ViewPageDailyNoteSettingRefreshHeader { + get { + return ResourceManager.GetString("ViewPageDailyNoteSettingRefreshHeader", resourceCulture); + } + } + /// /// 查找类似 在我游玩原神时不通知我 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 52cfd5c1..883310eb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1319,6 +1319,18 @@ 本周已消耗减半次数 + + 自动刷新 + + + 间隔选定的时间后刷新添加的实时便笺 + + + 这些选项仅允许在非管理员模式下更改 + + + 刷新 + 在我游玩原神时不通知我 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs index 0c59c5dc..a6bf36fc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs @@ -48,6 +48,27 @@ internal sealed class DailyNoteOptions : DbStoreOptions new(SH.ViewModelDailyNoteRefreshTime60, OneMinute * 60), }; + public bool IsAutoRefreshEnabled + { + get => scheduleTaskInterop.IsDailyNoteRefreshEnabled(); + set + { + if (value) + { + if (SelectedRefreshTime is not null) + { + scheduleTaskInterop.RegisterForDailyNoteRefresh(SelectedRefreshTime.Value); + } + } + else + { + scheduleTaskInterop.UnregisterForDailyNoteRefresh(); + } + + OnPropertyChanged(); + } + } + /// /// 选中的刷新时间 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs index 1ad21ec4..c79a993a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs @@ -67,13 +67,13 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient - public async ValueTask> GetDailyNoteEntryCollectionAsync() + public async ValueTask> GetDailyNoteEntryCollectionAsync(bool forceRefresh = false) { if (entries is null) { // IUserService.GetUserGameRoleByUid only usable after call IUserService.GetRoleCollectionAsync await userService.GetRoleCollectionAsync().ConfigureAwait(false); - await RefreshDailyNotesAsync().ConfigureAwait(false); + await RefreshDailyNotesCoreAsync(forceRefresh).ConfigureAwait(false); List entryList = dailyNoteDbService.GetDailyNoteEntryIncludeUserList(); entryList.ForEach(entry => { entry.UserGameRole = userService.GetUserGameRoleByUid(entry.Uid); }); @@ -84,15 +84,42 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient - public async ValueTask RefreshDailyNotesAsync() + public ValueTask RefreshDailyNotesAsync() + { + return RefreshDailyNotesCoreAsync(true); + } + + /// + public async ValueTask RemoveDailyNoteAsync(DailyNoteEntry entry) + { + await taskContext.SwitchToMainThreadAsync(); + ArgumentNullException.ThrowIfNull(entries); + entries.Remove(entry); + + await taskContext.SwitchToBackgroundAsync(); + await dailyNoteDbService.DeleteDailyNoteEntryByIdAsync(entry.InnerId).ConfigureAwait(false); + } + + public async ValueTask UpdateDailyNoteAsync(DailyNoteEntry entry) + { + await taskContext.SwitchToBackgroundAsync(); + await dailyNoteDbService.UpdateDailyNoteEntryAsync(entry).ConfigureAwait(false); + } + + private async ValueTask RefreshDailyNotesCoreAsync(bool forceRefresh) { foreach (DailyNoteEntry entry in dailyNoteDbService.GetDailyNoteEntryIncludeUserList()) { + if (!forceRefresh && entry.DailyNote is not null) + { + continue; + } + Web.Response.Response dailyNoteResponse = await serviceProvider - .GetRequiredService>() - .Create(PlayerUid.IsOversea(entry.Uid)) - .GetDailyNoteAsync(new(entry.User, entry.Uid)) - .ConfigureAwait(false); + .GetRequiredService>() + .Create(PlayerUid.IsOversea(entry.Uid)) + .GetDailyNoteAsync(new(entry.User, entry.Uid)) + .ConfigureAwait(false); if (dailyNoteResponse.IsOk()) { @@ -112,21 +139,4 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient - public async ValueTask RemoveDailyNoteAsync(DailyNoteEntry entry) - { - await taskContext.SwitchToMainThreadAsync(); - ArgumentNullException.ThrowIfNull(entries); - entries.Remove(entry); - - await taskContext.SwitchToBackgroundAsync(); - await dailyNoteDbService.DeleteDailyNoteEntryByIdAsync(entry.InnerId).ConfigureAwait(false); - } - - public async ValueTask UpdateDailyNoteAsync(DailyNoteEntry entry) - { - await taskContext.SwitchToBackgroundAsync(); - await dailyNoteDbService.UpdateDailyNoteEntryAsync(entry).ConfigureAwait(false); - } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/IDailyNoteService.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/IDailyNoteService.cs index 1582183c..392bc3db 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/IDailyNoteService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/IDailyNoteService.cs @@ -20,11 +20,7 @@ internal interface IDailyNoteService /// 任务 ValueTask AddDailyNoteAsync(UserAndUid userAndUid); - /// - /// 异步获取实时便笺列表 - /// - /// 实时便笺列表 - ValueTask> GetDailyNoteEntryCollectionAsync(); + ValueTask> GetDailyNoteEntryCollectionAsync(bool forceRefresh = false); /// /// 异步刷新实时便笺 diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml index c8971635..7b45799b 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml @@ -116,38 +116,68 @@ PaneBackground="{ThemeResource SystemControlAcrylicElementMediumHighBrush}" PanePlacement="Right"> - - - - - - - - - - - - - - - 0 - 0 - 0 - - - - - - - - - + + + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs index 7e9f37c5..30db6099 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs @@ -1,6 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using Snap.Hutao.Core; using Snap.Hutao.Factory.Abstraction; using Snap.Hutao.Model.Entity; using Snap.Hutao.Service.DailyNote; @@ -25,6 +26,7 @@ internal sealed partial class DailyNoteViewModel : Abstraction.ViewModel private readonly IDailyNoteService dailyNoteService; private readonly IInfoBarService infoBarService; private readonly DailyNoteOptions options; + private readonly RuntimeOptions runtimeOptions; private readonly ITaskContext taskContext; private readonly IUserService userService; @@ -36,7 +38,8 @@ internal sealed partial class DailyNoteViewModel : Abstraction.ViewModel /// public DailyNoteOptions Options { get => options; } - // TODO: 当切换用户后提醒此属性改变 + public RuntimeOptions RuntimeOptions { get => runtimeOptions; } + public string VerifyUrl { get From b7642847cd935b998dccb278dfa33fa7bf1c4f59 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Thu, 24 Aug 2023 22:55:28 +0800 Subject: [PATCH 27/43] fix refresh time update --- src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs index 0ae56cf3..83b77abd 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs @@ -133,7 +133,9 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom Date: Fri, 25 Aug 2023 11:36:07 +0800 Subject: [PATCH 28/43] try fix dailynote notification user sync --- .../DailyNoteNotificationOperation.cs | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs index 281ff93d..2286856b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs @@ -46,14 +46,21 @@ internal sealed partial class DailyNoteNotificationOperation string? attribution = SH.ServiceDailyNoteNotifierAttribution; - Response> rolesResponse = await bindingClient - .GetUserGameRolesOverseaAwareAsync(entry.User) - .ConfigureAwait(false); - - if (rolesResponse.IsOk()) + if (entry.UserGameRole is not null) { - List roles = rolesResponse.Data.List; - attribution = roles.SingleOrDefault(r => r.GameUid == entry.Uid)?.ToString() ?? ToastAttributionUnknown; + attribution = entry.UserGameRole.ToString(); + } + else + { + Response> rolesResponse = await bindingClient + .GetUserGameRolesOverseaAwareAsync(entry.User) + .ConfigureAwait(false); + + if (rolesResponse.IsOk()) + { + List roles = rolesResponse.Data.List; + attribution = roles.SingleOrDefault(r => r.GameUid == entry.Uid)?.ToString() ?? ToastAttributionUnknown; + } } ToastContentBuilder builder = new ToastContentBuilder() From 0fd018f42e2ce20b248339a58735ca6302d83beb Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Fri, 25 Aug 2023 11:47:53 +0800 Subject: [PATCH 29/43] UIGF import denial on invalid itemid --- .../Snap.Hutao/Resource/Localization/SH.Designer.cs | 9 +++++++++ src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx | 3 +++ .../Snap.Hutao/Service/GachaLog/UIGFImportService.cs | 8 ++++++++ .../Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs | 1 + 4 files changed, 21 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 8096554c..a18d5daa 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -1347,6 +1347,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 数据包含异常物品, Id：{0} 的本地化字符串。 + /// + internal static string ServiceGachaLogUIGFImportItemInvalidFormat { + get { + return ResourceManager.GetString("ServiceGachaLogUIGFImportItemInvalidFormat", resourceCulture); + } + } + /// /// 查找类似 请求验证密钥失败 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 883310eb..1444902d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -602,6 +602,9 @@ 祈愿记录上传服务不可用 + + 数据包含异常物品, Id：{0} + 请求验证密钥失败 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFImportService.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFImportService.cs index 76a7c99d..d0c06ddf 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFImportService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFImportService.cs @@ -56,6 +56,14 @@ internal sealed partial class UIGFImportService : IUIGFImportService _ => new(), }; + // 越早的记录手工导入的可能性越高 + // 错误率相对来说会更高 + // 因此从尾部开始查找 + if (toAdd.LastOrDefault(item => item.ItemId is 0U) is { } item) + { + ThrowHelper.InvalidOperation(SH.ServiceGachaLogUIGFImportItemInvalidFormat.Format(item.Id)); + } + await gachaLogDbService.AddGachaItemsAsync(toAdd).ConfigureAwait(false); return archive; } diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs index 595fdd59..4bcd177b 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs @@ -351,6 +351,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel } catch (InvalidOperationException ex) { + // 导入物品中存在无效的项 infoBarService.Error(ex); return false; } From 486e7fffd262a8ae36c5063f2eb49e44ebee52bd Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Fri, 25 Aug 2023 14:35:09 +0800 Subject: [PATCH 30/43] add enhanced count for composed reliquary sub affix --- .../Factory/SummaryReliquaryFactory.cs | 25 +++++++++++++------ .../View/Page/AvatarPropertyPage.xaml | 18 ++++++++++++- .../ReliquaryComposedSubProperty.cs | 22 ++++++++++++++++ .../AvatarProperty/ReliquarySubProperty.cs | 16 +++++------- .../ViewModel/AvatarProperty/ReliquaryView.cs | 2 +- 5 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs index 4393a93f..34fd6f2a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs @@ -8,6 +8,7 @@ using Snap.Hutao.Model.Metadata.Reliquary; using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.AvatarProperty; using Snap.Hutao.Web.Enka.Model; +using System.Runtime.InteropServices; using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary; using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; @@ -69,6 +70,8 @@ internal sealed class SummaryReliquaryFactory ArgumentNullException.ThrowIfNull(equip.Flat.ReliquarySubstats); result.ComposedSubProperties = equip.Flat.ReliquarySubstats.SelectList(CreateComposedSubProperty); + ApplyAffixEnhancedCount(result.ComposedSubProperties, equip.Reliquary.AppendPropIdList); + ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel); FightProperty property = metadataContext.IdReliquaryMainAffixMap[equip.Reliquary.MainPropId]; @@ -112,11 +115,20 @@ internal sealed class SummaryReliquaryFactory }; } + private void ApplyAffixEnhancedCount(List composed, List appendProps) + { + foreach (ref readonly ReliquarySubAffixId subAffixId in CollectionsMarshal.AsSpan(appendProps)) + { + ReliquarySubAffix subAffix = metadataContext.IdReliquarySubAffixMap[subAffixId]; + composed.Single(prop => prop.Type == subAffix.Type).EnhancedCount++; + } + } + private float ScoreReliquary(FightProperty property, MetadataReliquary reliquary, ReliquaryMainAffixLevel relicLevel, List subProperties) { // 沙/杯/头 // equip.Flat.EquipType is EquipType.EQUIP_SHOES or EquipType.EQUIP_RING or EquipType.EQUIP_DRESS - if (equip.Flat.EquipType > EquipType.EQUIP_SHOES) + if (equip.Flat.EquipType >= EquipType.EQUIP_SHOES) { // 从喵插件抓取的圣遗物评分权重 // 部分复杂的角色暂时使用了默认值 @@ -138,17 +150,17 @@ internal sealed class SummaryReliquaryFactory } } - private ReliquarySubProperty CreateComposedSubProperty(ReliquarySubstat substat) + private ReliquaryComposedSubProperty CreateComposedSubProperty(ReliquarySubstat substat) { FormatMethod method = substat.AppendPropId.GetFormatMethod(); string valueFormatted = method switch { FormatMethod.Integer => $"{MathF.Round(substat.StatValue, MidpointRounding.AwayFromZero)}", - FormatMethod.Percent => $"{substat.StatValue}%", + FormatMethod.Percent => $"{substat.StatValue}%", // Different from FightPropertyFormat.FormatValue _ => $"{substat.StatValue}", }; - return new(substat.AppendPropId.GetLocalizedDescription(), valueFormatted, 0); + return new(substat.AppendPropId, valueFormatted, 0); } [SuppressMessage("", "SH002")] @@ -157,10 +169,7 @@ internal sealed class SummaryReliquaryFactory ReliquarySubAffix affix = metadataContext.IdReliquarySubAffixMap[appendPropId]; FightProperty property = affix.Type; - return new( - property.GetLocalizedDescription(), - FightPropertyFormat.FormatValue(property, affix.Value), - ScoreSubAffix(appendPropId)); + return new(property, FightPropertyFormat.FormatValue(property, affix.Value), ScoreSubAffix(appendPropId)); } private float ScoreSubAffix(in ReliquarySubAffixId appendId) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml index 35bba5f6..57a1f2b0 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml @@ -660,10 +660,11 @@ - + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs new file mode 100644 index 00000000..53a7dd82 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs @@ -0,0 +1,22 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Model.Intrinsic; + +namespace Snap.Hutao.ViewModel.AvatarProperty; + +internal class ReliquaryComposedSubProperty : ReliquarySubProperty +{ + public ReliquaryComposedSubProperty(FightProperty type, string value, float score) + : base(type, value, score) + { + Type = type; + } + + /// + /// 强化次数 + /// + public int EnhancedCount { get; set; } + + internal FightProperty Type { get; } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquarySubProperty.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquarySubProperty.cs index 9caf7e72..063b15f1 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquarySubProperty.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquarySubProperty.cs @@ -1,23 +1,19 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using Snap.Hutao.Model.Intrinsic; + namespace Snap.Hutao.ViewModel.AvatarProperty; /// /// 圣遗物副词条 /// [HighQuality] -internal sealed class ReliquarySubProperty +internal class ReliquarySubProperty { - /// - /// 构造副属性 - /// - /// 名称 - /// 值 - /// 评分 - public ReliquarySubProperty(string name, string value, float score) + public ReliquarySubProperty(FightProperty type, string value, float score) { - Name = name; + Name = type.GetLocalizedDescription(); Value = value; Score = score; @@ -44,4 +40,4 @@ internal sealed class ReliquarySubProperty /// 评分 /// internal float Score { get; } -} +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryView.cs index 4ead1f70..3d14a34a 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryView.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryView.cs @@ -22,7 +22,7 @@ internal sealed class ReliquaryView : Equip /// /// 合成的副属性 /// - public List ComposedSubProperties { get; set; } = default!; + public List ComposedSubProperties { get; set; } = default!; /// /// 格式化评分 From 800ecb07d77a0d4c187ecd62b85c8791401cc163 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Fri, 25 Aug 2023 15:15:21 +0800 Subject: [PATCH 31/43] change how we format reliquary sub property --- .../Extension/EnumerableExtension.List.cs | 13 ++++++ .../Factory/SummaryReliquaryFactory.cs | 40 ++++++++++--------- ...maryReliquarySubPropertyCompositionInfo.cs | 33 +++++++++++++++ 3 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs index 41535305..bac4c6d9 100644 --- a/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs +++ b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs @@ -130,6 +130,19 @@ internal static partial class EnumerableExtension return results; } + public static TSource SingleOrAdd(this List list, Func predicate, Func valueFactory) + where TSource : class + { + if (list.SingleOrDefault(predicate) is { } source) + { + return source; + } + + TSource value = valueFactory(); + list.Add(value); + return value; + } + [MethodImpl(MethodImplOptions.AggressiveOptimization)] public static List SortBy(this List list, Func keySelector) where TKey : IComparable diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs index 34fd6f2a..e7299351 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs @@ -1,6 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Intrinsic.Format; using Snap.Hutao.Model.Metadata.Converter; @@ -58,7 +59,7 @@ internal sealed class SummaryReliquaryFactory Description = reliquary.Description, // EquipBase - Level = $"+{equip.Reliquary.Level - 1}", + Level = $"+{equip.Reliquary.Level - 1U}", Quality = reliquary.RankLevel, }; @@ -68,9 +69,7 @@ internal sealed class SummaryReliquaryFactory result.SecondarySubProperties = subProperty.GetRange(^affixCount..); ArgumentNullException.ThrowIfNull(equip.Flat.ReliquarySubstats); - result.ComposedSubProperties = equip.Flat.ReliquarySubstats.SelectList(CreateComposedSubProperty); - - ApplyAffixEnhancedCount(result.ComposedSubProperties, equip.Reliquary.AppendPropIdList); + result.ComposedSubProperties = CreateComposedSubProperties(equip.Reliquary.AppendPropIdList); ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel); FightProperty property = metadataContext.IdReliquaryMainAffixMap[equip.Reliquary.MainPropId]; @@ -115,13 +114,29 @@ internal sealed class SummaryReliquaryFactory }; } - private void ApplyAffixEnhancedCount(List composed, List appendProps) + private List CreateComposedSubProperties(List appendProps) { + List infos = new(); foreach (ref readonly ReliquarySubAffixId subAffixId in CollectionsMarshal.AsSpan(appendProps)) { ReliquarySubAffix subAffix = metadataContext.IdReliquarySubAffixMap[subAffixId]; - composed.Single(prop => prop.Type == subAffix.Type).EnhancedCount++; + SummaryReliquarySubPropertyCompositionInfo info = infos.SingleOrAdd(prop => prop.Type == subAffix.Type, () => new(subAffix.Type)); + info.Count++; + info.Value += subAffix.Value; } + + if (infos.Count > 4) + { + ThrowHelper.InvalidOperation("无效的圣遗物数据"); + } + + List results = new(); + foreach (ref readonly SummaryReliquarySubPropertyCompositionInfo info in CollectionsMarshal.AsSpan(infos)) + { + results.Add(info.ToReliquaryComposedSubProperty()); + } + + return results; } private float ScoreReliquary(FightProperty property, MetadataReliquary reliquary, ReliquaryMainAffixLevel relicLevel, List subProperties) @@ -150,19 +165,6 @@ internal sealed class SummaryReliquaryFactory } } - private ReliquaryComposedSubProperty CreateComposedSubProperty(ReliquarySubstat substat) - { - FormatMethod method = substat.AppendPropId.GetFormatMethod(); - string valueFormatted = method switch - { - FormatMethod.Integer => $"{MathF.Round(substat.StatValue, MidpointRounding.AwayFromZero)}", - FormatMethod.Percent => $"{substat.StatValue}%", // Different from FightPropertyFormat.FormatValue - _ => $"{substat.StatValue}", - }; - - return new(substat.AppendPropId, valueFormatted, 0); - } - [SuppressMessage("", "SH002")] private ReliquarySubProperty CreateSubProperty(ReliquarySubAffixId appendPropId) { diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs new file mode 100644 index 00000000..a39a92ab --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs @@ -0,0 +1,33 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Model.Intrinsic; +using Snap.Hutao.Model.Intrinsic.Format; +using Snap.Hutao.Model.Metadata.Converter; +using Snap.Hutao.Model.Metadata.Reliquary; +using Snap.Hutao.Model.Primitive; +using Snap.Hutao.ViewModel.AvatarProperty; +using Snap.Hutao.Web.Enka.Model; +using System.Runtime.InteropServices; +using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary; +using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; + +namespace Snap.Hutao.Service.AvatarInfo.Factory; +internal sealed class SummaryReliquarySubPropertyCompositionInfo +{ + public SummaryReliquarySubPropertyCompositionInfo(FightProperty type) + { + Type = type; + } + + public FightProperty Type { get; set; } + + public float Value { get; set; } + + public uint Count { get; set; } + + public ReliquaryComposedSubProperty ToReliquaryComposedSubProperty() + { + return new(Type, FightPropertyFormat.FormatValue(Type, Value), 0); + } +} \ No newline at end of file From 020c8c38a89d512c8986b5aa9ea02ed85dd043ab Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Fri, 25 Aug 2023 17:27:57 +0800 Subject: [PATCH 32/43] add signin client back --- .../Snap.Hutao/Model/Metadata/AvatarIds.cs | 6 +- .../Resource/Localization/SH.Designer.cs | 9 +++ .../Snap.Hutao/Resource/Localization/SH.resx | 3 + ...maryReliquarySubPropertyCompositionInfo.cs | 1 + .../View/Dialog/CultivateProjectDialog.xaml | 2 +- src/Snap.Hutao/Snap.Hutao/Web/ApiEndpoints.cs | 43 ++++++++++ .../Takumi/Event/BbsSignReward/Award.cs | 28 +++++++ .../Takumi/Event/BbsSignReward/Reward.cs | 25 ++++++ .../Event/BbsSignReward/SignInClient.cs | 78 +++++++++++++++++++ .../Takumi/Event/BbsSignReward/SignInData.cs | 38 +++++++++ .../Event/BbsSignReward/SignInResult.cs | 40 ++++++++++ .../Event/BbsSignReward/SignInRewardInfo.cs | 52 +++++++++++++ .../BbsSignReward/SignInRewardReSignInfo.cs | 58 ++++++++++++++ 13 files changed, 380 insertions(+), 3 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardInfo.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardReSignInfo.cs diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/AvatarIds.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/AvatarIds.cs index 25bb455a..2fa22d7f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/AvatarIds.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/AvatarIds.cs @@ -89,6 +89,8 @@ internal static class AvatarIds public static readonly AvatarId Lynette = 10000083; public static readonly AvatarId Lyney = 10000084; public static readonly AvatarId Freminet = 10000085; + public static readonly AvatarId Wriothesley = 10000086; + public static readonly AvatarId Neuvillette = 10000087; /// /// 检查该角色是否为主角 @@ -111,7 +113,7 @@ internal static class AvatarIds { [PlayerBoy] = new() { - Name = "旅行者", + Name = SH.ModelMetadataAvatarPlayerName, Icon = "UI_AvatarIcon_PlayerBoy", SideIcon = "UI_AvatarIcon_Side_PlayerBoy", Quality = Intrinsic.QualityType.QUALITY_ORANGE, @@ -119,7 +121,7 @@ internal static class AvatarIds [PlayerGirl] = new() { - Name = "旅行者", + Name = SH.ModelMetadataAvatarPlayerName, Icon = "UI_AvatarIcon_PlayerGirl", SideIcon = "UI_AvatarIcon_Side_PlayerGirl", Quality = Intrinsic.QualityType.QUALITY_ORANGE, diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index a18d5daa..5d7eef09 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -753,6 +753,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 旅行者 的本地化字符串。 + /// + internal static string ModelMetadataAvatarPlayerName { + get { + return ResourceManager.GetString("ModelMetadataAvatarPlayerName", resourceCulture); + } + } + /// /// 查找类似 {0} 月 {1} 日 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 1444902d..85bb5574 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -369,6 +369,9 @@ 单手剑 Need EXACT same string in game + + 旅行者 + {0} 月 {1} 日 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs index a39a92ab..58b7e451 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs @@ -13,6 +13,7 @@ using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary; using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; namespace Snap.Hutao.Service.AvatarInfo.Factory; + internal sealed class SummaryReliquarySubPropertyCompositionInfo { public SummaryReliquarySubPropertyCompositionInfo(FightProperty type) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml index c60c0cfc..8d8faac4 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml @@ -16,7 +16,7 @@ + Text="{x:Bind Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/> + /// 签到活动Id + /// + public const string SignInRewardActivityId = "e202009291139501"; + + /// + /// 签到 + /// + public const string SignInRewardHome = $"{ApiTakumi}/event/bbs_sign_reward/home?act_id={SignInRewardActivityId}"; + + /// + /// 签到 + /// + public const string SignInRewardSign = $"{ApiTakumi}/event/bbs_sign_reward/sign"; + + /// + /// 补签 + /// + public const string SignInRewardReSign = $"{ApiTakumi}/event/bbs_sign_reward/resign"; + + /// + /// 补签信息 + /// + /// uid + /// 补签信息字符串 + public static string SignInRewardResignInfo(in PlayerUid uid) + { + return $"{ApiTakumi}/event/bbs_sign_reward/resign_info?act_id={SignInRewardActivityId}®ion={uid.Region}&uid={uid.Value}"; + } + + /// + /// 签到信息 + /// + /// uid + /// 签到信息字符串 + public static string SignInRewardInfo(in PlayerUid uid) + { + return $"{ApiTakumi}/event/bbs_sign_reward/info?act_id={SignInRewardActivityId}®ion={uid.Region}&uid={uid.Value}"; + } + #endregion + #region ApiTakumiEventCalculate /// diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs new file mode 100644 index 00000000..edc720d2 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs @@ -0,0 +1,28 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; + +/// +/// 奖励物品 +/// +internal sealed class Award +{ + /// + /// 图标 + /// + [JsonPropertyName("icon")] + public string Icon { get; set; } = default!; + + /// + /// 名称 + /// + [JsonPropertyName("name")] + public string Name { get; set; } = default!; + + /// + /// 个数 + /// + [JsonPropertyName("cnt")] + public string Count { get; set; } = default!; +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs new file mode 100644 index 00000000..92278f15 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs @@ -0,0 +1,25 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; + +internal sealed class Reward +{ + /// + /// 月份 + /// + [JsonPropertyName("month")] + public string? Month { get; set; } + + /// + /// 奖励列表 + /// + [JsonPropertyName("awards")] + public List? Awards { get; set; } + + /// + /// 支持补签 + /// + [JsonPropertyName("resign")] + public bool Resign { get; set; } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs new file mode 100644 index 00000000..715601f5 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs @@ -0,0 +1,78 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; +using Snap.Hutao.ViewModel.User; +using Snap.Hutao.Web.Hoyolab.DynamicSecret; +using Snap.Hutao.Web.Response; +using System.Net.Http; + +namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; + +/// +/// 签到客户端 +/// +[ConstructorGenerated] +[HttpClient(HttpClientConfiguration.XRpc)] +internal sealed partial class SignInClient +{ + private readonly HttpClient httpClient; + private readonly JsonSerializerOptions options; + private readonly ILogger logger; + + public async ValueTask> GetInfoAsync(UserAndUid userAndUid, CancellationToken token = default) + { + Response? resp = await httpClient + .SetUser(userAndUid.User, CookieType.CookieToken) + .UseDynamicSecret(DynamicSecretVersion.Gen2, SaltType.LK2, true) + .TryCatchGetFromJsonAsync>(ApiEndpoints.SignInRewardInfo(userAndUid.Uid), options, logger, token) + .ConfigureAwait(false); + + return Response.Response.DefaultIfNull(resp); + } + + public async ValueTask> GetResignInfoAsync(UserAndUid userAndUid, CancellationToken token = default) + { + Response? resp = await httpClient + .SetUser(userAndUid.User, CookieType.CookieToken) + .UseDynamicSecret(DynamicSecretVersion.Gen2, SaltType.LK2, true) + .TryCatchGetFromJsonAsync>(ApiEndpoints.SignInRewardResignInfo(userAndUid.Uid), options, logger, token) + .ConfigureAwait(false); + + return Response.Response.DefaultIfNull(resp); + } + + public async ValueTask> GetRewardAsync(User user, CancellationToken token = default) + { + Response? resp = await httpClient + .SetUser(user.Entity, CookieType.CookieToken) + .TryCatchGetFromJsonAsync>(ApiEndpoints.SignInRewardHome, options, logger, token) + .ConfigureAwait(false); + + return Response.Response.DefaultIfNull(resp); + } + + public async ValueTask> ReSignAsync(UserAndUid userAndUid, CancellationToken token = default) + { + SignInData data = new(userAndUid.Uid); + + Response? resp = await httpClient + .SetUser(userAndUid.User, CookieType.CookieToken) + .UseDynamicSecret(DynamicSecretVersion.Gen2, SaltType.LK2, true) + .TryCatchPostAsJsonAsync>(ApiEndpoints.SignInRewardReSign, data, options, logger, token) + .ConfigureAwait(false); + + return Response.Response.DefaultIfNull(resp); + } + + public async ValueTask> SignAsync(UserAndUid userAndUid, CancellationToken token = default) + { + Response? resp = await httpClient + .SetUser(userAndUid.User, CookieType.CookieToken) + .UseDynamicSecret(DynamicSecretVersion.Gen2, SaltType.LK2, true) + .TryCatchPostAsJsonAsync>(ApiEndpoints.SignInRewardSign, new SignInData(userAndUid.Uid), options, logger, token) + .ConfigureAwait(false); + + return Response.Response.DefaultIfNull(resp); + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs new file mode 100644 index 00000000..f80cae1d --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs @@ -0,0 +1,38 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; + +/// +/// 签到提交数据 +/// +internal sealed class SignInData +{ + /// + /// 构造一个新的签到提交数据 + /// + /// uid + public SignInData(in PlayerUid uid) + { + Region = uid.Region; + Uid = uid.Value; + } + + /// + /// 活动Id + /// + [JsonPropertyName("act_id")] + public string ActivityId { get; } = ApiEndpoints.SignInRewardActivityId; + + /// + /// 地区代码 + /// + [JsonPropertyName("region")] + public string Region { get; } + + /// + /// Uid + /// + [JsonPropertyName("uid")] + public string Uid { get; } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs new file mode 100644 index 00000000..07b552de --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs @@ -0,0 +1,40 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; + +/// +/// 签到结果 +/// +internal sealed class SignInResult +{ + /// + /// 通常是 "" + /// + [JsonPropertyName("code")] + public string Code { get; set; } = default!; + + /// + /// 通常是 "" + /// + [JsonPropertyName("risk_code")] + public int RiskCode { get; set; } + + /// + /// 通常是 "" + /// + [JsonPropertyName("gt")] + public string Gt { get; set; } = default!; + + /// + /// 通常是 "" + /// + [JsonPropertyName("challenge")] + public string Challenge { get; set; } = default!; + + /// + /// 通常是 "" + /// + [JsonPropertyName("success")] + public int Success { get; set; } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardInfo.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardInfo.cs new file mode 100644 index 00000000..5a86a0f0 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardInfo.cs @@ -0,0 +1,52 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; + +/// +/// 签到信息 +/// +internal sealed class SignInRewardInfo +{ + /// + /// 累积签到天数 + /// + [JsonPropertyName("total_sign_day")] + public int TotalSignDay { get; set; } + + /// + /// yyyy-MM-dd + /// + [JsonPropertyName("today")] + public string? Today { get; set; } + + /// + /// 今日是否已签到 + /// + [JsonPropertyName("is_sign")] + public bool IsSign { get; set; } + + /// + /// ？ + /// + [JsonPropertyName("is_sub")] + public bool IsSub { get; set; } + + /// + /// 是否首次绑定 + /// + [JsonPropertyName("first_bind")] + public bool FirstBind { get; set; } + + /// + /// 是否为当月第一次 + /// + [JsonPropertyName("month_first")] + public bool MonthFirst { get; set; } + + /// + /// 漏签天数 + /// + [JsonPropertyName("sign_cnt_missed")] + public bool SignCountMissed { get; set; } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardReSignInfo.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardReSignInfo.cs new file mode 100644 index 00000000..3276f6fb --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInRewardReSignInfo.cs @@ -0,0 +1,58 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; + +/// +/// 补签说明 +/// +public class SignInRewardReSignInfo +{ + /// + /// 当日补签次数 + /// + [JsonPropertyName("resign_cnt_daily")] + public bool ResignCountDaily { get; set; } + + /// + /// 当月补签次数 + /// + [JsonPropertyName("resign_cnt_monthly")] + public bool ResignCountMonthly { get; set; } + + /// + /// 当日补签次数限制 + /// + [JsonPropertyName("resign_limit_daily")] + public bool ResignLimitDaily { get; set; } + + /// + /// 当月补签次数限制 + /// + [JsonPropertyName("resign_limit_monthly")] + public bool ResignLimitMonthly { get; set; } + + /// + /// 漏签次数 + /// + [JsonPropertyName("sign_cnt_missed")] + public bool SignCountMissed { get; set; } + + /// + /// 米游币个数 + /// + [JsonPropertyName("coin_cnt")] + public bool CoinCount { get; set; } + + /// + /// 补签需要的米游币个数 + /// + [JsonPropertyName("coin_cost")] + public bool CoinCost { get; set; } + + /// + /// 规则 + /// + [JsonPropertyName("rule")] + public string Rule { get; set; } = default!; +} \ No newline at end of file From 0de4aff03a948acd8d56c5e94c7a748ca252c394 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 26 Aug 2023 00:14:18 +0800 Subject: [PATCH 33/43] fix dailynote refresh time notify --- .../Snap.Hutao/Model/Entity/DailyNoteEntry.cs | 2 +- .../Snap.Hutao/Resource/Localization/SH.Designer.cs | 9 +++++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 3 +++ src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj | 4 ---- .../ViewModel/DailyNote/DailyNoteViewModel.cs | 11 ++++++++++- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs index 83b77abd..c2d5f859 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs @@ -136,6 +136,6 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom + /// 查找类似 正在获取实时便笺信息，请稍候 的本地化字符串。 + /// + internal static string ViewModelDailyNoteRequestProgressTitle { + get { + return ResourceManager.GetString("ViewModelDailyNoteRequestProgressTitle", resourceCulture); + } + } + /// /// 查找类似 成功保存到指定位置 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 85bb5574..5877f6df 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1034,6 +1034,9 @@ 注册计划任务失败，请使用管理员模式重试 + + 正在获取实时便笺信息，请稍候 + 成功保存到指定位置 diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj index c644ca09..ceecec06 100644 --- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj +++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj @@ -255,10 +255,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - all diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs index 30db6099..7f781ce2 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/DailyNote/DailyNoteViewModel.cs @@ -1,6 +1,8 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using Microsoft.UI.Xaml.Controls; +using Snap.Hutao.Control.Extension; using Snap.Hutao.Core; using Snap.Hutao.Factory.Abstraction; using Snap.Hutao.Model.Entity; @@ -89,7 +91,14 @@ internal sealed partial class DailyNoteViewModel : Abstraction.ViewModel { if (userAndUid is not null) { - await dailyNoteService.AddDailyNoteAsync(userAndUid).ConfigureAwait(false); + ContentDialog dialog = await contentDialogFactory + .CreateForIndeterminateProgressAsync(SH.ViewModelDailyNoteRequestProgressTitle) + .ConfigureAwait(false); + + using (await dialog.BlockAsync(taskContext).ConfigureAwait(false)) + { + await dailyNoteService.AddDailyNoteAsync(userAndUid).ConfigureAwait(false); + } } } From 0cdcb1c4444a06b841aa6b7ee41275065c344af6 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 26 Aug 2023 10:36:05 +0800 Subject: [PATCH 34/43] refine user panel UI --- .../Core/Threading/TaskExtension.cs | 4 - .../Resource/Localization/SH.Designer.cs | 2 +- .../Snap.Hutao/Resource/Localization/SH.resx | 2 +- src/Snap.Hutao/Snap.Hutao/View/UserView.xaml | 359 +++++++++--------- 4 files changed, 179 insertions(+), 188 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskExtension.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskExtension.cs index 0c49be52..b5dc143b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskExtension.cs @@ -10,18 +10,14 @@ namespace Snap.Hutao.Core.Threading; /// 任务扩展 /// [HighQuality] -[SuppressMessage("", "VSTHRD003")] -[SuppressMessage("", "VSTHRD100")] internal static class TaskExtension { - [SuppressMessage("", "VSTHRD200")] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static ValueTask AsValueTask(this Task task) { return new(task); } - [SuppressMessage("", "VSTHRD200")] [MethodImpl(MethodImplOptions.AggressiveInlining)] public static ValueTask AsValueTask(this Task task) { diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 62ca31ba..8162ec21 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -5416,7 +5416,7 @@ namespace Snap.Hutao.Resource.Localization { } /// - /// 查找类似 HoYoLab 的本地化字符串。 + /// 查找类似 HoYoLAB 的本地化字符串。 /// internal static string ViewUserCookieOperation2 { get { diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 5877f6df..0f8d765c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1959,7 +1959,7 @@ 米游社 - HoYoLab + HoYoLAB 网页登录 diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml index 0869d2e3..3f4667de 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml @@ -73,199 +73,194 @@ - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - public int EnhancedCount { get; set; } + public uint EnhancedCount { get; set; } internal FightProperty Type { get; } } \ No newline at end of file From e969267c1ed138df80e3525695726420bfd9252e Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 26 Aug 2023 16:13:49 +0800 Subject: [PATCH 36/43] port back signin reward feature --- src/Snap.Hutao/Snap.Hutao/App.xaml | 1 + .../Resource/Localization/SH.Designer.cs | 54 +++++++++++++++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 18 +++++++ .../Service/SignIn/ISignInService.cs | 11 ++++ .../Service/SignIn/SignInService.cs | 49 +++++++++++++++++ src/Snap.Hutao/Snap.Hutao/View/UserView.xaml | 24 ++++++++- .../ViewModel/User/UserViewModel.cs | 27 ++++++++++ .../Web/Hoyolab/HoyolabHttpClientExtension.cs | 8 +++ .../Takumi/Event/BbsSignReward/Award.cs | 2 +- .../Takumi/Event/BbsSignReward/Reward.cs | 4 +- .../Event/BbsSignReward/SignInClient.cs | 28 ++++++++-- .../Takumi/Event/BbsSignReward/SignInData.cs | 3 +- .../Event/BbsSignReward/SignInResult.cs | 2 +- .../Snap.Hutao/Web/Response/Response.cs | 13 +++-- 14 files changed, 231 insertions(+), 13 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Service/SignIn/ISignInService.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Service/SignIn/SignInService.cs diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml index fd4bf633..dd3332bd 100644 --- a/src/Snap.Hutao/Snap.Hutao/App.xaml +++ b/src/Snap.Hutao/Snap.Hutao/App.xaml @@ -51,6 +51,7 @@ 180 64 + 100 0.2 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 8162ec21..70b3f9bb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -1707,6 +1707,33 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 签到失败，{0} 的本地化字符串。 + /// + internal static string ServiceSignInClaimRewardFailedFormat { + get { + return ResourceManager.GetString("ServiceSignInClaimRewardFailedFormat", resourceCulture); + } + } + + /// + /// 查找类似 获取奖励列表失败 的本地化字符串。 + /// + internal static string ServiceSignInRewardListRequestFailed { + get { + return ResourceManager.GetString("ServiceSignInRewardListRequestFailed", resourceCulture); + } + } + + /// + /// 查找类似 签到成功，{0}×{1} 的本地化字符串。 + /// + internal static string ServiceSignInSuccessRewardFormat { + get { + return ResourceManager.GetString("ServiceSignInSuccessRewardFormat", resourceCulture); + } + } + /// /// 查找类似 多个用户记录为选中状态 的本地化字符串。 /// @@ -5424,6 +5451,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 当前用户 的本地化字符串。 + /// + internal static string ViewUserCookieOperation3 { + get { + return ResourceManager.GetString("ViewUserCookieOperation3", resourceCulture); + } + } + /// /// 查找类似 网页登录 的本地化字符串。 /// @@ -5451,6 +5487,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 领取签到奖励 的本地化字符串。 + /// + internal static string ViewUserCookieOperationSignInRewardAction { + get { + return ResourceManager.GetString("ViewUserCookieOperationSignInRewardAction", resourceCulture); + } + } + /// /// 查找类似 复制 Cookie 的本地化字符串。 /// @@ -5991,6 +6036,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 请刷新 Cookie，原始消息：{0} 的本地化字符串。 + /// + internal static string WebResponseRefreshCookieHintFormat { + get { + return ResourceManager.GetString("WebResponseRefreshCookieHintFormat", resourceCulture); + } + } + /// /// 查找类似 [{0}] 中的 [{1}] 网络请求异常，请稍后再试 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 0f8d765c..9cd1ebf6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -722,6 +722,15 @@ 你的胡桃版本过低，请尽快升级 + + 签到失败，{0} + + + 获取奖励列表失败 + + + 签到成功，{0}×{1} + 多个用户记录为选中状态 @@ -1961,6 +1970,9 @@ HoYoLAB + + 当前用户 + 网页登录 @@ -1970,6 +1982,9 @@ 刷新 Cookie + + 领取签到奖励 + 复制 Cookie @@ -2150,6 +2165,9 @@ 状态：{0} | 信息：{1} + + 请刷新 Cookie，原始消息：{0} + [{0}] 中的 [{1}] 网络请求异常，请稍后再试 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/SignIn/ISignInService.cs b/src/Snap.Hutao/Snap.Hutao/Service/SignIn/ISignInService.cs new file mode 100644 index 00000000..b5054b3a --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Service/SignIn/ISignInService.cs @@ -0,0 +1,11 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.ViewModel.User; + +namespace Snap.Hutao.Service.SignIn; + +internal interface ISignInService +{ + ValueTask> ClaimRewardAsync(UserAndUid userAndUid, CancellationToken token = default); +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/SignIn/SignInService.cs b/src/Snap.Hutao/Snap.Hutao/Service/SignIn/SignInService.cs new file mode 100644 index 00000000..6d3b8aba --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Service/SignIn/SignInService.cs @@ -0,0 +1,49 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.ViewModel.User; +using Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; +using Snap.Hutao.Web.Response; + +namespace Snap.Hutao.Service.SignIn; + +[ConstructorGenerated] +[Injection(InjectAs.Singleton, typeof(ISignInService))] +internal sealed partial class SignInService : ISignInService +{ + private readonly IServiceProvider serviceProvider; + + public async ValueTask> ClaimRewardAsync(UserAndUid userAndUid, CancellationToken token = default) + { + SignInClient signInClient = serviceProvider.GetRequiredService(); + + Response rewardResponse = await signInClient.GetRewardAsync(userAndUid.User, token).ConfigureAwait(false); + + if (rewardResponse.IsOk()) + { + Response resultResponse = await signInClient.SignAsync(userAndUid, token).ConfigureAwait(false); + + if (resultResponse.IsOk()) + { + int index = DateTimeOffset.Now.Day - 1; + Award award = rewardResponse.Data.Awards[index]; + return new(true, SH.ServiceSignInSuccessRewardFormat.Format(award.Name, award.Count)); + } + else + { + string message = resultResponse.Message; + + if (string.IsNullOrEmpty(message)) + { + message = $"RiskCode: {resultResponse.Data?.RiskCode}"; + } + + return new(false, SH.ServiceSignInClaimRewardFailedFormat.Format(message)); + } + } + else + { + return new(false, SH.ServiceSignInRewardListRequestFailed); + } + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml index 3f4667de..fff2f933 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml @@ -94,11 +94,15 @@ Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewUserCookieOperation}"/> + + - diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs index 71f81482..25c508b9 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs @@ -7,6 +7,7 @@ using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Core.IO.DataTransfer; using Snap.Hutao.Service.Navigation; using Snap.Hutao.Service.Notification; +using Snap.Hutao.Service.SignIn; using Snap.Hutao.Service.User; using Snap.Hutao.View.Dialog; using Snap.Hutao.View.Page; @@ -28,6 +29,7 @@ internal sealed partial class UserViewModel : ObservableObject private readonly IServiceProvider serviceProvider; private readonly IInfoBarService infoBarService; private readonly RuntimeOptions runtimeOptions; + private readonly ISignInService signInService; private readonly ITaskContext taskContext; private readonly IUserService userService; @@ -221,4 +223,29 @@ internal sealed partial class UserViewModel : ObservableObject } } } + + [Command("ClaimSignInRewardCommand")] + private async Task ClaimSignInRewardAsync() + { + if (SelectedUser is not null) + { + if (UserAndUid.TryFromUser(SelectedUser, out UserAndUid? userAndUid)) + { + (bool isOk, string message) = await signInService.ClaimRewardAsync(userAndUid).ConfigureAwait(false); + + if (isOk) + { + infoBarService.Success(message); + } + else + { + infoBarService.Warning(message); + } + } + else + { + infoBarService.Warning(SH.MustSelectUserAndUid); + } + } + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HoyolabHttpClientExtension.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HoyolabHttpClientExtension.cs index a477c338..97eed372 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HoyolabHttpClientExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HoyolabHttpClientExtension.cs @@ -73,6 +73,14 @@ internal static class HoyolabHttpClientExtension return httpClient; } + internal static HttpClient SetXrpcChallenge(this HttpClient httpClient, string challenge, string validate) + { + httpClient.DefaultRequestHeaders.Set("x-rpc-challenge", challenge); + httpClient.DefaultRequestHeaders.Set("x-rpc-validate", validate); + httpClient.DefaultRequestHeaders.Set("x-rpc-seccode", $"{validate}|jordan"); + return httpClient; + } + /// /// 设置头 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs index edc720d2..255112da 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Award.cs @@ -24,5 +24,5 @@ internal sealed class Award /// 个数 /// [JsonPropertyName("cnt")] - public string Count { get; set; } = default!; + public int Count { get; set; } = default!; } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs index 92278f15..1fb9bd1d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/Reward.cs @@ -9,13 +9,13 @@ internal sealed class Reward /// 月份 /// [JsonPropertyName("month")] - public string? Month { get; set; } + public int Month { get; set; } /// /// 奖励列表 /// [JsonPropertyName("awards")] - public List? Awards { get; set; } + public List Awards { get; set; } = default!; /// /// 支持补签 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs index 715601f5..da5d4ad6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs @@ -3,7 +3,9 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; using Snap.Hutao.ViewModel.User; +using Snap.Hutao.Web.Geetest; using Snap.Hutao.Web.Hoyolab.DynamicSecret; +using Snap.Hutao.Web.Hutao.Geetest; using Snap.Hutao.Web.Response; using System.Net.Http; @@ -12,11 +14,14 @@ namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.BbsSignReward; /// /// 签到客户端 /// -[ConstructorGenerated] +[ConstructorGenerated(ResolveHttpClient = true)] +[UseDynamicSecret] [HttpClient(HttpClientConfiguration.XRpc)] +[PrimaryHttpMessageHandler(UseCookies = false)] internal sealed partial class SignInClient { private readonly HttpClient httpClient; + private readonly HomaGeetestClient homaGeetestClient; private readonly JsonSerializerOptions options; private readonly ILogger logger; @@ -42,10 +47,10 @@ internal sealed partial class SignInClient return Response.Response.DefaultIfNull(resp); } - public async ValueTask> GetRewardAsync(User user, CancellationToken token = default) + public async ValueTask> GetRewardAsync(Model.Entity.User user, CancellationToken token = default) { Response? resp = await httpClient - .SetUser(user.Entity, CookieType.CookieToken) + .SetUser(user, CookieType.CookieToken) .TryCatchGetFromJsonAsync>(ApiEndpoints.SignInRewardHome, options, logger, token) .ConfigureAwait(false); @@ -69,10 +74,25 @@ internal sealed partial class SignInClient { Response? resp = await httpClient .SetUser(userAndUid.User, CookieType.CookieToken) - .UseDynamicSecret(DynamicSecretVersion.Gen2, SaltType.LK2, true) + .UseDynamicSecret(DynamicSecretVersion.Gen1, SaltType.LK2, false) .TryCatchPostAsJsonAsync>(ApiEndpoints.SignInRewardSign, new SignInData(userAndUid.Uid), options, logger, token) .ConfigureAwait(false); + if (resp is { Data: { Success: 1, Gt: string gt, Challenge: string challenge } }) + { + GeetestResponse verifyResponse = await homaGeetestClient.VerifyAsync(gt, challenge, token).ConfigureAwait(false); + + if (verifyResponse is { Code: 0, Data.Validate: string validate }) + { + resp = await httpClient + .SetUser(userAndUid.User, CookieType.CookieToken) + .SetXrpcChallenge(challenge, validate) + .UseDynamicSecret(DynamicSecretVersion.Gen1, SaltType.LK2, false) + .TryCatchPostAsJsonAsync>(ApiEndpoints.SignInRewardSign, new SignInData(userAndUid.Uid), options, logger, token) + .ConfigureAwait(false); + } + } + return Response.Response.DefaultIfNull(resp); } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs index f80cae1d..3b9c21ba 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInData.cs @@ -12,7 +12,8 @@ internal sealed class SignInData /// 构造一个新的签到提交数据 /// /// uid - public SignInData(in PlayerUid uid) + [SuppressMessage("", "SH002")] + public SignInData(PlayerUid uid) { Region = uid.Region; Uid = uid.Value; diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs index 07b552de..274be2c9 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInResult.cs @@ -15,7 +15,7 @@ internal sealed class SignInResult public string Code { get; set; } = default!; /// - /// 通常是 "" + /// 通常是 0 /// [JsonPropertyName("risk_code")] public int RiskCode { get; set; } diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs b/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs index c9889a2f..775236d3 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs @@ -54,7 +54,14 @@ internal class Response public static Response DefaultIfNull(Response? response, [CallerMemberName] string callerName = default!) { // 0x26F19335 is a magic number that hashed from "Snap.Hutao" - return response ?? new(0x26F19335, $"[{callerName}] 中的网络请求异常，请稍后再试"); + response ??= new(0x26F19335, SH.WebResponseRequestExceptionFormat.Format(callerName, null)); + + if (((KnownReturnCode)response.ReturnCode) is KnownReturnCode.PleaseLogin or KnownReturnCode.RET_TOKEN_INVALID) + { + response.Message = SH.WebResponseRefreshCookieHintFormat.Format(response.Message); + } + + return response; } /// @@ -67,7 +74,7 @@ internal class Response public static Response DefaultIfNull(Response? response, [CallerMemberName] string callerName = default!) { // 0x26F19335 is a magic number that hashed from "Snap.Hutao" - return response ?? new(0x26F19335, $"[{callerName}] 中的 [{typeof(TData).Name}] 网络请求异常，请稍后再试", default); + return response ?? new(0x26F19335, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default); } /// @@ -82,7 +89,7 @@ internal class Response { if (response is not null) { - Must.Argument(response.ReturnCode != 0, "返回代码必须为0"); + Must.Argument(response.ReturnCode != 0, "RetCode has to be 0"); return new(response.ReturnCode, response.Message, default); } else From 1d8ee4cee52aa1f1c605e89a922ed17c852c70ef Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 26 Aug 2023 17:08:18 +0800 Subject: [PATCH 37/43] remove redundant attribute --- .../Core/LifeCycle/AppInstanceExtension.cs | 1 - .../Snap.Hutao/Core/Threading/Delay.cs | 3 --- .../Core/Threading/DispatcherQueueProgress.cs | 1 - .../Snap.Hutao/Service/Game/GameService.cs | 18 +++--------------- .../Snap.Hutao/Service/Game/LaunchOptions.cs | 10 ---------- .../Snap.Hutao/View/Page/LaunchGamePage.xaml | 11 ----------- .../View/Page/LoginHoyoverseUserPage.xaml.cs | 1 - .../View/Page/LoginMihoyoUserPage.xaml.cs | 1 - .../Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs | 1 - .../Snap.Hutao/Web/Hoyolab/PlayerUid.cs | 2 +- .../BbsSignReward/SignInRewardReSignInfo.cs | 2 +- 11 files changed, 5 insertions(+), 46 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs index c1cdbd0b..06f24566 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs @@ -25,7 +25,6 @@ internal static class AppInstanceExtension /// /// app实例 /// 参数 - [SuppressMessage("", "VSTHRD002")] public static unsafe void RedirectActivationTo(this AppInstance appInstance, AppActivationArguments args) { redirectEventHandle = CreateEvent(default(SECURITY_ATTRIBUTES*), true, false, null); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs index b87abc2f..ac3c1d4e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs @@ -11,19 +11,16 @@ internal readonly struct Delay /// 最小，闭 /// 最小，开 /// 任务 - [SuppressMessage("", "VSTHRD200")] public static ValueTask Random(int minMilliSeconds, int maxMilliSeconds) { return Task.Delay((int)(System.Random.Shared.NextDouble() * (maxMilliSeconds - minMilliSeconds)) + minMilliSeconds).AsValueTask(); } - [SuppressMessage("", "VSTHRD200")] public static ValueTask FromSeconds(int seconds) { return Task.Delay(TimeSpan.FromSeconds(seconds)).AsValueTask(); } - [SuppressMessage("", "VSTHRD200")] public static ValueTask FromMilliSeconds(int seconds) { return Task.Delay(TimeSpan.FromMilliseconds(seconds)).AsValueTask(); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs index c4b9b1b1..d6869b52 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs @@ -21,7 +21,6 @@ internal class DispatcherQueueProgress : IProgress public event EventHandler? ProgressChanged; - [SuppressMessage("", "VSTHRD001")] public void Report(T value) { Action? handler = this.handler; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs index 8a0cea37..ff23744e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs @@ -225,14 +225,8 @@ internal sealed partial class GameService : IGameService return false; } - if (launchOptions.MultipleInstances) - { - // If multiple instances is enabled, always treat as not running. - return false; - } - - return Process.GetProcessesByName(YuanShenProcessName).Any() - || Process.GetProcessesByName(GenshinImpactProcessName).Any(); + return Process.GetProcessesByName(YuanShenProcessName) is [_, ..] + || Process.GetProcessesByName(GenshinImpactProcessName) is [_, ..]; } /// @@ -254,13 +248,7 @@ internal sealed partial class GameService : IGameService game.Start(); - bool isAdvancedOptionsAllowed = runtimeOptions.IsElevated && appOptions.IsAdvancedLaunchOptionsEnabled; - if (isAdvancedOptionsAllowed && launchOptions.MultipleInstances && !isFirstInstance) - { - ProcessInterop.DisableProtection(game, gamePath); - } - - if (isAdvancedOptionsAllowed && launchOptions.UnlockFps) + if (runtimeOptions.IsElevated && appOptions.IsAdvancedLaunchOptionsEnabled && launchOptions.UnlockFps) { await ProcessInterop.UnlockFpsAsync(serviceProvider, game, default).ConfigureAwait(false); } diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs index b2813d54..9e9ac01e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs @@ -31,7 +31,6 @@ internal sealed class LaunchOptions : DbStoreOptions private bool? unlockFps; private int? targetFps; private NameValue? monitor; - private bool? multipleInstances; /// /// 构造一个新的启动游戏选项 @@ -151,15 +150,6 @@ internal sealed class LaunchOptions : DbStoreOptions } } - /// - /// 多开启动原神 - /// - public bool MultipleInstances - { - get => GetOption(ref multipleInstances, SettingEntry.MultipleInstances); - set => SetOption(ref multipleInstances, SettingEntry.MultipleInstances, value); - } - private static void InitializeMonitors(List> monitors) { // This list can't use foreach diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml index 4a8b69c5..d246fe86 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml @@ -214,17 +214,6 @@ - - - - - - - /// 补签说明 /// -public class SignInRewardReSignInfo +internal sealed class SignInRewardReSignInfo { /// /// 当日补签次数 From eb557afd18061d703559bb1b872d0f43db94e417 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 26 Aug 2023 19:55:02 +0800 Subject: [PATCH 38/43] add color for enhanced count --- .../UInt32ToGradientColorConverter.cs | 44 +++++++++++++ .../View/Page/AvatarPropertyPage.xaml | 61 +++++++++++++------ 2 files changed, 88 insertions(+), 17 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs new file mode 100644 index 00000000..419e8043 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs @@ -0,0 +1,44 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Microsoft.UI.Xaml; +using Snap.Hutao.Control; +using Snap.Hutao.Control.Theme; +using Snap.Hutao.Win32; +using System.Runtime.CompilerServices; +using Windows.UI; + +namespace Snap.Hutao.View.Converter; + +/// +/// UInt32 转 色阶颜色 +/// +[DependencyProperty("MaximumValue", typeof(int), 6)] +[DependencyProperty("MinimumValue", typeof(int), 1)] +[DependencyProperty("Maximum", typeof(Color))] +[DependencyProperty("Minimum", typeof(Color))] +internal sealed partial class UInt32ToGradientColorConverter : DependencyValueConverter +{ + public UInt32ToGradientColorConverter() + { + Maximum = StructMarshal.Color(0xFFFD0093); + Minimum = StructMarshal.Color(0xFF4B00D9); + } + + public override Color Convert(uint from) + { + double n = Math.Clamp(from, MinimumValue, MaximumValue) - MinimumValue; + int step = MaximumValue - MinimumValue; + double a = Minimum.A + ((Maximum.A - Minimum.A) * n / step); + double r = Minimum.R + ((Maximum.R - Minimum.R) * n / step); + double g = Minimum.G + ((Maximum.G - Minimum.G) * n / step); + double b = Minimum.B + ((Maximum.B - Minimum.B) * n / step); + + Unsafe.SkipInit(out Color color); + color.A = (byte)a; + color.R = (byte)r; + color.G = (byte)g; + color.B = (byte)b; + return color; + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml index 4ff3222d..019cf69d 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml @@ -28,19 +28,38 @@ - - - 1 - - - 0.5 - - + + + + + + + + + - + + + 1 + + + 0.5 + + + + + + + @@ -53,7 +72,7 @@ @@ -672,13 +691,17 @@ TextTrimming="CharacterEllipsis" TextWrapping="NoWrap"/> - + + Opacity="0.8" + StrokeThickness="1"> + + + + + Text="{Binding EnhancedCount}"> + + + + From 14c75d7c045dccba031a4aec6e83fa2eacbdb062 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 26 Aug 2023 21:50:50 +0800 Subject: [PATCH 39/43] fix dailynote activation exiting --- .../Snap.Hutao/Core/LifeCycle/Activation.cs | 14 ++++++++++---- .../Service/DailyNote/DailyNoteService.cs | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs index b3fbd1e0..52346413 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs @@ -241,10 +241,16 @@ internal sealed class Activation : IActivation { case UrlActionRefresh: { - await serviceProvider - .GetRequiredService() - .RefreshDailyNotesAsync() - .ConfigureAwait(false); + try + { + await serviceProvider + .GetRequiredService() + .RefreshDailyNotesAsync() + .ConfigureAwait(false); + } + catch + { + } // Check if it's redirected. if (!isRedirected) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs index c79a993a..a2469230 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs @@ -116,10 +116,10 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient dailyNoteResponse = await serviceProvider - .GetRequiredService>() - .Create(PlayerUid.IsOversea(entry.Uid)) - .GetDailyNoteAsync(new(entry.User, entry.Uid)) - .ConfigureAwait(false); + .GetRequiredService>() + .Create(PlayerUid.IsOversea(entry.Uid)) + .GetDailyNoteAsync(new(entry.User, entry.Uid)) + .ConfigureAwait(false); if (dailyNoteResponse.IsOk()) { From 00f083608eaded24e69da6f576e06145c18a438c Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sun, 27 Aug 2023 15:57:39 +0800 Subject: [PATCH 40/43] refine navigation icons --- README.md | 1 - .../Behavior/SelectedItemInViewBehavior.cs | 2 - .../Control/Markup/BitmapIconExtension.cs | 2 +- .../Core/Annotation/HighQualityAttribute.cs | 3 + .../Snap.Hutao/Core/LifeCycle/Activation.cs | 5 + ...435_AddRefreshTimeOnAvatarInfo.Designer.cs | 546 ++++++++++++++++++ ...230827040435_AddRefreshTimeOnAvatarInfo.cs | 52 ++ .../Migrations/AppDbContextModelSnapshot.cs | 9 + .../Snap.Hutao/Model/Entity/AvatarInfo.cs | 6 + .../Metadata/Weapon/Weapon.Implementation.cs | 7 + .../Model/Metadata/Weapon/Weapon.cs | 5 + .../Resource/Navigation/Achievement.png | Bin 0 -> 43908 bytes .../Resource/Navigation/Announcement.png | Bin 0 -> 28359 bytes .../Resource/Navigation/AvatarProperty.png | Bin 0 -> 7963 bytes .../Resource/Navigation/Cultivation.png | Bin 0 -> 5708 bytes .../Resource/Navigation/DailyNote.png | Bin 0 -> 38853 bytes .../Resource/Navigation/Database.png | Bin 0 -> 16466 bytes .../Resource/Navigation/GachaLog.png | Bin 0 -> 11487 bytes .../Resource/Navigation/LaunchGame.png | Bin 0 -> 5585 bytes .../Resource/Navigation/SpiralAbyss.png | Bin 0 -> 5201 bytes .../Resource/Navigation/WikiAvatar.png | Bin 0 -> 9315 bytes .../Resource/Navigation/WikiMonster.png | Bin 0 -> 10785 bytes .../Resource/Navigation/WikiWeapon.png | Bin 0 -> 8795 bytes .../AvatarInfo/AvatarInfoDbBulkOperation.cs | 54 +- .../Service/AvatarInfo/AvatarInfoService.cs | 2 +- .../Factory/SummaryReliquaryFactory.cs | 2 - ...maryReliquarySubPropertyCompositionInfo.cs | 7 - src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj | 24 + .../View/Control/BottomTextControl.xaml | 7 +- .../View/Control/BottomTextControl.xaml.cs | 2 +- .../Control/BottomTextSmallControl.xaml.cs | 2 +- .../UInt32ToGradientColorConverter.cs | 1 - src/Snap.Hutao/Snap.Hutao/View/MainView.xaml | 34 +- .../Snap.Hutao/View/Page/SettingPage.xaml | 17 - .../Snap.Hutao/View/Page/WikiWeaponPage.xaml | 232 ++++---- .../ViewModel/Wiki/WikiWeaponViewModel.cs | 13 +- .../Event/BbsSignReward/SignInClient.cs | 1 - 37 files changed, 861 insertions(+), 175 deletions(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.Designer.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.cs create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Achievement.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Announcement.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/AvatarProperty.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Cultivation.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/DailyNote.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Database.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/GachaLog.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/LaunchGame.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/SpiralAbyss.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiAvatar.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiMonster.png create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiWeapon.png diff --git a/README.md b/README.md index 96550b17..943728fc 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ Snap Hutao is an open-source Genshin Impact toolbox on Windows platform, aim to * [dotnet/runtime](https://github.com/dotnet/runtime) * [DotNetAnalyzers/StyleCopAnalyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers) * [microsoft/CsWin32](https://github.com/microsoft/CsWin32) -* [microsoft/vs-threading](https://github.com/microsoft/vs-threading) * [microsoft/vs-validation](https://github.com/microsoft/vs-validation) * [microsoft/WindowsAppSDK](https://github.com/microsoft/WindowsAppSDK) * [microsoft/microsoft-ui-xaml](https://github.com/microsoft/microsoft-ui-xaml) diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs index 74df6403..89d8034d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/SelectedItemInViewBehavior.cs @@ -2,9 +2,7 @@ // Licensed under the MIT license. using CommunityToolkit.WinUI.Behaviors; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; namespace Snap.Hutao.Control.Behavior; diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Markup/BitmapIconExtension.cs b/src/Snap.Hutao/Snap.Hutao/Control/Markup/BitmapIconExtension.cs index b8751a52..be542e67 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Markup/BitmapIconExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/Markup/BitmapIconExtension.cs @@ -21,7 +21,7 @@ internal sealed class BitmapIconExtension : MarkupExtension /// /// Gets or sets a value indicating whether to display the icon as monochrome. /// - public bool ShowAsMonochrome { get; set; } = true; + public bool ShowAsMonochrome { get; set; } /// protected override object ProvideValue() diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Annotation/HighQualityAttribute.cs b/src/Snap.Hutao/Snap.Hutao/Core/Annotation/HighQualityAttribute.cs index 0757aaf0..901ae9ec 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Annotation/HighQualityAttribute.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Annotation/HighQualityAttribute.cs @@ -1,12 +1,15 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using System.Diagnostics; + namespace Snap.Hutao.Core.Annotation; /// /// 高质量代码 /// [AttributeUsage(AttributeTargets.All, Inherited = false)] +[Conditional("DEBUG")] internal sealed class HighQualityAttribute : Attribute { } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs index 52346413..c53a38cb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs @@ -243,6 +243,11 @@ internal sealed class Activation : IActivation { try { + if (serviceProvider.GetRequiredService() is IHutaoUserServiceInitialization hutaoUserServiceInitialization) + { + await hutaoUserServiceInitialization.InitializeInternalAsync().ConfigureAwait(false); + } + await serviceProvider .GetRequiredService() .RefreshDailyNotesAsync() diff --git a/src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.Designer.cs new file mode 100644 index 00000000..52928b03 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.Designer.cs @@ -0,0 +1,546 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Snap.Hutao.Model.Entity.Database; + +#nullable disable + +namespace Snap.Hutao.Migrations +{ + [DbContext(typeof(AppDbContext))] + [Migration("20230827040435_AddRefreshTimeOnAvatarInfo")] + partial class AddRefreshTimeOnAvatarInfo + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.10"); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ArchiveId") + .HasColumnType("TEXT"); + + b.Property("Current") + .HasColumnType("INTEGER"); + + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("Status") + .HasColumnType("INTEGER"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ArchiveId"); + + b.ToTable("achievements"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.AchievementArchive", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("achievement_archives"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.AvatarInfo", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("CalculatorRefreshTime") + .HasColumnType("TEXT"); + + b.Property("GameRecordRefreshTime") + .HasColumnType("TEXT"); + + b.Property("Info") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ShowcaseRefreshTime") + .HasColumnType("TEXT"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("avatar_infos"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateEntry", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("cultivate_entries"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateItem", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("EntryId") + .HasColumnType("TEXT"); + + b.Property("IsFinished") + .HasColumnType("INTEGER"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.HasIndex("EntryId"); + + b.ToTable("cultivate_items"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateProject", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AttachedUid") + .HasColumnType("TEXT"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("cultivate_projects"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.DailyNoteEntry", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("DailyNote") + .HasColumnType("TEXT"); + + b.Property("DailyTaskNotify") + .HasColumnType("INTEGER"); + + b.Property("DailyTaskNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("ExpeditionNotify") + .HasColumnType("INTEGER"); + + b.Property("ExpeditionNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("HomeCoinNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("HomeCoinNotifyThreshold") + .HasColumnType("INTEGER"); + + b.Property("RefreshTime") + .HasColumnType("TEXT"); + + b.Property("ResinNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("ResinNotifyThreshold") + .HasColumnType("INTEGER"); + + b.Property("TransformerNotify") + .HasColumnType("INTEGER"); + + b.Property("TransformerNotifySuppressed") + .HasColumnType("INTEGER"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("UserId"); + + b.ToTable("daily_notes"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaArchive", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("gacha_archives"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaItem", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ArchiveId") + .HasColumnType("TEXT"); + + b.Property("GachaType") + .HasColumnType("INTEGER"); + + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("QueryType") + .HasColumnType("INTEGER"); + + b.Property("Time") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ArchiveId"); + + b.ToTable("gacha_items"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GameAccount", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AttachUid") + .HasColumnType("TEXT"); + + b.Property("MihoyoSDK") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.ToTable("game_accounts"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryItem", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("inventory_items"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryReliquary", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("AppendPropIdList") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("Level") + .HasColumnType("INTEGER"); + + b.Property("MainPropId") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("inventory_reliquaries"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryWeapon", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ItemId") + .HasColumnType("INTEGER"); + + b.Property("Level") + .HasColumnType("INTEGER"); + + b.Property("ProjectId") + .HasColumnType("TEXT"); + + b.Property("PromoteLevel") + .HasColumnType("INTEGER"); + + b.HasKey("InnerId"); + + b.HasIndex("ProjectId"); + + b.ToTable("inventory_weapons"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.ObjectCacheEntry", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("ExpireTime") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("object_cache"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.SettingEntry", b => + { + b.Property("Key") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("settings"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.SpiralAbyssEntry", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ScheduleId") + .HasColumnType("INTEGER"); + + b.Property("SpiralAbyss") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Uid") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("InnerId"); + + b.ToTable("spiral_abysses"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.User", b => + { + b.Property("InnerId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Aid") + .HasColumnType("TEXT"); + + b.Property("CookieToken") + .HasColumnType("TEXT"); + + b.Property("IsOversea") + .HasColumnType("INTEGER"); + + b.Property("IsSelected") + .HasColumnType("INTEGER"); + + b.Property("LToken") + .HasColumnType("TEXT") + .HasColumnName("Ltoken"); + + b.Property("Mid") + .HasColumnType("TEXT"); + + b.Property("SToken") + .HasColumnType("TEXT") + .HasColumnName("Stoken"); + + b.HasKey("InnerId"); + + b.ToTable("users"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b => + { + b.HasOne("Snap.Hutao.Model.Entity.AchievementArchive", "Archive") + .WithMany() + .HasForeignKey("ArchiveId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Archive"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateEntry", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.CultivateItem", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateEntry", "Entry") + .WithMany() + .HasForeignKey("EntryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Entry"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.DailyNoteEntry", b => + { + b.HasOne("Snap.Hutao.Model.Entity.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaItem", b => + { + b.HasOne("Snap.Hutao.Model.Entity.GachaArchive", "Archive") + .WithMany() + .HasForeignKey("ArchiveId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Archive"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryItem", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryReliquary", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); + + modelBuilder.Entity("Snap.Hutao.Model.Entity.InventoryWeapon", b => + { + b.HasOne("Snap.Hutao.Model.Entity.CultivateProject", "Project") + .WithMany() + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Project"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.cs b/src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.cs new file mode 100644 index 00000000..0e1f87e4 --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Migrations/20230827040435_AddRefreshTimeOnAvatarInfo.cs @@ -0,0 +1,52 @@ +// +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Snap.Hutao.Migrations +{ + /// + public partial class AddRefreshTimeOnAvatarInfo : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CalculatorRefreshTime", + table: "avatar_infos", + type: "TEXT", + nullable: false, + defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0))); + + migrationBuilder.AddColumn( + name: "GameRecordRefreshTime", + table: "avatar_infos", + type: "TEXT", + nullable: false, + defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0))); + + migrationBuilder.AddColumn( + name: "ShowcaseRefreshTime", + table: "avatar_infos", + type: "TEXT", + nullable: false, + defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0))); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CalculatorRefreshTime", + table: "avatar_infos"); + + migrationBuilder.DropColumn( + name: "GameRecordRefreshTime", + table: "avatar_infos"); + + migrationBuilder.DropColumn( + name: "ShowcaseRefreshTime", + table: "avatar_infos"); + } + } +} diff --git a/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs b/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs index dac00816..646ae427 100644 --- a/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs +++ b/src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs @@ -69,10 +69,19 @@ namespace Snap.Hutao.Migrations .ValueGeneratedOnAdd() .HasColumnType("TEXT"); + b.Property("CalculatorRefreshTime") + .HasColumnType("TEXT"); + + b.Property("GameRecordRefreshTime") + .HasColumnType("TEXT"); + b.Property("Info") .IsRequired() .HasColumnType("TEXT"); + b.Property("ShowcaseRefreshTime") + .HasColumnType("TEXT"); + b.Property("Uid") .IsRequired() .HasColumnType("TEXT"); diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/AvatarInfo.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/AvatarInfo.cs index 9d1ecbd0..aff34126 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/AvatarInfo.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/AvatarInfo.cs @@ -31,6 +31,12 @@ internal sealed class AvatarInfo : IMappingFrom public Web.Enka.Model.AvatarInfo Info { get; set; } = default!; + public DateTimeOffset ShowcaseRefreshTime { get; set; } + + public DateTimeOffset GameRecordRefreshTime { get; set; } + + public DateTimeOffset CalculatorRefreshTime { get; set; } + /// /// 创建一个新的实体角色信息 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.Implementation.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.Implementation.cs index c9f863a2..86a4465c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.Implementation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.Implementation.cs @@ -5,6 +5,7 @@ using Snap.Hutao.Model.Calculable; using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Metadata.Abstraction; using Snap.Hutao.Model.Metadata.Converter; +using Snap.Hutao.Model.Metadata.Item; using Snap.Hutao.ViewModel.Complex; using Snap.Hutao.ViewModel.GachaLog; @@ -22,6 +23,12 @@ internal sealed partial class Weapon : IStatisticsItemSource, ISummaryItemSource [JsonIgnore] public WeaponCollocationView? Collocation { get; set; } + /// + /// [非元数据] 养成物品视图 + /// + [JsonIgnore] + public List? CultivationItemsView { get; set; } + /// [JsonIgnore] public QualityType Quality diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.cs index 01cc7e55..19136d47 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.cs @@ -61,4 +61,9 @@ internal sealed partial class Weapon /// 被动信息, 无被动的武器为 /// public NameDescriptions? Affix { get; set; } = default!; + + /// + /// 养成物品 + /// + public List CultivationItems { get; set; } = default!; } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Achievement.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Achievement.png new file mode 100644 index 0000000000000000000000000000000000000000..9935dd917f0807338a97334a1984b5ad1114f932 GIT binary patch literal 43908 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 CKU$*z literal 0 HcmV?d00001 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/AvatarProperty.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/AvatarProperty.png new file mode 100644 index 0000000000000000000000000000000000000000..b1b9e0d30502fa4c106707b00d08a26331c2f1e8 GIT binary patch literal 7963 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 literal 0 HcmV?d00001 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Cultivation.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/Cultivation.png new file mode 100644 index 0000000000000000000000000000000000000000..addca85706b7ee07134fbf25eba931d57498ec30 GIT binary patch literal 5708 zcmV-S7PIMzP)G`W@jTKYh8N`%uG*VsIMP`1HG7; znvN_cuPVHI<=p%4VwG7{L6B9*B&+a2q*W-bsKSvGCs0;d1)KSFb+qGF<5j-s5k8m= zh2A7<;l(PkYJy;5aK;Je*{ZV77Q*uIjgR3!fA&-O#>Ta~Z_I|oe;)MPEolU>MDzGXRV&CyMe?o5W z9c7z|;mAuTb;tN8CgB}_#6JUpIoOZ@k`hS-iP(^yhV+ayUD;Qkoxz2(XOvB9rHXG~ zK6m;(7>wb9V66#q6`jg$w?5)v zFcd_-qpW9SXX(T+H8q2dwk}%?OCUfu&Vx1&rZp{&BXo0>Ra7dQf+Jpd9|mKnAeeQa z7R8U0?LT|#Z^C8FGI$>JAQTM2W@!ZJT6rGy(zR1vDzmr>l-;ebqeLGJBmoAZwGK6P zdnvb|29OJhAuvl8<6bjHhx+-lp2^6{LFLvOlvZxh?PsFs?-_u*vV?E578T~d%K z#7i091{j2)7J{t9QDvP8LgCS)395X3;5a$)80SC!KeXIxT=!yN_{JaN`la*u?1NwO zYomp^SQdOMXsv`O2(Q6F3=;%%7m)iVSaV66Yk2INn0Nfev%j79hucUu3cEJUdTL=U zGKEsI5Q%h+W!wj(Yi|gK2_imTO+e+ligaaD)A~QIyW_qshDBi4hPhHL+CW?&Q(RE! z3UALr*ad?yEQUxB;TGlf0+&lyHZ!FcL`Tal-FEIq7d5jI`CYM)P$vD>5Kl_#hWY!_ zHt>c0-CEZf=|)+rLrVrr@X5)l_&Bi~24R>WNDP_EdSX)YqR0Bi9_qH)1=;<=u?3H1 zewA4iE5HKA>RojUmR)Z6RJZ-KxJnbS3)*YHQVeZnJS&U2kAWT!o|V*O2aX=7M1F1x za7cK1mRP*;$wYa|q%IE@5=Ae_n946jDeCfByO& z)E}tO?Qgu*i%-toM_1oC{F4E!HLTKoW20p5bLW+rC8jckAdKcOfA~E1)D%HVdx#hr z^W&fY?F;@HZ2|#vSb`^EYC*8rV%gtGcH+4mMF`1a7$p(>%fElYKebd><)f~q7^Ov7 z+?}v)ok?;h>^NpgTH1%_ea8qK4kyfv=>)+{Dl@GPr<0pjrS-8?n7atc%^gvc+=NoG ztn8&D)i`l<3sO=Xyk}1o)$e9yrl6=W3%j-#^X-dQI`QF|W;`@V7_61S{wC%g6c>?O z;DVVjjUZZXHd4^ltgC!xA($|hBM4UckNg21P_nxA^h$$Ep4(B3AHQ*c?`JS~vRGFy z`|k65%kcs&ADy|4-=1m4ilHC;_}4$z{XI6E{MD($NJ?~YA+RMRf6kFPVaM`C+2&=Uw9x)PI}(vaSK$esx_;x-z{GDsG~I#@~&mF4;P)7SS?Yax|&#Y;_3*+Z~;mnvM8 zy@MF`45I8#G{uoBkVGY@E8D7zxFD>CWn9LI<2&%yo5zrmA(`@EP}H~s$ooRHPYiGK z0Fn+0iK0}l9H)FwRF{x;A8iyCWZ~6UcEf5|!a}@wYzMwmzg@~dh?0W{n}2PhftwBO zH@%?-$kJGNiE3Nh_6YIl`mLwX9Yps-;V7x}`I%A|->`c%^1 z5Eo7!Mg*H|y?RR#?%nT$6^Lm;Y~Jh&_h_mCfLcC1J&VC%FV7ozeSV%h$f9*oD*)wt za+5^Rv^w;0gA!*5>W6$>aj9(~OhJBL7B}Y{Ua9&vqchQol9GJBo}MlVVNMAuMQG}o zSpzv!q5Q+k%5BSC zuDyD-RaeQ{CT31vCI$z+823%e6|7G{gwQFrCF3IDu18ae#QxKU*COwh5!CghUn3LO@5sML-uB?#^58R3;ZC&vrgj;`UMaeVb<6NX2;{MeoJJEJ3B>Hk0n6&B^e3dD5k z`awsZE-)-Dcj4xZR&1}?MC(QP{qHWK4WD1tb!;ikRVIdwg?Ty)5^mClSj-Z@{zJR) z%4_x5R#Sy6ibJv}mPjR0@Uffpdqu9G z>L0&^;<6%)j(RcBH-dgzq#T9Pp(Wt@l{={1;tpGjIn6oQakp=_qQqT1aPRnE#xrduq?@+m0$|nes%}o&<_q)jYq>vRzm2(biyW-ZhyBMV3 z1xz!NennVffXvlznlLypf}YMkUa>4EF-TS*BfFn0gZdzhKrM?*GWEk$fpgL@Y;?AE zQH6W(+8eKEI?5DXh^@W%wlX{`DyO(7C;Vu?(+;a)2|={q zZNtVAB~}n4Mn;LcEM;+JS$M2H6VQh23<^YjywZm$4%xCx3Pk->;T2mexvS8|7K-0! zBq6b5tcE27F*-Ox{$9#Gga@-QltEO|U?|mhXbeYjxf`vw?xMThgUuv{(n>c!ke$Oj z=99)-=!aoru&1B@rWLWwa~Um7cjt9khcuZ+B?+Yrs8t^6i%UpAB3S`e$)c!^li+1^p-~?cf@D|F->mP~a{@%k`UF z47(0LkCgOG%{k=r(Xj<2JZ3$th@}KE<)1{$ja!I(7)Po65Ts#na}mSn6k)ixZ$&X# zi@YKi(sOfV7omMfM-rA0@8HK;5z9>nFxc6JHZBV2#yv8t@Q?z*0V>ybi|Zf4DXQ9p zIJ*1QDFZZCMe{V6tEvh)u0mK1OU@6`+t!XNpL`0xUm8C-Hav=^h6}j)o#^-pxoX8y!tgPNMPmpYj&O%%nP#yx;5N zuXNG|hJvUIJ5f+sg&SX-L&?^yD5|ceav?kwfVKr1N3J6^BLjY)by^*kv=CafVo>P3 zc~dupelGlMsI>0dQjO|^hcVREg&Swiz&j#!hRuaz6Ez@B&M<6NVN+mvL1=N3wa6|h z!-UU^;qETYvlv47fnX_5As{U$4>d2o%#Xi!@dA2V?rB^G9V3e(GHDg-tSdnjY~G5p zU3++C_uRh4XP8$e013wiL5&q)P0UTz*mnFRMti!^{KXmGl94Ql{5*zeodLFtbt4D| zS%*wlDOIQ+-hqBp>_1EyCWn6Pq;B|}x+El}VAG-FNY5`s+ocPbpg2T%nk%%zLHKMk zQ#MznSujOV$u0_;(RHBPLjj*=Qcp)Be~{LQ_hsZ)R`Wo!@76WA_Z{Z$Bcu%y=|&Gw z`SfEi0#j3%dgP^b>huZ(Xj>nLv|T)h!mT@z?XFspg<$UqVXuW~Zv1*hv;G^2Ia(QX zP5JvWUQpi?!Cx#wLSgTqS}Bg?6r|<5Fw%Yx#m^m}{tIaW(@r4=g+>J%HAfAMBkr-^=Ya?cO%`C0LZKxy897Lzeu?p}c8on} zS(YVu8p}Bso4%R7RVOlL(7s|S+L$`1G-4tS77$WT6nYykV6?T_P%$hQ{sNWphYOZf zR_}xvFohr%dN~wU8@`2Br|iVwPZ~ch2mD4|CI# zFe@xZ8tCriGvb?}`Duz6f|*kG_C4k0DOM&WEgjwM_c1!$&s!E|h#Rz+LJ+*EIfQiq z6TaC*pd~6U!%UgEwPvYeh}O(@Q4xe$B5E_kny1kqDlUV)%#@|5yW3lJscIW3U0=Cv zC#q|rGx#QIF~rWggM6_u7wf9~+ve%mg0RtH3&KW+EeIPOQ41sU#V_gj zxj+!TJ!80cr{A*YdfNHcf~W{$>kb#cP|JZ`RCh%l0&_vM-ygE%xfVO$S`ihOQCysj zXC?9?Tk%{Aoo}s(iXfI_LL+fReAkNSTIhUhg&kDd=&%K0qr(=2jSgE7HacuU*yxCg zAXxI{SqVgZ*R1Dy8lDH{oW(9Gg6Leq#pvr9kBM_F#?<62&qT6Mvk?_Rw6_lNJ7hU` zBs;c^GI#gx^u@%v7DGu(-)icC*@#+S2D>Om8>l&`wT(GPTAf;QliYhD?&b1gdwI$N;Z7+h^ zu)Duk>0FD!EQOf@NiBBw_bQ$1X_z5^TnIaLZKJ~$gpCec5H>mt6NCVS-&g1xA6xWT zB~xefWFGmZ7A>EiQp>g1ex(>Dh&cfsWj#_54yQid@o>}@#MAI}>Zcw`O43iEFx;>9 zodiQdCk(Hc2Hx!ASo>(Sp-Ny&Oa3=XK* zI052K7=&Sh__pD+hd$WC%~@B6`cBKttaRP6?BZSirsJ7J5i8x_&w4I)P1v=GWJ7vd zc%5C_8O3FY@W|KR5DXpb?Q++a3xaTftuwb#Q@4-rcRC&X9op*9~UQ_SGIrn)?cHnvWl;>nddv&x)2P8V6$}M z;^HWs?heOc-mx+K^k4r;Ef0z1Mp_6%o1KjfryE2OVL>n@E3o%-yDN$jA8)sGmkJX@ zd1Z+%DF3gY{YQ9RfOy(SG4S7n!NiN=n~>jF)YZ|U6Gc*T5-K;9kqNYW-JeEEYBIMB z+FRRI3a|0VK9b2FV^d6@)noX`pCJx%(j^**!!v!*AX8dkDR z#n8fD>el^0ioMuPq%RU1Qb`OA4W|uDRY$TWwXyH`sdwn7{vq=B5|ffqP~^f!R}o)d z&#+*TErWgin35dktbvVDd7cP~8t z=R4mS_r7=EyW`!A?CiDo{;lb2X05rBC{1-md>m>V004mhQVFL0bgusAz`}U?>>}kn zdpcpeDj9eH00iCt9Ka-Y0vZ4S?a*FV-&0>rRm{@GiObx|#lo7)*U9w>4FE_;`?{K2 zI#_#xEv#+roh2bh&Fv7dy_FuQ0DApRf%Fn2(2#kDEt?n^%aFS4515PfUOx{O=d!iJiNZjhHq};or=jt|TFL zo}R8^+}u7sK3qQhTrTdm+`OWqqTD=u+EPu0AF|FK|F+YU#khUVUAcL=c>dApUqCC%|KMD`+#UbL z+{%*M+R@s{+S$|N3CsH*tgD@ir;CT3%l`}M|2+Pm7(CflP3=EC{+F^iIsJ!)ho`*v zlN$dv$o~@Uq3h>r&8=G=O8g_@e!OJ@&Hb7xEImoQ1llg?cB_Euv2=ED3!JOY+ap(wz|$;%^P!6|CP zZ_a5WBx=nsY{SPdWG?*Q{b4SaUjKOZzx!ML|Lm{fZvQm2%pL!a>HIU`{s{>&C3}x2 zXZihmMCe$%{k!F85B^sah?!gd6Wx*!%YWQzZ3X%FZTtUY3;Y*ZA3N(OqW>T6{x6t^ zi;bs`xx2ND?US|sx8cP7Bs}*&_^)UG!{0^mOr`BxddW zl)2oWQq-9yZ#w|+A@C(kM%OoE|F1!fb)O$SR?s6u)jR%0k1;y;ED|MEG;k;ire+R{ zW)8Y+nZ(*tj>*12N&d)!JOm+;tyhg#HYi}=2LxrKcb3QHFP|@xZ|~x{+k&xfF&}RQ zTLje%kFXKwpb#J>hzI};sf|E}QsVYNt${opW=KjRN(DSpEEpPN2rmjV27jj^t_=|M z6#`_7WDX$$l5473fpbzsXz}@fFaY}7qlrMk!(g9#v;@GqX^|8o1OiGtZu9z3IQx#l zjtdyo@EQdAb;gNCgj|WaW_t5lzTQaxWaZYSG^r952!sRnxOo!q_-#7q;CERqcj*r@ z3>`+(STN*b35H)@C>E*NJA|CiWR%V0veU@njYon4>M}V}&a!>ksUEXjcH{_1)azJ{ zkl(AqidWZvP9HTW{oLFV;zpS8x)V@}!NwHamJk5FTSMm$L0g{Ebov1xf?>g)83MEc zAQE$O*X}6*e$eX&_C)G%!3>cWG65u^w8$Mbfy>d!@{KMMEudqx@_-C7T$@C=cON`4 z-%136!MX_KVg0fKVWkNHut!=$>(zHu!#;MyXv~OTiD;LXAOJF|OVV*cD<{oe(}C{m zpH1v)*F4G3zTCR@3@Jy8mpR2wVLyDb&O7SrirT}F9U&sL87P>`YokVh5W&&tp)YdJ zHt0~cl|Z~zM~6#Kxh4h}A7dakE^7p)^+92uUZ`nXncS;ya~8QACO??bf0#*2ojqY_&Zm{2`fe)S!Y%44x8j23uR%K%PsvLwU?gNWU}Fy(i6&8h%okVP1ll(SI` z;hjayKv}eoL`4Ytlth;feto%o!4lJ?w)A4tFJ7YQ_+%R1$rl~`djrCUy)KMmtW%O1Qk-Bv24;^@@_+h*C+9;TxzhP7Ii>)ERuH;?i zG2J_tnIn_?J8-Lk1{244zrS;`MN2oP%U5(1M#YT3sOC|r=4JR{uu2-VkGz*l@mBW< z2m@4tRP|4;!kxHyKvLDxu1kWc2|&PS3d~B@$1GZ+jxw3o`V5y;my;+#Dx=xI#zuth zXwb#RV`mWLc43HpeQ4{l{}3mj6sZsSUUn6(P<n4JP z-g*Fb7(`N%+$ptM6rtI@e5fJ9U{}1;8Xi}ROPkogU_UuE6s!lq{p={i& zM)kNwiw`}@nj};x3BGdNm510qma>Wi-O-i7*~&fwF1vB9lk-=<_%J1WJ&NYtjhrHE zbukH-h48V?!FY73NP#yoI0x7QVM=#;1fN2o^8p6)w1%~uXY?hs&1H7n#FrDXRAq6Y zTckyX3(o-V^~(mPzUp{B+;|8agnNaReBPiw!Pl>8E!j!;s7%ogYn zW=v9qQa!YUI);!a(WW=n+Btp|0HyY_RIn%+Yt-Vl09DP*vEMH?1=(B&(d2)$_3Z-qgdSD<^4jK#lT9=p;_h#Sdur%&l9= zO8i3cH_GQ>%FxnUZJ_pZYzjm!Rj)pG?(~kTX@r?ez9<%j=?^#eYyhk`c{|BvR=2eb84j@dojQgs@1kj&gihB9x3nL!w!yYfY&4W3E|C|&|{C_x9h77Uj5reyy?o%YL1 z!*{yY5n|~{Z@Ji~ekE~Ac>leHAI)Es(E}D2f9;n$TaTPviSh4vIE!Y=bPiYs0y;kQ zas27!yQ)nPs?G=~6VP9AZ!lW%47}gI6j`39Qv@8JSM#B{Qg>(opz-4RX*wk;XKx+s z)yuq_t`|?XHfj2jCtbery4Z?p_n;jS{&WpR_uJLF8#T(c2MVMF*3h-y<>B8dK3<+) z)u1{6;D`&*dujkg@ocxbC`FgaUX(zw)}1JWK4jxohTdLej|ScB>5KV_pxc}VLI$7* zLf0AcjDOFSYsFVMu1B%6H+$$gAL5ml?vH*&UnF@E`B7QTf%YG*Gmxj%1YD;9uf zDhbfhXsrg|aim(lz*F*^bh)Y>cWs!3kJbI8H~h{={P#ewZf`8PV)!k76%(LC&i3wc z+jhDAer4q9TH7GCTYum$^Q-Yv`R)%N|1Ki6V6h>9Z*CRG&4k0Z%}3r=V=*4OGQ3r1 zj{SJ`uIY&s>k?&!WM~Tf{W{CHb${eGXS7Jk%QnpK?1;BhO>K1l6mV5o*>W%SkD9c5 z|J_#+UXpyR6jB|S9qba?MzACGhZ?0fwFi!#Ax>&pRFPm81EWw9VARIz33pZ{cGyW6 zQjsymc4P(rnA&5*yQMx0!?GV%B32;guVLQ#YF<%gAoDyA2xdq3V-+z+yP`Mf-TmA% z-*4fDMH(TarQ5F(HWec_W=tR0Wx;=QLx}fq_6*+4nA=Oq-Z`rjZb*TLv?k{xgO#?V zV!Ue`XxkiQ`KOgZmiqsW9LasMoiJ>%m-v*md-7}ULvkN+{l;Gp-9Y5YSdS|RbY%sA<$W~!j<(YMRbAqMQ1_rnHX zg%YCPh?|H%56>>7T13BH?TqaR{@6?Hp~gf2ID5xkzDpQ%_=`rvxV<*tWqJPRi*5gg zBdhRyQ9=b?9!Sb3l!}e7m7!fIjabAZzN=QD&n))UInkgwbk`(mNQ)gGh8=}yWuD(W z+hWvb9-uf{Wug~2iO%#y7NJ!Ld-qEsKH!SF_eOsl_o1N@cS zv}J-DCV^>nlr*_47N8Q_Z?pmB6yTqQ8=yT$5Vm_a-xrNZ@;@BUehDB0xbF97i+NjV zF4c>uh=-n)@IkrAndJ1jIW3qo40L_%STR;r=i@W?R;LC;Iq*r0O;T5ThQyHqOz){Y zOvX~*fj+>dJ!SXA<@yXmYQqP`lz9g@>lDaK78J@WXiA-FRF(Ow!?fTQKAehLy1tjz zVfKf#6NH%uk82;L+m2a#3S-I2Qi=nm`@1XS_%XvcAqk&RT{Unvn{)mgd21TI(0@a5 z@GYA*5dh*(=`y1>v;8pFqlxwc1G6@Ve$MZCCgTedkwbXt#Y$b(FAISTFHK_lw0H* z!xjRyzFP`$NoAA{Mt<)Lzkgb~IDjlKjxONfMSA#ebhTzCe-^)Fe@F4Lf=>KX5bJxt zTo%W!Cqof9D#^}ecKD%cVIqkDAc}n%HlBo|-MU9jVUvU4@)b=>jBKEFST;>tp)ht$ zD3S#Y=y$Xr1rE6F0D*d7v>`0!-T-F8O?&yBnSx#0$0a=%iJOW1Bu}RoeW&2gQ*ek~ zm$S2$Zm3L7B`%N;R}I0OO)Lw8c85>&ZF8XZd&E$@9&lZA#4L#Sa00Vo`}v zj|Y;&qJQq$RpPL?h9pb1;2YZb@g~wNs(Hj5RCONEg(bbmsTWdl+@EVIm|JA4sxrwg z925oUr)Zo8Xp9}u)2v^;lf3Av>>I-m*o~MVXUb>cSJ1Y67U2=7;!qTphA>cGj76pC z8))Xu-3`d08f*&J?%`5TOhwv;%`QlY0z_pU%yvR(NfIr#)$wh4P=fY~3ZE)#QWo&(qQtU+s}Z&88wYH%8YE(anfI4*M(zA; zC%e6*?;^4Ni$Z5&)%%vN|4cz+5o9C!uN`O{9F3H?*g7w}Lwr4~Ts?BTZ_9gn$Tp#*-n9k166a5}e6aD;~ii>M6Yq{QgsxU1n{X}!^ygvr{ z@TJEsA!yVKNNRSST4EM_@NK4}#Zdup`~<4y+*yFZOWgh-a6uFcftk(r9I7beI%Qst z0J=A`=VMRF?#I{HqwlYR4*#&T0y0E}3Qr-ES6^sXzv`e$xVj_C>Av!*o2P7(=W@uI ziXfcg@lB0JT%8uc7TLKWQ!5M4%q4C$DJTvz6}dA{JhC~^Gvm4zX>-{)ioaurxj^wg zK@xCS*gIJ~0H#acU;+gFdrs#H+qq@Vgl?QZ0`B!N>ALHENn8Ihj^VyBF3ro-+2(Cv zf13e?EOnQ{UTo5=jFa#0|2iWZ)poEQg3{W1Y=-F5fq~29ZLixcyl^ z&Ljh<2qP_`WCd&Du$uk+^UU9RsO5?#d9eMV;^8`#sX3Pyzm?D2x;S`O^6a`p5_LEq zr-RY}-KsI0FSINZN4yzoigo&3)|7JmlPlZI#lR=|2)TE}5)aoX>huQ)H2#x4ylfJ` zOcmp7-RTdL%8al?RG4+h`>0OeH&4U0d(c0mgvJfS&bU44PkOzA*bsu`#rB}$7y~PP z@YvTQTD6nZ#yCII!Y1G*OKBdLu`U~k6|HU~1FRjbG!Q$8Odw% z0|4~nhV7V|$bUAE-!~Qa~+%pO2Wfg(MteTrZ zZNm6|wVz7ee>g2hf$ZZl{G-FTl^5hCoQG!Ik}aO=Lzm`ta=QRG_2l#DpN zX{>q6xIYB^MH1+s0y6Ri=mF;t*ZUujagr^z=3pOfwkB1&+V*1M0)nT?04KKxMO5fi zkR8L2Xzq)5$0LAEDEr%IGy)wVOnX8JsiNqyQ8~Z68G`I@i=^)d^Y7qwb>kSPeJk~d zzR}BZmlMN~Y&LAd%=nYlR=VM<>9!4Y#Mal|j|`^0!fn-Ci2E$RX9FBgSkied3#o+J zpQMaXt?jFt99%8SIvj*O7EPbZ;~dUTn+>h08(l?G%Xj^Melk(qwhJex6_A)Lm9p`d z&`{}g%<};Z&Cbl+B$s$N_h^0H`qgwr4I1(*j!RE z@e_Q2a?i6Wn|g;qWbs`0JJX4@K2^G#+Yh#D?>tD~?#`^-JpMiDkwWbDf1mM7o%|z* zEp>ZLOE0#J%Kw!G&m!7f-hBKig_uz&#^F=Q3gS# z5u%h5A=y0S>CG54;$&IvqCJDfxNyT?qpmk^B0s*soPK?i6!5)I&#?t~NvMThN38l5`@o}8!DTs44m7FYar0CnM_xfdB-G42TxPm?ob<@vur*3q z*lQo%Ca+%X5>hHBUR9&TwF_pnjRLZ4`MQ&4UJnb`J&Ydx{n;Z0_#Kpg_Q7ophADmb zn|73|k3~gqUWj?8NL*~n_q>e@BMg=Q!FGP-j-urHJ{is{jXXZssjF->S?y}|5DCcJ zFz!v$@^ddG;2G$}s_Vm`Ss-&RPim;j+PHL%ORxVMj3?MsxLB~=43A-s-Nah_LXXPd$<;{=aIVjBPr8r(fAA?sn6=I9oj9ab+dcX-;G zse#n@y+ql)@{dfmWr%|UcD#h+1QZ<+4I+piQU?wVH6 zTBL)%#>Y!ayvuKMufl;7$>ULG&#nohZ5DhUOH_gQxKr0h2A@%B@n`D0SRhgTMmD2J28Z+0N`6`=k$ybx@sPWHf&D7E zYsJ8!8l#&hi=tbxRZ{&qWjs8w!^!9|C-EP({si~M>ZWJzk9(GoO*X+a`S+?%RzR*hE zRGyC|a%!j$XwA)&+WNY4o zmte8N!A2$A(2U@`lbpT=-c3$Fp7lbU=v~TYrP9aFgPE5HV9<$m)*2~YRjvGG#frd<^u7wX` zFLNlNr^7?LE`J~N+B^j0B1IV}&Z`vfe9ub{uCyZ-MFvzIP+n0#=MZCEyNv9)jqB0I z9XFynzR^>DdnoO+e!5FAm7P)RJFiEh@@Ij`SSj1=h@i>RwW;K zlKb5f{i_Cd%h2R<>ju9b^NX2sz6C$Mpqrv(1`B^nRAR(R(1E7UZc&C%>PO$KrwcpE zt`qjP8e7vbA#2N2Jd3=fkrlJ`w88lSoq{(GOy>4ZQUEtUs$78g&j!^l27>Py+HRJU zF7OnSwJD2^|IvFzQZg@bVK39Ta>dszd`!~iGuHDRsGQ5TkO1RfuP^`) zCGEGzlePo{N2$Z5#hRu)sJ{%wo&NOXi)5t>g9(0t~71X7*{mfa)3ef``faa)^Hpo`Z?40*PFolSbdBye2Ht}srk zeBr|D>|y2ae$Q)MC`N|-Lq`OC&C>*X1%vmHO4YLK{RJ^ag$+^9wWAfNjMw=HXS+Fc zOUm*?FAE!LE&=&d$x1BBe2_Lh-O{*Kus4dyME7A=x7Whb%Js|}j!I>RxNpCiR&2ZN zKzTT6_-+7jfAvSO>UqXWUg<28EuQT6KZ7@5?M9#;m0By9STecV31|OUro`0{ZYh{_LdQ1FDU#yKcCAj0QoT4t za!l;!rwh9ZrA>FnMMBf)B16bOnWTN3YH5`GjY}#=f{uyZH%!Z(L;zS#b=ay1+>WU@ zUnk%x!jTBlppbqnL^*TBdd_xAFV%VYtnV4Bv*V|Jw$5jh9uU?9_w_o0$hP z!=QQei`Y>7_u%iZ1k-1(Zlkvd>kd$N_HpvB&PPq%j>#?w9Ovi7C-5kSN2=8w(#paO zUgY_kh_(nT?Nv##m0QEb)z-fg6R`620!x(_P%HK=|wkf zYzljSfr2iNT*qo{BxqRZw6cvZ7T^-rVDAtR@1L3N(26ab1U4J;l;KpP@m7Dn+Z`lO zhR{k*^&IN2-M%4EU$l2V_vul>*}%zkC!c((&YwFwUDyPP z343~&%Ri>;uz;7m(D`?sk#8k25Vqw>!Dm}Bv!3lMiE=TYgSO=4FgJ1dNjnTzdsNbW zA8uahCPmEP{U+5~?Dx4T55V#e!5$&*sO$0!h=p(`l(~Tacqg9wmp3Fzqt8&AMY7`P z`eEZk*}{xUbO0SJDw^=nXFx6!nvE*VcfRK}x52gf!no;C*^+ZZK-SXQ2vl#*#)xdN z9=i1JUO^3V?CfQBas4mnR-C1|ljU>1zAWtQ6IqvQnae3uy|faeez|JG>)j9D?~dMZ zGfFw{^o7qw)4ro&)ygwNvbPi~lYppm)O{@MF-jyt^|*LD zko(Q}*VmIz>&vnwkeL}DZaP)Uuwik?{%eQmD$HRFXrZMRCf1FG>%^|=!kY-fOA39O z=wzesg0C>3DD3y60__25$P&)WR-wQb7YgX;VMRTh5*tJix2;xeG(D$DJ*v={0VMGZ ztA6AD8jIM)MAG{&4Xtf)H!`vD!PzQ1@x3XebyPYZz)@5yzUH_Z(t%`dv~oQ--FTU7 zu=#B96}gG1glBlk$ev?r`q%;$!@iXCz3gID|( zM>n(9+t^@etQTuSNH5d9dWB6oqs=HAQELpCaTs8P7G7?n3wtU#yy0+9m~SDNT~wvG zn8_;d?3(VhySXk6Fat&}xmLbh^~bDf72~DUM0|kq<`=1)nRp9SHPXUgV&IR0=!>BP{UA@hudR8d+46U|<^wCG+7XFbtP^q>MXoh=+^Af#+S$=tJ^Qnm&&+s{bN>DxB)#0J zTm*Jk>3+h{?#Vyzj)L-l)<^5lcD5C3O7tl&F*tw#{>wwjnTdW-o z&NYhVy?f>ZQA>-F25*OG?!Xi3&l;RxQ#M(c$x^8Du*4>iVlVMGpJ{0}#SwYX4>sLa z$<`6{3XJ)M+$g zK?%-t@U1|JhVO~o&|h~6*beek0WLA6UiKNS8264YOeQa)4|8HbWwIUcGF~5;%v?Co z>5^W0IMv=xs|YI&wK~Us36PMNwvOeCNhr@JWh~*4x+|D<`+ZLQB(AwnV0cnYiP?x* z5As8I{#^k0#Y+`$5+BXa)RRfxBd|a&e2xmVFR4qhN?K(G^kD` z`;XroUpjMYF65wFjiv5o--y+9&B(%BeX*!{j2MYnd8k^%&(~VZUh$ndIW&oxp%vBU z@MLnMJ)22pMQOQakB&%{{Y0A$dn*swMy8PE6k-CnUk}ln8Vnqh9PMpL77&y60!15` zHuTp#UbkROt5tbg(7!S;v-Aot^?ViClu4>3E%SlTvm0qqkURBOi$nJ9M{!MATGYQi z^va-5`JJBH*=+1r&kS)PP&QmTc}*?6s`3m>Rx@GD(M;)RYm=b9USl#YR_|vP>^nK$ zRXvap^@cxG5+lcF$;ju4gBWEf2&|~uZ{8=JF&;^no+gWnbvE$YpR;MN( zcKlpsMd?_|JlN?!Ad$8u^TO`N?8*dfw4BtLR3%2+ts2rEepmnvDZY0C>r~B?F9l8g zt#QR8dj8yfHjj;9FP$!wEIlS^1Tv&4l>mEyRc~X<`aR_kyHe1I`U8f8tZB6J}#009SkC#ss$gA zHldcP)>U5OVbP=?)Wb#G0dWw8Qo4j!AMJMu))6;&IY={X04og8go-aJ8qSJ;8io7k zQ%iW^Ukbm0S1peO0PlHsCqGGBXCs>_xSs|$9Fq|hnkQJR0{nE@%yE1rw=6Iw0&jn8 zXPELuMSfSsD-T)nPRWiMnxoOp143EzhJOP(e53EU+v)^ccBWkS`p5CE9)2Gr^JGyI>SzNrU3H#??}`N)-0bnc z3B<|W{AMslyzcYja8U0upY(}-bls~NL-Ro0wO#)>XWQVDJG$51Jal>L zuL1Srw+NKbfL(;Ja>K1FY>`_XeAA<0(RUw}yE+ z@F$OIqz=~x_)~vYfBsc}OIYS+P(1UiIPfAN@GW{fjZ!b+0IS`l0d2V_Zb+#|@KlO7 zm=T2CaS6rvp++zWa3lRHWWUk~Z$U7mQ0haa;<JZ}|nBfXc^e#P60tH)%6h zXEZdUAHSo=8-|^`qJ;=X@Uf?;7@`tG@<1|1eeYkq(^f5bUOYG&{^gRy&+QT`UyYrb z*!Z36tpn*ghh)@V$xYy5nyCEdJc=sHk7#T zEI9r4=BD=tT6(&ukPyFg#g&xnFG=X~nTg0l;J1OT?I1ekE$KkE(p)J8ce06sfIKQpbwjeiSvGfnL>EOn%) z>=onAP>BcdPkRKb_C6=&_+T2UjslDFcugWY(AQYms`nC*Ftz@5COoGUOdOI*wjfg7W=~9xb`kPZsbjy?+fAEPIi}y zg*Tp!A(~7*2lj$x#|#Syf_(IZq_@sqf$N^O(uMr+r)`i90pV=a3{qHm&Az9wkFvrh zz=Xk!PBlDjVFE9KDs%2+@7XEI%eo+D3A|xvDdMeoMm2$T7^C`f7AQq}`G~3ur-RTv zRtdK1)6bGb$Ka$7b3hA1pw=DWXEcuTf4&*luE*)T^83SF%=*6U74EtXsVbV)N8)ea zkrP<0Z6&8gzfQJ}=P~$JWp*VGUv7RwQHPX=lqQuN7QI5XfP~IC_a+HwAuR>@Tj#GP zF8u*}7hdO)f0sWqKm!U8A_7au%eaF??kK{BO1#Ht=F<J%c-b9VUGS}6P0+m-nN=d!r~qQ(Li-7`HyqPi=e~^fEz<=ad!kylJ|B+!ylH>u|SXpH%gK1^>B!o`0B{dMbu{%{tr~RdKAxegZ*{H3GP;&_Nrl|fRaUQ1Mdo7 zlKl8!O|^HHEpo|}ErCvTg8^+73xk6*w3jtYFC$uNH0L91i8HK)6joIX!Q31loMUS! zayP1#bSnqfva0$p1g}K(Z&Ql0nmD4;+V#+&%|*ii@T>6QO!oDZ#Ai5e><-q(hqW-l zT6dji&517#WMl)EB!1K6|8V%@oGXkOS@%JYG^KSSNe^QwJQ6ukul_h5eXL%FDEZNP zJQ~)DI@4-P*5IxZCqCChX4jin$pg=xM@7QJ+jyNL3u`DWAI51R^1q+$i@26bu;hot zqIci2U8QwI6V)#++D~axv4+UFxi@pdn&smt4s*I0sF2Q(e_sRsp&<@=*FF1uv`^g(87I-L1zv}PF#@WwiA zfW!e7e>$LfW8ltZd6By2v4L;Bl<#Bw8zQWaK1{;x`DBcLn3bA%A)H(UKh8|@v7TzX z2tpQ536Tjrd1&$Co}IBp+a5;Puv*eHNH$O0yQ^G$ zf!D;VyCWFTW|?e_Am8dDSxDi&Plc#nh4`7ahsDA2pUlM?f%}F!j&7%cgB?68LFI^zm+5xbHy(Or)3@lAv?s%j=8EGs}i zS82q`pX!fsj(|L4dDG7A) zjHuwV#X(+dtsTZe3qoXf4WfQN2F6>&C*L<8;!=U%!RE=2u0-frP63ssk$YYp-(2vq z?S>+Cbvk;{??-c~->$nh9TghQ^Ns88pmI(u8Nv-dtqIj2cO14mONjw zH(vCmibACUR^B1kTAMfJ5HxFJ-met=y*CesLguos-A3}Crc4npSw*IFQuf}QH^1Kt z^zw4(Rjr4h{=#*xc8l<_KOzXY8nrK5ZD^j4yA{s~JJN!yk5(M9ag2bc=YI8@O`$6s z2D(j4fQ7es)?fk%E=c3fy-eU&*$Qf1hdwKYU-f;A=F21sKU~Jo?+GmpdQ0`2%LbU* z&an5KEQP9{x<9I6w`;z_(8|e%M9z%LUJ_I6{!*iyWYr|aXw9llo5xTLpG?L~bFCRu z5=?j#dcZz>WwB|1Zo+y#2}jm?u_>BTZ{~xQEhOG{)Ac8nE41fU;VbgFEX}W%%uZse z(;WmZ&{gEVf^_j`+^lAa99J6p*bx0n?T-mFO4m;IS>9JX;8HUJ>3ttr)1fqTf3EXG z=nzBHT`lMy9qZS?!WQ-@P2QPgZ^RkIjlks`~Tk}9y`LB*kfSqh(2iyRKl;;t@3nF5O3 zWD#`PJM8C4ki4Q^Ut=*JCehZ$Tdo1yglM2V|g5%U_l(S1)#>XWKvkk*wD@10N~Dn*^_;+Im~dRm|S>?zxA z{Yiw&gucq8jKbAsaZJ5yHwIdlGw?dR95^5N4|8_(WtI;m7~_?lbT$xqG<8^`&-nW4 zO!1)E$uTfLQ+N({w0to=v8jMgAkIAdfzttvm>=UWT4rI?54-wKaOZ84iUA#S_$aV5 zFgj!cOPOgd4ab`q!=iPFruw_SGuluY@9R=3#U0BG@y}D@-k%NVE^X=ih2M2@Ps=my z?YS0Ip?BbwrBE{k?QA&}zqsD{#%qAV&!9V>-P(&E@YWLrg*ku5tdW=wh?q$d>dodu zkTHJwqkE)M+F@w4H|ka&vn8``GOJsFG#sOAHi>W+?!4{qm&NPe7ZL8nPa|zS^=Vbd zW5P(EM4|bJl3xUs$~Nqm<>lcGMd$oofM=OO!5fX`AsJEqu3045n0;NlqBNGbycoAM zRlfvFnH|$iuS+kSQi>oxykEmxNKTj%e41z!D5xS?Bn5=&Q2O}}#Ib~l)Pzs;{w&xf5h z%_DNgAIb{JtLmy`FrSOB6hKzCN%hQod%0gK6_r1mpkQbK;KHf{K=5G!Bt(l&o}+a@l@{f=sj zTu%t+NdPg^8nEnNECrC|lNm%P);1Y^Bpeo|U*^-M{B=-*jR#?R+4Id)n9S8Ac=Qf0 z;!zO(V~L&KuZQ0WMW2PJkUwX9@l{#rZTcUU9|=DxA?Aq?`6hJ0UNh*EHqY_^FG=w; za#*>t1Sprp;TbCvc9cTaD`M1Ad<$Mm1#%O7ebmMJ?BjmOPltMb|4Z*EeQa&ce)g~+ zoD8GgY*cVW&j@EsON|+%<@*P7PCXI+g2d#yr+*seFhgV~ru9>7X;WuYRQh}`k}irl zE*SM*D26R&a3+3SU)$gdhnk&CU(b=f0b>}3tO9t$SN4r<@XxM6=|N#mU)1I{W(ba6 z3!grFX*KcSSUNRO9FVRZI=Hhm5)l1$G1f-2DRDuJn({gYCnUR&L!E%>?X_og(g^^{kYLt$KPl zrCNHiKWchRb=FF5Af1`d9Vg=={Sm2jlIGmIkAzMe_jngvLho3v}liDFmJaMSCF-PwZyN;s< zURHw(;@NuBXk=CBcb?Y z%-Y`>Jnk)nGy{S+`~Ix{)ghO`rZlgOGNZ|KDE^kbehK)X+35xM@K*i^0+~CoqbkYv z9IlC4&(w=OC;GNuSsNb%oWn`zf-+lHQsVhji&?0~(1P_C#6F20R%TZ;cz>UI+jrsz zMc8wR2r_I`1p89OXY8-8m$51<^Au5{e(J}K!HmxrX(3`{m(y>*OHL-2-?CtiCF3#5 zW98X*$PkzNrqp{!!OYg%B;d4$s4=8gSaRxhcIhLGUrL>z z-9oj3FJBimMMAO~!P1M#KjbTq;`H-cHE-WNVCFF~HR0sC}pckR{r@^v4lzwR^M z2}eUVb&THm8RB|EWW|AbCru56j0`+y@Y{iR6vvwZ!Kf)9Ps_;p>23e+%KSIQhv2_Ak(%%T11 z?ZM$t$y5jq^qwn2`Jl|P9QLh@J#ZPn#>+TfKqqwiE_KhVT{PwB*V0neP#F0XwF^L{ zZUbSijA|LHBYE%eit1DT6!1E%TiyWUP*UfcX*|h{i@|y3{c|%E>9J z;W~a@zb$1CgOFP1Nx*M);-~mfG{C9x=B30`o(hQj&gqK|{UW*8Su)!vBIfxK#iT_@ z*7_jUi{SH;p-dLdX1+>`8l<;N)6$-?=ai=>Cbc+)(qa_0*iACH680g}p=|J9a3~Tia;OdLtz;dPohr z7J3=F);nIx?gn>j3O3A0-eza;Ttll>A48)r9V4kmoWR=J4^Z(>EZroL#*Fm^VfWI~ zZRcHq$BMf2Agtsq41+@@C1JRTuy9XcpN_H7!14R^U+==zI2;8O`NpwRgn?$XO|I~)axt8llUWs!8g0a=fJiyOgjvY;XWL_`Z>8r*H)=@KdZW?Lf zH}r3NOnM1vHhVWVABi!JFSN0ioMWAZyKwdDfPhT+pV9>DP(&#Qj7@&N6bMYQCF-^D{aCgeN^5;D&1v)@f1hcsDh+o2h zgJ?T0D`M)xE9{xYr%9BL7rcY^e;yYPdI$H%!Zqa0t6Ik84XE#zDV!}l>Pvx3g;ZtI zx@hy325e0F85*ufjp&Ppbh)!JZk}JmcJ%m+jZ&d|LOuj{o*v((P-TKY9!XF4VAAXQ zK14X^|KdAxc_aY!09YY$Msy96X_@qrd+X&4-Dd4{@3o`pDwELJ^%7YR>0K#SJB-O{ zdHMp%8$6&rs)`eA1IiJ-Z>s9NB7V2wO<_B~-W&*4ZN(bld%*>%yx748xf* zYOa%aR?(@gI?hzI4~dtoK}I--uiQF z;&Rr%4wr;FK77Yc{I=lpRR9sSabfhu?@2ge7Mx|xpMWm zNf(NU8tDWKXt4$fHc?VYN&PX@!>Ib>7EkI0+jX~)G>MMjexg`Yji%FK;h^DO@zXEd z#_lC#5`n*PCQs1P1Yr*P8<1TAY;}%a-`z09&7b_JH<-b`WGjs|>}PcN7Vd%~Shc8V zn;3k@QzR(5Nvr#bTy0@~Ue5rQ`Y5R#4yzjaQ;G?*%W*)|CkxMRgt{h0K$x}h zCd`9gBR+Xg4YfA?@{FSDmT7wNWS@S{w5U&e%70U_=cq#jQ9O32V1MN^64$#&x}Htb z$FC;GaWU&J4OX>zT{RxY0{x*TE?hOvFeGIPIXOd9F!D=~@5=}2VE3>#cQ?$iZa=&| zKIJxEEhqE8onO=K7JY({=_O42asL+p&peySGH$jo%i0yQDJd=x5Q#U zMiMdR2N8byF(=b~`KwodE*Clj03NLM0-#no&_vO-a|Jof`0bCG+KatIx2ik)vv2Oy zSTi)e@$J8#EzDic9-K@BtrUgDT^YA1rHGkHDMd;-U@N7FA|l0#T$~FBgAiz<2KkCzKW4>JpFu_97u$1e|)F9E>nW?9cfq!b}eBB&NmQ)<>P5Gj|x*KO5< zn-&&7{m3GI;eChXcfW80|LpTOG0v^4N<pk#?ms=mTrb8;m)3D~A;PKU z7_Y44xO^*bj=lxvhzYlLODy#?LaE)Tw$@N>tx&{VssOQ|NN;#C9u~z zbLy-zg*fN7btd>UM4~{D{L+fqU~=81ztgWf`Hfc21^E`0m44eAkpr97ib5T2pB>Tbjo{Xq;SIalp|vW+wHCzw#-Ua|e)89R5svL>P#P;i_i%XQEEC4;Aw@ z5g5b}u~npET-`7qy?%8K^SuJo?GZR;XwN5z2}(1_lvp}6hjV8JP!Nb!!G0SoJPbhQzP^+p|Fj$g2AAJ=dX+aMY#Xe zJhsLqR@O5N2MLZ0BJaWjZthm{nHP5H@F0?Nhf-8xDG)Ly!ctdsq6Gi%|8Se%cZSl= zT>q;sR9_`Ts`Qh08$Y@TmD^@}w^}sCOeNv4C6SZ&2{c1#U6CGNFS(v-&bvQ3>_}jR zz(_d#I?z=R0>AvR13@llkQ-2Qu*Mv;b!R$> z!3Yk2hbdwBhn)^s5F7+8S6aZTKVo9_)NlQtAlys=5xi7>`gg7$jHYW0VUGdOnuruB zm(VIgy^WFiv6r5^+V5fvr4>wNV63V665yuz)sezI_bx&yhVd%Ja))UlZ6e&l)izcz z>_)ivXct-uzIAe5N?4RwOf{yUl$}P3P1*+S?M@j z)DrygGcT_mi|iDxIF-O;IjXWmRTi+e0u!S@NOA7`0-{L4h)aVy)Mc7a*v09|?1i@C z^7T$FbujEPR<=sKwvpq7n>lW67uXtEM2axiab>HbFZJm z84Bhh8p`ZA&uWca%ueP5B9PSbU9fmR%wP^wDe&P2#I<1!Yidx}PpLy$FqUDv`ZHQo zqdC%W-Zh}1p8B=F1^5IaH|r++6IR=I4`%1df{Wp;1J&WJGb^3=>o-X|@q51U+USDW z*+xGuVT7T)##!Yhs=UM`v#3gglcxq)JkaObp z!o5a)rcKW(%!H5>L!cj8Fl*9|TBy1f4m`7H4|PK?UuWJ>2%{xpxa!5c$3h3(dGp!= zb^RDLy_))^-}HukPTRSEk5Ii^>Yh3RvGMV1;n*SRbqeS2uD@ON)Dsr1**Z=cueC zR0bh&p%mc*!gH*cVe$h1^k2SGoj)_U|HzTvYoz%qswx6th)A^(Dun=B_mT)<8W8xw zcc2`eP&gpAtPpcu(Var{M;+fC+}Z$$Tr3Mo%`)ExFxQ<)%}Uw**Jc!cRbvU=u*0X1 zIpDh9oxsEtsOqd*8BpmZO<$@qfPCh;4Cpb1^56%k8BRz!*b zZc|lPj~&7d z5j(FT0Q~rwIb1lF;N_b+UcIfbx|!p%&u{wM;L3l!vO2}_r4*+Y6WrP^ab-P6KV?`8 zA4~1RP(%2tAq53f-*ZL4JtsRjyxhU>{L7c{>Hpn(KYVz(^A#eBLB4<|Ap%H1WE>Ez zx2w=0S`R?wg(Bm2O9pNRuaMQ?2ZVk~33iBgxms>EdT78@Z>PuO&W*fU(FRkirwJ%) zmd48Z;CT=lJ)QzK+rI!23-|0=K!k`~z@yZY-~uk_4I%=qZ5VI(i=sg=BBJW2Fg*X# zTHrx!02m(zS||5dW7dxyiC>;y=%3r(9MSwjf6oPPOv7krjL9g+>C;1$drII=Ns zKV8}Nho{`6JrM(mZssy+yL|eo!jGNkV0ECdx?NyWScoO$l|^1zeC6UcKJw5Irxp`z zj4IsPF0nl^nD4e8Wq*in`U#$?HMZbuZ`@v+;*UOm^#i~4%lCZ>z&{|S9xTRC=#e1- zvkxgG<5_>bcYi}nYZ4z45knvd2@}YMG&b^gD~O^(AXrC&Sc7b3Yh(TWXo|_rxre%| z4qb`sO^DcwGc{N#IFG`>kJ>=So_-eqM0|HB6lTYDVH4Irz7vjZRYtzSW-`L=^6N61j%*sdl+4?uE6)0xh z_uyd=`B|crD{l}hAXG3)A~%h&_Jzj@4qu_hTq#bTt1Pgd6UMoLWdzdu&0#GcRsnt{0uS z|K5emrZl&RC~r8 zKGq7oj>ddnqc=zq$Ih2QMsQ=RL~oFwu)vE~MtJ6CjzcHuZ1pT93KL5}n4~8j!_D@&1ce4NRiN*A#SktzOII)#f{zCguTo9Vz&DJO! zfkoGEsj*PLF7~V(6$UW~(RWOwh*@lH4#_HZV^)77#qFPLZS31XZg5TH3>vwj-64sA zBIVM(l$R|6D1!C%*3IQVy4jv;5PJitQIE0e5P&+#L2DHr47cwRQx-BTWLd}>LXQc# zzXsft5ceYzK-5#e@wYsQXnHADDqOzC8Z?i9>rULG9x{@Beq4CEIA)~?ksQ8ub98#L zJK=t8nVFHMF?6IrnxV9t6y6jrKj_@O%P^J81@!m9&1>mth4$7*v*-5S)`c>L$`@Z` z_*q$feqE#$5>4nN3Q?k=6k+l304ma08g?);gjZhK!mBG8c6$R{9|IdxgO%+9w?-AV zGr=eaZjUU!_Syv3Z|8{n3FhZh-2cctx;>4re0d|e=e>*X83KOsE%`% z7KlTbNf_`+-5WNSK7c+j)L>ZZ`xERcwKh;KF~J8S5RrGfQ0s9y2+V?zG)c@vQCn{F zzm67-sI90sZfG2A8X)a(0sqP|Ge@rD;}EQ+EvO?vB5oR*0tP46$N1%GiO0Gzw!rq5 z6`CV*Q4nsRPX6p1fYq=3XMej1{s>MD@hK7Qi`iUWZ;AaVv`G^RU4tefX00`WDTo)uo)HUJt{Cu9rvrSjRdAWjrcy{Ny}({iMFKq1y`p4olq~wvCIod4YKa&%a`X zG)F(CaJ4t0B-9WmoLWvXEd{S#-2qh=b4xu$W$q@C_p-hS;qvMfuic#1e`k$_tq5oC z?PF`L%0KtHmBD-7bNEP??bpQAStm7s;XPFWW6fZ{w#E&1gGSqI#qjpK^=ECxptj-6 zL;^_ggtGT&IE%`pm}tg&?Ey2p*ayDnri!E185JRM*bA_$=~?&9#ps% zs_zgQ3+*p8fr8u7veJrI?bIZyATbaSF^#XZe-CW+DyMqW~828>YzqPehsQ>td8)x71 zp2J5vuwVC}^*vW@H3Kbkk5@yMXTagFFxS1P$5WtnT>oK1J!UO=JyByY<8^c)lM9;- z4i07}rGxQ>3&Wf>{&vQI{6GS>HjwOLp*bJF@85s|K}qYJK!_niZNOmpm4FIRJoq>bE`xUxs34Q4K9}U8Q$zgNVtA z^)l|sq`EyG+bz%r1U}qtlzD|y1E4$T z;Ns04Os6Hz9_#w(Tf!)_SY6Gqx;{mmXs}`zL+!f)r%{^jsk0sZ%F8?W&a2xe&pb50 zyqrc)8(T6f#6ICK^lAhI>JcDbI}2PqOp_|80O!LA_bu=d2?o7+UoVa6rtlav{x|lq z3jROOf}Nb}>LAp-!NZyxNViIoHTtj)0QMF+BA=+>EHcGJoB-SaTgM5p(qN^)ij`8+ z9q#;HJN|JvYi``TpV@a5rm;)g|)Gz(Ur`!5S zy@ZiU^WcXots(*bYAO#{*H=)ejzr8NvhBejluJLm$X<3)Zm={L;qt8X>WBy%@YRy2+fo;{Yy%t1JzxeB)ZgtPi61Z1DvOjU}u?QL= zk+;O*LWKvKN$Cy%a3yQfw>V+UkA%XWe@5qV)hGQ$*2yD>nYW+`P2%leqMPXFqH zGXETPx{R1TWJ1(0|JJALFv#}OK6wuHSR3-jdpfmXWx@$-R=Q5h94@AEWy(*y_VPAT z&T;belAHWJaX~$kaRJsokY6i|cXBKqox{=PE{qiiIRB7U-U^3eFm+KFJNqzNasYOZ zZNsh2o@l(Fnp76Jy<>2CF~ZryDX#8Xy!65vBF)IM3Ui6_8n?5|tf;PX$}RvMVu7-- z==L?v-8U>=eQAdSpch!ZA|fR@Nvbteok@K4*Rlq0xW4S)`q%{uBf1*=0kC^Pd(gW2 zi}uGB5%J%LcZ!IElcQ~s>*NFSme`$}$P}$*JA$IayH*lT7=N)Ddf`%MPZgW`>($g*}mB>||-2U6h^WjfDIIK<`ia3fDhJy$d2vuc40Jg>!SH>}ho%mlSRD6>(_n9FA z8!U4jT5(6q9D1VqxoyE28(Zc#1b<{B2p!Xy1lEHw=V2#P59LLL)EaS zbyZaW14*JW&Pq2$TEvJFjiNA^UD{ZEXEl0G;VJe*vSOL4sdzHjg9)6f1AbLhC3c3Vk-~g+CrXTN?W76DEj@3V-YvKDcoK&+5wmAjiv zP!S`WR>%P?4HHC)YuacJG0-45)tE(Bl`NAg7AMfJ66J7KYg-f?H z?2dE9kuz3e1u9ZdtRMvF*a2Bb%H=uw>!megewbi>A;xrUs%O8p5t{+-8=mN&N=o}Y z`I&_YC@e@3Q%sH%`T^h!pov;(SYg~kp5l396KFt)JrCL8;a)YsZicUW7v(McjNgEq z!y|a`!up7qVVa6%s=gBBq*DkH;`z|cF*bKP2PdJVs)}k^N!~`8V{xse#5O*SU z!d%$S49!^EkT%%1vVo1#o^><551dL894psH7Aq@btgMW2ZM(vK$GbRx)LH0Pw=GOw zLNURTpAj356hx_piWsb%S5rr-F0x`O!Tc~mWo#h=Jo~kc`0C2&=*dSG-wPsb2*Z-; zOsr#qwIkoH$J97i+VU3%Yv{h?kR;(OB+weDHC0JlRr>PH`c+%n3dkol$NXP-K(H^*pS9M^- z1y{Qta049%D6$qMfRd3RE!7u}{p5pBJ@fomv9*=s@bNiR)283=4^v;2(?Z8CfYp?O zYu6@F%oxrkuEqxd(hi7qdmVFaTZy@m<~mYkk{PUT7r3^WV{OePPO@zM7zVxh;_$*lr_o>(Zbv*5pZzzV3Czz4vLN{4=g-V09 z$j1DU?(vr{ZlAT=+jQd05XRSkGX%g_6$-&did>Z3bW&nc8DxclG2#M|$aB}wUWYtu z&2{;Jva-0nUD9hSQ@nD0j2mkirqc?YSfSg|=yxKdy#&{;k06S0d@;rO!!df@7#D9$ zP#SR)*TX3pVqMWjYeKT=Z0v)GAc`1sJ;IIa8Adw=u5Of=rwRVTLqj~Y0Nj{V_CGwg zb9y&7ADK(l8BXJMB|gUxfCwizQ!GEFWZHI89AxcDJCtN5yB1{Fg6ro#&a9! z1Bg`1Qy1LPiMPrTvr3sc^6OGkD)khjDD^k?t=$mjo;=k%k~{e@ywnxJDWOkwIM z9M-_@R)(F839d3D?x#4poTA%}(CcYLk#b?0aAkBuYZpqaK$uJo*0yrm8CRIL%05P# zW>Wk`5$1<(>g+%J&K8Ef2v0mT#N%gEq`ZVb{MHuo+@jNpf38XkYXntgKun0VMwBQh zUp{QI>#Bsz@dWFM!aYNcpMU=Vf9)>}u`{jkv3!VcUz_58`rYp$Ctp zU+k6TA4bN!3IJg4l1K!RlG#~g5i%lDx?m>JP0X)EA#nn}M1&9iwQxw^^Z2(cbFFOy z?!jo>)~IEo};eqrt9H4OldKRBm)sS9^s=rPa(MwxX!fDni- zvt8@7uvj0J__0&{FHTDXBH}%BM|l+^xWFL#P6lnZ0+fM>k`OH3n)^ij1>@F^jR+AS zB_K*f6p=)MVocez}2MA&?dlZC5)(>fS7S< ztpc+_5)qP!UG{~a#@JeSp(NB8vp^+8r3ZJU8Bwb&f8e*mA!dOf7C3x#4gm0B{4^rW*Thd3fXJItgLCTGvYV59E>cKia$p8f8j-vdY>X|&nWgcxgb@Wr28t|hjcllk@`d*C z?J08KD6RmhPyG6)_T7x;Z=0p1)`5KBcs&k;H=zhrqb^|i$I8oz{WtQ5k$FY1uH;NSxhQHZh+hXr6rgO zuwYm)gxGiW3W*;`T5Ca(1}7TAej6fKaZ4OKWnwU&BJFBizBxgp1V@H34hud z)d_ZXOY{?h#L6kdUI~^;V2rEEZ>?Z=Qek(y1c=d(Djc5I_}GsvgCQ^mC;@)ycFvg* zzUOevkKNlv%7Pa!uIp!CTt7F6%ukKxyC+nld!1B`V9OD)5Gi3+h`><~%sDBgS?QQX zB9{-sF^5{xvlW=sjAd;Ce-d&sT-w%*If^4<<=hFe9;Tp35wQZKO6cC5dH${GmDS&P z<+ZKlv-1kS_`XAYaw(=>#8~Vz23>_Ta`80If#otf^3u}w#K7fFxOrz{ws_{XtU9?g zZ%f0!Euz<9Y$$ABxt?Ash!_Yg1V$j0W=(iQt&UOhkA#Rt2ulPkT(Ev9x6CeZO)59% zrDzdU5UGeLD#!VY7am#uqc41Z?a8&ZT$Yy;NA^Sj5DtJ1wA- z7*&fJC}WzQvaaapo-7f;+(HjaM+abUg?C38Hdn_7o+`5|IvC16B}s(2IlG*YkkIg{#_ ze&bV3@%FncZrWCVot)H6-Z}@%T+2KN>K=u716R+nIH6$@Vu%I(h> zi+o~G`Uf*5i=TLC0cVeNaQRk_VPB)0D9ojdr8$K|1BF3{kw%1m%6RZh2Y>Osi#WCr zLjXMY+bIX=J$ZOO#*+^$;3E$Xu{`i`;w%8o@_^8|HF&?i zUZAL4N}9lB3q5yrjBc-M2fg%P7iIMl0EnwgQhG{Nk_+FcoO%Nbf>odR)xU)xKi_S! z)`l7gjZeQ0vS~DDI8FsLfiq!SpGxCK+da~2(W!L#n_pc!*X=1<>VZrE0Yd2~0FefZ zg{h>b99#!O0un_{?V<1``6-jzUJ)yp^Mg8ZL=$N@#`fkEVqK6^94RD;hE}1BD(dY; z1aYEKN>l0MDE2--z(n3{QRHa3k**fEUc`m|(C%f34 zSZs}*B_>uVz4=m1uH1rkZg#B*#t@DUBRqDlhhKPXh&1Zp`eugbZ;txU-yGe$9z`G7 zh1@R@pNe~WkhoqexO_n_+@J;Eee|M^rEuE?^#e*N?o&sd+R^4`ZddtVzPvU0XCAz>|**vD}?4=gO*qaOgj4(n>(27@H%5o10~`9RZmEUU+SU2k$w0ZFijg zGXT5JBG}Rw=qv-x5D_D;;JpL$C;!@i?L7x~UzAq00rvGZ8tY615@MIY5RMG<0aP?_MBbe%-xogbyrjTLSo zK7g4NBR4>AK9QsoxzJAw(oC3)3sj{=q*>xvL4^vF9?8ZEI*CSKMUX;aIM)M-;OS@9 zFv$r=mJ=kg!aXN?=*Akiw+bms1M+2Bjd2|Zto6B;3?dCFEFuQF-4wY|NT_f%Li{*D zE9X8B9G+Of%E_h7f(K4S_~-+DJbtQ+qY-24<_>RM+g|$ijr`t?&B^;$Sbt;$dep>x zA?ilQwkvz8*VDTcbC+W7l2s+KQelZ=J5U-)SdydBg)Litw20-wE2GI%*VlIc%B7p* z2i1+y^7(}DS3bCik32Mwq!|>uMJr&M8@zPG$Fl<?0_Nsoyzjys&K*tZkH5JoFWt-#$BZ~ubQPTJ>LY262aa%<89fVHb@huYsioG_le zzl+ny4`HdNptU=OAeXgS-t0Y?{m2AlIq>Y&9HjvwvM{Y_LDqLOoPF%*R<>FE2{9#N zrKvv*Y0aKjhk!yn|EJ&nSFhdSDE79d&L2k%Uy7+|GMh#NhVmm}pNY#cGkI61>T(p# zhyA^f;_v>e|M8iVKlhO(qzbTNAw=G9=>v-tgN;E{6fj0mwe)0WMjl7Vqt?8<)N))9 z)m?nIA7g%@Be7=63xl1lDU1;)hA1XzUt&rtpAjB0;)qdowuSW+FC+pcIixL<)fzSXlb)fAhw`%*_s3s!K$Pij(EAJ2R)A_?^$*{BPvO7JmBi0mjoXOIs5mm;2cC z0BCE0(pxfiMI?~v7)6>k7j$M&ID0xpa!yH0_7GkYb8eVQ+R8 zd#9d$X6xia65((^f}fleid3~PMhO~vT=dAB9fP_7O`y@aBZ zzLI-AsiW4;L)Y&{xaVXK#}+$S7{o{;7YZDr2o));ZW`>4+%W~Mi3nI+=%TAMy?A+q z-BF39IfXcmk!Z$JPk{kkyE;NI(lvF8I~t-0+ZACUvRFtNB!Xd2BaKvJcR5__yY=JL z%0Lf`GYI6ltkRCx3M{Nx=QdVusuf@RkHu*aEC5%=1$~7DMi3{|q!Qc#v_Zt#ySRJE zSRWZ|Z07(eA8JBSiN?ydMOgvom*)S|#`gHLWEDHBYfFL6y%nzf*u4b#@K14Z%>=RP z7k~Y~sz>W@W(o3~M=GH`8g$o~S~494Wy7Cx9XsnE7l~Q1J~MdY&%V5hM^2>>UzewG zX%mz$aIKU=L4YzYGsXC)Ndbtgg|Ze^9D7y5hm>lr^YvVehAX_N6r+C{EVH4Yi~-dTBtG>u#!(e){= z-kM^RRW8VAF2cpvMwsixZcrIBV$Dby*vTstg~d`&BaPj0Cb5Edy9On{)~?%1y0h~gxVTJ2vSyC zt82;8v)5M8#Ol^*Jh6`AzT#_iZ0^*5__JFl&o4(vV)sKKI~(FG3XzMdQn7}$f`S=H zJFv`v)=&VFSR(=e4|b)w1#D-XBh84kS(|GC97(2Tem@JMg%^`{0eBoVYq}t8Tw>dH>jlr>D?5(rQ6b{D_ zLUJkmYXgYd8A7uc`)<~IZ(}AT3H#tEFDcgF0o`tE` z1Z+$u2H(E8jSoF`;^yu3v9rnmU@&d0vJ@WJL0>K%pKOv^1rYVg-}tYa3-spxk>ipe z^5l`c$3q&6QV$S4fCUKI$?h6?Q0t0Vmm+fbh~8e)`pK_-dlL^G?Lren69epW?_wfE zaQbu1PLI`!ktjErPAKKojT!w2Fd!&vk&pr6sHPp-mkLOw7cN9f>wmv+Xh!|8zQCr7YxJ-mVsxlj7_f}%W$FhKUHJ< zEDN(#G_{aYL<%c5_n<93u$_}c$XXw*>FthHPlbv`Z@$%L$dib=B6*8+1%44|8~Z#EushWgL7_sS2jtOb%tVR2ExmZ)c~QUr8jU}+9m zNEm5XW6;yJ*&6f}=6VWo#OS69hXxUba}fp|g<)T#lWMGPI!Sf0uc0iUedW_yC%6mq zlf6Kl5kDFe)WjO>?``YUMsWlEBzB-q6L$2X6<^_cM?Mh9_4iD;yEQm^~S`0`2EM8*}j$k4iPD9Bm-cr*vwhuIU#HYFDINP%{CJ-A<>++(+!vo-J^J7=C$&Wp5GjRJ zJHREH03%4*dHCSHhfJu!ZAGxqjWG1{ln?=ZSV+)t$qxeADJE56adU3~&f z!qh4%9R6>3bN!0iO4l2bfNjVv6Or=de0+Uvm_GSuU%t%`9&-vn#Ds3de(>fwuVNhP zYRsi9KAwXjCW#d&Q9y2irJhD#J4;MN7^;xj0x$%T)|iW3W=qEk26Gx=sxn1RyR8kK z0FidF99Dq&fd&g;w#Fz5gR*pl(-=bVdPN@C~&Z{6JmDI9P6=Q8_{w!QFl*lu^63UeUGnih_#K z26G&1eB31}pIx+u0XQS#f5K63(Osq_uhHOg_Dd4PgP%Y}5KM|R+$`C+3^_!o% zYxng=76Cv_jrXQ23je}XG&48{0inz*5sPRMA)nr*rId~1%X;VLj(zBvD_Qi&(HLpO zb+vr$CAJVa-HA2LcNL{>A|PTS$F)Tum7td}=2L~ah>`G1%4UlaIijy#u&g<02z=}09S&;UB-z+2?nWhi2$V_jet%>&?Jz;z?23dn3n(~ z-b&lTe~t-dCb+#>Vs*DblqOJ`u|Ba70P|fn%N*WpJHSF8#K5y$Fdj=SK`PZ!Qrdsr zy3b*6ik-~x>a7yDcU*x=M z5I6K9#4lGOVj-~PW(M{^c6otX-pC{W2AUgE3ao{22z>(x0ud4+H?2Y7&wh5-Fio*2 zfs|w|{EX;KK-?SS4?q6X%jbXZ_pW{X@~s^2Jzp0|@)7@Vb?QV=DwNX_#hOBLd;vN*)xkcVljpHUFXi+o=gitWdvHem|yDy za_$D`*ZcmBY$R}i&I_kEN0C!8;+SS4plxd(f!>XCiz~M)jB`6PC!-aBf@3xVzJ6&7 zAGq%*0Q`LbHvvFID1>+VrE;+tZonsPO&MbAp+PH`N`2xtKJ~pCX7|8LUBo)P)Rv&J z$Za+!-hbu>g^W;j-KWX>!i#B!r|p^U2S4}u+rtM>q!{)!DieOociFyA3?;g>;=1|~ z0e;ZfM8Xjo>mCyjS-?yyNMRtA%XY}~3TAhT#SUY*s4>(;gNSGt6ZJGvq?;1EfDeij zr>G3(qM1onBJDKgpnPaWuB3t$CrQ--^4e1{f!&AIZ_!WbaS+_g*+uRYhYr8|FXf!o^^uCG@pszwjD;>rQLKG^-} z*I(X3Kh-#Ydibx`*R!tym;*4f##S!&!Z}KU1m|>RsUUvPCq5V-4T!CXwN^y^;;(($ z4TZng1r0%FN3O)n&GlEUP5ipBP#91*+^tos?r_2{m&@Is`^=Zu@!07UY0TJHB7vGZ zn=VYWsW0cf-H0RQ9WXOL?wu6uqTC|)+UrM1Q|A%XR@}4_>h*Er!Z)4nYzhm_gh)BQ zti86)J}oScT(5Cs!{GTFBkX1sPAsH&==dC13CZ2p|5)(PuVq7XQR= zdJ_Pw@i7;Tf{{C`?BkZbBDNp^Sr}v!pLLzMT6kf^Pt?4IMF4cP^Cm)E(emIjCUVv< zVM197UcFu7m6b6}WpVy+ipS3N(T{;NC7fE;ZbF^60HCkG{Y*a#7idLDVnUKKdL6=e zB*-#BSqcOs+hdCx8x@T+*>nERvWFH&jBQg@U;f$#f8>efsvJfCHP=pOgPRXD^HPO}M`MC#KKttxhKynC z95y9CFbtE=gNWnQ($?VYpnT!t#v|XpvcvB`GeCmSzjo?==IlkNt>aRjUBXJ8NR?dWRdECBAcYf*YF| z1|5yZ&h~NPNT(j)9$C_ew6olA7Nc*f9k_G1(u(VJo&M~uW0narBCPFJw6axEWn?Br zOvD$s^m__w#((_6ZGP~XPl zWX}kZ2q+4{<`me@EVA5fp}F~EL94jC|2ySF2fpx~Rh&E5H^)yd{^Ok$^ZNh*YYG>e z9D<1?M8<`zlDZ66&6VA;h24v_uGWGTffy@qIMd|KToGffFuSyJt$>y*#R>@nFldU( zh|5xe^<=*lbZQ|&%32Gs>I1-`G5+nxpSt(L|M#E1@Obi-4gB2u7m(+!PqTtLSSYl< z*2u*`DMgVIObR1AlM16rg@rkb`CbIAXJdc&otZS2Cydgq5#-Yf`4osE-j@_xSpoSV z$B5m7G0G~ue0_@b?HuP1^>F4;gft>7bQwuX=%h^`&t50R_p9v#GF-2Ad)H!`y8)rG z;^%K{whJ}0+bxb5Pd~GU!djerVCi$K7pvc|e@7&9;I+B;@EJ5-zCbBv3W|GBi#RO~ z0(Tt7IxeT4`pr+z629+xL8DUuP_Cx0n{<%^j}Xsq(G2?lP?#LOeg7m-4p(@%f*4DH zWup0#zkce$xx=6R*6rhKJH|eEWMDHREO3+XOs$)LE2OxS5Ug0ln$d|A6{Vr=X^HJg z=^i+CR&&o?o&D%JIKw9l-C5-^!6jj7QG)ap7=+ z#W{t=fx_IJLXtXaBNAq0{C>B+Fm_EbusOEanHrQP%p2n-1rK$yE7^CsfVhJj>lrTH z*uhVK;OsXyuUCH$)*2FP#hA=m<1Mmtj<^udpkOrgBDk%|7YioTBR=mjaSH&bPyG7d znxX!0)#A7!&(LIQHFy9AIU{`SFGUdf93C9n1pwGhvt{Nv{pQL0dq@BD8@Erck4v0e z?yzBCZKp&xRaok4EX-*fT8uHA(*Uubos^Kq3PsKsNLGL(BK#a9E^Yo%@ zUL^pzO)u*D7#_QxW_a=(3eUGBQ0=OszV(e@VXX*}1bxC0cOvr9PX2AZx;>9H`!GL; zEcZ$xqO7$UGp7J>0=>WgD^H!n|MG7yeQP`$vOBmtG%@IR74AKm;_zaML6&~eS@I`9&I7Nyu=<|+|5)Ft2p*~*iDDkLn9k6i}1Ayy&wYB?;7rqs(eao~~ zup*XS@w?#M7IA?|b+uU{f;ixo0FiTN!X>nks{lxV^6B3lzybQ>Po4bnKmOet`j<}j zaL+M~UWfft+Z;oz-2koEVH{bEP*uSFr#kr33%j_nK1B(O(paqT7TB3o7<3~X877Eg z!Zwk-Xe*kt=&=AphC7*YMQO+`9tczrVdc_CU5-u*&{5M=L(r5AI7eTb_-Ab{Ml>M5&pq+ zH@~5wVXc&&Bj;jmfm(hG9lOE^gpkQItiJWR!|rxxQK6e|@vW@kNd6n(HM6V!VYZWfi{P6j0?EYMpeNT<0}$g=p{!q5^JED;*$t}2 zIvv9WeI0N<^bh~-Yp;8fZ$)DQSP`*du$#hh#>MSpGl+cIR0t_zjtJ0T*33wNP^FU7 zB+`-fR3jrg^Ykm5|M#!HGR1%S7nX2hAwo)}?j{P012^eQ;JG0cs4Xv76|k~eAZaNY zhYq>y?hrl32XtX!u;-pPw`1FW9^b}xr@imJ#cveE0I)l?Sluz$o!Wh|AWoud9Am*P znM90lKevIGZe}%*C8uxLGLNm5(i%IpMkXNBaAc9vh!n2RMu<@^TNb$)_yJPiPE7sMuYc+d6;AwKm)3M;)b`KTYC#i)*kFP+yKT2Tl*E-x39h4-d_*I1P5Xl?Iu{+s&I4DU|Lw0_qbJt_09d}U=_Rs=yFu|dBt>mYUR+VeASX5$N7RXL?N3Shya91#eG2;4wJ%YB1+lMF-Jrx zgG-gB$DUrB{vW^i{QBc3W6^)@!wXpIYpjndB#}X^8An3##61JCvUG!qqes02@;bhx zAC&q4+-2Y=%>%U;?CtFpJGwB*oh6=Rc3Go2_w$OH;}|^Tn0)&{AsN z|AC`l-F(ITkJg$o09b3M)|w!{O+}=%wpK3+?;t6>Wb7!0MHPbW1tK6=TSsCDY$eu+ zAUOH<*8K+n^~vutJNwQ1R2q&IY7B(y-gYV1I&>q`d524g@Mxs$aNT`81xr3Dw#b#J5E?m=3Bp()nyTM7w2;n^onsYe_EN`TJ&$hab zn!VExw65cxuYwgWE5Y{I;?}mo+O|Pn2=*HBy*N2EAK}d51Zk|0#tN5iP4W9*UeyoZ zH!SZtxAZ%kSIj?#*bv>8dk09p08(1(1MGbi95oi%Ld2I0@IdyDWdO2B@c7xrv$iKt z30BWt$l$=oRI7R>J_@seLLdM?i=eAIss8LKazha8nwh)D5ZMg^Pw#JfBfQ) z4KBX8lKch3UlBGMZK{1khSH z(M}ZkZum`_=kM8?-wnw1CR9_5_QN;HEw;xNyHo3f{qKB??PtbX;MQh|LF)eCKYeQ* zmv2q+S;E?m`)eez%D5vMewUWeC&}Pjto1P_`=_@R!DrJY-q}7cO2B134^Y}{Lu9m-!EhEMjFwqBfP4B zor%TH#9}uyGpf$s04wLEXmSd~Wep*T2#4k)tZz^7$KP7Vupi-l_Y9s{EqlL{kL1Pr z@2hemB8AtGLvVcvL)NJ+6In{f(|X8OkI%h#vQ`OeMQ4r%S>-55j_m^(L~eEomB?%)6X z+rz!11@P7l;2&>JaBVXeS>(`RI<6CgK^G_mCb>otOQwD&a{pQHu+2`=; zE1THfp8WXeXz>mrodD!i0&BofqTZIOBO7=Fz)O|Fsk9bnUYXf4tz`{3a*R=kXdq3T z4;}ROV^#ru+QV`WttPlnZD94p$T{UQtQT~a(m*Ah38lS(0(z9CwHrI9KzD8m0QHFZ zglX@C;Q#HsrLf7}p--x>^CV>HBi-nSvXS3EP_F8 z{>NwZv)>%~m#EiKf=`4k_BWQdmS@5%iY_>jhl3T4k>WHWYp(1i4NKwYI zcdiDgg0}an$JtwR!nF5?kIw$}!@G+&00H$kUw#hPx5j8gv>+)=Mipx3G#*;1A?21! zhl2NnE1L9K*K%34mw1k0F&P_~VM?|_+9v!prxICh3$&5Zc8o^Bx@;o?3pW`UprIrm zygat(iBRbZ2GB@>Pi$Qw>^xti=@`HI-F^J>{SyGd_g>!)Jf8mG_@MhafZG6e0o;xq zJ5ec2|CLIeDv5hw28tqws#>s_N7-c!19A*e>5Sr{&Z92|gZ}fK{YUQftcR)@3?izu zq!3x{XH%g`qem6c>SU=%dZkn#R0`}dk*j@{*fq$FM^ksD{LRVcWb?zji#Oi?c=6_k zcNcH?vs3JB*7(j>rg-Jc>+m&Wxs)4Ndk;@8(c`6Lwy3S4>RfA4LMu>M*=J?x`*K_x z7+oiz4fIR)*aZA*en)stH@qRoJ@f@yWcy&;REh z{`m13Hl`kXuRIrcJpIA^81FU9ZInhqZ{gaCe$ms9c@a=hToLZB&lb-ix%& zt~EW!NSCdFxfMOHiKvdm9?UJATj%lk^;;4Da{G_>UR}>w)-~_#pTJ?6=7K< zENrY-*l-fVwSTn0PycX?#RAycnx1|2YuiUt;3p66(l5HUJtU$L0|7CXZs;=dO{H<7 z<}CWnGO7cR>s*+g3=J?d9T{K*^@wyaB8JC6?_ki|?|eQw^U5HLf0l=tnoJ}>17xMV zkQ$YnKJ7{%%O`tLJK)p>o|-rU>o+>{Jn3zcnDxI1%5I=#;=+(P{kWPv+sxqtggrQC+*@@!It< z_HK-^vsqzlL&V+uG~#p-FguNCJ5KQ*mJcW=-V?{=hwae24~a$}pxmT00Qho)##>iT z+O3U79%~bawqqR6I_%$X@!z-RxPKb3vF7pR=L4?nzHrD(dM`Ha-F6=StM@~(YdOY- zfxywSK?DS9iv^{`@+wXxZ1cV>C-K65Cb`H)C(irU|8sK+Zw0P4Fu- zQBuD^#3@14JHlur&Ya3J#huV=C-W93r!8*(UxN=mS>pa#z_N`PtxfULwK2A?RChMk z{Cl@&qhIrq-m`1$x~`{2g?4#QjWwm%QbU};%q>xp#Hr#?$yN|kSqqNUO>+T|C5Nz_ zZa$TV_51I9UTnt2Bf_DoAjM=-Ku~h10P-cpatuDL-GntR*L6-ouCX3~^^=w;JzGz% z2H>1SRN>Kb#T0crZVC{dCT|XLH^GfCj|a!O>CW2j1ncYd@%sAccx|md_6>fun03Ezm+^M& zct%VNC0Vq^g2fdpXk+BuJkp}uI#Jn^aTje_84IgqUskkFMjilVD1?=Z+E<*JrJ?5& zI!P}jn5Aiq@XvsQ%i*G_i~*1U4F#}%O?^^a0cNK%-kanmhO!_+^Fi{*RC)u>C7^pE zs<=omn-Xzbb#w;aIR)>Yfp?~}_|oCL*#WR~G;epBqI(?x+}!LhZ*R#dUz^wr&_{3A zN#Cf$rCj&%Sv&=R#e?}(09Xw6|HfA~0pQ^3=Hw2510w8qOTN=J@uP0Zcfg^iMj>*` zTJMijz)$acRLR={DRaJ%z6t!AK`mfL0b&N&2y7;c95U*Hxty7n-Csc{Uob8um}9}p zno~uSV~yQF{+a-72ld)ZQ0`4gKr$L@Vw6T?#aiP|9WRb3Np`1TmRHNUF#uFekvg&t zfRhTl17PQn>RkYs!+#wBju(s90HAK#2>_hT!{+1Oj~B+wb?j!7jr9`%m|R_ZusOjk z0N^Fx0)WYgjvgE@?m+YHT&ViJ(Kw7ba+4NgTtHL;>leaY)IToNhfbXKq(ElN5YdEF z4$RW+359WIfCU8Ure38;xIut@^C{Si;h_Kc;r^5Uji)m%Ao&48RXHNkE?3D@m`XvH z>IW4-HkAX&{Ip7OawOoh#`Kl&5j_z5;ze-qxdki{jYl2#CEZ%z9$PhFCO68Z1#n}q zL)ljnRnX6179{anr=m_ys8xk5l4N;N@28BL9d`O_-3qRac{WK&}& z$W#jeNir9J4h)Jpi4W?sE>H1^!TfAevp>z?^A~*uM3!o}0N{gEA7Q0vog5I~+84L}u3*ICcZj(E9LRi$E}YlzN}CBMUhh*VVp zlIoMD7^1~Nd3__MJH@4@HVJ7o{nxwWjOtd#|$v7ctxLdTploAFwDco z#PH6ElORMEg_@a}P-q}_b3u{`9zjIJsU#6Gu~XhlcO##tOh~n*{OOS@ERhG;F;hnb zVN(FdN&1r`sn%pOK>A*6%N8v6pCw;NJzLO1o`$(!(lz9DfPxXs(b|j2J;^`?gx)n# zZqaO(s-&s}+22Yp1ach<^W>Q`RK+dCO)l;b$=lQFM{r4QOD`D$;!{rYz4T!2jTq(W zI0p)mogKc*=P}Rm+y+Vkp904G zDUHkTsuGzI%W>e#w)0DX&hSVeFToxyb+^!SOHe}8ha_b!3Ph#4eL{OVrIhEh~ z)>5wg0|kGQmhxgN2rYwysYn(D6Gfxc(s~pTY>0>&^{U5|EiRD^J2hT7D$b3FW6h}6 z+cCV{;pIG)ap}SQsKLxkAyQEhMDJ3LOfzoU9+XOBZBUR~BkMorED7}w0mwxz1<+8P z8CE2PyjuQ3wJ0^Hrz0vy>EId!Z>$hg=Rf0Jl&RxOgdglDD|M z$-YQ`8!+#s5*Bi$X5VyO1jwPH693PB{LOJU4OnPTYI_w+{PU=@l{~=mrkk+Yy7WGC%j1G}QD!Ez7 ze5J2*Ql;|+mLlO9jxPY1A3Z!I1GI(M>*Vv4=$%vJ3@nkRiR=fU6S!&3FqPXmW)8@^ zml8X1$y{tB^uf!kn#9l`96o*?EDV8NvI^;~F5>crfL#GF7nh#wKx5q$`XM?_FW%=T zgwGv+7hql)lJYAuM9ptUAQl(7?4wGbbL5KYnTQB6hEAwH&cH=7EbUjyM@_?ZB@*Qw z0+p%)KRi#U+_i?K;#VT!ub-3If*pk3zDS)>u)XQQ~Nb=xJ)e8 z0A}w*8|?jgAc4C)gYtCZ&@vhd$stvDftHy-_z=O(%f?yy)05ZoOWhu{|6-QC?Cf;%C&CIpuSg1fuBLvX+Qe)pdHV|LG( z-RY_Bs;+vTs_JOvuhMA9#K-^u08Lf~qzd`&gP23m>Kp;k0H^scG}wdNAE9l^bXow)WWW{>`w#^xNfj{kMSTbtFhmHb zSNm;-41mni&f8BM2&hB@oZZR_!vU5mQr8FoOU0xWh=6z~K-MQ|8fejWfRRS9Dibug z7f@I&3j6{Ku7wKHX=0a#4(fyhcqC{iVTc+5g0jS!#sHMO&;SW?oN*XR1(-tCneMF$ zL#OZ-87KgFG;KUXeue|LC2fk>^WW9h4%JStU4ytW0RyH5(jG83BZnGC<`70<0u=xt zewyxi=M_mhJlNYlusF24yzMW3x4m)%3R7KgzIVhy!vZkBPF}7U?(Z+aI1NJ8yLa1G z=mJ(W0alw&`W&lBh2M~;e4b*xd0$1z^NW;+1j$H|QBcllO^P~McVmS=IJOvX#;j|s><3RRniu5<6R8KTOb%YZ5YZJnsQ9E$J1r&5Fy7r6*Ks4ZnIgS`5 z8GvcY$?p9C0Hk(5C5kda0md^*b^(BnBSO9M?*s}1hyVbnF!*!57y@b!ZZ#M^w}-3) zOaN^R4-!SC0SjV^!|w%=A{P;+ixH`V`Ilh-)WZ-LVr6e*HukXbq8)Bw>jj@W5x^S} z=JyhIL?FS64I$zfQ}IV(nItR$ClCp;5@3PGGMp(vC6vcexGKQ@A(s;93UQlceHrS1 z%r3Zm@p_`qNvlJY>@lw~9nx&ygMX>O%t5=0ww6;6#|#v@PP=hp=m(`2+fEZVk_!bj z6_-uRAGx~${9_VKgQnTgE#j7q_2MEWjiR-Q=?3vl_qDk+6S+*uw0S)6NWl5Vmxwgb zu|YUzhz4Ppy>=l~pWmaXFOVmn)XE3dE73fZr?1wk@5Pt<# zQ)VPLCt)NhrMwLH?KR`__ebq0AQjW7mVC#S<1!c7hy7W=E}m6bsWM)XKZjTu#b5AE z*1pg~nMEzK0*BK*n|3@0Ut+X``N#ZJwzZ}8gB8oMTN~1PD7j?DRK|?$5yJ7|apg;KcLjI1Gb)4|&q~*d$+^op z{`u+3rMpv}XdYAE9lt&QgF8|icbiIEc-yM`8bZI(%r}%`tka-^qu|fk2`{s z%Z1Bn3LaKYMD8RaJ2qa^tFa{0Bil^tmg%do?Q*P9tG497RzId?f6%wkT|`>$a(NL5 zTU0xenpAUcn6KFi8k<EG*O82@gYZP7N}IO{exHpH}6y;MDXmcTckYnyM} zwcN4#8Xx{sGPhqYmOFMZeI?y*6fRvc{h>NjQ&`hm^Gilz41Nmz5V?p*%&D{*@A$Z zfS-$-`7e`?8oahXS9`w0+`> zwwXV(cRzC4bJl8>?dR6Vg!=ufUKGFNkPPeh30;caUOi~6+sq7GOH$O=Gs z&3_Si9(_xE?B4eNhkyMQ&IqapY9FdIm^k=1j4ccWY!>WK1TMIExOR9JRAD@ER3tPV z3YSzzFu^~PCsU3!OQ!5;yb;7ayl*7WtYdTvI6znrKvs<}D4Juod)@9Df)b|zdWR>ZXmtlBiWcvx23*s0o?p5?Rz zwN$nQdqqAk55nm(7v8m#v=eW?H+yR@_Q(a6B=Z?_Uy=vbjp02!22<}P8p zaeQPPhRc}iTz9Ogdi7rs_m6v@yg>a?&9|DW=B{PBm4)tgPv0B#P%=D$jmz(69e)_T zv}`*i{qG!RE<)B5iA_k_x(@=@Tckae`tuWgfBGWaOJ1JZxH;Ob)pd9OLb6xojwhGl zciPVha$Lzd&-VP|^zAcxuh@PM{bs43@2>Ju(L~=`-}q)$VDlZ~sf;({41c$KHS-Vq zLZPD0%cHm-d1MA;(p}9T0hesMrtX7WiCX!Ed7p%?pY}phcgxJm^7Fom2+d`!c|Rz; zX4&ei=yzI5Oy-LaxLqhT8$Jx*Y#b))Uv)U$0v}9PX`AJ1gldJP1DxKrW$JVtPt6}j z&$R?=-EI|61*R`&1D|cc^RA1Ji(m8$ygM%k&PbXa=+;SFXxr`{J?_s5JdrOH*7SW6 zz3N`OR^Cn!o-s}W8{Zqu!S-8^Mqs1KJ{^opbfn1q_wOIGk=rxUW76}~Qq=K@c@z{R zXvCfW%qCK|%YK#NOpXL-et4g{Rvm7>?YziOYQHXBp*+P-cGr4W+_+p;Rn+khQV&ve zOn3`jm%i3atomQJT()fvc2Z=0dKG_KO0O)`JyP(n- z(MbRRE>~HQn7UW)d7h`Ay2kUzCVf#1cC~i>X-ttP2sT;&p}jno_Jo*`TT}(yVnn?Y z6hj*mGoy~n6*Knvb6fkSzA`>$I3;aTe}T59$|4Isv<%XoaJR@s-f*74!^E0^YZ=Yh zpcbK{z+slap=-WJ3^ta_kg=h(K`Go2RivG00wUiYfODh~@PbWF?&mz$y1yCVZ{3cg zMEvKM&708MS6*+iN^`=Sg*A086_(^#L?WrlUJs1sC5_pa>e}_g_tV%(c#CiO{&;-x zN#g2o&^5u=;8sx*(X6__2Gf@x^auN7)Zh)~c?9&MmACl^k%|^3vTUkInLSQ%WMw?W z##&_9Qs@t;h@wX-boo<#i?nyh8nys3{u-Pez=19swwsZO z`E7G58iPAv<)NhSo8hjy=6U*w#IyUwzg}s>K=*){zvDe2xl%IN5%`ZNPHlb663FuM zn>+=)XIl~zPIuXPlitcU;n z$)cl_?{ntN)5ahIih#&2 z6%@)1W!&QoK_DzuhHH?mCutcu-novX@J@c>tu+tq@B<{Gx(~ z7zeW2XYqC4B)bQJyViUL@NddM_%XPE%y8(ZXxf6f!tg^3J4}B0g+@T z-w@4&l42oR#%=bzym)bGtbpT^Cbu*>ZXFiiqe+Q6j0=>?iHv7>g6WV1-%BTVc#Hp= zj!vV`{FHEByMkkfzqE0+?;mDe-GYVMzV8v~ZXCZ}0Mf;lj~MXiunB-{l0{-DUle)y z93KYX0(xklTCg>&HIp5?Qj;t~M-r78-8=$2#6GEmJdV(w&9*+B(D86_3wK(bjvJUS zl|>ufvO2iJX^uUp;Wr~D7ikTCRpMT4sFJVt{T+`QLE!=YEa2$)`tkl~SsaKWsHOeQ zr*0A9K?evKQa{Ky< zP2qHwiQx0XuKTI5kt^cPA59AkIvZTqD`6LX#Q$mgTqX>a7f{vtdi9Q;j09c{Bex2x@nb8P9O8wN4 zQgqdV<1m2mpL_(+mQZigNSLng?lH=6g5Myg*_ z>fvmr6q)_?82wJ4_seWLd!E|I^F+|RTgX@7fXAU)c6UIaY5r{E@l8qO3xAizq}5cX zYBQ?~;~@+|(dtW<17nD=z|{dna=ZY7{9~332L<|fR1O}Qqt2f$P#bLZut&Led{Q*$ z4@bm>-npx@;mqLFXi(^y_&FmD^ zXJp_LW?y4(iEq`T#_onGf-@n)Y0YYE3yZ;0CWWy3!c3MHu6+j|q1M8*!Q>BYmk`MZ z$Ih^2PRGG3!S+4f^ocbUYax%^lF>ouN_ix5Z=j9IWiXgYhSG&#ePNbWxt9J}u4ky6 zhzPjiaB4RkZU9XcMhA82DpnR#!a>X=NL`wvqxTAmt}w^pj>_;Kms3C~wG&!8Vgz>! zQ@F-nkwBh~7;GwzVA$C`)Yv2Oks)N;YLvoR*Mmfr@_+KvZBX^^4~7rFwkMyBLj4t& z!SPG87Ap+?pNXNoDiK%O6h!coLcCxY;#H2qNHXAE9zRpU!mJ%9?UO|k`As3%Np3c# zQq)LPgYt@J3+sdesWQ0gcQou2AlhhY#D7NHe3Ekk4;i65TA2J3UaFod5}FYI_XUPp zhbc_OAM~=0jeB}}Ob?k%g0&-gHD0y#jhu|BNoaD^gd9ItezvYqqcVSICp^%CyUT$k zfdm5mbFvI1&QHL?OXpk%S1O9AY|LGPxcJcmTCU}5w<35i-dXX#;-PHumC(T|;Ao=C zcQ>P71#oorO#a-v1zBUn?P3x$h#wLMU6Ty~_!dmQ*p78g&mlElhH@O|Rx%(N%aS4F zO>CWrf*bC;Ra|ycS!3(t)hv7k?x<3&}5CTJ2-#S_vNmJ7Mb21?-J5&5qXbu*#qyX0PoYuo^Qxe`ma z6PIj4lXDZ7i&l1i5F&u-Q^_q=9={Do1i%3cmCwZjnkyUKOfp0%v+{RAon}yMErl~9 zQ6*6jBV-aaq%WrugL%)lrdk7>ohs1$%&=FLVqhx}^!zmN zD;4jk)I{QMhyuzMT$fE4#^A=X3`lqpw6b{jF0M@?W2VF`{+NA~y@Oxpj_e{{Uafq{ z62>XE=dG|PzUVK$``A3!Gla!yhHVF*KhcP3u$3dF&3=#|1wNEBgvD1gw7Y#j(W3n| z&MU0_-KLtxZuy5T#&u(5@5#)JbKz}NJUj89uoHBDna5vYUn`T`!iJMd47XRLS!J%U zob-y*=3zSWV&;!jkv2I)=zfWU5~kzw4Xb8hi;^q~dWKPwY(B7ZSpPUr+McayjC>8c z8{y`YkSca<&?UBdU#Yon1~>{QKL3TkM7`<7)*)d92yGBG{5Qg7ue zzn}zu=EUM^`k+p=BX~XIIPOW4AKZBQsX8Oud%oCdtqQTJUFEYnfz^Y0J5<%6<*-V) zyP^=C^Ggy6Nd9X5@nxmhOHyp{)6MY4@;iTeHN>OzfZ2(Kkt$ErN`~S}q6?$rRF#c> z-AJ5YRzM{RlX5`gvd4_1+6LI=X&p>y^RX)wi8UnmgQnv#lhu>xnsX<|yEuDXB75i|5NV`Yney!sg}|M+1d z^in61C`8UHyu%lM(Bz=Fr=5E5j5@kv711BEwq!0&X)>6@^{}yu@1@u?UHAo%;DS8* zjm&;ah@LM#{vYwTfu$H?BRBtH;3^dZFly*iu<4jk8`$8dBh_9Mh6BYc;$wSAI=z!UwB?pm(x&e49W8edEyC`-Z$=b( z+a4Yq?DzSKlb|M}7Rz^+1-?WOd>+!|ac3d(9Yic_P^^WfogM^p2cP}z5?U!B7$jJU<8fGNLGDcS5hahGMK!>Tpi0jtDa@)zVhtqt+=5M5qO6PeOL?m{I8mr=QDU7wNR`TU z$RvB2OzHG)3kGYor?%xKe*wJvnR8F4B57NxT$!LGbK3dUUuC7x<@J#qd7z9nIK%o3 z+5t)NZyhphg1DjCna}O^Rl%~*T(xX!U!%VJ>ZCaiQ3_RWR#Cxp)Yx1u&wg~~3SjGO z*qkvq4P5^B^dO8d-atgt1Qh?MsjPxTuDG}C)F{sYItgjM$14A%>W4DI{h6*;BuKD% z!b6C(N9zeALio&2CrbAqtMF^tL&hpdf~!hD8E9;p zy%qO_;o>E-sppiLy)nP{>#wM|47(>>B3No`KF-= z;@9Dl<`v&l$KQ6r{%6{M@RKWwzII+@)x%H!k&Q!CXHrZq^~P%`oI)UI zqY6IHZ178KHmr`cX;!CLsdLRBfcHG%{si@uB3?|q&67^9jr+`qhv znp;NK9wTWBd?8V(tWPAV!NLvk+rILPZ6lRvOoT#K!6t988PTu;my=_xb&q^2MWg^I z!d0C9%}e$1z$({njcI$-Ub0s~x*xR;wh!HGvppQZcao__kTBzImN*s!dzSI~YnX*^v`$eB(&uz22%MG|gi`lr5u%cZ|8p zJ632^)A=k5Mwzim-}RsbauAD6EQkkg!LR$Ow98gCX<{g zeEyAOmLG)6ou+W0mREsG9UK_|#E}?!6Ls1jbk($9!hHOrlbX1*ZVQx97Y5?Vd`D!a zrshy3JAL1p%E>{9+~@#-BCLUmk{m)+lH4X4chZtEc8Dq*R}IpJzkCfqP3_lg3j1AO zfV*TP*)`F7x(6Cz)XG>TlL3K2?W%S=4gs#!rxJ@C0`&7DH z?Bu8Hp=O|JO|&{mfd=rq4bU?0>8Q_De4&y zAwF^w`q2Av#rQw8GK!mf@#t?7W*(gdo~1x9K%u_^e_5d^Dpzm$B1&|Zb>S*72jhn_ z+Ger%Ix>$kaX#g3mv~P`ZqsF|)vWzc%AWl_Q%aOm{_?)+E`M3VfmdgXpP=d00ju>g zg=lh#Tbq%SYO?gfbB5jjAd%49AGpbO@Ia8YH?UlLx^3@=*ux%{E0c;W?`^DTEVqy~ z(eK%0`hx4eQhf0Z`#`NGBd60Q;&+=z;JV{@Qh8$i{J$U4e62veqG-;9ZH&TWkH?0< zY`*b3K`nX?nr93UjUi6!LmpN$dD_rJV_(RsLqTygDb6J5H*NU-Y(DGt8>%c6Lwzm+ zBZFW=@0~&)W=E3oW%^0zD|ae(Jh8v^8&u8It)5s|p50S&21Et=?`v+WvdmwjY}B*& zmu{_J|4fG^ZnQlulstgm2g_3yvWML1iupMIg}LGl2>cOgV%%J-9|sLP)%M;c`Ealw zbI_bH)ivH4sEiiJ${5FOT+u7;6*CqTY)8WyS>Z7k7cFw3b1(p1@$5k*CL4;)f87Um z=Y+nZjK{@3$_L?=T2hay@n^w4r7d)&&7F;{^b1*a0MvU%5wJD$z*aA zJ5vU@Z)xS4+jOMwo#2Tlbb)!^T*!{eiGZZt0Sq1V6hKM~p|ndGS2 z@zj#VsRoj~-lh`p&k3Md*-_NEyc|PPN`<7SHwz;O5oJqFpA6;Jl2ih)gwtp0+!cL&074$ZAljbq&%g1y^J0>lfsZhHHng|RoGJgqlcs5g9 z+TFl)zNPrb<=>%3GW`~H0Q{GypLZEYxU7V8?0A?tSUVXzjC;y4qF0HRym=pR6^ztL zCIgt-eUBD#>kiyu3T^^2q35U@53bk=XZhjjQUL$yMWLuzq#4|O(B6t7?p~TNixyZtE55M3(U~f2W`e@5Cs|n()rlYG7F2iXMnjFzaMFWZ zrdWn@l68@h2%D}qYSE$&H+eFSAc?-$y2#do%R1U>sn%f&5BM*>HJO)7xXczkzNWYK zi()1a=>65)hdNS%DDyI2eq%(kIgzOOXwq~c_DV^Sh7vf*LeAlFn8M~c7JIkhBjojg z0c7v{meD$k{9zECYT_7qy?c4L>&e|`n!hbtmrYdx*9Fox@_`~#JPfQ<%fl+sPE+uw zvI3Hfp)tMwXtPsB57V)$vAmedfsc~WC1{P2DV9Xz7~Jl-wmb92TkwfIjxP{bq?rVz zSY!`v^_va^{Pr4KTKIZd`w)tufSG)Pd+^zB9^Rs4MnNtCaY#PIY5?UEXWj>UamKV^ zO4Ja~@EpMxL$kb%gtcr&XWxrF;IFZ7iFE9e9M&+&nXNIIo!z>8=SbVbW46@2z1o*b zIKokP0k9|xSKq6mPLy9knW*DA1M5+LQHV^iw{tznUN(G>_eTc|oUR2t7NsY=y?-KV z6h90g2st0)5x_*%tJ@VL^K|pCdKAZL>G8Zg4Fi7-p4Cfoq2`k0j9+JD2nn1^xRTWw zh}cCTmhtECZ1~}L(q%uelfEO1wD`yEj?4jn&D7Av|LcjO38#hr>7IqzGM%`|iw}W7 z2K6RyZ33N-sE3WGgs#Z-)L0YNiw%ws5PxsoP*wVX^+MrvFRAZ~ySz?66f0#qiL>pt zyM~Q~F^0mW5Lgs_7G-(3a-06OK;=X)NmUWl&q%M?r!WP&DHJoYi4+<1@??}WtD8-7 zt~yJ&OqUriq}qIW?jHV39M5n4L2_Dm} zVuuX_{g|KSNfB9HCPpt~uW&5r<-+J$I!(UkupGmO_+e3NVJ&}(vY}bnT|W3_*mXaE zmF-k5uSO#!;i-gdo0U9Chf5@|a=d=$yI1tUnM_QO%^pLOa0$S4HXs+lyE@_^#g0W) z0kO)k&bQ5gd!FK-4L1(sKC#E;zl<1&<+B@ryf{$BHZq1}Lb0zM2MMvbmy#*n&X$gT z$TsX&>Tpnd+)aZV(lckp^zVie&;$Z5FXd~22i4G6jV+r9t1i_1JgFV+zH1_E`xeP~ z>$kT4)i>P`;)2b2D(+x#^#L{%fs4^-d&}ZmB?pNZYv3>buBPa`s;Hayzd93P z2O1zal9}+Qv?>CoIz8Xj{I`dy7*EIlDmm~Tmrv(2kDW%MXLv0|57O1Zx8T+uqv?fxIAgyUUi7`_gH93 zkepN%aLr-yQ!a7A>>nB#6`{vt`bb+K30Jg(*Y&W|EdV_h1!EWc`X;xmgHqvu+E|OOua5QK(-Q75Vq7FN8Kx$$TfM8?9DuhrEhD z;TXV;5mRAcZF=bACimmt+1b=5#|!fZ<8oK@wxTJvd$J~hPAzlFuIzY zZ^smXFWL9EtJ%uu;a;WiHP*nU_ccRDvh{B`L|etE(!G+eR4n<|R}z;mcR6&St^#i4 zOTSIahKsB$nK=3Dw+_ScMp+QaBBQtZ2W&dt7S)va-ouKnFBp;1yD?tJUE0ibRIW|0 z^W8&r4?8&Jah5g9@PM+E_~S+rF;`tkKz2xNlP5ww`cry@anCkm-=ST681I<4OP^{`2|KyeDQqbQ59$ zvPXJh)_dWo(p>fd{Ti0JIy>S6Wl{NUo>{SnYhv1F^U%*2cw{@jsrp#}lemWK-#`=S z)-g_e+{Vi^E_e<;cTwA;8Dm}tI@5<9gRH-cWmLHSGr!f&N>8acyP9wU+TX&beC$oS zIIT9|ABi-avr|f_Hj52)1lUZkB|9b@NZ6n5%?$PJB zFL``_9653%86a7DLXBnB0*hVE5P!%$c z0x9+`IpF8i{C>T7{v)4Wqr=r<@v&s~Uoo{BQfErlN404~tN*&tLNmcp%X)IBMHf{s zL6ci`B_4wT1?wXammV)@IZG*?O>M3E_b~wij%(_oI;x}3+*#E?pb!E@-<4!oM|6s5 zX`I%+SR^yc6r#nA=k;ClE;u3V{#G)6jI;TM*}XT9iwnHV4XGOB03GdySMjonTscS4 zd)_kr!LBm*3-&ARM$Ue}rsZ}FPB35FwYZ}Flo z$DvlOsC1Zcc{IGybDJaIYL>fZxI&xK&T@##jH9?FeNI=+oM13-!`Cl!;YZJ?5-rjf zvb7lFk}zy_u%h@mMWh1LJ3M1XzVK512sKv9d4~O?5%( z9$NRCiPHe>-Khjz0jUY^*8bEC12+6Q8cLHowC0j1E9Iua(isI8?L-wT2?Hj zHqRqP{h(&N%6O`Ls-`D>Pzum(<6x!HH9y<#G_V9GRKT5V?oYiwI93VMQ8jQ)u($nm z@rzEA&-|5_u*9H*u1LWC@tbsiTN#bEFqF0p|2%Fcwh}x+CcQEVyFX$Uqm-tA;Nzs< zhIWr`*l)6N`YM=wuUg>BK+~|s(ssYCLlQycnzDfJ5SnRcN7AALVZfR#4{D&qY>7C> zYY5`t(rQPHP_~TqLekb;?{z>5K+h@+^FP{Vbcvov$MZC=!%^NL$o=|n_HkU~qvP!S zPXWk&2SHg=eGTd{YUn)NA{}-#mAGC*Q~j093G`iIJMi{{&HZ^Z5fTNHQ(0PHEw@Bn zS@a*Utnop)Jl4o>W3&{HzIbma29rH;+gENjKh399O-hD!VF#U6>y^ten6jE7qUAtGTXq5``2 zs=Djm-1r9f5d$)a5OZSzXbrXvipNaiG65p6t?!H+3b7`?Atphq ze*dQRQdi zo2hvMM8IUpZP&+X<<^yfB-<9nh7XW-dQznjdul9(95w2_m!C&;L+~gj8`=#ZTKHnL zq1KGQt{^vr@6Mh`dPP((;uJRT_lrE6OY(8Eh3GQ+VBtC%zLlNW{L^-qpc3qck53g@`+z0#UCPoz*MUB9bIlV@DaQY~z(DA~{Ck%D0wru~n)KQGdS!mGqqVZv zBfwvfMgi7IDPrJ-YjMHvWjrq@@cCFmAPr)6f&}#w(HpR9TG&j13pIjLwL3Z~dU<_u zL+7#j;pR1#)g@CwLZ1ROo`t7QnF$i-(wY^LlHL7+n_zZ+T zlF*E)W!MJ(A^o;mhIyZmC}n{`zU%pH(X)d{@)vxP65!-XqTJ=|RwHcjdCi8E;qnG}1I zXE5mYSs1H6ejAs`;4_n&0RgCw7b-^Qyo6!Eb>rE7jqf+{spqfoeLCbyZi!t;ggV$v zo@;B9s#262ka7h&1E|Nda04dfhe6;n_xD`XQvHDOe&h=&=Unk~$J_~y%p!)Rc$4;! zkDzDuo?cr^`YvSewj?C%ASDpMFG_2Urlqqc1|81*fP(y9E8ZA)k?J;mrrt6_wN z@$&{U>DISL8e?F;rt%G*0)@~6-XIkQ-%?*J-}lYRtuk6$EezQKQuaO`U=R;Gq(SA; z8DfK2Y(Tl2dQU%3nBT$9v^_4m?M>C?kF;CJ4=MEV%;0Ls@b=c#zr}i}k+@lO+MoHm zWdOoBP#wu)$mowglJn1OY(uQDUZ_^)uHGnD#6G|;A()VjYag5jvZ#BLV!m?Rnolum zts)b1t&b#d{nV||a{%dfy7Kqc*^CBk_(gb`1=V}-V!T*Q;k$_os$es18u=XH6)qjT zo2kI~A;PARF=d8YpDE{tQ&YOr1mR*qby&mCSMGaK)ERo}lCs~zT)@F&60KkuBV2jj zULEs*xwlNg++PX+;`u?Y7tD@;!CLooRf8XM6WyoIr8 zNR}Bf;1;e8ivGtX!y>WOSt&H6=tGPv0#m?P4*TbIfse)9pK~Zi;RRN+}tB#T7x%^yBC9lohl zFrttRs1N1^YE4=t)u;6Olt;DQBgN=YA9kD#b~x+KAz+I}L;)%uh{jlVo+e@7zED(1 zD&=bYs9S#y1lJwC_o46Rx^wHH>|U~NVQx|0vQ`?RcUXEsQYFeg=hTLQ-f0DQzMPQ( zdL0(?e{MAE6mlS&bpSFVO3g}7fB9S<7z6ydus6{dC&GJyOz6Z-@FMz1KyUAJQwTBF z$z6v3u&mb|5`LYIyMCz*fQSydBoFl_ihSt7(1`rXr!rE3a8wT+Izi4{=o+)Hu3YkZ z>1ffAC{^LfV7$ou^s^&Ut-=}49SRXWbV(wr6v&$D`EMTa))VMZnm+Vb@y<(-%2BDB z)V64hwA7?x9P0nTL{0trUkd>b_h?VYrX;|xFvP8C%THEM>w_B6PpA-$Tf#g5QsqMS zt=HjZfRS0>b)ZlfUaF!Zu|WA zGtGZ4VgJLxaHp|LqcoW-bfo&~SA3efqrIsW{3YliUYd^r+O4#_JlNbf?Oy z%a@!#n+F8s@A}0h@qHhs31Xs$ZrPkgyNXAJ#J^U^wGFvEj*#lD!Afl8)-Zwxp%$41 zdp8y09Jd{j%-MT9zs55yfB(1II8bivetNAIfAimTUj;74|64kZrFXXOu@Z>Ke1T^` zha&H7U37pGRMS+?Rakg*zrD-B?kC@}G$Om=t0yyYm^^@6&-=nTG8+4hnZ^u#9%A)E zRM21n2!;1=^tf~4F-tnBk$yho04QTKb;J0_97rtXDA-T`kuKivPTa`sG)bkJ&4LIV zDj%{>22l-t8tf>B=q87Wdog>KQ^{<&;Lq&L#M99K#FdKAbux&Yc=Po<6PzE%yih+N zLgldHZqqRva4-tX=#N!2M;D`@J%yWHL&afRNT27ClttzGFB}+dUE9{yZQRJa%a7Ye7N++6o}6N)HG3?g(cU2Nns7P(WaI-ad4J<{sanT}YFbuYwzFY{G1vt3eSkEH zX()I4Nz5-j%RrY$mL?M!jFqTAXbwcpsE!`DuTR)swKRtUq{AYF2`!XFPNaUnOKONa>M>)DV7(0lm??S~yw&QM$o+g-@tY9hSIL`yF$T-LlVLYcc_0f8z}D z!!mIQF7PI}-6pd5bh}UG3uOtdKb?013J4tli%e@FCPqq$hQV{v(e$syEW$UipWcz9 zMIdfvp-Sg3H0;hoToMWHmF6a3}A}iENt$zaRLD@&5mXpb~z3`js&M1`5=b*JBmA*J$Rk_up>;|_BGox zxyC990%**pn(Ty%0~Z~BtBJuI!49L9+>k+*a&b2vakE4&-A*i&7TRkOwSqE~4VQX0 zb?(EMFM;oF20rjcKFJQ!ItM+MZ0s3(V7t4X^O?O6!(;WtHOoQ8G<7{epnECo92_b< zlA3091p?%uQfSq7j@MZ5{zqUWa+SUBMRV~G?^RVKFidsE0ScY8ZeBg&hCOrrPY%4(#m!?$4oFI3+O~ui zS*p*6ZrMd|=Ob&J*mRn`49Z6{Zex*KZ4=VJd9{$8cIp4`veMaM7?L<8cl8JM*&pqO zsYWYi(mfHnVwSe~HLb|NUZ`2I{!qf{57+m}-MpLYMRJg;IrwAqv>A@a_$9#cZH0Dt zK^Ha#|BX9OIeU78Gu&)R;g52Tc4354Vvd~?xO<&=%wCcz z%`w+1qDE$2j0bs+LX45s3kg08CR#ph!0XOIDP+e$K~%M=%)?L)@bB_a+kLEn-19Lt zIKLsL3M+Q#{Bpk5bS|XW)INhM!c?uT^1a%EwV2m25fVPg z(HLX1ah8F$R6PK*rVJ^4JdoaRIC8Gg0^vU1LRin0BK${0uZgoI z;;+|kw@3of9xiN)vY#10Uxe0LcZ@kyLBW5A9TibfF8xk@dM`c1`QIDW=4uG?l&pP~ z1QAyDIA|0g0c}Sg%=F`0krihkyy!W=ib)24|DG4!NTEYf4$ zQ{H9HJZ`w!3Z{qMYLQrphrR(JGQs@U0Z}g9evi=_O}GF5TExSnlZvX#y;z=;B0t~a z{nO*ige;BzRGCpe0;x2aaZ0~}DHe2@4?VQ!px1jRB)af%3uHQcK}vsN6Z=Fvghd5E zgZ1qXCn4G+y8kz`pUxNUkpI9^Djhjawe)Nm9aXJ!M zQF#31pWLR}l4OmcCq!AW{0wulAcTxMix>f)Cj1YoUJ_wKcjm8J0iRPqT|MtT&2?2(_h<;u?YftE?kHsd){-}>+0jjQT zShanvc^r=jRq+besc=7~%724BniR_qy!CY*-ks5or(roE&pA~k0DbNTMQUNi;{zV2 za+>4`!6Jl6eyjlD6~l>XItOonY#|Q~vNZIMY~08H)vTI6#u-clACCw7Szb@yBGu^a zIU$kDvhWaYM@)jJ-DcWoji zR)rX5R9AI;Stq$6YCm0*_$T(=W@`naJd$DgH1fTuEe>o5Nx%q&EwWWa{&w-aH#&Kl z)%h6OSQ~CebDvMyAcSW#of^`2vU=jh2P^@!O)B$3=A>Wi7jfS1`C-|e*Y2xR$7MZT zeBVyCy6Np@z`Aj-+|^5HdrN-{yBYm=5mR6)Qd`hGEbx>JqCu>VvtxXe&ny_{LHLG= zd2g=`0mBDy5fP8nQ|SJi%~NuC?NbtUj6rY^*dX_UeS!dahUygqb`?DHeMa z1mmBr*6BWI5m$7);cGH=Q%Z-7QAvl9x=StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetP!MDuY{q8nhNhuMdZ@0s>W;rZNPKy}Uj!3h z@_uiu$0$^agHcAc{$mN%yHa8uE)o%OT-l|lVG?JEOlYm48JGQ6h? zio~*yHeUa)4C>!$UkSj=udnxR-IKWtQAQMHjvhL8`t?8fQiNTI;xsM5Fnn^2)D;( zty{C>p0lU+`^8^<72vXYHC%nwrA(bM1Kg!2zBP|wM!K;PuxuMifK)0{w038~{hB7d zJ#om9#eTnsbjkwTK)^EmXv=NzzcuguI}1eJ9qi=4G%Q7872KkPDj&I3>=`KsuGqhqdFuE!OOk(zIF4o z8AC=~d;f-;#!d9?g$}S=z%Yn*bhHiOKoNiR78;9z|;c(+nRgx`75p0W!{uMm;#J$WpcQtqX@(Fey>Y=40 zhTrSJ>sIl4RCL3Fzb3*dcnE)+GA}J@SK5xXOnvK>ckkJ;bN_h76U6QHAuE2e3kUMr z!g*YE!2|5ue~f~>V)|zHL6lXZNsFvdpmW5i(np35FMj62F`Eh|OG z_)r~goK81bHj*q*)W3pAPZzh|`5?c4Ycl{Pg&{%#7patiD4bv*2{yayJ5HVfpKXf- zw(JuwYB-`@zTwk@lbbsnvJJUJ`h|4a4_J+= zKJI_GLSFkxzi&0}SodmKMFyj%gPvn)aORTNubSM_p|tE<&!Nv3<1MUV(Ac?<*v)${ ztz_c3QU*<)&D#q^CeQsj2O2x^dQ`COQw;$~zxvg$m@uYfZFZlMh2tjF?DF`7o@1?< z@@U*<)aaok;u=^2mgvJ1$fKwI5LzmMH&}rrN(iDrIs>+CH|K@8ZOT~BPoDX8{%ZqD z%(`rUCJk*I+`5A2pLmoXeb}AKg#5iFy&Q! zaqC@t@Yw;n!g2cKda!}-e*d6!+L247Wj^G!2;{o*TiLZ>b=aYhMoSz_mo7Lr|2uDGgy{<}-#%YOgLvu$s__ZhqD zcH?u)R96o`)Z%m;szveU6383MyKgPyuBH9B?fDrjUetj*lVWORCvI;R$#jNobw{zW z$qRb;_IGbN`55r`tf7tIp+h}C``yzUZr|U~i`yxoI26KNNi@TOKP!YFdHK0t=!of_PcPTr!?c<>b=JWO^`~Idy7u)K()(;+_PPp>>D;YMmgo)p%*yRnnI?>wFEh-=-vZd}%3M(TDJvlR`he?&{O-_j-M( zEY&^zuFTKL{UE8rlCmqLH z8BtTk3pZNKan|zV83za^-lMT8jG-AgoNk`|?X8GFM|a{&#lu%9h5z{A^t&dEdwu+8 z>yJ$j1)a#M7v1)vrN#XN`Umcjn-`Mdw+tL!1H-4%+i{2oPCK95+YhsO<9e2@T+65H z4srbr*9`#F<(oRm9o3h#%Y~{4U<;%&Chlw>o42%cNqA^r*6d5?@B93bnKjjZ&YC%m zapT63TQ~rhFPBhmUlex%k)C6?l8d;0=xUnxHB;LO1?5BOTiTz)dv-B?%ou+3owIoS zg=Jq4z;EuknWOZ76UHb@dQaGJD{4mMZPauTuQR}q0XcQkr}$o(bJP7yKX(otja#v; z6p|uy{OBH9>OUhDZ2}b9S`CVa%vAGpIOnBz4^mW>&zSNMibKRFLVm!Bpo+M2Wqf%m zt5!7N^?($dl-1GY1{C!8ak`s#($jJPYztG5aBTlZD$6UW9yXS#bHB&1iD!`xA14;? z#k38Mx3^PVSi}#npY!zqfIy!0i7|eZ`#G1(hszmc=IM@SFPKo9gf#U{9lZbHa)e9| zqQgrp+(C204vy~MO7i$tHf?F9WYEA{8XFUi`j!mU!*U46z$1#318!BukZmN7MgI|b z95~ocOJgVQyz-~lZtTdio%dSt!$}Pi{ zm5XVlNu{D7$@F%IxoFPxuLnTyY(v*g`sV0w4=4{E%n1oyBZu;aFE4dvFDK9DcdH|BC7>Q_@VC?neq#F19sgtFLCRDELLCCP=y`^m5-$hh| zZMB;Li(o++CH*VNgtxI~?Gbgrs2Oi2dQ9bwKOaO@J;;KErkl9_I{Jtr8BL_8TPHW) z&xo-Ve7fQ=q?6axhXH+`pT~<^(O>I&Urhg#3bhA}#f} z-6355JWN9)la6CpHpa=P0;dLGnvjS^5CnmtuBV@!J><1VJvlj;&3k$L>36^I`*_8t zKp3rOFWa`%vvPxr%4xS>I(u5>@OS>WiO$vt!5kSwm*`2@sDCL^O=F+40 zA+K!eMHimY|CLx5jyrGvly~2#WBABi{9cRZs6p6Jkc1QL4MQNAH1PVI)NX2`XYUb4 zpD~<0nOvS+)Wms{swykS4BlH`ckIshm+$*LDDJF#@lQ*?xNhB{2rJib;exZyA|CI> z>GC6p0*0xh>lxDVFE4`ND`Y@AmBi3>Y}-Qh`0;qWkm}^^#f!i2>09y*;ksL2>zg<1 z+}EdnbJkIJpx?r$9^T@ZJNwVP`ltPoE=NxU)i3ROJ!MR%vW8*}J-!C>)c12?C_uP4&-BkbH#@7}f8eB8+ zc4_rS2ivx+qaZ7RESe~;EG$FEFfxDl9pT^Fsk?xtA&DYEcM{2tvSww3Lq|sp{qVE> zkB=S^ngS>opGO7i-n={8$e#;Dy;$B5AZrq9YB_pNhF_FQuA zL#=B+zw4?U>(?CaUVW^4_>k^MUQi?6Wuof_mSufC09nom@vcs`G!>!dO{f|+deqV> zGaO|d?P+fR$#PzKqlNaC6j?bUrA0x;jGaj&+=QWbVoM@|1eoA74Sc3R!-i&5NnzsP zDw=&Dq~c^6yU7~X2fH^)-Lh>s9S*!6C%KA@B$xPO!t=anktB|IC+Q}GSTuzj1D9ao&<$ioKv6_w!Nw&k1Y812TBDy=;G!vmh$mFu zoWGA<8|pZHc8J3Mu8OlR7`AZxu0cQ9w{`XW!#h5GW6G$mlcvCzPKW<$8@47M96ic& zaVAdbi@!h2o9~3_iG?_OP8ppY9dvg$VjBq**+!9V^mG(Slt?FaR5gTYW=KRkk!1

E)X5Ok~HZUF@lAz~yit0fHnT+7ymNGGH%s@U-jXUT?l~S z3gY*NNGFo?Emb($9j3NnKQ&Xbm^-f;w^wHKrqrUILz}Mn=4I1j|1A_aN&@h7?y-)3m_{50xAxNL^!Uq z?|3u2TUxmAq5*vWih%(9X>oeXm2;e9|7ie!d}WK1;D~b-uVeP%eccyqSQQU+9aq?1 z+eMb&#ODd43Y`eXaYQ?bBFo6Kit2J92?`E}gsQ4omVzW1D2k1usHBYyNGgVHlZ+=2 zB^fOf$LVwv4CW)GBNS!@@HTgUCOZ{-)&r0@Do_Kij? z#?mF-Y+lz*-Hr|{pPT&r{y5AIWI@2~4q@m9q9CIv3SO5FQPi5dv#+#Lcu33nJghO#->H#KhryJ{?=uWT7f=KpmnvX;RRp()%i|_vB}wQG>U%O|_mLQXS}tRR02g20 zAHM*b8mND7VcipIbo+vkzA95SAdN;ou}tu!`cBye_O5!2L?VeSn)EMmBfIigw5*MH zKNZDEXI=HfITsYn)h))YU3ExVzq*;aZ3!aXB2|Nm@q1Oe+cS9FZmO%Z@q1Ldjx}J! zx-bo!oT4C!v_V6C3&+#F^czq~)!;F7c7;(L8g5m>DS;%o>FmvrFuUnjCNpJf9^;01 zX;{D4T(NoguFo67m)7*@**|+q0WL=y4NYxiG!fP5Brm_50aI`I=K&m8^Ek0c1Ox%q z<)wfBQdAn5eAaDjI+(+l@t1M-oGS-RKWo$ro*)x@+k2E%OWR1satL>c2tt}!vx`V{ z!|pXZaM)pdJ|B8Yr%z>wSWM%Ml;X8kueC&x^ZZeO@EIHrrJih+ty1&nO_U^5tyR#8dkns3|&9!p=Z~o%`X=PgAZ9s{-zmc z_n&>zTi}?XI_Ox%|BQ3M##QL{C5nAB@J&J!kCt zu5gmxo)$DMjb&MQ{n=y%a`E>a`lb3#ITw&b2}zQ$Z3|u3$fT2Ky2+VSMo|!yzVIu} z-pmCvGny~C?!$HOzmvCq_5O1T3Tep=LH+&%w6?Y(xg~nd45m{i>2{#zDL8@(&QJhD z5W(q0lsr7~;3D?49AoH({Sf;FSi7dNZux6V2FDIBzkEo)gR#i5rpY7Do-~rS?Qpz< z`yaaZp1{B>1Ic8BWHN#%N{FI}>h$7rxlXF@lmJ8oWLd#94X`cJ=_KLq2>r_|xcs~^ zU--?t@LGc9b2;=F*bfN(n!=unE znzW=kFd7UZ5`aUIaVRP_Hi96KPA7>+BWR|BYc4+X ziw34lo(O;z%MeS*%siupeEEab%NBij=cu7s44c@GLp>IO${Z>u7vU)P&}kUhJ{3Dh zLCg}sA<@~bGkU@h#++Wkx{p?Vzc261oiS^86e){zufbWPuR5ptoSLB+2f&w&C92Sp z;HS6#_$MRJzDt#51yk2>djh!KUIaVy^#J&MUSvr|krhnS#4-(1=@{KzJq)O<;s;lp z#`KzO3d^biiz5eXX*p6yN_R5lj5D#5&5MurU`_u;gJw> zeK@jnu^ciP1IA3~Lt7UF94%|6&7MWZ&gOVaJxBI$;+{Kxb~gaF3X%)k>BijEL*GFK zzIhj2bAu>|$g%^EFB`AdLwjq>*8|{ofFdiX4i}cCBS{jOOoC{*jh>zeSDZJA?_72c zICH^_pl6bJv+^jZ9L?}4S5sZ#Zrr=$=!YXm_hrb~96mkR$=bbbBoUCj4)8h8lO&NpU3`!2jZfsd4DXP!` z58QL_ebcUdO7!}3@c4tc9X3loUi0+;>_1pfAj^kCaiTih7@0Vcp5sI{f!>TtMiZzU zJ^>^znPiNTfnyjm?IH>Xjt8}f(Iaz7wrzbW;+!uJ>c34kM=VCdipg2RR8QP{sTiMMZo z?~$iodwbd?Pv`o5K909F^2AHaPpa>fmEhAaE#Y_f+=SEVMo&lSN$Ql2xtsw*CjvT+ zP6b`c1r$_I0M(}gDTwZ)sbLRmS1w}V;>M4Phn~6p{7Km(KRTL17eJH+6h*=iYy_tR z-C^JkshmEum~gknyKl_jmTHx`=XZCM{qpC({Kcj{8?V6vvnPS%3qV&C3VdjWN^eFc z>67^QAe3K!$puT!IA_+)58QiSxqs(Fhgy?g55Nm=Ze{M7TbMd|3hl=ZGjQA`6b+n2 zqIC@$*6gLUSfaFg6wz=qJ+1qwuiMC~HCxzKx1R&`O*FI_0IAYHEt&G%IEVQFhVwwY` zpa{RC6CyDpx|_7ufl{JyrU&+RLu-l8JLeA%KbTx!|Lt#w=g$Y8`7(W{tONx?pr$g! zqUUbHa92<=_DWhBS99b123BqFJa&VdWVoHk@m2y}g+DA@&U5eX`A_Wxvd7cY zxgoJDVz_Tv)Q;cpWlp7wSjyn@V;QX8G-riVxZ&WZM84od++_V8$bHUGScaPC<6d$ z5B6}|y)W|O@1F%>Q{L4#N zvZ|i60lnQDS@80X@!z?6#Ex+#ZsAZ$#==Il;dnSrKhv1H*Nxq3m6{IQc6WXJf~tUYw^{sXqF zfPq!j__Fc|W&6p*x>&b$8p1lPQ6aG+TuD1e@{ za3~PW7QrV`)L&(AAvEqd(z<`?v(ImQW5KiWSkHgjF?Gthz)LSYK_acA>jtgO&0I5Y zAOp)>RAnb|hLc=5wFRMV5r>b4$?Kbsp(jbFQ>0QliZj5Vs=>^hJc>E91|n%`l+e_k zQDv?RUf&*}FiRnxvB;P`S&&%FBj18(!ELMz;l~ zRA+H?xAj?G>pQ1U9M(f~r+{gsh(&uy#(EJ%ksIbWUOoSvKR@sA_#Czc{s0WL;JVGw z)L~OrBXDgQ9DHR}?VUGXajD-EKbW86!?G-P?ECU+@RR^XR25>|HcnL`tr_gv{~zmt zH(orP-`sfRJ#RE!nqaK$7T{kgpn|&wQEq=;M(5cF}oC*RE^f?(&l0$CL z1HiKjcXHu(?q$=bOUVy9=-aoL{DKPd`;-$56(GtohIwLLQ9wA65vqXQwbI_QIrjd@ zJO|?|oI?FhJ?!aPvB2TVkjb1_%M-9MGz~!z$jR?V>7Y?G)-HaoZsVbjU|%?Jz(zL& ziY1#+u0Rp+`=9^fq0vK%qApb?qZwFVVWZ?J0a%uO;;?Pf8G~S!i~hwS%8O6DYg@Vb z7&9+_h`S&B9Uaa4D9H6t)UT92g##!k96)YC3I0GHs_I4*MWSgRWqHjU`23^!DNgME ziSPOB$zuOLJ*oweL=n~LA(U4{QF%3`gKFqMXf&mj!?5F<>{lMU`;o$a(9$Jf$06tu z7*zyab@9Z} zP2>EtrchK|hNAk(7?6l3NT=dxS{l<<(F5C8yC6wq{&R7xk2&frodGMYhC>wj!SC@pX>XT~UIP9DMVp;hE$ z=OH@WNU{?I5yKKth){db-A~sYkuihAF$+m|e)!0OuhY&~SseZU z)&wD^Kg7beo%zzWzf-pHKNWx=2!j1z5d8mG0RL6?e*hKKR%`Df-G2Z8002ovPDHLk FV1l&`Ymoo| literal 0 HcmV?d00001 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/LaunchGame.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/LaunchGame.png new file mode 100644 index 0000000000000000000000000000000000000000..ef6f636723984d346b83c0e929a60903a9f95919 GIT binary patch literal 5585 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 literal 0 HcmV?d00001 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/SpiralAbyss.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/SpiralAbyss.png new file mode 100644 index 0000000000000000000000000000000000000000..73f88076cc015e25570ed93c70738abaed4d43f3 GIT binary patch literal 5201 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 LNkvXXu0mjfs72~i literal 0 HcmV?d00001 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiAvatar.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiAvatar.png new file mode 100644 index 0000000000000000000000000000000000000000..2f6b6711532138c71c5b85e04d2760d8298030df GIT binary patch literal 9315 zcmV-pB%IrcP)dEXlSkTef8>Y9poTL-tHlCvh^#Odo05{_9LKooRozN&Bzu zH0@0PbS9l9lQ!+tPUEE0+G!g_PR6#ZIDSZqB}J47^Cj^m5_|x}b9=uF+}*p2#qM2T zK`9Bo83+qtu>$vg_q^^o=Mpv0Km!dl&_DwXG|)f;4K&a|-JnqeHRIVcF+9a+D;8_Y zXJdL;i;2&26p6ohAs(ln5;O>5!?P#G#_$}W+?cLuv5;Pfksj{WwL*`s5qqt5YwTGk zeT;NA@H!&`d+mBromSa7?`WibB}184Uc7K8PWLH(W(naouxw!VlujEXO^+!LY!G1N zU^o3M87=#F_aiaxYeFzlY!Sm6W+maCYW&$Uu*C;S&)bUD)+l>48_xo>vrCjpZ8?2q zlKuWK{`-ZguhM;lZ6So)z*@wx&S&UY>1$(j4xy5+2Sq8m@ecsK#gY(>Q z_wE`^Oia^DFTc)?6Y@uTi4jZ2FX^nyko`^M|j zFVa1PZ$dySG;MW$i5-4MejfvR7w8^AnGhw(@HR<4}- ziC`bt%vOrOpJvbbT(0zaj-MlcW=AI@!=cBXGCsfb`g!BCmS`)*`UYrVWQ-qI0u0T6 z`TEP|8wg~D^f@PkMcg4_0!0&7x!1SC(n<&MY5TH!-{&a2i-36k^9A z9JBXBrO(4*<1;6;wRh5DM$4&GqXT{_19nH z$K9Q6^z<)3M(K2h7M9l7BSBl~9Dh!yJtx5=TW9&~3m0b2Qx%AKosiR-pVjnYWDy3W z7a1_X^V4x!W&;mW3=EH%M%U&#e?LfIz;wu5MKndD)Y9HgK>~l*dSZn-yLvLfC=#Mu&>t3&?VcJ%d13u1?cs_E=lzs#jxD z;tNdGpJs0C$NU(gu7p51no6ny(gChzCCtTd(Cp-d-v ze2@WvG|84o5hSviG)=R6AXJAS#p3)dC03TGsU=F8(u7#NJ>y6S#B3171Te_mU2UWS zsF+j757NVjN9fgy*Eu;#_)t^2;~cYWj*%j~rpXy`uz&w>#giZzWHN-9&TZ}LqW;n9Z$KKPQ%M>gJHQD6z}>`SWbZ+)F7g$; zBRQV4ytqWY?L|`I5ou}W0WTE@LO@yoY@y`yA3r(reU-4dtAs#ei8!tlf}WeaVb}~% z1A+`YSU{$w)imCg=7TjRfqV^aXC{@TdSQ#X(C^>6Myo4JWuHM+AXw!DnGng%6m2Cp zIf3pj+&0t=u)*w+kBMvV((=+gZKXCnzatYOleOALa!doN za+O_k`SvU)MkRcJk)p*kOvfWzU7sfp)Fd<4SC@@A0;B^(aCc9iMOEO&EY?9f)Jg~d zQlhn~zKd`8`xoZkFCHgT)Xa>_W;S7l#t)RmBV;L@Oy?=m+{}#N0yl*71(P66Eyav1 zK@9vK-MxKf|2I4mNC}}jG`;W<_VfjEK~27w>_#>*+hKqa0Y(&DF91IjqO%^r3=iTO zgpkQM5u!*j!ts#PX8kbslGgFrB{J!@|`9F6g$w!=viy z={AnnH?0y7_fh=K@Xp#qi%Ap?*Pa8@Hw6%@I=AiLO3A^SEL8v;lrH_UTcxIEn4WFf`c-9^X0WpsC+ z^b;HFpu;yQ7(Q54N$Hp+4gg&aO8hLZxMNAmg~~uNfu%y1$^L^5dVX_)1*1-f?i4lONu2X}zw zyBYr2J=n@0W!Ga8CY8!jGL>girZ^KJVPcsuiv@Hr@2NhjL$)C*8OHL8XC**wB18`9 zAS4AQXRLpxV>}|UZjz5p@3`BwT?tVrgjR*xyH^roE0v{p-kM?IVCxMW8Q()YcMVW? zDH@w#E4RWu ztP6OpL$V=M)-$*rQ6Y6hkOKAu0$f5`IN3pKYi5|9QPR~raF-AvxSd5-I}rlFj}ZnE ztlUt5hM5x?9zOO6o%*E@GLh-53KJ`<^y<0q)0MX_@z;<7*C*B}*4@m>;6wyF?%ZDE zkFmWwI5C2PEFp3gC4@6L<#3s$n++nMXrizW6L^MrCdrA> z-W4lT8%Vt?f$>3m+wEF4%fx0$Lg=vg1CkJ!p{pzAAgYi-2BZieNFmVM-$TD}=5a;_ z=M~50#T9z#+pjRgt!S^zOcx0f7%ABO5%w1Dn_GH*CZp)a7fh)q+jRnoHEA+vy6en# z9ld{(I-fYXoq%jdz)ube@mprB|I~*+=!*=-_ZTT)YY239wbLhm^O=fd06>`E{Jm%C z$&*Kn_dp7nob`mfz*Wihw4)#y^vFk%fpk+@WuUghodztW0P&L>VhLgV{JjMwqWWeNhJkh|+Crx~acf}|v4yA7AlWKFkIr&X`~ zN)%xvR4ja;Pz5Uhjy|J}b`x=Uu>luxjGd!&#A*4y@6c>^_3{RI6@FavTg*un-f$Mp% z(YMn~m)}^geU;VA_3V|5%8jJ=Dy*Bj0A!a_<7-py@Rks|yO?Q_;{QPzmC>lQ#=lZ~ zv2$8VyB9Wr@^=GVY6mn+v@(FzVGoxRC4d5`ASVxaO9+o78H?K)5Ft7`O{UM^RyP7G zVQSJy>!7}Ve=D*wAzE6(6eOICO4;q)*z_i&)rPRD3o! z@Fs+$cbwhMh~tl|1+ku1YHu$R4dVXQ@BVbM1r>1v)@ue*@nnesC>7$o*vOkc@o;!F=UsM6zm5e0Jk$(34sLK)Y=;L_nJ55 zN3XqM5&Nn@*m_#}-jgT&1-LG~b=?SIH#Z{z$EqHYkBMSq{9e^GJWa}pP+sw@09jp_ zZ469U^B^>(8|ZCANQQ_~__|6_%4c3O$!8w?^S&J|JOfJLoB#YgQy-pQlL3$ctDZ8h zN#frNKfG{>F1>A*5IE&k2;lcZY6x}WS8CWH6C#~+xt1&)+&v5`XlfF|yBz?Qzzgn6 z;7}Wa?f8j)%XfKWjm^z62{Sg@!I!QxnF3cG|NV{sWRhZvtx^19#pvbKt@k+*rX3{8 zn{1FX%t(CX*g>|g(c$=g7?E$je%V5Xf&M5bs27Af0kEckif_AK4|(KO+E+ZeVOe2a z&8jZShtlG57IY;E;Yo;ap=nhtfmh1pu|&uU>MNd@S*Tg8RCI$BI3%|SQUH(=c!&g< zXesD~1R0RU?xwc3hB-m81P)-JufKPb#@IT=*uG)IrYPDAixj^(Wf8Sd6}txgr`AE8 z-~ln-+}6gEcm)u?)=TapCQ{XjMg{kvl6 zGbzI^oK1PJ4G2<9&n9{HlK>>Zw1QocVnhhrl5R2J*WbIvA6@_vFTc0S)fbX%U`P1L z)f7?#t%Xp9Rm|JO?!2m_>w7?#y^r}a_~GC+id#VyyAw=QNwjE;}; zoXRenJpr|W*ahMbh(n}3`bZ#6{nVK!c)kQ|2zVCApjuwM%M)ho%{zDo7L!&aLQIK%RJBE~l>P%Ko~dgy23buNrm?Ux%$Z5!^3lZlsDo4iaE?*@*yY zfNZBxDFrSl;F{vPm$}z+$zq_wJ)LBOj&wUapk6=>JfK?Ou^_%70$2-+XEWX~1PCVyE|D42Qgdcr~m{kJZ@k_sUl0O5Gb~#1Q#yO2n3SF0yg&=J)(L{rjf(Ici#W{IBSR2A? z#j`o8)=yF3`oy{sXaXKTb)08NS8F2#i35ioC`;YMq?-R&c?>Ab+DS(=z`CbQJuCaGl`iR>=t;`Ui|hx7AUEz~5wcgFQw8x6=1(82(q z7PFQ#`&xkb1o9>9A#m6NPk-dJVH4Pal~AY%8Cdfe8ET`RZht9yl^{!qja0@WA!InY zoQZW)b@_2Q`SnyzQYreCS3KQ-86@1y1d9Ru!(abB_biSuX)!!DO0gaFZ#n{i4FCG& zuUUdrkP43+J48nwJ8W&TApwhEG8sSwcoc|M`fXGKq$?)LNLf=ZOW+~LYH#zJ%;k)e z4=52L$f93J2+Sk|aRlUrD%4?|`p^eyU}%8qiEsYP^9C7Ih#(*bqp+4SHrno+2r64T zSPjd{>qAZ+#=M*<<-_F!0&9RE7yWvnnEcYjCB?EW4l%(DJ3QcZ$Sz=zfX$F7MJS;b ze&Z9rQc*qFF*|Kdsq;$)(F>e!>)=xKD-$B?LI}^|93L(xpyV5=6#X_w{jJ!+EgNUE z>&SyKKFj3nC;&!YHEDAykZlI!MW~Vi$VfNa&oVd$4m$)yJ35qh08r^S#jo4sUYz5{ zV(kbXl40=OG~uMHGTOS+)_7Z>kYO#Sq~(n1+A_M zsdSYf2cKl}Isw}`we|E+lS4BzucBWSIJunG!kju1!mG`(j9U6VLUjmHj6BMEs0~Xc zS5)0i#1gnbs|y)~dJtPhIKoHK??x(9;s0?`7pC;{>v96hBj?rTSe6hFjcu`5S@Q~2 zbV%v$3v;zsZrNce-0@M#wVp85g_AK^Nj*5htLV2^p>c?lL0OB-38+g5pKXrOlMx0K zL}m*NDIZd!OENGKP7V@?KM43SCIMMOwAnh;xv2*ycoqH162kB@N?S_`I7tYL%SoY0 z@`=FQ&PqkU&~qW4lHS5aBa&vk_PU7iXkSrR!y`aCTu=*NiB*%#oj&b{xtRsyxT8c` z%u*0uZc3^GUu}-riYKHkHm~Dlgr$|#h?mP*DEQX5K9s$CNuNrw4#a4*vy;!Hh)Zv2 z1g~T_bmG0>q=c-3dVLoDF3UDVwD`9`J@_Sq3hZuYNO&|-Jj+QX%U(vdeKSrzQI+*q zYtb*H2GmJ=Nu4;|P`PX_NW)ULANqV0{x0!k+oEKPL_*ZNtCw$VQZ2mO96R@$vJ~fp ztrEiGaw-=0mi;c(6Xl{`uQtbiihiL=V1U|m`;ZXJ3#N2H zF>)>2O9HBGjs=t7R1g(k~1pis8C(1>?Zf%YQs_i!gbpojYb<#gz zx?XR-c9Cku!W~mxcqPBsaa%GdAt7po-!{j*=vN|y=CR7DlU~&fQYJ)1Dh1oFHpe4- z%z6dkZPWre^0|9>r}Fn^XXXw2AH$|fudi}#9B*nj(ZE^N(gix z082?UDapQQ%hlG&3$n^EsR&yak4qvOR6nj;B`)OfZ3Ce^( z(XTk(&Njz#H~L!ChHO8e;(Paq8X+JV;!+O8;I2*z4(^7jz35k$8;p6loGSgKoS;ky z6#aUgQ;#;skPu=+6Bw7(u7Jww0)wpDJS09b6S%q%@MY_TAlV6wo zAubNKtIaVmJZvse+q=T3;>z1rBE9y?kCa*tB7af<`)33RIToSP=Gd(#rDfNgDqT+g znTYE=@9GjSAXIOA1j`6NZPY7N1=sr zCDb4x%KuNf=r^b~$Naj?xU@?NKOV=c=gcm4at;Gh>F1^^ucpe<0jf)Gs2VhK9tAsT zsT-ZF7>} zPB7>h9=A+LtM^o?)RWkv=$Os(3h0g?iSCaSpG+FNR>E%5_+#Z#qvK8Rg&T(9rvWWQ~W z>u5$8IP~BEy?JqpZ^;a)08$93NCzi`BlQcg+0hm2rS9H--mB6{9mvs21gE@IMlCKU z;ATpvqO+Vbw-P1>V4?IK<9DR}ohR3L_ z!`WW3bfhDPU2_6-IRXDu0Y$%>&KDM{ZF3wncqFl@KnwF5EaqP@dQn%?zyqqne$#_Q zQxkGA_Esc-9rmJM`>r|jRqUGM2LFF~vFNvA$#hG!zR}7`=r} z;jsrSh9M%9%eQA~Woe#94;*$SiWbnWId1U%*UN2=i-x6Io8x)|De1^BsC74+aC3ds z1ti0seTUg^G;jIh{4CAhyl!mI5te&Fr+|2_ned z-M3Ony1R6Tk{fH3%?7(EsvTJL$*})V&OP)4NSII^+|B-hAwx}YGTgexpRHu*s%mGQ zYIeWlWW9j30qk>?NvZX^vZEf-p{>1>x_6jf(4Dy{P6ntp z>=Ym{Ff!)&eXo05&8|6asA4*}m-HdHva&c&Yb(oTpY^esvj5OgE<)=C)pC3%IQ4w2 z6+8OO5c}%N5^b!laASLGecdp+;i~sBHR}XfE${5>wtQxBIZ1uj95+ z@#0Jb?%Xp@I|qjik%{N=2aa$Zn%+uM(14UsZK7KCy@1_K5WlnAT$zQ0MD8RufR#Nk zco&s$`SK0pcxRv0#z<7TYmOWI8&G+_U!(mlA>$w{Bdi z*;TXygX>pH2zL{M#pPdVfQ5mo7m8`{+>_P|{8;?%O7WIR*d*D?!o0-|$L||Ie54{7 zfHyAw*f<_xWa#d)W_?f1Eg8qUUN}zyz&9a6kwTmbMMlidE;yb8eRyX&&e!;H6QD2A zgiBc12-(5~12KA;j;)8G3GwfT5ZFplY{D88+B?k{4ZJM=yBHA$nE|Q3j;L zMTrm(9~!oN4%^|zEwijwb*(R&X+Lf77YgTKa1 z!WPcalApaWKSzVRNBMCNBg8V39+jkoNashbsCkZF64BD^Efi-h@maim0Wksm%~**H z^G6dm6y>Pr(D(uVS~X<-(#x+K24z=gD;+sJYWW;wkPOO6zYR(&!8ajF`*@ybhiCBm z(&Y(y>iEND=fRG^O_-f58buhe)LMdvUa=onJ9Ecia6xs%x_fEv{hLZ+xZZFYSO6h; zL}4+joj&t|pPlz!digbrba>{MAG3T8WAfFDW>T<5+7~GxRApAPIrs|u5od6G@#1@q zgaCGr?dLZQq!1}$7-%#eo4xfDI`r66{Jj{{qfA3S-YP zQY_suZH45Fnq?ojP<(0SD<3|>+4PM1ZpLvp^(sm7y3~#<`R;}wyRlIOv>I)PgswTvzPK=G^ z^}<^$NW~*Br%xZFkA3t*)IbsCb}jZXFHVHHxkYX;LK?tRv%Bw)AKgbE{>6uk*9cF4 zmyuz5c3HX_edUD<)4xjrqoy3#=T44(o~?dABXCq>Ju0{|(`{@O{> zYQA!?s5G!*u;hW22N4fZ>F!yaR0BqadReStlyBmW<{wi`8dx@T7k`Fc_@fuznEhL- z6KWo|XCEDlHMJJbv7c)AMo9bm^rz3#0cL0hNenkJTpUy}D>G%YbGrtXEWKtesO3%| zx^kYaW_~t^1uQoNHe4TnYWPbbP5YdDO?V#1k3U5F_YE5Sb!Om@p0{y8lG-V)rcxcFM1$fT~mfdXj*RSfx5!JO-%@|~TiVffj zY57F)wH6n720_lwPdqvHs2wSO5F8n(I{vS0BEEeQYbykmo{aHiZOh4|HQvM7Z$=}vWVQvq^@sFDr<}0mwIGznN z5=2ph5U;5Qp@DL2n=c?lr12l;Bdd*pZJ>b$8fc(_1{!Fffd(3Apn;z&{6FS5Ti|Ut RjvxR4002ovPDHLkV1iT>jw%2E literal 0 HcmV?d00001 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiMonster.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiMonster.png new file mode 100644 index 0000000000000000000000000000000000000000..e07218e4c09b94231f8ff7febf501f151a875f90 GIT binary patch literal 10785 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 literal 0 HcmV?d00001 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiWeapon.png b/src/Snap.Hutao/Snap.Hutao/Resource/Navigation/WikiWeapon.png new file mode 100644 index 0000000000000000000000000000000000000000..f2f8e43abf26a9ac071ece0a0c5569441fde0358 GIT binary patch literal 8795 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信息 /// 取消令牌 /// 角色列表 - public List UpdateDbAvatarInfos(string uid, IEnumerable webInfos, CancellationToken token) + public List UpdateDbAvatarInfosByShowcase(string uid, IEnumerable webInfos, CancellationToken token) { token.ThrowIfCancellationRequested(); - List dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid); + List dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid); EnsureItemsAvatarIdDistinct(ref dbInfos, uid); using (IServiceScope scope = serviceProvider.CreateScope()) @@ -57,7 +58,7 @@ internal sealed partial class AvatarInfoDbBulkOperation } token.ThrowIfCancellationRequested(); - ModelAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == webInfo.AvatarId); + EntityAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == webInfo.AvatarId); AddOrUpdateAvatarInfo(entity, uid, appDbContext, webInfo); } @@ -76,7 +77,7 @@ internal sealed partial class AvatarInfoDbBulkOperation { token.ThrowIfCancellationRequested(); string uid = userAndUid.Uid.Value; - List dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid); + List dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid); EnsureItemsAvatarIdDistinct(ref dbInfos, uid); using (IServiceScope scope = serviceProvider.CreateScope()) @@ -113,7 +114,7 @@ internal sealed partial class AvatarInfoDbBulkOperation } token.ThrowIfCancellationRequested(); - ModelAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == character.Id); + EntityAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == character.Id); AddOrUpdateAvatarInfo(entity, character.Id, uid, appDbContext, transformer, character); } } @@ -133,7 +134,7 @@ internal sealed partial class AvatarInfoDbBulkOperation { token.ThrowIfCancellationRequested(); string uid = userAndUid.Uid.Value; - List dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid); + List dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid); EnsureItemsAvatarIdDistinct(ref dbInfos, uid); using (IServiceScope scope = serviceProvider.CreateScope()) @@ -167,7 +168,7 @@ internal sealed partial class AvatarInfoDbBulkOperation } token.ThrowIfCancellationRequested(); - ModelAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == avatar.Id); + EntityAvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == avatar.Id); AddOrUpdateAvatarInfo(entity, avatar.Id, uid, appDbContext, transformer, detailAvatarResponse.Data); } } @@ -176,13 +177,31 @@ internal sealed partial class AvatarInfoDbBulkOperation } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static void AddOrUpdateAvatarInfo(ModelAvatarInfo? entity, in AvatarId avatarId, string uid, AppDbContext appDbContext, IAvatarInfoTransformer transformer, TSource source) + private static void AddOrUpdateAvatarInfo(EntityAvatarInfo? entity, string uid, AppDbContext appDbContext, EnkaAvatarInfo webInfo) + { + if (entity is null) + { + entity = EntityAvatarInfo.From(uid, webInfo); + entity.ShowcaseRefreshTime = DateTimeOffset.Now; + appDbContext.AvatarInfos.AddAndSave(entity); + } + else + { + entity.Info = webInfo; + entity.ShowcaseRefreshTime = DateTimeOffset.Now; + appDbContext.AvatarInfos.UpdateAndSave(entity); + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void AddOrUpdateAvatarInfo(EntityAvatarInfo? entity, in AvatarId avatarId, string uid, AppDbContext appDbContext, CalculateAvatarDetailAvatarInfoTransformer transformer, AvatarDetail source) { if (entity is null) { EnkaAvatarInfo avatarInfo = new() { AvatarId = avatarId }; transformer.Transform(ref avatarInfo, source); - entity = ModelAvatarInfo.From(uid, avatarInfo); + entity = EntityAvatarInfo.From(uid, avatarInfo); + entity.CalculatorRefreshTime = DateTimeOffset.Now; appDbContext.AvatarInfos.AddAndSave(entity); } else @@ -190,26 +209,33 @@ internal sealed partial class AvatarInfoDbBulkOperation EnkaAvatarInfo avatarInfo = entity.Info; transformer.Transform(ref avatarInfo, source); entity.Info = avatarInfo; + entity.CalculatorRefreshTime = DateTimeOffset.Now; appDbContext.AvatarInfos.UpdateAndSave(entity); } } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static void AddOrUpdateAvatarInfo(ModelAvatarInfo? entity, string uid, AppDbContext appDbContext, EnkaAvatarInfo webInfo) + private static void AddOrUpdateAvatarInfo(EntityAvatarInfo? entity, in AvatarId avatarId, string uid, AppDbContext appDbContext, GameRecordCharacterAvatarInfoTransformer transformer, Character source) { if (entity is null) { - entity = ModelAvatarInfo.From(uid, webInfo); + EnkaAvatarInfo avatarInfo = new() { AvatarId = avatarId }; + transformer.Transform(ref avatarInfo, source); + entity = EntityAvatarInfo.From(uid, avatarInfo); + entity.GameRecordRefreshTime = DateTimeOffset.Now; appDbContext.AvatarInfos.AddAndSave(entity); } else { - entity.Info = webInfo; + EnkaAvatarInfo avatarInfo = entity.Info; + transformer.Transform(ref avatarInfo, source); + entity.Info = avatarInfo; + entity.GameRecordRefreshTime = DateTimeOffset.Now; appDbContext.AvatarInfos.UpdateAndSave(entity); } } - private void EnsureItemsAvatarIdDistinct(ref List dbInfos, string uid) + private void EnsureItemsAvatarIdDistinct(ref List dbInfos, string uid) { int distinctCount = dbInfos.Select(info => info.Info.AvatarId).ToHashSet().Count; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs index ada9aadb..0ab000cb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs @@ -56,7 +56,7 @@ internal sealed partial class AvatarInfoService : IAvatarInfoService return new(RefreshResult.ShowcaseNotOpen, default); } - List list = avatarInfoDbBulkOperation.UpdateDbAvatarInfos(userAndUid.Uid.Value, resp.AvatarInfoList, token); + List list = avatarInfoDbBulkOperation.UpdateDbAvatarInfosByShowcase(userAndUid.Uid.Value, resp.AvatarInfoList, token); Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false); return new(RefreshResult.Ok, summary); } diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs index 42dfa146..341f375e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs @@ -3,12 +3,10 @@ using Snap.Hutao.Core.ExceptionService; using Snap.Hutao.Model.Intrinsic; -using Snap.Hutao.Model.Intrinsic.Format; using Snap.Hutao.Model.Metadata.Converter; using Snap.Hutao.Model.Metadata.Reliquary; using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.AvatarProperty; -using Snap.Hutao.Web.Enka.Model; using System.Runtime.InteropServices; using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary; using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs index 610bd18f..3a689e73 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs @@ -2,15 +2,8 @@ // Licensed under the MIT license. using Snap.Hutao.Model.Intrinsic; -using Snap.Hutao.Model.Intrinsic.Format; using Snap.Hutao.Model.Metadata.Converter; -using Snap.Hutao.Model.Metadata.Reliquary; -using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.AvatarProperty; -using Snap.Hutao.Web.Enka.Model; -using System.Runtime.InteropServices; -using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary; -using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; namespace Snap.Hutao.Service.AvatarInfo.Factory; diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj index ceecec06..90df6056 100644 --- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj +++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj @@ -102,6 +102,18 @@ + + + + + + + + + + + + @@ -229,6 +241,18 @@ + + + + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml index 7df671df..f9b745d6 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextControl.xaml @@ -2,14 +2,19 @@ x:Class="Snap.Hutao.View.Control.BottomTextControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:cw="using:CommunityToolkit.WinUI" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> - + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs index 0a027c33..86674acf 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Control/BottomTextSmallControl.xaml.cs @@ -9,7 +9,7 @@ namespace Snap.Hutao.View.Control; [ContentProperty(Name = nameof(TopContent))] [DependencyProperty("Text", typeof(string), "")] -[DependencyProperty("TopContent", typeof(UIElement), default!)] +[DependencyProperty("TopContent", typeof(FrameworkElement), default!)] internal sealed partial class BottomTextSmallControl : UserControl { public BottomTextSmallControl() diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs index 419e8043..48fadd3f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Converter/UInt32ToGradientColorConverter.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Xaml; using Snap.Hutao.Control; -using Snap.Hutao.Control.Theme; using Snap.Hutao.Win32; using System.Runtime.CompilerServices; using Windows.UI; diff --git a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml index 31ba8934..d897540f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/MainView.xaml @@ -11,6 +11,7 @@ mc:Ignorable="d"> 0,44,0,0 + 24 + PaneDisplayMode="Left" + UseLayoutRounding="False"> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Announcement.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/LaunchGame.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/GachaLog.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Achievement.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/DailyNote.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/AvatarProperty.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/SpiralAbyss.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Cultivation.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Database.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiAvatar.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiWeapon.png}"/> + Icon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiMonster.png}"/> - + - + + + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml index a7b9acd4..61c874ae 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml @@ -182,21 +182,6 @@ HeaderIcon="{shcm:FontIcon Glyph=}" IsClickEnabled="True"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - + + + + + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs index 105114a1..298fa8e8 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs @@ -7,6 +7,7 @@ using Snap.Hutao.Model.Calculable; using Snap.Hutao.Model.Entity.Primitive; using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Metadata; +using Snap.Hutao.Model.Metadata.Item; using Snap.Hutao.Model.Metadata.Weapon; using Snap.Hutao.Model.Primitive; using Snap.Hutao.Service.Cultivation; @@ -83,6 +84,7 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel { levelWeaponCurveMap = await metadataService.GetLevelToWeaponCurveMapAsync().ConfigureAwait(false); promotes = await metadataService.GetWeaponPromotesAsync().ConfigureAwait(false); + Dictionary idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false); List weapons = await metadataService.GetWeaponsAsync().ConfigureAwait(false); List sorted = weapons @@ -91,7 +93,7 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel .ThenByDescending(weapon => weapon.Id.Value) .ToList(); - await CombineWithWeaponCollocationsAsync(sorted).ConfigureAwait(false); + await CombineComplexDataAsync(sorted, idMaterialMap).ConfigureAwait(false); await taskContext.SwitchToMainThreadAsync(); @@ -100,12 +102,17 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel } } - private async ValueTask CombineWithWeaponCollocationsAsync(List weapons) + private async ValueTask CombineComplexDataAsync(List weapons, Dictionary idMaterialMap) { if (await hutaoCache.InitializeForWikiWeaponViewModelAsync().ConfigureAwait(false)) { ArgumentNullException.ThrowIfNull(hutaoCache.WeaponCollocations); - weapons.ForEach(w => w.Collocation = hutaoCache.WeaponCollocations.GetValueOrDefault(w.Id)); + + foreach (Weapon weapon in weapons) + { + weapon.Collocation = hutaoCache.WeaponCollocations.GetValueOrDefault(weapon.Id); + weapon.CultivationItemsView ??= weapon.CultivationItems.SelectList(i => idMaterialMap.GetValueOrDefault(i, Material.Default)); + } } } diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs index da5d4ad6..cb83751e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/BbsSignReward/SignInClient.cs @@ -3,7 +3,6 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; using Snap.Hutao.ViewModel.User; -using Snap.Hutao.Web.Geetest; using Snap.Hutao.Web.Hoyolab.DynamicSecret; using Snap.Hutao.Web.Hutao.Geetest; using Snap.Hutao.Web.Response; From 8ca6251d33b2d12983443f527cbd8cfdd3fb0ec1 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sun, 27 Aug 2023 17:02:23 +0800 Subject: [PATCH 41/43] add refresh time for avatar property --- src/Snap.Hutao/Snap.Hutao/App.xaml | 2 +- .../Extension/DateTimeOffsetExtension.cs | 2 + .../Snap.Hutao/Model/Entity/DailyNoteEntry.cs | 10 ++- .../Resource/Localization/SH.Designer.cs | 63 +++++++++++++++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 21 +++++++ .../AvatarInfo/AvatarInfoDbBulkOperation.cs | 12 ++-- .../Service/AvatarInfo/AvatarInfoDbService.cs | 17 +---- .../Service/AvatarInfo/AvatarInfoService.cs | 11 ++-- .../AvatarInfo/Factory/ISummaryFactory.cs | 2 +- .../Factory/SummaryAvatarFactory.cs | 25 +++++++- .../AvatarInfo/Factory/SummaryFactory.cs | 5 +- .../AvatarInfo/IAvatarInfoDbService.cs | 7 +-- .../View/Page/AvatarPropertyPage.xaml | 28 ++++++++- .../ViewModel/AvatarProperty/AvatarView.cs | 6 ++ 14 files changed, 169 insertions(+), 42 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml index dd3332bd..ebf0792b 100644 --- a/src/Snap.Hutao/Snap.Hutao/App.xaml +++ b/src/Snap.Hutao/Snap.Hutao/App.xaml @@ -48,7 +48,7 @@ 288 212 304 - + 320 180 64 100 diff --git a/src/Snap.Hutao/Snap.Hutao/Extension/DateTimeOffsetExtension.cs b/src/Snap.Hutao/Snap.Hutao/Extension/DateTimeOffsetExtension.cs index 7edab75f..867ef104 100644 --- a/src/Snap.Hutao/Snap.Hutao/Extension/DateTimeOffsetExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Extension/DateTimeOffsetExtension.cs @@ -9,6 +9,8 @@ namespace Snap.Hutao.Extension; [HighQuality] internal static class DateTimeOffsetExtension { + public static readonly DateTimeOffset DatebaseDefaultTime = new(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)); + ///

/// 从Unix时间戳转换 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs index c2d5f859..62e69ed8 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs @@ -58,7 +58,15 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom SH.ModelEntityDailyNoteRefreshTimeFormat.Format(RefreshTime); } + public string RefreshTimeFormatted + { + get + { + return RefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime + ? SH.ModelEntityDailyNoteNotRefreshed + : SH.ModelEntityDailyNoteRefreshTimeFormat.Format(RefreshTime); + } + } /// /// 树脂提醒阈值 diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 70b3f9bb..e4619b1e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -420,6 +420,15 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 尚未刷新 的本地化字符串。 + /// + internal static string ModelEntityDailyNoteNotRefreshed { + get { + return ResourceManager.GetString("ModelEntityDailyNoteNotRefreshed", resourceCulture); + } + } + /// /// 查找类似 刷新于 {0:yyyy/MM/dd HH:mm:ss} 的本地化字符串。 /// @@ -1122,6 +1131,60 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 养成计算：尚未刷新 的本地化字符串。 + /// + internal static string ServiceAvatarInfoSummaryCalculatorNotRefreshed { + get { + return ResourceManager.GetString("ServiceAvatarInfoSummaryCalculatorNotRefreshed", resourceCulture); + } + } + + /// + /// 查找类似 养成计算：{0:MM-dd HH:mm} 的本地化字符串。 + /// + internal static string ServiceAvatarInfoSummaryCalculatorRefreshTimeFormat { + get { + return ResourceManager.GetString("ServiceAvatarInfoSummaryCalculatorRefreshTimeFormat", resourceCulture); + } + } + + /// + /// 查找类似 我的角色：尚未刷新 的本地化字符串。 + /// + internal static string ServiceAvatarInfoSummaryGameRecordNotRefreshed { + get { + return ResourceManager.GetString("ServiceAvatarInfoSummaryGameRecordNotRefreshed", resourceCulture); + } + } + + /// + /// 查找类似 我的角色：{0:MM-dd HH:mm} 的本地化字符串。 + /// + internal static string ServiceAvatarInfoSummaryGameRecordRefreshTimeFormat { + get { + return ResourceManager.GetString("ServiceAvatarInfoSummaryGameRecordRefreshTimeFormat", resourceCulture); + } + } + + /// + /// 查找类似 角色橱窗：尚未刷新 的本地化字符串。 + /// + internal static string ServiceAvatarInfoSummaryShowcaseNotRefreshed { + get { + return ResourceManager.GetString("ServiceAvatarInfoSummaryShowcaseNotRefreshed", resourceCulture); + } + } + + /// + /// 查找类似 角色橱窗：{0:MM-dd HH:mm} 的本地化字符串。 + /// + internal static string ServiceAvatarInfoSummaryShowcaseRefreshTimeFormat { + get { + return ResourceManager.GetString("ServiceAvatarInfoSummaryShowcaseRefreshTimeFormat", resourceCulture); + } + } + /// /// 查找类似 保存养成计划状态失败 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 9cd1ebf6..037f796e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -237,6 +237,9 @@ 网络异常 + + 尚未刷新 + 刷新于 {0:yyyy/MM/dd HH:mm:ss} @@ -527,6 +530,24 @@ 风元素抗性 Need EXACT same string in game + + 养成计算：尚未刷新 + + + 养成计算：{0:MM-dd HH:mm} + + + 我的角色：尚未刷新 + + + 我的角色：{0:MM-dd HH:mm} + + + 角色橱窗：尚未刷新 + + + 角色橱窗：{0:MM-dd HH:mm} + 保存养成计划状态失败 diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs index 5dee9171..3a99e0ac 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs @@ -40,7 +40,7 @@ internal sealed partial class AvatarInfoDbBulkOperation /// Enka信息 /// 取消令牌 /// 角色列表 - public List UpdateDbAvatarInfosByShowcase(string uid, IEnumerable webInfos, CancellationToken token) + public List UpdateDbAvatarInfosByShowcase(string uid, IEnumerable webInfos, CancellationToken token) { token.ThrowIfCancellationRequested(); List dbInfos = avatarInfoDbService.GetAvatarInfoListByUid(uid); @@ -63,7 +63,7 @@ internal sealed partial class AvatarInfoDbBulkOperation } token.ThrowIfCancellationRequested(); - return avatarInfoDbService.GetAvatarInfoInfoListByUid(uid); + return avatarInfoDbService.GetAvatarInfoListByUid(uid); } } @@ -73,7 +73,7 @@ internal sealed partial class AvatarInfoDbBulkOperation /// 用户与角色 /// 取消令牌 /// 角色列表 - public async ValueTask> UpdateDbAvatarInfosByGameRecordCharacterAsync(UserAndUid userAndUid, CancellationToken token) + public async ValueTask> UpdateDbAvatarInfosByGameRecordCharacterAsync(UserAndUid userAndUid, CancellationToken token) { token.ThrowIfCancellationRequested(); string uid = userAndUid.Uid.Value; @@ -121,7 +121,7 @@ internal sealed partial class AvatarInfoDbBulkOperation } } - return avatarInfoDbService.GetAvatarInfoInfoListByUid(uid); + return avatarInfoDbService.GetAvatarInfoListByUid(uid); } /// @@ -130,7 +130,7 @@ internal sealed partial class AvatarInfoDbBulkOperation /// 用户与角色 /// 取消令牌 /// 角色列表 - public async ValueTask> UpdateDbAvatarInfosByCalculateAvatarDetailAsync(UserAndUid userAndUid, CancellationToken token) + public async ValueTask> UpdateDbAvatarInfosByCalculateAvatarDetailAsync(UserAndUid userAndUid, CancellationToken token) { token.ThrowIfCancellationRequested(); string uid = userAndUid.Uid.Value; @@ -173,7 +173,7 @@ internal sealed partial class AvatarInfoDbBulkOperation } } - return avatarInfoDbService.GetAvatarInfoInfoListByUid(uid); + return avatarInfoDbService.GetAvatarInfoListByUid(uid); } [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs index 59455ba6..1ae7fb4c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbService.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore; using Snap.Hutao.Core.Database; using Snap.Hutao.Model.Entity.Database; using EnkaAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; -using ModelAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo; +using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo; namespace Snap.Hutao.Service.AvatarInfo; @@ -15,7 +15,7 @@ internal sealed partial class AvatarInfoDbService : IAvatarInfoDbService { private readonly IServiceProvider serviceProvider; - public List GetAvatarInfoListByUid(string uid) + public List GetAvatarInfoListByUid(string uid) { using (IServiceScope scope = serviceProvider.CreateScope()) { @@ -24,19 +24,6 @@ internal sealed partial class AvatarInfoDbService : IAvatarInfoDbService } } - public List GetAvatarInfoInfoListByUid(string uid) - { - using (IServiceScope scope = serviceProvider.CreateScope()) - { - AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService(); - return appDbContext.AvatarInfos - .AsNoTracking() - .Where(i => i.Uid == uid) - .Select(i => i.Info) - .ToList(); - } - } - public void DeleteAvatarInfoRangeByUid(string uid) { using (IServiceScope scope = serviceProvider.CreateScope()) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs index 0ab000cb..ee1200d0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs @@ -10,6 +10,7 @@ using Snap.Hutao.Web.Enka; using Snap.Hutao.Web.Enka.Model; using Snap.Hutao.Web.Hoyolab; using EnkaAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; +using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo; namespace Snap.Hutao.Service.AvatarInfo; @@ -56,28 +57,28 @@ internal sealed partial class AvatarInfoService : IAvatarInfoService return new(RefreshResult.ShowcaseNotOpen, default); } - List list = avatarInfoDbBulkOperation.UpdateDbAvatarInfosByShowcase(userAndUid.Uid.Value, resp.AvatarInfoList, token); + List list = avatarInfoDbBulkOperation.UpdateDbAvatarInfosByShowcase(userAndUid.Uid.Value, resp.AvatarInfoList, token); Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false); return new(RefreshResult.Ok, summary); } case RefreshOption.RequestFromHoyolabGameRecord: { - List list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByGameRecordCharacterAsync(userAndUid, token).ConfigureAwait(false); + List list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByGameRecordCharacterAsync(userAndUid, token).ConfigureAwait(false); Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false); return new(RefreshResult.Ok, summary); } case RefreshOption.RequestFromHoyolabCalculate: { - List list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByCalculateAvatarDetailAsync(userAndUid, token).ConfigureAwait(false); + List list = await avatarInfoDbBulkOperation.UpdateDbAvatarInfosByCalculateAvatarDetailAsync(userAndUid, token).ConfigureAwait(false); Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false); return new(RefreshResult.Ok, summary); } default: { - List list = avatarInfoDbService.GetAvatarInfoInfoListByUid(userAndUid.Uid.Value); + List list = avatarInfoDbService.GetAvatarInfoListByUid(userAndUid.Uid.Value); Summary summary = await GetSummaryCoreAsync(list, token).ConfigureAwait(false); token.ThrowIfCancellationRequested(); return new(RefreshResult.Ok, summary.Avatars.Count == 0 ? null : summary); @@ -96,7 +97,7 @@ internal sealed partial class AvatarInfoService : IAvatarInfoService ?? await enkaClient.GetDataAsync(uid, token).ConfigureAwait(false); } - private async ValueTask GetSummaryCoreAsync(IEnumerable avatarInfos, CancellationToken token) + private async ValueTask GetSummaryCoreAsync(IEnumerable avatarInfos, CancellationToken token) { using (ValueStopwatch.MeasureExecution(logger)) { diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ISummaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ISummaryFactory.cs index 8a3fb260..222ce266 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ISummaryFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ISummaryFactory.cs @@ -17,5 +17,5 @@ internal interface ISummaryFactory /// 角色列表 /// 取消令牌 /// 简述对象 - ValueTask CreateAsync(IEnumerable avatarInfos, CancellationToken token); + ValueTask CreateAsync(IEnumerable avatarInfos, CancellationToken token); } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarFactory.cs index a4d82b30..ba2b4b49 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarFactory.cs @@ -6,6 +6,7 @@ using Snap.Hutao.Model.Metadata.Converter; using Snap.Hutao.Model.Primitive; using Snap.Hutao.ViewModel.AvatarProperty; using Snap.Hutao.Web.Enka.Model; +using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo; using MetadataAvatar = Snap.Hutao.Model.Metadata.Avatar.Avatar; using MetadataWeapon = Snap.Hutao.Model.Metadata.Weapon.Weapon; using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; @@ -21,7 +22,12 @@ namespace Snap.Hutao.Service.AvatarInfo.Factory; [HighQuality] internal sealed class SummaryAvatarFactory { + private static readonly DateTimeOffset DefaultRefreshTime = new(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)); + private readonly ModelAvatarInfo avatarInfo; + private readonly DateTimeOffset showcaseRefreshTime; + private readonly DateTimeOffset gameRecordRefreshTime; + private readonly DateTimeOffset calculatorRefreshTime; private readonly SummaryMetadataContext metadataContext; /// @@ -29,10 +35,14 @@ internal sealed class SummaryAvatarFactory /// /// 元数据上下文 /// 角色信息 - public SummaryAvatarFactory(SummaryMetadataContext metadataContext, ModelAvatarInfo avatarInfo) + public SummaryAvatarFactory(SummaryMetadataContext metadataContext, EntityAvatarInfo avatarInfo) { this.metadataContext = metadataContext; - this.avatarInfo = avatarInfo; + this.avatarInfo = avatarInfo.Info; + + showcaseRefreshTime = avatarInfo.ShowcaseRefreshTime; + gameRecordRefreshTime = avatarInfo.GameRecordRefreshTime; + calculatorRefreshTime = avatarInfo.CalculatorRefreshTime; } /// @@ -67,6 +77,17 @@ internal sealed class SummaryAvatarFactory Weapon = reliquaryAndWeapon.Weapon, Reliquaries = reliquaryAndWeapon.Reliquaries, Score = $"{reliquaryAndWeapon.Reliquaries.Sum(r => r.Score):F2}", + + // times + ShowcaseRefreshTimeFormat = showcaseRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime + ? SH.ServiceAvatarInfoSummaryShowcaseNotRefreshed + : SH.ServiceAvatarInfoSummaryShowcaseRefreshTimeFormat.Format(showcaseRefreshTime), + GameRecordRefreshTimeFormat = gameRecordRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime + ? SH.ServiceAvatarInfoSummaryGameRecordNotRefreshed + : SH.ServiceAvatarInfoSummaryGameRecordRefreshTimeFormat.Format(gameRecordRefreshTime), + CalculatorRefreshTimeFormat = calculatorRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime + ? SH.ServiceAvatarInfoSummaryCalculatorNotRefreshed + : SH.ServiceAvatarInfoSummaryCalculatorRefreshTimeFormat.Format(calculatorRefreshTime), }; ApplyCostumeIconOrDefault(ref propertyAvatar, avatar); diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs index ff899c70..2937b9d0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs @@ -4,7 +4,6 @@ using Snap.Hutao.Model.Metadata; using Snap.Hutao.Service.Metadata; using Snap.Hutao.ViewModel.AvatarProperty; -using ModelAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; namespace Snap.Hutao.Service.AvatarInfo.Factory; @@ -19,7 +18,7 @@ internal sealed partial class SummaryFactory : ISummaryFactory private readonly IMetadataService metadataService; /// - public async ValueTask CreateAsync(IEnumerable avatarInfos, CancellationToken token) + public async ValueTask CreateAsync(IEnumerable avatarInfos, CancellationToken token) { SummaryMetadataContext metadataContext = new() { @@ -35,7 +34,7 @@ internal sealed partial class SummaryFactory : ISummaryFactory return new() { Avatars = avatarInfos - .Where(a => !AvatarIds.IsPlayer(a.AvatarId)) + .Where(a => !AvatarIds.IsPlayer(a.Info.AvatarId)) .Select(a => new SummaryAvatarFactory(metadataContext, a).Create()) .OrderByDescending(a => a.LevelNumber) .ThenBy(a => a.Name) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/IAvatarInfoDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/IAvatarInfoDbService.cs index 3fa3f867..ef7f9383 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/IAvatarInfoDbService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/IAvatarInfoDbService.cs @@ -1,8 +1,7 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using EnkaAvatarInfo = Snap.Hutao.Web.Enka.Model.AvatarInfo; -using ModelAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo; +using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo; namespace Snap.Hutao.Service.AvatarInfo; @@ -10,7 +9,5 @@ internal interface IAvatarInfoDbService { void DeleteAvatarInfoRangeByUid(string uid); - List GetAvatarInfoInfoListByUid(string uid); - - List GetAvatarInfoListByUid(string uid); + List GetAvatarInfoListByUid(string uid); } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml index 019cf69d..de7a022f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml @@ -227,7 +227,7 @@ Grid.Row="1" DisplayMode="Inline" IsPaneOpen="True" - OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength}" + OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength3}" PaneBackground="Transparent"> @@ -236,7 +236,8 @@ - + + - + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs index 5ddffe75..6a4a2a55 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarView.cs @@ -93,6 +93,12 @@ internal sealed class AvatarView : INameIconSide, ICalculableSource public uint FetterLevel { get; set; } + public string ShowcaseRefreshTimeFormat { get; set; } + + public string GameRecordRefreshTimeFormat { get; set; } + + public string CalculatorRefreshTimeFormat { get; set; } + /// /// Id /// From f37ed7423833611bd53e91eec1b740dd18495625 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sun, 27 Aug 2023 19:38:08 +0800 Subject: [PATCH 42/43] fix response message on -100 --- src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs b/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs index 775236d3..6948e1a2 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs @@ -74,6 +74,13 @@ internal class Response public static Response DefaultIfNull(Response? response, [CallerMemberName] string callerName = default!) { // 0x26F19335 is a magic number that hashed from "Snap.Hutao" + response ??= new(0x26F19335, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default); + + if (((KnownReturnCode)response.ReturnCode) is KnownReturnCode.PleaseLogin or KnownReturnCode.RET_TOKEN_INVALID) + { + response.Message = SH.WebResponseRefreshCookieHintFormat.Format(response.Message); + } + return response ?? new(0x26F19335, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default); } From 1e73c1ba96facebca9bdf21a1637af9f27cb981e Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sun, 27 Aug 2023 20:10:31 +0800 Subject: [PATCH 43/43] fix #855 --- .../Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs | 5 ++++- .../Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs index a81a4b7b..9b682e8e 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml.cs @@ -61,7 +61,10 @@ internal sealed partial class LoginHoyoverseUserPage : Microsoft.UI.Xaml.Control manager.DeleteCookie(item); } - WebView.CoreWebView2.Navigate("https://account.hoyoverse.com/#/login"); + CoreWebView2 coreWebView2 = WebView.CoreWebView2; + coreWebView2.Settings.IsGeneralAutofillEnabled = false; + coreWebView2.Settings.IsPasswordAutosaveEnabled = false; + coreWebView2.Navigate("https://account.hoyoverse.com/#/login"); } catch (Exception ex) { diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs index e9337c85..09534641 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml.cs @@ -40,7 +40,10 @@ internal sealed partial class LoginMihoyoUserPage : Microsoft.UI.Xaml.Controls.P manager.DeleteCookie(item); } - WebView.CoreWebView2.Navigate("https://user.mihoyo.com/#/login/password"); + CoreWebView2 coreWebView2 = WebView.CoreWebView2; + coreWebView2.Settings.IsGeneralAutofillEnabled = false; + coreWebView2.Settings.IsPasswordAutosaveEnabled = false; + coreWebView2.Navigate("https://user.mihoyo.com/#/login/password"); } catch (Exception ex) {