From 63ac0695bbd79197ab5d5d8362482eaefee99d40 Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 6 May 2021 18:42:52 +0800
Subject: [PATCH] update game laod action

---
 .../Application/UI/Views/MainView.axaml       |  3 +++
 .../UI/Views/Pages/GameRelatedPage.axaml      | 16 ++++++++++++++++
 .../UI/Views/Pages/GameRelatedPage.axaml.cs   | 19 +++++++++++++++++++
 .../ST.Client.Desktop.Avalonia.csproj         |  6 ++++++
 .../Models/Settings/UISettings.cs             |  2 +-
 .../Services/Mvvm/SteamConnectService.cs      |  2 +-
 .../UI/ViewModels/MainWindowViewModel.cs      |  2 +-
 .../ViewModels/Pages/GameListPageViewModel.cs | 12 ++++++------
 8 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml
 create mode 100644 src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml.cs

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
index 00d586f18..8194287ca 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
@@ -178,6 +178,9 @@
         <DataTemplate DataType="vm:LocalAuthPageViewModel">
           <pages:LocalAuthPage/>
         </DataTemplate>
+        <DataTemplate DataType="vm:GameRelatedPageViewModel">
+          <pages:GameRelatedPage/>
+        </DataTemplate>
       </TabControl.DataTemplates>
       <TabControl.ItemTemplate>
         <DataTemplate>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml
new file mode 100644
index 000000000..0e203fc5c
--- /dev/null
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml
@@ -0,0 +1,16 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
+             xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:StartPageViewModel"
+             x:CompileBindings="True"
+             x:Class="System.Application.UI.Views.Pages.GameRelatedPage">
+  <StackPanel HorizontalAlignment="Stretch" Margin="{StaticResource PageMargin}" Background="Transparent" Spacing="20">
+    <Grid ColumnDefinitions="Auto,Auto">
+
+    </Grid>
+  </StackPanel>
+</UserControl>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml.cs
new file mode 100644
index 000000000..2005cd0b3
--- /dev/null
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml.cs
@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System.Application.UI.ViewModels;
+
+namespace System.Application.UI.Views.Pages
+{
+    public class GameRelatedPage : UserControl
+    {
+        public GameRelatedPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
index a15904ec4..e41fefa30 100644
--- a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
+++ b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
@@ -53,4 +53,10 @@
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
     <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0013977-beta" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Application\UI\Views\Pages\GameRelatedPage.axaml.cs">
+      <DependentUpon>GameRelatedPage.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/Models/Settings/UISettings.cs b/src/ST.Client.Desktop/Models/Settings/UISettings.cs
index 05abb86d3..bae4bb5c9 100644
--- a/src/ST.Client.Desktop/Models/Settings/UISettings.cs
+++ b/src/ST.Client.Desktop/Models/Settings/UISettings.cs
@@ -74,7 +74,7 @@ namespace System.Application.Models.Settings
         /// 所有窗口位置记忆集合
         /// </summary>
         public static SerializableProperty<Dictionary<string, WindowSizePosition>> WindowSizePositions { get; }
-            = new SerializableProperty<Dictionary<string, WindowSizePosition>>(GetKey(), Providers.Local, new Dictionary<string, WindowSizePosition>()) { AutoSave = true };
+            = new SerializableProperty<Dictionary<string, WindowSizePosition>>(GetKey(), Providers.Local, new Dictionary<string, WindowSizePosition>()) { AutoSave = false };
 
         private static string GetKey([CallerMemberName] string propertyName = "")
         {
diff --git a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
index 5658b38b3..62d6992b9 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
@@ -170,7 +170,7 @@ namespace System.Application.Services
                         {
                             IsConnectToSteam = false;
                         }
-                        await Task.Delay(2000);
+                        Thread.Sleep(2000);
                     }
                 }
                 catch (Exception ex)
diff --git a/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
index bfe0d61eb..93a1c86a3 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
@@ -103,7 +103,7 @@ namespace System.Application.UI.ViewModels
         public void Initialize()
         {
             Threading.Thread.CurrentThread.IsBackground = true;
-            SteamConnectService.Current.Initialize();
+            //SteamConnectService.Current.Initialize();
             ProxyService.Current.Initialize();
             AuthService.Current.Initialize();
 
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs
index 371082607..14de05970 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs
@@ -113,12 +113,12 @@ namespace System.Application.UI.ViewModels
                 });
         }
 
-        //internal override async void Activation()
-        //{
-        //    if (IsFirstActivation)
-        //        SteamConnectService.Current.Initialize();
-        //    base.Activation();
-        //}
+        internal override void Activation()
+        {
+            if (IsFirstActivation)
+                SteamConnectService.Current.Initialize();
+            base.Activation();
+        }
 
         private bool _IsOpenFilter;
         public bool IsOpenFilter