增强Image2的功能优化所有头像加载逻辑

shi-jianyu · Nov 3, 2021 · f67d9ab · f67d9ab
1 parent e86e95c
commit f67d9ab
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 87 deletions.
diff --git a/references/AvaloniaGif b/references/AvaloniaGif
diff --git a/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml b/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
@@ -18,7 +18,7 @@
         x:DataType="vm:MainWindowViewModel"
         x:CompileBindings="True">
   <Panel Margin="{Binding #MainWindow.OffScreenMargin}">
-    <controls:EmptyControl x:Name="DesktopBackground"
+    <controls:WallpaperControl x:Name="DesktopBackground"
          IsVisible="{ReflectionBinding Source={x:Static ms:UISettings.EnableDesktopBackground},Path=Value,Mode=TwoWay}"/>
     <local:MainView DataContext="{Binding}"/>
     <!--<controls:WebView3 IsVisible="False" InitialUrl="chrome://version"></controls:WebView3>-->

diff --git a/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml.cs
@@ -21,7 +21,7 @@ public MainWindow() : base()
         {
             InitializeComponent();
 
-            var background = this.FindControl<EmptyControl>("DesktopBackground");
+            var background = this.FindControl<WallpaperControl>("DesktopBackground");
             _backHandle = background.Handle;
 
 #if DEBUG

diff --git a/...tion/UI/Views/Controls/ConsoleShell.axaml → ...s/Controls/UserControl/ConsoleShell.axaml b/...tion/UI/Views/Controls/ConsoleShell.axaml → ...s/Controls/UserControl/ConsoleShell.axaml
diff --git a/...n/UI/Views/Controls/ConsoleShell.axaml.cs → ...ontrols/UserControl/ConsoleShell.axaml.cs b/...n/UI/Views/Controls/ConsoleShell.axaml.cs → ...ontrols/UserControl/ConsoleShell.axaml.cs
diff --git a/...ion/UI/Views/Controls/ItemsSelector.axaml → .../Controls/UserControl/ItemsSelector.axaml b/...ion/UI/Views/Controls/ItemsSelector.axaml → .../Controls/UserControl/ItemsSelector.axaml
diff --git a/.../UI/Views/Controls/ItemsSelector.axaml.cs → ...ntrols/UserControl/ItemsSelector.axaml.cs b/.../UI/Views/Controls/ItemsSelector.axaml.cs → ...ntrols/UserControl/ItemsSelector.axaml.cs
diff --git a/...ication/UI/Views/Controls/PaperView.axaml → ...iews/Controls/UserControl/PaperView.axaml b/...ication/UI/Views/Controls/PaperView.axaml → ...iews/Controls/UserControl/PaperView.axaml
diff --git a/...tion/UI/Views/Controls/PaperView.axaml.cs → ...s/Controls/UserControl/PaperView.axaml.cs b/...tion/UI/Views/Controls/PaperView.axaml.cs → ...s/Controls/UserControl/PaperView.axaml.cs
diff --git a/...lication/UI/Views/Controls/TitleBar.axaml → ...Views/Controls/UserControl/TitleBar.axaml b/...lication/UI/Views/Controls/TitleBar.axaml → ...Views/Controls/UserControl/TitleBar.axaml
diff --git a/...ation/UI/Views/Controls/TitleBar.axaml.cs → ...ws/Controls/UserControl/TitleBar.axaml.cs b/...ation/UI/Views/Controls/TitleBar.axaml.cs → ...ws/Controls/UserControl/TitleBar.axaml.cs
diff --git a/...tion/UI/Views/Controls/ToastMessage.axaml → ...s/Controls/UserControl/ToastMessage.axaml b/...tion/UI/Views/Controls/ToastMessage.axaml → ...s/Controls/UserControl/ToastMessage.axaml
diff --git a/...n/UI/Views/Controls/ToastMessage.axaml.cs → ...ontrols/UserControl/ToastMessage.axaml.cs b/...n/UI/Views/Controls/ToastMessage.axaml.cs → ...ontrols/UserControl/ToastMessage.axaml.cs
diff --git a/...ication/UI/Views/Controls/EmptyControl.cs → ...ion/UI/Views/Controls/WallpaperControl.cs b/...ication/UI/Views/Controls/EmptyControl.cs → ...ion/UI/Views/Controls/WallpaperControl.cs
@@ -8,15 +8,15 @@
 
 namespace System.Application.UI.Views.Controls
 {
-    public class EmptyControl : TemplatedControl
+    public class WallpaperControl : TemplatedControl
     {
         readonly INativeWindowApiService windowApiService = INativeWindowApiService.Instance;
 
         Window window;
         Window ParentWindow;
         IntPtr _Handle;
         IntPtr _DwmHandle;
-        public EmptyControl()
+        public WallpaperControl()
         {
             //this.InitializeComponent();
 

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
@@ -120,17 +120,18 @@
                       HorizontalAlignment="Stretch">
             <!--<Image x:Name="avatar" Source="/Application/UI/Assets/Icon.ico" Height="64" Width="64"/>
             <Label Content="{ReflectionBinding Path=Title}" Foreground="{DynamicResource HighlightForegroundBrushKey}" VerticalContentAlignment="Center" FontSize="18" Margin="8,0,0,0"/>-->
-            <Image x:Name="avatar" Clip=""
-                   Source="{ReflectionBinding Path=AvatarPath, Source={x:Static service:UserService.Current},Mode=OneWay,Converter={StaticResource BitmapAssetValueConverter},ConverterParameter=64}"
+            <gif:Image2 x:Name="avatar"
+                   Source="{ReflectionBinding Path=AvatarPath, Source={x:Static service:UserService.Current},Mode=OneWay}"
                    Stretch="Uniform"
                    VerticalAlignment="Center"
                    HorizontalAlignment="Left"
                    Height="64"
-                   Width="64">
-              <Image.Clip>
+                   Width="64"
+                   FallbackSource="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
+              <gif:Image2.Clip>
                 <EllipseGeometry Rect="0,0,64,64" />
-              </Image.Clip>
-            </Image>
+              </gif:Image2.Clip>
+            </gif:Image2>
             <StackPanel Spacing="5" VerticalAlignment="Center">
               <TextBlock Text="{ReflectionBinding Path=Res.User_UnLogin,Mode=OneWay,Source={x:Static resx:R.Current}}"
                         IsVisible="{ReflectionBinding Path=User,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={StaticResource IsNullConverter}}"

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml.cs
@@ -6,6 +6,7 @@
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.ReactiveUI;
+using AvaloniaGif;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Media.Animation;
 using System.Application.Settings;
@@ -25,7 +26,7 @@ public MainView()
         {
             InitializeComponent();
 
-            var avatar = this.FindControl<Image>("avatar");
+            var avatar = this.FindControl<Image2>("avatar");
             var nav = this.FindControl<NavigationView>("NavigationView");
             var back = this.FindControl<ExperimentalAcrylicBorder>("NavBarBackground");
 

diff --git a/...T.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml b/...T.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml
@@ -54,15 +54,9 @@
                 <gif:Image2
                            Width="184"
                            Stretch="Uniform"
-                           Source="{Binding AvatarUrl}">
+                           Source="{Binding AvatarUrl}"
+                           FallbackSource="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
                 </gif:Image2>
-                <!--<Image Width="184"
-                       Stretch="Uniform"
-                       Source="{Binding AvatarUrl,Converter={StaticResource BitmapAssetValueConverter}}">
-                </Image>-->
-                <!--<Image Width="184" Stretch="Uniform" IsVisible="{Binding AvatarStream^,Converter={StaticResource IsNullConverter}}"
-                       Source="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
-                </Image>-->
               </Panel>
               <Panel Grid.Column="1" Margin="10 5">
                 <StackPanel Spacing="8">

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml
@@ -20,7 +20,7 @@
             Background="{DynamicResource ThemeBrushKey}"
             Padding="10"
             Margin="{StaticResource ScrollMargin}">
-      <ui:CommandBar DefaultLabelPosition="Right" 
+      <ui:CommandBar DefaultLabelPosition="Right"
                      IsSticky="False">
         <ui:CommandBar.PrimaryCommands>
           <ui:CommandBarButton Icon="Add"
@@ -95,7 +95,7 @@
                   </ia:EventTriggerBehavior>
                 </i:Interaction.Behaviors>
 
-                <Grid Height="184"
+                <Grid Height="224"
                       ColumnDefinitions="Auto,*">
                   <Border CornerRadius="{StaticResource PaperRadiusLeft}"
                           ClipToBounds="True">
@@ -112,18 +112,15 @@
                              Width="184"
                              AutoStart="true"
                              Stretch="Uniform"
-                             Source="{Binding AvatarStream^}">
+                             Source="{Binding AvatarStream^}"
+                             FallbackSource="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
                       </gif:Image2>
-                      <Image Width="184"
-                             Stretch="Uniform"
-                             IsVisible="{Binding AvatarStream^,Converter={StaticResource IsNullConverter}}"
-                             Source="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
-                      </Image>
-                      <!--<gif:Image2 Width="184" Height="184" 
-                                            AutoStart="true"
-                                            Source="{Binding MiniProfile.AvatarFrameStream^}"
-                                            Stretch="Uniform" 
-                                            IsVisible="{Binding MiniProfile.AvatarFrameStream^,Converter={StaticResource IsNullConverter},ConverterParameter=invert}"/>-->
+                      <gif:Image2 Width="224"
+                                  Height="224"
+                                  AutoStart="true"
+                                  Source="{Binding MiniProfile.AvatarFrameStream^}"
+                                  Stretch="Uniform"
+                                  IsVisible="{Binding MiniProfile.AvatarFrameStream^,Converter={StaticResource IsNullConverter},ConverterParameter=invert}"/>
                     </Panel>
                   </Border>
                   <Panel Grid.Column="1" Margin="10 0 0 0">

diff --git a/...nt.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml b/...nt.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml
@@ -66,31 +66,27 @@
                     Margin="10 0">
               <Grid Height="92"
                     ColumnDefinitions="Auto,*,Auto">
-                <Panel x:Name="avatar"
-                       Cursor="Hand"
-                       ToolTip.Tip="{ReflectionBinding Path=Res.UserChange_OpenUserUrl,Mode=OneWay,Source={x:Static resx:R.Current}}">
-                  <!--OpenUserProfileUrl-->
-                  <i:Interaction.Behaviors>
-                    <ia:EventTriggerBehavior EventName="Tapped" SourceObject="{ReflectionBinding #avatar}">
-                      <ia:InvokeCommandAction Command="{ReflectionBinding #u.DataContext.OpenUserProfileUrl}" CommandParameter="{Binding}"/>
-                    </ia:EventTriggerBehavior>
-                  </i:Interaction.Behaviors>
-                  <gif:Image2
-                         Width="92"
-                         AutoStart="true"
-                         Stretch="UniformToFill"
-                         StretchDirection="Both"
-                         Source="{Binding AvatarStream^}">
-                  </gif:Image2>
-                  <Image Width="92" Stretch="UniformToFill" IsVisible="{Binding AvatarStream^,Converter={StaticResource IsNullConverter}}"
-                         Source="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
-                  </Image>
-                  <!--<gif:Image2 Width="184" Height="184" 
-                                            AutoStart="true"
-                                            Source="{Binding MiniProfile.AvatarFrameStream^}"
-                                            Stretch="Uniform" 
-                                            IsVisible="{Binding MiniProfile.AvatarFrameStream^,Converter={StaticResource IsNullConverter},ConverterParameter=invert}"/>-->
-                </Panel>
+                <Border CornerRadius="{StaticResource PaperRadiusLeft}"
+                        ClipToBounds="True">
+                  <Panel x:Name="avatar"
+                         Cursor="Hand"
+                         ToolTip.Tip="{ReflectionBinding Path=Res.UserChange_OpenUserUrl,Mode=OneWay,Source={x:Static resx:R.Current}}">
+                    <!--OpenUserProfileUrl-->
+                    <i:Interaction.Behaviors>
+                      <ia:EventTriggerBehavior EventName="Tapped" SourceObject="{ReflectionBinding #avatar}">
+                        <ia:InvokeCommandAction Command="{ReflectionBinding #u.DataContext.OpenUserProfileUrl}" CommandParameter="{Binding}"/>
+                      </ia:EventTriggerBehavior>
+                    </i:Interaction.Behaviors>
+                    <gif:Image2
+                           Width="92"
+                           AutoStart="true"
+                           Stretch="UniformToFill"
+                           StretchDirection="Both"
+                           Source="{Binding AvatarStream^}"
+                           FallbackSource="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
+                    </gif:Image2>
+                  </Panel>
+                </Border>
                 <Panel Grid.Column="1" Margin="10 5">
                   <StackPanel>
                     <DockPanel LastChildFill="True">

diff --git a/....Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfile/UserProfileWindow.axaml b/....Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfile/UserProfileWindow.axaml
@@ -13,6 +13,7 @@
         xmlns:ccl_services="using:System.Application.Services"
         xmlns:sys_app="using:System.Application"
         xmlns:service="using:System.Application.Services"
+        xmlns:gif="using:AvaloniaGif"
         xmlns:vm="using:System.Application.UI.ViewModels"
         ExtendClientAreaTitleBarHeightHint="30"
         WindowStartupLocation="CenterOwner"
@@ -74,12 +75,15 @@
         <Panel Margin="{StaticResource ContentMargin}">
           <StackPanel VerticalAlignment="Center">
             <DockPanel>
-              <Image Source="{ReflectionBinding Path=AvatarPath, Source={x:Static service:UserService.Current},Mode=OneWay,Converter={StaticResource BitmapAssetValueConverter},ConverterParameter=184}"
-                     Width="184" Height="184">
-                <Image.Clip>
-                  <EllipseGeometry Rect="0,0,184,184"/>
-                </Image.Clip>
-              </Image>
+              <gif:Image2 Source="{ReflectionBinding Path=AvatarPath,Source={x:Static service:UserService.Current},Mode=OneWay}"
+                  Stretch="Uniform"
+                  Height="184"
+                  Width="184"
+                  FallbackSource="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg">
+                <gif:Image2.Clip>
+                  <EllipseGeometry Rect="0,0,184,184" />
+                </gif:Image2.Clip>
+              </gif:Image2>
               <StackPanel Orientation="Vertical" Margin="16,0,0,0">
                 <Button Content="{ReflectionBinding Path=Res.AsyncSteamAvatar,Mode=OneWay,Source={x:Static resx:R.Current}}"
                         Opacity="0"
@@ -251,7 +255,7 @@
                       Command="{Binding OnBindFastLoginClick}"
                       CommandParameter="{Binding CurrentSelectChannel}"/>
             </StackPanel>
-            
+
             <Button Classes="Hyperlink"
                     HorizontalAlignment="Center"
                     HorizontalContentAlignment="Center"

diff --git a/src/ST.Client/Services/Mvvm/SteamConnectService.cs b/src/ST.Client/Services/Mvvm/SteamConnectService.cs
@@ -92,8 +92,7 @@ public SteamUser? CurrentSteamUser
             }
         }
 
-        const string DefaultAvatarPath = "avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg";
-        object? _AvatarPath = DefaultAvatarPath;
+        object? _AvatarPath;
         public object? AvatarPath
         {
             get => _AvatarPath;
@@ -254,7 +253,6 @@ public void Initialize()
                         {
                             IsConnectToSteam = false;
                             CurrentSteamUser = null;
-                            AvatarPath = DefaultAvatarPath;
                         }
                     }
                     catch (Exception ex)

diff --git a/src/ST.Client/Services/Mvvm/UserService.cs b/src/ST.Client/Services/Mvvm/UserService.cs
@@ -103,23 +103,10 @@ public SteamUser? CurrentSteamUser
             set => this.RaiseAndSetIfChanged(ref _SteamUser, value);
         }
 
-        public string DefaultAvatarPath
-        {
-            get
-            {
-                if (OperatingSystem2.Application.UseAvalonia)
-                {
-                    return "avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Assets/AppResources/avatar.jpg";
-                }
-                return string.Empty;
-            }
-        }
-
         object? _AvatarPath;
-
         public object? AvatarPath
         {
-            get => _AvatarPath ?? DefaultAvatarPath;
+            get => _AvatarPath;
             set => this.RaiseAndSetIfChanged(ref _AvatarPath, value);
         }
 
@@ -134,7 +121,7 @@ public UserService()
             {
                 User = null;
                 CurrentSteamUser = null;
-                AvatarPath = DefaultAvatarPath;
+                AvatarPath = null;
             };
 
             Task.Run(Initialize).ForgetAndDispose();
@@ -217,7 +204,7 @@ public async Task RefreshUserAvatarAsync()
                             {
                                 var avatarLocalFilePath = await httpService.GetImageAsync(avatarUrl, ImageChannelType.SteamAvatars);
                                 var avatarSouce = ImageSouce.TryParse(avatarLocalFilePath, isCircle: true);
-                                AvatarPath = avatarSouce ?? DefaultAvatarPath;
+                                AvatarPath = avatarSouce;
                             }
                             return;
                         }
@@ -240,7 +227,7 @@ async Task<bool> RefreshSteamUserAvatarAsync()
                         CurrentSteamUser = await steamworksWebApiService.GetUserInfo(User.SteamAccountId.Value);
                         CurrentSteamUser.AvatarStream = httpService.GetImageAsync(CurrentSteamUser.AvatarFull, ImageChannelType.SteamAvatars);
                         var avatarSouce = ImageSouce.TryParse(await CurrentSteamUser.AvatarStream, isCircle: true);
-                        AvatarPath = avatarSouce ?? DefaultAvatarPath;
+                        AvatarPath = avatarSouce;
                         return true;
                     }
                     else
@@ -250,7 +237,7 @@ async Task<bool> RefreshSteamUserAvatarAsync()
                 }
             }
 
-            AvatarPath = DefaultAvatarPath;
+            AvatarPath = null;
         }
 
         /// <summary>

diff --git a/src/ST.Client/UI/ViewModels/Pages/SteamAccountPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
@@ -155,7 +155,9 @@ public async override void Initialize()
                 {
                     if (!string.IsNullOrEmpty(miniProfile.AnimatedAvatar))
                         item.AvatarStream = httpService.GetImageAsync(miniProfile.AnimatedAvatar, ImageChannelType.SteamAvatars);
-                    //miniProfile.AvatarFrameStream = httpService.GetImageAsync(miniProfile.AvatarFrame, ImageChannelType.SteamAvatars);
+
+                    if (!string.IsNullOrEmpty(miniProfile.AvatarFrame))
+                        miniProfile.AvatarFrameStream = httpService.GetImageAsync(miniProfile.AvatarFrame, ImageChannelType.SteamAvatars);
                 }
             }
             _SteamUsersSourceList.Refresh();