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

fix #1774

Browse Source
This commit is contained in:
qhy040404
2024-06-27 10:54:53 +08:00
parent 3211bfbbd6
commit 7f06b0a07c
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/UserView.xaml
View File

@@ -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"

19
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Bbs/User/UserInfo.cs
View File

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