AuthTrade Use Image2 Control

XTsat · Apr 24, 2022 · c092eb0 · c092eb0
1 parent e28ce37
commit c092eb0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/....Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml b/....Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml
@@ -182,7 +182,7 @@
                                  Height="128"
                                  Stretch="None"
                                  Margin="10 0"
-                                 Source="{Binding ImageStream^,Converter={StaticResource BitmapAssetValueConverter}}"/>
+                                 Source="{Binding Image}"/>
                         </Panel>
                         <Panel Grid.Column="1" Margin="10,5">
                           <StackPanel>

diff --git a/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs
@@ -69,19 +69,6 @@ protected override void InitializeComponent()
             }
         }
 
-        /// <summary>
-        /// 是否使用 <see cref="IHttpService"/> 加载确认物品图片 <see cref="Stream"/>
-        /// </summary>
-        static bool IsLoadImage
-        {
-            get
-            {
-                // 此页面当前使用 Square.Picasso 库加载图片
-                if (OperatingSystem2.IsAndroid) return false;
-                return true;
-            }
-        }
-
         private string? AuthPassword;
         private bool AuthIsLocal;
 
@@ -394,13 +381,6 @@ private void Process(string? codeChar = null)
                     });
                     var list = steam.GetConfirmations();
 
-                    if (IsLoadImage)
-                    {
-                        Parallel.ForEach(list, confirmation =>
-                        {
-                            confirmation.ImageStream = IHttpService.Instance.GetImageAsync(confirmation.Image, ImageChannelType.SteamEconomys);
-                        });
-                    }
                     MainThread2.BeginInvokeOnMainThread(() =>
                     {
                         _ConfirmationsSourceList.Clear();
@@ -432,14 +412,6 @@ private void Process(string? codeChar = null)
                             steam.Refresh();
                             var list = steam.GetConfirmations();
 
-                            if (IsLoadImage)
-                            {
-                                Parallel.ForEach(list, confirmation =>
-                                {
-                                    confirmation.ImageStream = IHttpService.Instance.GetImageAsync(confirmation.Image, ImageChannelType.SteamEconomys);
-                                });
-                            }
-
                             MainThread2.BeginInvokeOnMainThread(() =>
                             {
                                 _ConfirmationsSourceList.Clear();