Merge pull request #1746 from DGP-Studio/develop

DGP-Studio · Jun 19, 2024 · a697104 · a697104
2 parents 3513268 + 87f1f2c
commit a697104
Show file tree

Hide file tree

Showing 227 changed files with 3,640 additions and 2,388 deletions.
diff --git a/.github/ISSUE_TEMPLATE/CHS-bug-report.yml b/.github/ISSUE_TEMPLATE/CHS-bug-report.yml
@@ -19,7 +19,7 @@ body:
         - label: 我已阅读 Snap Hutao 文档中的[常见问题](https://hut.ao/advanced/FAQ.html)和[常见程序异常](https://hut.ao/advanced/exceptions.html)，我的问题没有在文档中得到解答
           required: true
 
-        - label: 我知道文档站的导航栏中有**搜索功能**，且已经搜索过相关关键词
+        - label: 我知道[文档站](https://hut.ao/zh/menu.html)的导航栏中有**搜索功能**，且已经搜索过相关关键词
           required: true
 
         - label: 我的问题不是[已完成](https://github.com/DGP-Studio/Snap.Hutao/issues?q=is%3Aopen+is%3Aissue+label%3A%E5%B7%B2%E5%AE%8C%E6%88%90)的问题也不是一个别人已发布的**重复的**问题

diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -64,12 +64,10 @@ jobs:
           > 该版本是由 CI 程序自动打包生成的 `Alpha` 测试版本，**仅供开发者测试使用**
 
           > [!TIP]
-          > 普通用户请[点击这里](https://github.com/DGP-Studio/Snap.Hutao/releases/latest/)下载最新的稳定版本
+          > 普通用户请 [点击这里](https://github.com/DGP-Studio/Snap.Hutao/releases/latest/) 下载最新的稳定版本
 
           > [!IMPORTANT]
-          > 请注意，从 Snap Hutao Alpha 2023.12.21.3 开始，我们将使用全新的 CI 证书，原有的 Snap.Hutao.CI.cer 将在几天后过期停止使用。
-          >
-          > 请安装 [DGP_Studio_CA.crt](https://github.com/DGP-Automation/Hutao-Auto-Release/releases/download/certificate-ca/DGP_Studio_CA.crt) 到 `受信任的根证书颁发机构` 以安装测试版安装包
+          > 请先安装 **[DGP_Studio_CA.crt](https://github.com/DGP-Automation/Hutao-Auto-Release/releases/download/certificate-ca/DGP_Studio_CA.crt)** 到 **受信任的根证书颁发机构** 以安装测试版安装包
           "
 
           echo $summary >> $Env:GITHUB_STEP_SUMMARY
@@ -111,12 +109,10 @@ jobs:
           > 该版本是由 CI 程序自动打包生成的 `Alpha` 测试版本，**仅供开发者测试使用**
 
           > [!TIP]
-          > 普通用户请[点击这里](https://github.com/DGP-Studio/Snap.Hutao/releases/latest/)下载最新的稳定版本
+          > 普通用户请 [点击这里](https://github.com/DGP-Studio/Snap.Hutao/releases/latest/) 下载最新的稳定版本
 
           > [!IMPORTANT]
-          > 请注意，从 Snap Hutao Alpha 2023.12.21.3 开始，我们将使用全新的 CI 证书，原有的 Snap.Hutao.CI.cer 将在几天后过期停止使用。
-          >
-          > 请安装 [DGP_Studio_CA.crt](https://github.com/DGP-Automation/Hutao-Auto-Release/releases/download/certificate-ca/DGP_Studio_CA.crt) 到 `受信任的根证书颁发机构` 以安装测试版安装包
+          > 请先安装 **[DGP_Studio_CA.crt](https://github.com/DGP-Automation/Hutao-Auto-Release/releases/download/certificate-ca/DGP_Studio_CA.crt)** 到 **受信任的根证书颁发机构** 以安装测试版安装包
           "
 
           echo $summary >> $Env:GITHUB_STEP_SUMMARY
diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -31,6 +31,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Uri.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/WindowOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///View/Card/Primitive/CardProgressBar.xaml"/>
+                <ResourceDictionary Source="ms-appx:///View/Control/RateDeltaTextBlockStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml.cs b/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
+using Microsoft.Windows.AppNotifications;
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.LifeCycle;
@@ -68,6 +69,10 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         try
         {
+            // Important: You must call AppNotificationManager::Default().Register
+            // before calling AppInstance.GetCurrent.GetActivatedEventArgs.
+            AppNotificationManager.Default.NotificationInvoked += activation.NotificationInvoked;
+            AppNotificationManager.Default.Register();
             AppActivationArguments activatedEventArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
 
             if (serviceProvider.GetRequiredService<PrivateNamedPipeClient>().TryRedirectActivationTo(activatedEventArgs))
@@ -81,14 +86,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
             LogDiagnosticInformation();
 
             // Manually invoke
-            HutaoActivationArguments hutaoArgs = HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs);
-            if (hutaoArgs.Kind is HutaoActivationKind.Toast)
-            {
-                Exit();
-                return;
-            }
-
-            activation.Activate(hutaoArgs);
+            activation.Activate(HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs));
             activation.PostInitialization();
         }
         catch (Exception ex)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/InfoBarDelayCloseBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/InfoBarDelayCloseBehavior.cs
@@ -0,0 +1,51 @@
+// 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;
+
+namespace Snap.Hutao.Control.Behavior;
+
+[SuppressMessage("", "CA1001")]
+[DependencyProperty("MilliSecondsDelay", typeof(int))]
+internal sealed partial class InfoBarDelayCloseBehavior : BehaviorBase<InfoBar>
+{
+    private readonly CancellationTokenSource closeTokenSource = new();
+
+    protected override void OnAssociatedObjectLoaded()
+    {
+        AssociatedObject.Closed += OnInfoBarClosed;
+        if (MilliSecondsDelay > 0)
+        {
+            DelayCoreAsync().SafeForget();
+        }
+    }
+
+    private async ValueTask DelayCoreAsync()
+    {
+        try
+        {
+            await Task.Delay(MilliSecondsDelay, closeTokenSource.Token).ConfigureAwait(true);
+        }
+        catch
+        {
+            return;
+        }
+
+        if (AssociatedObject is not null)
+        {
+            AssociatedObject.IsOpen = false;
+        }
+    }
+
+    private void OnInfoBarClosed(InfoBar infoBar, InfoBarClosedEventArgs args)
+    {
+        if (args.Reason is InfoBarCloseReason.CloseButton)
+        {
+            closeTokenSource.Cancel();
+        }
+
+        AssociatedObject.Closed -= OnInfoBarClosed;
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
@@ -1,18 +1,25 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.UI.Xaml.Media.Imaging;
 using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Caching;
 using Snap.Hutao.Core.ExceptionService;
+using Snap.Hutao.Core.IO.DataTransfer;
+using System.IO;
 using System.Runtime.InteropServices;
+using Windows.Graphics.Imaging;
+using Windows.Storage.Streams;
 
 namespace Snap.Hutao.Control.Image;
 
 /// <summary>
 /// 缓存图像
 /// </summary>
 [HighQuality]
-internal sealed class CachedImage : Implementation.ImageEx
+[DependencyProperty("SourceName", typeof(string), "Unknown")]
+[DependencyProperty("CachedName", typeof(string), "Unknown")]
+internal sealed partial class CachedImage : Implementation.ImageEx
 {
     /// <summary>
     /// 构造一个新的缓存图像
@@ -26,12 +33,14 @@ public CachedImage()
     /// <inheritdoc/>
     protected override async Task<Uri?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
+        SourceName = Path.GetFileName(imageUri.ToString());
         IImageCache imageCache = this.ServiceProvider().GetRequiredService<IImageCache>();
 
         try
         {
             HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
             string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
+            CachedName = Path.GetFileName(file);
             token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
             return file.ToUri();
         }
@@ -42,4 +51,27 @@ public CachedImage()
             return default;
         }
     }
-}
+
+    [Command("CopyToClipboardCommand")]
+    private async Task CopyToClipboard()
+    {
+        if (Image is Microsoft.UI.Xaml.Controls.Image { Source: BitmapImage bitmap })
+        {
+            using (FileStream netStream = File.OpenRead(bitmap.UriSource.LocalPath))
+            {
+                using (IRandomAccessStream fxStream = netStream.AsRandomAccessStream())
+                {
+                    BitmapDecoder decoder = await BitmapDecoder.CreateAsync(fxStream);
+                    SoftwareBitmap softwareBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied);
+                    using (InMemoryRandomAccessStream memory = new())
+                    {
+                        BitmapEncoder encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.BmpEncoderId, memory);
+                        encoder.SetSoftwareBitmap(softwareBitmap);
+                        await encoder.FlushAsync();
+                        Ioc.Default.GetRequiredService<IClipboardProvider>().SetBitmap(memory);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:shci="using:Snap.Hutao.Control.Image">
@@ -14,6 +14,13 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.ContextFlyout>
+                            <MenuFlyout>
+                                <MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding SourceName}"/>
+                                <MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding CachedName}"/>
+                                <MenuFlyoutItem Command="{Binding CopyToClipboardCommand, RelativeSource={RelativeSource TemplatedParent}}" Text="复制图像"/>
+                            </MenuFlyout>
+                        </Grid.ContextFlyout>
                         <Image
                             Name="PlaceholderImage"
                             Margin="{TemplateBinding PlaceholderMargin}"

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Loading.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Loading.xaml
@@ -24,7 +24,7 @@
                             x:Name="ContentGrid"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            x:Load="False">
+                            x:Load="True">
                             <ContentPresenter.RenderTransform>
                                 <CompositeTransform/>
                             </ContentPresenter.RenderTransform>

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs b/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs
@@ -5,7 +5,6 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Navigation;
-using Snap.Hutao.Core.Abstraction;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.View.Helper;
 using Snap.Hutao.ViewModel.Abstraction;

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Selector/InfoBarTemplateSelector.cs b/src/Snap.Hutao/Snap.Hutao/Control/Selector/InfoBarTemplateSelector.cs
@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.Service.Notification;
+
+namespace Snap.Hutao.Control.Selector;
+
+internal sealed class InfoBarTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate ActionButtonEnabled { get; set; } = default!;
+
+    public DataTemplate ActionButtonDisabled { get; set; } = default!;
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is InfoBarOptions { ActionButtonContent: { }, ActionButtonCommand: { } })
+        {
+            return ActionButtonEnabled;
+        }
+
+        return ActionButtonDisabled;
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/SizeRestrictedContentControl.cs b/src/Snap.Hutao/Snap.Hutao/Control/SizeRestrictedContentControl.cs
@@ -21,8 +21,8 @@ protected override Size MeasureOverride(Size availableSize)
             element.Measure(availableSize);
             Size contentDesiredSize = element.DesiredSize;
             Size contentActualOrDesiredSize = new(
-                Math.Max(element.ActualWidth, contentDesiredSize.Width),
-                Math.Max(element.ActualHeight, contentDesiredSize.Height));
+                Math.Min(Math.Max(element.ActualWidth, contentDesiredSize.Width), availableSize.Width),
+                Math.Min(Math.Max(element.ActualHeight, contentDesiredSize.Height), availableSize.Height));
 
             if (IsWidthRestricted)
             {

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Converter.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Converter.xaml
@@ -10,6 +10,7 @@
     <shmmc:AchievementIconConverter x:Key="AchievementIconConverter"/>
     <shmmc:AvatarCardConverter x:Key="AvatarCardConverter"/>
     <shmmc:AvatarIconConverter x:Key="AvatarIconConverter"/>
+    <shmmc:AvatarIconCircleConverter x:Key="AvatarIconCircleConverter"/>
     <shmmc:AvatarNameCardPicConverter x:Key="AvatarNameCardPicConverter"/>
     <shmmc:AvatarSideIconConverter x:Key="AvatarSideIconConverter"/>
     <shmmc:DescriptionsParametersDescriptor x:Key="DescParamDescriptor"/>

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/CornerRadius.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/CornerRadius.xaml
@@ -2,4 +2,5 @@
     <CornerRadius x:Key="ControlCornerRadiusTop">4,4,0,0</CornerRadius>
     <CornerRadius x:Key="ControlCornerRadiusBottom">0,0,4,4</CornerRadius>
     <CornerRadius x:Key="ControlCornerRadiusTopRightAndBottomLeft">0,4,0,4</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusAll16">16</CornerRadius>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
@@ -23,6 +23,9 @@
     <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing4Template">
         <StackPanel Orientation="Horizontal" Spacing="4"/>
     </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing6Template">
+        <StackPanel Orientation="Horizontal" Spacing="6"/>
+    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="StackPanelSpacing4Template">
         <StackPanel Spacing="4"/>
     </ItemsPanelTemplate>

diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Proxy/HttpProxyUsingSystemProxy.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Proxy/HttpProxyUsingSystemProxy.cs
@@ -3,7 +3,6 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using Snap.Hutao.Win32.Registry;
-using System.Linq.Expressions;
 using System.Net;
 using System.Reflection;