From 5d35de8f694ce5f1b7c2a72efc2399f8f2556066 Mon Sep 17 00:00:00 2001 From: RMBGAME Date: Fri, 28 Jul 2023 11:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Steam=20=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A1=86=E5=B1=95=E7=A4=BA=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ref/Avalonia.Image2 | 2 +- .../DrawingContextExtensions.cs | 1 - .../Models/Abstractions/IAccount.cs | 2 ++ .../Models/BasicAccount.cs | 2 ++ .../Models/SteamAccount.cs | 6 ++++ .../UI/Views/Controls/AccountItems.axaml | 33 +++++++++++++++---- 6 files changed, 37 insertions(+), 9 deletions(-) diff --git a/ref/Avalonia.Image2 b/ref/Avalonia.Image2 index e35275521..1fb8d0397 160000 --- a/ref/Avalonia.Image2 +++ b/ref/Avalonia.Image2 @@ -1 +1 @@ -Subproject commit e3527552162b91038d538d9ec6446d0be5524fbe +Subproject commit 1fb8d0397ee26dc43ba858f9d08f22dbe0fe0753 diff --git a/src/Avalonia.Base.Internals/DrawingContextExtensions.cs b/src/Avalonia.Base.Internals/DrawingContextExtensions.cs index 890556f8c..a8302ab61 100644 --- a/src/Avalonia.Base.Internals/DrawingContextExtensions.cs +++ b/src/Avalonia.Base.Internals/DrawingContextExtensions.cs @@ -6,7 +6,6 @@ namespace Avalonia; public static class DrawingContextExtensions { - public static void DrawBitmap2(this DrawingContext context, Bitmap source, double opacity, Rect sourceRect, Rect destRect) { context.DrawBitmap(source.PlatformImpl, opacity, sourceRect, destRect); diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/Models/Abstractions/IAccount.cs b/src/BD.WTTS.Client.Plugins.GameAccount/Models/Abstractions/IAccount.cs index 6b20cbc90..af545544d 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/Models/Abstractions/IAccount.cs +++ b/src/BD.WTTS.Client.Plugins.GameAccount/Models/Abstractions/IAccount.cs @@ -16,6 +16,8 @@ public interface IAccount string? ImagePath { get; set; } + string? AvatarFramePath { get; set; } + ThirdpartyPlatform Platform { get; init; } string? PlatformName { get; init; } diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/Models/BasicAccount.cs b/src/BD.WTTS.Client.Plugins.GameAccount/Models/BasicAccount.cs index de9d72b6b..5e4aea022 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/Models/BasicAccount.cs +++ b/src/BD.WTTS.Client.Plugins.GameAccount/Models/BasicAccount.cs @@ -16,6 +16,8 @@ public sealed class BasicAccount : ReactiveObject, IAccount public string? ImagePath { get; set; } + public string? AvatarFramePath { get; set; } + public ThirdpartyPlatform Platform { get; init; } public string? PlatformName { get; init; } diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/Models/SteamAccount.cs b/src/BD.WTTS.Client.Plugins.GameAccount/Models/SteamAccount.cs index 9861b173a..8959286cd 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/Models/SteamAccount.cs +++ b/src/BD.WTTS.Client.Plugins.GameAccount/Models/SteamAccount.cs @@ -40,6 +40,12 @@ public sealed class SteamAccount : ReactiveObject, IAccount set => this.SteamUser.AvatarMedium = value; } + public string? AvatarFramePath + { + get => this.SteamUser.MiniProfile?.AvatarFrame; + set => this.SteamUser.MiniProfile.AvatarFrame = value; + } + public bool MostRecent { get => this.SteamUser.MostRecent; diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml index 1c12338cb..ca9dfeefb 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml +++ b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml @@ -142,13 +142,32 @@ - + + + + + + -- GitLab