From 7f06b0a07c9775170b8143c67d3ac62feffc8f73 Mon Sep 17 00:00:00 2001
From: qhy040404 <qhy040404@163.com>
Date: Thu, 27 Jun 2024 10:54:53 +0800
Subject: [PATCH] fix #1774

---
 .../Snap.Hutao/UI/Xaml/View/UserView.xaml     | 10 ++++++----
 .../Web/Hoyolab/Bbs/User/UserInfo.cs          | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/UserView.xaml
index 92181983..d4e7bfb5 100644
--- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/UserView.xaml
@@ -9,6 +9,7 @@
     xmlns:mxim="using:Microsoft.Xaml.Interactions.Media"
     xmlns:shux="using:Snap.Hutao.UI.Xaml"
     xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
+    xmlns:shuxci="using:Snap.Hutao.UI.Xaml.Control.Image"
     xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     xmlns:shvu="using:Snap.Hutao.ViewModel.User"
@@ -24,13 +25,14 @@
                     <ColumnDefinition Width="auto"/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <PersonPicture
+                <shuxci:CachedImage
                     Grid.Column="0"
                     Height="32"
                     Margin="2,0"
                     HorizontalAlignment="Left"
                     Background="#FFDAB79B"
-                    ProfilePicture="{Binding ProfilePictureIcon, Converter={StaticResource AvatarIconCircleConverter}}"/>
+                    CornerRadius="{ThemeResource CornerRadiusAll16}"
+                    Source="{Binding ProfilePictureIcon, Converter={StaticResource AvatarIconCircleConverter}}"/>
                 <Button
                     Grid.Column="0"
                     Width="32"
@@ -101,7 +103,7 @@
                     Height="32"
                     Margin="2,0"
                     HorizontalAlignment="Left"
-                    ProfilePicture="{Binding UserInfo.AvatarUrl, Mode=OneWay}"/>
+                    ProfilePicture="{Binding UserInfo.AvatarUri, Mode=OneWay}"/>
                 <TextBlock
                     Grid.Column="1"
                     Margin="12,0,0,0"
@@ -233,7 +235,7 @@
                         Height="36"
                         Margin="1,1,6,1"
                         HorizontalAlignment="Left"
-                        ProfilePicture="{Binding SelectedUser.UserInfo.AvatarUrl, Mode=OneWay}"/>
+                        ProfilePicture="{Binding SelectedUser.UserInfo.AvatarUri, Mode=OneWay}"/>
                     <TextBlock
                         Grid.Column="1"
                         Margin="1,0,0,0"
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Bbs/User/UserInfo.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Bbs/User/UserInfo.cs
index f8702e16..0f5d43a8 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Bbs/User/UserInfo.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Bbs/User/UserInfo.cs
@@ -98,4 +98,23 @@ internal sealed class UserInfo
     /// </summary>
     [JsonPropertyName("ip_region")]
     public string IpRegion { get; set; } = default!;
+
+    [JsonIgnore]
+    public Uri AvatarUri
+    {
+        get
+        {
+            string source = AvatarUrl.OriginalString;
+            if (!string.IsNullOrEmpty(source))
+            {
+                return AvatarUrl;
+            }
+
+            string target = string.IsNullOrEmpty(IpRegion)
+                    ? $"https://img-os-static.hoyolab.com/avatar/avatar{Avatar}.png"
+                    : $"https://bbs-static.miyoushe.com/avatar/avatar{Avatar}.png";
+
+            return target.ToUri();
+        }
+    }
 }