From 220959591734cadfe8dcc12a59167ea52497ab0e Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Thu, 5 Aug 2021 08:16:36 +0800
Subject: [PATCH 01/10] fix Desktop Bridge System Boot Run

---
 .../Launcher/App.config                       | 10 ++++-----
 .../Launcher/Launcher.csproj                  | 11 +++++++++-
 .../Launcher/Program.cs                       | 19 +++++++++++++---
 src/ST.Client.Desktop.Avalonia.App/Program.cs | 22 +++++++++----------
 ...pPlatformService.SystemBootRunArguments.cs | 19 ++++++++++++++++
 .../Services/IDesktopPlatformService.cs       |  5 +----
 6 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 src/ST.Client.Desktop/Services/IDesktopPlatformService.SystemBootRunArguments.cs

diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/App.config b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/App.config
index 731f6de6c..c116b6cf4 100644
--- a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/App.config
+++ b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
\ No newline at end of file
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+  </startup>
+</configuration>
diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Launcher.csproj b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Launcher.csproj
index 1a009c040..ac834b312 100644
--- a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Launcher.csproj
+++ b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Launcher.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <ApplicationManifest>..\..\ST.Client.Desktop.Avalonia.App\Properties\app.manifest</ApplicationManifest>
     <AssemblyName>Steam++.Launcher</AssemblyName>
     <RootNamespace>System</RootNamespace>
@@ -31,5 +31,14 @@
     <Compile Include="..\..\Common.CoreLib\Properties\ThisAssembly.Version.cs">
       <Link>Properties\ThisAssembly.Version.cs</Link>
     </Compile>
+    <Compile Include="..\..\ST.Client.Desktop\Services\IDesktopPlatformService.SystemBootRunArguments.cs">
+      <Link>Application\Services\IDesktopPlatformService.SystemBootRunArguments.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
+    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
+    <PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml" Version="4.7.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Program.cs b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Program.cs
index c5dcf6dd2..37ce51dd0 100644
--- a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Program.cs
+++ b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher/Launcher/Program.cs
@@ -1,17 +1,30 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using static System.Application.Services.IDesktopPlatformService;
 
+static string? OnActivated(IActivatedEventArgs args)
+{
+    if (args.Kind == ActivationKind.StartupTask)
+    {
+        // 静默启动（不弹窗口）
+        return SystemBootRunArguments;
+    }
+    return default;
+}
+
+var activatedArgs = AppInstance.GetActivatedEventArgs();
 try
 {
     Process.Start(new ProcessStartInfo()
     {
         FileName = Path.Combine(AppContext.BaseDirectory, "..", "Steam++.exe"),
-        Arguments = string.Join(" ", args),
-        UseShellExecute = false,
+        Arguments = (activatedArgs == default ? default : OnActivated(activatedArgs)) ?? string.Join(" ", args),
+        UseShellExecute = default,
     });
 }
 catch (FileNotFoundException)
 {
-
 }
\ No newline at end of file
diff --git a/src/ST.Client.Desktop.Avalonia.App/Program.cs b/src/ST.Client.Desktop.Avalonia.App/Program.cs
index c82e92305..49fc00be9 100644
--- a/src/ST.Client.Desktop.Avalonia.App/Program.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/Program.cs
@@ -12,15 +12,15 @@ namespace System.Application.UI
         static readonly object lock_global_ex_log = new();
 
 #if WINDOWS_DESKTOP_BRIDGE
-        static string[] OnActivated(string[] main_args, global::Windows.ApplicationModel.Activation.IActivatedEventArgs args)
-        {
-            if (args.Kind == global::Windows.ApplicationModel.Activation.ActivationKind.StartupTask)
-            {
-                // 静默启动（不弹窗口）
-                return IDesktopPlatformService.SystemBootRunArguments.Split(' ');
-            }
-            return main_args;
-        }
+        //static string[] OnActivated(string[] main_args, global::Windows.ApplicationModel.Activation.IActivatedEventArgs args)
+        //{
+        //    if (args.Kind == global::Windows.ApplicationModel.Activation.ActivationKind.StartupTask)
+        //    {
+        //        // 静默启动（不弹窗口）
+        //        return IDesktopPlatformService.SystemBootRunArguments.Split(' ');
+        //    }
+        //    return main_args;
+        //}
 #endif
 
         // Initialization code. Don't use any Avalonia, third-party APIs or any
@@ -34,8 +34,8 @@ namespace System.Application.UI
         {
 #if WINDOWS_DESKTOP_BRIDGE
             if (!DesktopBridgeHelper.Init()) return 0;
-            var activatedArgs = global::Windows.ApplicationModel.AppInstance.GetActivatedEventArgs();
-            if (activatedArgs != null) args = OnActivated(args, activatedArgs);
+            //var activatedArgs = global::Windows.ApplicationModel.AppInstance.GetActivatedEventArgs();
+            //if (activatedArgs != null) args = OnActivated(args, activatedArgs);
 #elif !__MOBILE__
 #if MAC
             AppDelegateHelper.Init(args);
diff --git a/src/ST.Client.Desktop/Services/IDesktopPlatformService.SystemBootRunArguments.cs b/src/ST.Client.Desktop/Services/IDesktopPlatformService.SystemBootRunArguments.cs
new file mode 100644
index 000000000..97d2b1316
--- /dev/null
+++ b/src/ST.Client.Desktop/Services/IDesktopPlatformService.SystemBootRunArguments.cs
@@ -0,0 +1,19 @@
+namespace System.Application.Services
+{
+#if NETFRAMEWORK
+    static
+#endif
+    partial
+#if NETFRAMEWORK
+    class
+#else
+    interface
+#endif
+    IDesktopPlatformService
+    {
+#if NETFRAMEWORK
+        public
+#endif
+        const string SystemBootRunArguments = "-clt c -silence";
+    }
+}
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/Services/IDesktopPlatformService.cs b/src/ST.Client.Desktop/Services/IDesktopPlatformService.cs
index e13868a6b..dc628ae4a 100644
--- a/src/ST.Client.Desktop/Services/IDesktopPlatformService.cs
+++ b/src/ST.Client.Desktop/Services/IDesktopPlatformService.cs
@@ -8,7 +8,7 @@ using System.Windows;
 
 namespace System.Application.Services
 {
-    public interface IDesktopPlatformService : IPlatformService
+    public partial interface IDesktopPlatformService : IPlatformService
     {
         protected new const string TAG = "DesktopPlatformS";
 
@@ -126,8 +126,6 @@ namespace System.Application.Services
         /// <returns></returns>
         string? GetFileName(TextReaderProvider provider);
 
-        const string SystemBootRunArguments = "-clt c -silence";
-
         /// <summary>
         /// 设置开机自启动
         /// </summary>
@@ -231,7 +229,6 @@ namespace System.Application.Services
 
         void FixFluentWindowStyleOnWin7(IntPtr hWnd)
         {
-
         }
     }
 }
\ No newline at end of file

From 16997b6c6ac2af2f9ca71975aef19806faeef72f Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Wed, 4 Aug 2021 18:23:51 +0800
Subject: [PATCH 02/10] Misc

---
 .../App.axaml.cs                              |  3 +-
 .../Implementation/ShowWindowServiceImpl.cs   |  5 +-
 .../UI/Views/Pages/GameListPage.axaml         |  2 +-
 .../Windows/GameListPage/IdleAppWindow.axaml  |  2 +-
 .../Views/Windows/MessageBoxWindow.axaml.cs   |  7 +++
 .../PlatformNotificationServiceImpl.cs        | 40 ++++++++++++
 .../Services/IShowWindowService.cs            |  3 +-
 .../Services/Mvvm/SteamConnectService.cs      | 63 +++++--------------
 .../ViewModels/Pages/GameListPageViewModel.cs |  4 +-
 .../SteamShutdownWindowViewModel.cs           | 17 +++++
 10 files changed, 90 insertions(+), 56 deletions(-)
 create mode 100644 src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs

diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
index 21eee23fd..100ed5980 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -270,8 +270,6 @@ namespace System.Application.UI
 #if WINDOWS
                     JumpLists.Init();
 #endif
-
-                    IsNotOfficialChannelPackageDetectionHelper.Check();
                 }
 
                 desktop.MainWindow =
@@ -301,6 +299,7 @@ namespace System.Application.UI
 #if StartupTrace
             StartupTrace.Restart("Desktop_Startup.Start");
 #endif
+            IsNotOfficialChannelPackageDetectionHelper.Check();
 #if WINDOWS
             if (isOfficialChannelPackage)
             {
diff --git a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs
index 958814ea8..5ce319f64 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs
@@ -159,12 +159,13 @@ namespace System.Application.Services.Implementation
             TWindowViewModel? viewModel = null,
             string title = "",
             ResizeModeCompat resizeMode = ResizeModeCompat.NoResize,
-            bool isDialog = true)
+            bool isDialog = true,
+            bool isParent = true)
             where TWindowViewModel : WindowViewModel, new()
         {
             DialogWindowViewModel? dialogWindowViewModel = null;
             await Show(typeof(TWindowViewModel), isDialog, customWindow,
-                title, viewModel, resizeMode, true, dwvm =>
+                title, viewModel, resizeMode, isParent, dwvm =>
             {
                 dialogWindowViewModel = dwvm;
             });
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
index 46c0095a2..564bdabca 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
@@ -239,7 +239,7 @@
           </ItemsRepeater.Layout>
           <ItemsRepeater.ItemTemplate>
             <DataTemplate>
-              <StackPanel Spacing="8">
+              <StackPanel Spacing="5">
                 <Border DockPanel.Dock="Top"
                         Cursor="Hand"
                         x:Name="AppAvater"
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/IdleAppWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/IdleAppWindow.axaml
index 30a495819..6ef5192a7 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/IdleAppWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/IdleAppWindow.axaml
@@ -72,7 +72,7 @@
                         OffContent=""
                         HorizontalAlignment="Right"
                         Margin="5 0 0 5"
-                        IsChecked="{Binding Source={x:Static service:SteamConnectService.Current},Path=IsAutoAFKApps}"
+                        IsChecked="{ReflectionBinding Source={x:Static ms:GameLibrarySettings.IsAutoAFKApps},Path=Value}"
                         ToolTip.Tip="{ReflectionBinding Path=Res.GameList_AutoAFK,Mode=OneWay,Source={x:Static resx:R.Current}}"
                         VerticalAlignment="Center">
           </ToggleSwitch>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs
index 091b10b53..8dbd941bf 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs
@@ -31,6 +31,13 @@ namespace System.Application.UI.Views.Windows
             AvaloniaXamlLoader.Load(this);
         }
 
+        protected override void OnOpened(EventArgs e)
+        {
+            base.OnOpened(e);
+            this.Topmost = true;
+            this.Topmost = false;
+        }
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
diff --git a/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs
new file mode 100644
index 000000000..26cc862f2
--- /dev/null
+++ b/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs
@@ -0,0 +1,40 @@
+using System.Properties;
+
+namespace System.Application.Services.Implementation
+{
+    /// <inheritdoc cref="INotificationService{TNotificationType, TEntrance}"/>
+    internal sealed class PlatformNotificationServiceImpl : INotificationService
+    {
+        readonly IDesktopPlatformService dps;
+
+        public PlatformNotificationServiceImpl(IDesktopPlatformService dps)
+        {
+            this.dps = dps;
+        }
+
+        public bool AreNotificationsEnabled() => true;
+
+        public void Cancel(NotificationType notificationType)
+        {
+        }
+
+        public void CancelAll()
+        {
+        }
+
+        public void Notify(string text, NotificationType notificationType, bool autoCancel, string? title, Entrance entrance)
+        {
+            title ??= ThisAssembly.AssemblyTrademark;
+            // 调用托盘显示通知
+            throw new NotImplementedException(title);
+        }
+
+        public Progress<float> NotifyDownload(string text, NotificationType notificationType, string? title)
+        {
+            // 桌面端不支持带进度的通知，下载新版本改用桌面端的窗口进度条控件，由更新服务桌面端版实现
+            //title ??= ThisAssembly.AssemblyTrademark;
+            //throw new NotImplementedException(title);
+            throw new PlatformNotSupportedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/Services/IShowWindowService.cs b/src/ST.Client.Desktop/Services/IShowWindowService.cs
index 09fe64691..f79ec8e5d 100644
--- a/src/ST.Client.Desktop/Services/IShowWindowService.cs
+++ b/src/ST.Client.Desktop/Services/IShowWindowService.cs
@@ -57,7 +57,8 @@ namespace System.Application.Services
             TWindowViewModel? viewModel = null,
             string title = "",
             ResizeModeCompat resizeMode = ResizeModeCompat.NoResize,
-            bool isDialog = true)
+            bool isDialog = true,
+            bool isParent = true)
             where TWindowViewModel : WindowViewModel, new();
 
 
diff --git a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
index 0de77d9af..002475bcb 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
@@ -105,10 +105,11 @@ namespace System.Application.Services
                 }
             }
         }
-        #endregion
 
-        #region 是否已经释放SteamClient
         private bool _IsDisposedClient = true;
+        /// <summary>
+        /// 是否已经释放SteamClient
+        /// </summary>
         public bool IsDisposedClient
         {
             get => _IsDisposedClient;
@@ -136,22 +137,13 @@ namespace System.Application.Services
                 }
             }
         }
-        public bool IsAutoAFKApps
-        {
-            get => GameLibrarySettings.IsAutoAFKApps.Value;
-            set
-            {
-                GameLibrarySettings.IsAutoAFKApps.Value = value;
-                this.RaisePropertyChanged(nameof(IsAutoAFKApps));
-            }
-        }
+
         public void RunAFKApps()
         {
             if (GameLibrarySettings.AFKAppList.Value?.Count > 0)
             {
                 foreach (var item in GameLibrarySettings.AFKAppList.Value)
                 {
-
                     RuningSteamApps.TryGetValue(item.Key, out var runState);
                     if (runState == null)
                         RuningSteamApps.TryAdd(item.Key, new SteamApp
@@ -177,7 +169,7 @@ namespace System.Application.Services
             if (!SteamTool.IsRunningSteamProcess && SteamSettings.IsAutoRunSteam.Value)
                 SteamTool.StartSteam(SteamSettings.SteamStratParameter.Value);
 
-            var t = new Task(async () =>
+            Task.Factory.StartNew(async () =>
             {
                 Thread.CurrentThread.IsBackground = true;
                 try
@@ -206,10 +198,10 @@ namespace System.Application.Services
                                     CurrentSteamUser.IPCountry = ApiService.GetIPCountry();
                                     IsSteamChinaLauncher = ApiService.IsSteamChinaLauncher();
 
-                                    if (IsAutoAFKApps)
+                                    #region 初始化需要steam启动才能使用的功能
+                                    if (GameLibrarySettings.IsAutoAFKApps.Value)
                                         RunAFKApps();
 
-                                    #region 初始化需要steam启动才能使用的功能
                                     if (SteamApps.Items.Any())
                                     {
                                         LoadGames(ApiService.OwnsApps(await ISteamService.Instance.GetAppInfos()));
@@ -234,13 +226,10 @@ namespace System.Application.Services
                 }
                 catch (Exception ex)
                 {
-                    Log.Error(nameof(SteamConnectService), ex, "Task LongRunning");
+                    Log.Error(nameof(SteamConnectService), ex, "SteamConnect Task LongRunning");
                     ToastService.Current.Notify(ex.Message);
                 }
-            }, TaskCreationOptions.LongRunning);
-
-            //t.Forget();
-            t.Start();
+            }, TaskCreationOptions.LongRunning).ConfigureAwait(false);
         }
 
         public bool Initialize(int appid)
@@ -256,7 +245,7 @@ namespace System.Application.Services
         {
             SteamApps.Clear();
             if (apps.Any_Nullable())
-                SteamApps.AddOrUpdate(apps);
+                SteamApps.AddOrUpdate(apps!);
         }
 
         public async void InitializeGameList()
@@ -267,29 +256,10 @@ namespace System.Application.Services
             IsLoadingGameList = false;
         }
 
-        //        public void UpdateGamesImage()
-        //        {
-        //#if DEBUG
-        //            if (BuildConfig.IsDebuggerAttached)
-        //            {
-        //                return;
-        //            }
-        //#endif
-        //            //if (SteamApps.Items.Any())
-        //            //{
-        //            //    Parallel.ForEach(SteamApps.Items, new ParallelOptions
-        //            //    {
-        //            //        MaxDegreeOfParallelism = (Environment.ProcessorCount / 2) + 1
-        //            //    }, async app =>
-        //            //    {
-        //            //        await ISteamService.Instance.LoadAppImageAsync(app);
-        //            //        //app.LibraryLogoStream = await IHttpService.Instance.GetImageAsync(app.LibraryLogoUrl, ImageChannelType.SteamGames);
-        //            //        //app.LibraryHeaderStream = await IHttpService.Instance.GetImageAsync(app.LibraryHeaderUrl, ImageChannelType.SteamGames);
-        //            //        //app.LibraryNameStream = await IHttpService.Instance.GetImageAsync(app.LibraryNameUrl, ImageChannelType.SteamGames);
-        //            //        //app.HeaderLogoStream = await IHttpService.Instance.GetImageAsync(app.HeaderLogoUrl, ImageChannelType.SteamGames);
-        //            //    });
-        //            //}
-        //        }
+        public async void InitializeDownloadGameList()
+        {
+
+        }
 
         private bool _IsRefreshing;
         public /*async*/ void RefreshGamesList()
@@ -299,7 +269,7 @@ namespace System.Application.Services
                 _IsRefreshing = true;
                 if (SteamTool.IsRunningSteamProcess)
                 {
-                    var t = new Task(() =>
+                    Task.Factory.StartNew(() =>
                     {
                         Thread.CurrentThread.IsBackground = true;
                         try
@@ -331,8 +301,7 @@ namespace System.Application.Services
                             Log.Error(nameof(SteamConnectService), ex, "Task RefreshGamesList");
                             ToastService.Current.Notify(ex.Message);
                         }
-                    }, TaskCreationOptions.LongRunning);
-                    t.Start();
+                    }, TaskCreationOptions.DenyChildAttach | TaskCreationOptions.PreferFairness).Forget().ConfigureAwait(false);
                 }
                 else
                 {
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs
index ddec9dd2e..75a50a881 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs
@@ -119,7 +119,7 @@ namespace System.Application.UI.ViewModels
 
             EnableAFKAutoUpdateCommand = ReactiveCommand.Create(() =>
             {
-                AFKAutoUpdate?.CheckmarkChange(SteamConnectService.Current.IsAutoAFKApps = !SteamConnectService.Current.IsAutoAFKApps);
+                AFKAutoUpdate?.CheckmarkChange(GameLibrarySettings.IsAutoAFKApps.Value = !GameLibrarySettings.IsAutoAFKApps.Value);
             });
 
             MenuItems = new ObservableCollection<MenuItemViewModel>()
@@ -135,7 +135,7 @@ namespace System.Application.UI.ViewModels
                       IconKey ="ClockArrowDownloadDrawing", Command = SteamShutdownCommand },
             };
 
-            AFKAutoUpdate?.CheckmarkChange(SteamConnectService.Current.IsAutoAFKApps);
+            AFKAutoUpdate?.CheckmarkChange(GameLibrarySettings.IsAutoAFKApps.Value);
         }
         public ReactiveCommand<Unit, Unit> EnableAFKAutoUpdateCommand { get; }
 
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/SteamShutdownWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/SteamShutdownWindowViewModel.cs
index e3094627f..73134856b 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/SteamShutdownWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/SteamShutdownWindowViewModel.cs
@@ -1,7 +1,11 @@
+using DynamicData;
 using Newtonsoft.Json.Linq;
+using ReactiveUI;
 using System.Application.Models;
 using System.Application.UI.Resx;
+using System.Collections.ObjectModel;
 using System.Properties;
+using System.Reactive.Linq;
 
 namespace System.Application.UI.ViewModels
 {
@@ -10,8 +14,21 @@ namespace System.Application.UI.ViewModels
         public SteamShutdownWindowViewModel() : base()
         {
             Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.GameList_SteamShutdown;
+
+            _DownloadingAppSourceList = new SourceList<SteamApp>();
+
+            _DownloadingAppSourceList
+               .Connect()
+               .ObserveOn(RxApp.MainThreadScheduler)
+               //.Sort(SortExpressionComparer<SteamApp>.Descending(x => x.))
+               .Bind(out _DownloadingApps)
+               .Subscribe();
         }
 
+        private readonly ReadOnlyObservableCollection<SteamApp>? _DownloadingApps;
+        public ReadOnlyObservableCollection<SteamApp>? DownloadingApps => _DownloadingApps;
+
+        private readonly SourceList<SteamApp> _DownloadingAppSourceList;
 
     }
 }
\ No newline at end of file

From de29d52ee351923fa1aca818da32bde166bed2dc Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 5 Aug 2021 09:59:58 +0800
Subject: [PATCH 03/10] NotifyIcon

---
 .../Internals/UnmanagedMethods.cs             | 103 +++++++++++++++++-
 .../PlatformNotificationServiceImpl.cs        |   1 -
 .../UI/NotifyIcon.cs                          |  60 ++++++++--
 3 files changed, 149 insertions(+), 15 deletions(-)

diff --git a/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs b/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
index ee76b649b..14e02686a 100644
--- a/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
+++ b/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
@@ -1,4 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
+// Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 // Slightly modified and extended version for the use in SQRLDotNetClientUI
@@ -19,7 +19,7 @@ namespace System
         public static extern IntPtr LoadImage(IntPtr hinst, string lpszName, uint uType, int cxDesired, int cyDesired, uint fuLoad);
 
         [DllImport("shell32", CharSet = CharSet.Auto)]
-        public static extern int Shell_NotifyIcon(NIM dwMessage, NOTIFYICONDATA lpData);
+        public static extern int Shell_NotifyIcon(NIM dwMessage, [In] ref NOTIFYICONDATA lpData);
 
         [DllImport("user32.dll")]
         public static extern void PostQuitMessage(int nExitCode);
@@ -132,6 +132,46 @@ namespace System
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
             public string szInfoTitle;
             public NIIF dwInfoFlags;
+            /// <summary>
+            /// String with the text for a balloon ToolTip. It can have a maximum of 255 characters.
+            /// To remove the ToolTip, set the NIF_INFO flag in uFlags and set szInfo to an empty string.
+            /// </summary>
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+            public string BalloonText;
+            /// <summary>
+            /// String containing a title for a balloon ToolTip. This title appears in boldface
+            /// above the text. It can have a maximum of 63 characters.
+            /// </summary>
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+            public string BalloonTitle;
+            /// <summary>
+            /// Mainly used to set the version when <see cref="WinApi.Shell_NotifyIcon"/> is invoked
+            /// with <see cref="NotifyCommand.SetVersion"/>. However, for legacy operations,
+            /// the same member is also used to set timeouts for balloon ToolTips.
+            /// </summary>
+            public uint VersionOrTimeout;
+            /// <summary>
+            /// Adds an icon to a balloon ToolTip, which is placed to the left of the title. If the
+            /// <see cref="BalloonTitle"/> member is zero-length, the icon is not shown.
+            /// </summary>
+            public BalloonFlags BalloonFlags;
+
+            /// <summary>
+            /// Windows XP (Shell32.dll version 6.0) and later.<br/>
+            /// - Windows 7 and later: A registered GUID that identifies the icon.
+            ///   This value overrides uID and is the recommended method of identifying the icon.<br/>
+            /// - Windows XP through Windows Vista: Reserved.
+            /// </summary>
+            public Guid TaskbarIconGuid;
+
+            /// <summary>
+            /// Windows Vista (Shell32.dll version 6.0.6) and later. The handle of a customized
+            /// balloon icon provided by the application that should be used independently
+            /// of the tray icon. If this member is non-NULL and the <see cref="TaskbarNotification.Interop.BalloonFlags.User"/>
+            /// flag is set, this icon is used as the balloon icon.<br/>
+            /// If this member is NULL, the legacy behavior is carried out.
+            /// </summary>
+            public IntPtr CustomBalloonIconHandle;
         }
 
         public enum NIM : uint
@@ -2103,6 +2143,65 @@ namespace System
         }
     }
 
+    /// <summary>
+    /// Flags that define the icon that is shown on a balloon
+    /// tooltip.
+    /// </summary>
+    public enum BalloonFlags
+    {
+        /// <summary>
+        /// No icon is displayed.
+        /// </summary>
+        None = 0x00,
+
+        /// <summary>
+        /// An information icon is displayed.
+        /// </summary>
+        Info = 0x01,
+
+        /// <summary>
+        /// A warning icon is displayed.
+        /// </summary>
+        Warning = 0x02,
+
+        /// <summary>
+        /// An error icon is displayed.
+        /// </summary>
+        Error = 0x03,
+
+        /// <summary>
+        /// Windows XP Service Pack 2 (SP2) and later.
+        /// Use a custom icon as the title icon.
+        /// </summary>
+        User = 0x04,
+
+        /// <summary>
+        /// Windows XP (Shell32.dll version 6.0) and later.
+        /// Do not play the associated sound. Applies only to balloon ToolTips.
+        /// </summary>
+        NoSound = 0x10,
+
+        /// <summary>
+        /// Windows Vista (Shell32.dll version 6.0.6) and later. The large version
+        /// of the icon should be used as the balloon icon. This corresponds to the
+        /// icon with dimensions SM_CXICON x SM_CYICON. If this flag is not set,
+        /// the icon with dimensions XM_CXSMICON x SM_CYSMICON is used.<br/>
+        /// - This flag can be used with all stock icons.<br/>
+        /// - Applications that use older customized icons (NIIF_USER with hIcon) must
+        ///   provide a new SM_CXICON x SM_CYICON version in the tray icon (hIcon). These
+        ///   icons are scaled down when they are displayed in the System Tray or
+        ///   System Control Area (SCA).<br/>
+        /// - New customized icons (NIIF_USER with hBalloonIcon) must supply an
+        ///   SM_CXICON x SM_CYICON version in the supplied icon (hBalloonIcon).
+        /// </summary>
+        LargeIcon = 0x20,
+
+        /// <summary>
+        /// Windows 7 and later.
+        /// </summary>
+        RespectQuietTime = 0x80
+    }
+
     [Flags]
     internal enum DropEffect : int
     {
diff --git a/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs
index 26cc862f2..7aeeedc4e 100644
--- a/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs
+++ b/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs
@@ -26,7 +26,6 @@ namespace System.Application.Services.Implementation
         {
             title ??= ThisAssembly.AssemblyTrademark;
             // 调用托盘显示通知
-            throw new NotImplementedException(title);
         }
 
         public Progress<float> NotifyDownload(string text, NotificationType notificationType, string? title)
diff --git a/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs b/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
index fcb8c9768..b7b2d2c2a 100644
--- a/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
+++ b/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
@@ -20,6 +20,11 @@ namespace System.Application.UI
         string _toolTipText = string.Empty;
         bool _visible = false;
         bool _doubleClick = false;
+        /// <summary>
+        /// Represents the current icon data.
+        /// </summary>
+        private UnmanagedMethods.NOTIFYICONDATA iconData;
+
 
         public event EventHandler<EventArgs>? Click;
         public event EventHandler<EventArgs>? DoubleClick;
@@ -131,6 +136,15 @@ namespace System.Application.UI
 
         ~NotifyIcon()
         {
+            iconData = new UnmanagedMethods.NOTIFYICONDATA()
+            {
+                hWnd = _window.Handle,
+                uID = _uID,
+                uFlags = UnmanagedMethods.NIF.TIP | UnmanagedMethods.NIF.MESSAGE,
+                uCallbackMessage = (int)UnmanagedMethods.CustomWindowsMessage.WM_TRAYMOUSE,
+                hIcon = IntPtr.Zero,
+                szTip = ToolTipText
+            };
             UpdateIcon(remove: true);
         }
 
@@ -141,15 +155,6 @@ namespace System.Application.UI
         void UpdateIcon(bool remove = false)
         {
             if (_window == null) throw new ArgumentNullException(nameof(_window));
-            UnmanagedMethods.NOTIFYICONDATA iconData = new UnmanagedMethods.NOTIFYICONDATA()
-            {
-                hWnd = _window.Handle,
-                uID = _uID,
-                uFlags = UnmanagedMethods.NIF.TIP | UnmanagedMethods.NIF.MESSAGE,
-                uCallbackMessage = (int)UnmanagedMethods.CustomWindowsMessage.WM_TRAYMOUSE,
-                hIcon = IntPtr.Zero,
-                szTip = ToolTipText
-            };
 
             if (!remove && _icon != null && Visible)
             {
@@ -158,17 +163,17 @@ namespace System.Application.UI
 
                 if (!_iconAdded)
                 {
-                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.ADD, iconData);
+                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.ADD,ref iconData);
                     _iconAdded = true;
                 }
                 else
                 {
-                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY, iconData);
+                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY,ref iconData);
                 }
             }
             else
             {
-                _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.DELETE, iconData);
+                _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.DELETE,ref iconData);
                 _iconAdded = false;
             }
         }
@@ -242,6 +247,37 @@ namespace System.Application.UI
             }
         }
 
+        public void ShowBalloonTip(string title, string message, BalloonFlags flags, IntPtr balloonIconHandle)
+        {
+             iconData = new UnmanagedMethods.NOTIFYICONDATA()
+            {
+                hWnd = _window.Handle,
+                uID = _uID,
+                uFlags = UnmanagedMethods.NIF.TIP | UnmanagedMethods.NIF.MESSAGE,
+                uCallbackMessage = (int)UnmanagedMethods.CustomWindowsMessage.WM_TRAYMOUSE,
+                hIcon = IntPtr.Zero,
+                szTip = ToolTipText
+            };
+
+            iconData.BalloonText = message ?? string.Empty;
+            iconData.BalloonTitle = title ?? string.Empty;
+
+            iconData.BalloonFlags = flags;
+            iconData.CustomBalloonIconHandle = balloonIconHandle;
+
+            UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY,ref iconData);
+        }
+
+        /// <summary>
+        /// Hides a balloon ToolTip, if any is displayed.
+        /// </summary>
+        public void HideBalloonTip()
+        {
+            // reset balloon by just setting the info to an empty string
+            iconData.BalloonText = iconData.BalloonTitle = string.Empty;
+            UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY, ref iconData);
+        }
+
         /// <summary>
         /// Handles the NotifyIcon-specific window messages sent by the notification icon.
         /// </summary>

From 4a1ae528abdea7af7a9d83281b37799fe5a4ab5c Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 5 Aug 2021 15:52:55 +0800
Subject: [PATCH 04/10] =?UTF-8?q?windows=E6=89=98=E7=9B=98=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../App.axaml.cs                              |   3 +-
 .../PlatformNotificationServiceImpl.cs        |   7 +-
 .../Internals/UnmanagedMethods.cs             | 148 +++++-------------
 .../PlatformNotificationServiceImpl.cs        |  39 -----
 .../UI/NotifyIcon.cs                          |  95 ++++++++---
 src/ST.Client.Desktop/UI/INotifyIcon.cs       |  15 ++
 .../UI/ViewModels/Pages/DebugPageViewModel.cs |   4 +-
 7 files changed, 129 insertions(+), 182 deletions(-)
 delete mode 100644 src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs

diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
index 100ed5980..6d817f16c 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -211,6 +211,7 @@ namespace System.Application.UI
                         #region NotifyIcon
 
                         var notifyIcon = INotifyIcon.Instance;
+                        notifyIcon.Visible = true;
                         notifyIcon.ToolTipText = ThisAssembly.AssemblyTrademark;
                         switch (DI.Platform)
                         {
@@ -255,8 +256,6 @@ namespace System.Application.UI
                             .Select(x => new MenuItem { Header = x.Key, Command = x.Value }).ToList();
                         notifyIcon.ContextMenu = NotifyIconContextMenu;
 #endif
-
-                        notifyIcon.Visible = true;
                         notifyIcon.Click += NotifyIcon_Click;
                         notifyIcon.DoubleClick += NotifyIcon_Click;
                         compositeDisposable.Add(() =>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
index 26cc862f2..8cfa5e6a4 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
@@ -1,3 +1,4 @@
+using System.Application.UI;
 using System.Properties;
 
 namespace System.Application.Services.Implementation
@@ -25,8 +26,12 @@ namespace System.Application.Services.Implementation
         public void Notify(string text, NotificationType notificationType, bool autoCancel, string? title, Entrance entrance)
         {
             title ??= ThisAssembly.AssemblyTrademark;
+
             // 调用托盘显示通知
-            throw new NotImplementedException(title);
+            if (DI.Platform == Platform.Windows)
+            {
+                INotifyIcon.Instance.ShowBalloonTip(title, text);
+            }
         }
 
         public Progress<float> NotifyDownload(string text, NotificationType notificationType, string? title)
diff --git a/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs b/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
index 14e02686a..adfb4ac88 100644
--- a/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
+++ b/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
@@ -18,8 +18,11 @@ namespace System
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         public static extern IntPtr LoadImage(IntPtr hinst, string lpszName, uint uType, int cxDesired, int cyDesired, uint fuLoad);
 
-        [DllImport("shell32", CharSet = CharSet.Auto)]
-        public static extern int Shell_NotifyIcon(NIM dwMessage, [In] ref NOTIFYICONDATA lpData);
+        /// <summary>
+        /// Creates, updates or deletes the taskbar icon.
+        /// </summary>
+        [DllImport("shell32", CharSet = CharSet.Unicode)]
+        public static extern bool Shell_NotifyIcon(NIM cmd, NOTIFYICONDATA data);
 
         [DllImport("user32.dll")]
         public static extern void PostQuitMessage(int nExitCode);
@@ -113,7 +116,7 @@ namespace System
             public uint dwTime;
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         public class NOTIFYICONDATA
         {
             public int cbSize = Marshal.SizeOf<NOTIFYICONDATA>();
@@ -126,48 +129,26 @@ namespace System
             public string szTip;
             public int dwState = 0;
             public int dwStateMask = 0;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-            public string szInfo;
-            public int uTimeoutOrVersion;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-            public string szInfoTitle;
-            public NIIF dwInfoFlags;
             /// <summary>
             /// String with the text for a balloon ToolTip. It can have a maximum of 255 characters.
             /// To remove the ToolTip, set the NIF_INFO flag in uFlags and set szInfo to an empty string.
             /// </summary>
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-            public string BalloonText;
+            public string szInfo;
+            public int uVersion;
+            public int uTimeoutOrVersion;
             /// <summary>
             /// String containing a title for a balloon ToolTip. This title appears in boldface
             /// above the text. It can have a maximum of 63 characters.
             /// </summary>
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-            public string BalloonTitle;
-            /// <summary>
-            /// Mainly used to set the version when <see cref="WinApi.Shell_NotifyIcon"/> is invoked
-            /// with <see cref="NotifyCommand.SetVersion"/>. However, for legacy operations,
-            /// the same member is also used to set timeouts for balloon ToolTips.
-            /// </summary>
-            public uint VersionOrTimeout;
-            /// <summary>
-            /// Adds an icon to a balloon ToolTip, which is placed to the left of the title. If the
-            /// <see cref="BalloonTitle"/> member is zero-length, the icon is not shown.
-            /// </summary>
-            public BalloonFlags BalloonFlags;
-
-            /// <summary>
-            /// Windows XP (Shell32.dll version 6.0) and later.<br/>
-            /// - Windows 7 and later: A registered GUID that identifies the icon.
-            ///   This value overrides uID and is the recommended method of identifying the icon.<br/>
-            /// - Windows XP through Windows Vista: Reserved.
-            /// </summary>
-            public Guid TaskbarIconGuid;
+            public string szInfoTitle;
+            public NIIF dwInfoFlags;
 
             /// <summary>
             /// Windows Vista (Shell32.dll version 6.0.6) and later. The handle of a customized
             /// balloon icon provided by the application that should be used independently
-            /// of the tray icon. If this member is non-NULL and the <see cref="TaskbarNotification.Interop.BalloonFlags.User"/>
+            /// of the tray icon. If this member is non-NULL and the <see cref="NIIF.USER"/>
             /// flag is set, this icon is used as the balloon icon.<br/>
             /// If this member is NULL, the legacy behavior is carried out.
             /// </summary>
@@ -183,33 +164,6 @@ namespace System
             SETVERSION = 0x00000004
         }
 
-        [Flags]
-        public enum NIF : uint
-        {
-            MESSAGE = 0x00000001,
-            ICON = 0x00000002,
-            TIP = 0x00000004,
-            STATE = 0x00000008,
-            INFO = 0x00000010,
-            GUID = 0x00000020,
-            REALTIME = 0x00000040,
-            SHOWTIP = 0x00000080
-        }
-
-        [Flags]
-        public enum NIIF : uint
-        {
-            NONE = 0x00000000,
-            INFO = 0x00000001,
-            WARNING = 0x00000002,
-            ERROR = 0x00000003,
-            USER = 0x00000004,
-            ICON_MASK = 0x0000000F,
-            NOSOUND = 0x00000010,
-            LARGE_ICON = 0x00000020,
-            RESPECT_QUIET_TIME = 0x00000080
-        }
-
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         public class MENUITEMINFO
         {
@@ -2143,63 +2097,31 @@ namespace System
         }
     }
 
-    /// <summary>
-    /// Flags that define the icon that is shown on a balloon
-    /// tooltip.
-    /// </summary>
-    public enum BalloonFlags
+    [Flags]
+    public enum NIF : uint
     {
-        /// <summary>
-        /// No icon is displayed.
-        /// </summary>
-        None = 0x00,
+        MESSAGE = 0x00000001,
+        ICON = 0x00000002,
+        TIP = 0x00000004,
+        STATE = 0x00000008,
+        INFO = 0x00000010,
+        GUID = 0x00000020,
+        REALTIME = 0x00000040,
+        SHOWTIP = 0x00000080
+    }
 
-        /// <summary>
-        /// An information icon is displayed.
-        /// </summary>
-        Info = 0x01,
-
-        /// <summary>
-        /// A warning icon is displayed.
-        /// </summary>
-        Warning = 0x02,
-
-        /// <summary>
-        /// An error icon is displayed.
-        /// </summary>
-        Error = 0x03,
-
-        /// <summary>
-        /// Windows XP Service Pack 2 (SP2) and later.
-        /// Use a custom icon as the title icon.
-        /// </summary>
-        User = 0x04,
-
-        /// <summary>
-        /// Windows XP (Shell32.dll version 6.0) and later.
-        /// Do not play the associated sound. Applies only to balloon ToolTips.
-        /// </summary>
-        NoSound = 0x10,
-
-        /// <summary>
-        /// Windows Vista (Shell32.dll version 6.0.6) and later. The large version
-        /// of the icon should be used as the balloon icon. This corresponds to the
-        /// icon with dimensions SM_CXICON x SM_CYICON. If this flag is not set,
-        /// the icon with dimensions XM_CXSMICON x SM_CYSMICON is used.<br/>
-        /// - This flag can be used with all stock icons.<br/>
-        /// - Applications that use older customized icons (NIIF_USER with hIcon) must
-        ///   provide a new SM_CXICON x SM_CYICON version in the tray icon (hIcon). These
-        ///   icons are scaled down when they are displayed in the System Tray or
-        ///   System Control Area (SCA).<br/>
-        /// - New customized icons (NIIF_USER with hBalloonIcon) must supply an
-        ///   SM_CXICON x SM_CYICON version in the supplied icon (hBalloonIcon).
-        /// </summary>
-        LargeIcon = 0x20,
-
-        /// <summary>
-        /// Windows 7 and later.
-        /// </summary>
-        RespectQuietTime = 0x80
+    [Flags]
+    public enum NIIF : uint
+    {
+        NONE = 0x00000000,
+        INFO = 0x00000001,
+        WARNING = 0x00000002,
+        ERROR = 0x00000003,
+        USER = 0x00000004,
+        ICON_MASK = 0x0000000F,
+        NOSOUND = 0x00000010,
+        LARGE_ICON = 0x00000020,
+        RESPECT_QUIET_TIME = 0x00000080
     }
 
     [Flags]
diff --git a/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs
deleted file mode 100644
index 7aeeedc4e..000000000
--- a/src/ST.Client.Desktop.Windows/Services/Implementation/PlatformNotificationServiceImpl.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Properties;
-
-namespace System.Application.Services.Implementation
-{
-    /// <inheritdoc cref="INotificationService{TNotificationType, TEntrance}"/>
-    internal sealed class PlatformNotificationServiceImpl : INotificationService
-    {
-        readonly IDesktopPlatformService dps;
-
-        public PlatformNotificationServiceImpl(IDesktopPlatformService dps)
-        {
-            this.dps = dps;
-        }
-
-        public bool AreNotificationsEnabled() => true;
-
-        public void Cancel(NotificationType notificationType)
-        {
-        }
-
-        public void CancelAll()
-        {
-        }
-
-        public void Notify(string text, NotificationType notificationType, bool autoCancel, string? title, Entrance entrance)
-        {
-            title ??= ThisAssembly.AssemblyTrademark;
-            // 调用托盘显示通知
-        }
-
-        public Progress<float> NotifyDownload(string text, NotificationType notificationType, string? title)
-        {
-            // 桌面端不支持带进度的通知，下载新版本改用桌面端的窗口进度条控件，由更新服务桌面端版实现
-            //title ??= ThisAssembly.AssemblyTrademark;
-            //throw new NotImplementedException(title);
-            throw new PlatformNotSupportedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs b/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
index b7b2d2c2a..dbe44392b 100644
--- a/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
+++ b/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
@@ -132,19 +132,21 @@ namespace System.Application.UI
             {
                 _window = new NotifyIconWindow(this);
             }
-        }
 
-        ~NotifyIcon()
-        {
             iconData = new UnmanagedMethods.NOTIFYICONDATA()
             {
                 hWnd = _window.Handle,
                 uID = _uID,
-                uFlags = UnmanagedMethods.NIF.TIP | UnmanagedMethods.NIF.MESSAGE,
+                uFlags = NIF.TIP | NIF.MESSAGE,
                 uCallbackMessage = (int)UnmanagedMethods.CustomWindowsMessage.WM_TRAYMOUSE,
                 hIcon = IntPtr.Zero,
-                szTip = ToolTipText
+                uVersion = 2000,
+                szTip = ToolTipText,
             };
+        }
+
+        ~NotifyIcon()
+        {
             UpdateIcon(remove: true);
         }
 
@@ -158,22 +160,22 @@ namespace System.Application.UI
 
             if (!remove && _icon != null && Visible)
             {
-                iconData.uFlags |= UnmanagedMethods.NIF.ICON;
+                iconData.uFlags |= NIF.ICON;
                 iconData.hIcon = _icon.Handle;
 
                 if (!_iconAdded)
                 {
-                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.ADD,ref iconData);
+                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.ADD, iconData);
                     _iconAdded = true;
                 }
                 else
                 {
-                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY,ref iconData);
+                    _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY, iconData);
                 }
             }
             else
             {
-                _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.DELETE,ref iconData);
+                _ = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.DELETE, iconData);
                 _iconAdded = false;
             }
         }
@@ -247,25 +249,68 @@ namespace System.Application.UI
             }
         }
 
-        public void ShowBalloonTip(string title, string message, BalloonFlags flags, IntPtr balloonIconHandle)
+        /// <summary>
+        /// Displays a balloon tip with the specified title,
+        /// text, and icon in the taskbar for the specified time period.
+        /// </summary>
+        /// <param name="title">The title to display on the balloon tip.</param>
+        /// <param name="message">The text to display on the balloon tip.</param>
+        public void ShowBalloonTip(string title, string message, NIIF flags)
         {
-             iconData = new UnmanagedMethods.NOTIFYICONDATA()
+            ShowBalloonTip(title, message, flags, IntPtr.Zero);
+        }
+
+        /// <summary>
+        /// Displays a balloon tip with the specified title,
+        /// text, and icon in the taskbar for the specified time period.
+        /// </summary>
+        /// <param name="title">The title to display on the balloon tip.</param>
+        /// <param name="message">The text to display on the balloon tip.</param>
+        public void ShowBalloonTip(string title, string message)
+        {
+            ShowBalloonTip(title, message, NIIF.NONE, IntPtr.Zero);
+        }
+
+        /// <summary>
+        /// Displays a balloon tip with the specified title,
+        /// text, and a custom icon in the taskbar for the specified time period.
+        /// </summary>
+        /// <param name="title">The title to display on the balloon tip.</param>
+        /// <param name="message">The text to display on the balloon tip.</param>
+        /// <param name="customIcon">A custom icon.</param>
+        /// <param name="largeIcon">True to allow large icons (Windows Vista and later).</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="customIcon"/>
+        /// is a null reference.</exception>
+        public void ShowBalloonTip(string title, string message, Icon customIcon, bool largeIcon = false)
+        {
+            if (customIcon == null) throw new ArgumentNullException(nameof(customIcon));
+            var flags = NIIF.USER;
+            if (largeIcon)
             {
-                hWnd = _window.Handle,
-                uID = _uID,
-                uFlags = UnmanagedMethods.NIF.TIP | UnmanagedMethods.NIF.MESSAGE,
-                uCallbackMessage = (int)UnmanagedMethods.CustomWindowsMessage.WM_TRAYMOUSE,
-                hIcon = IntPtr.Zero,
-                szTip = ToolTipText
-            };
+                // ReSharper disable once BitwiseOperatorOnEnumWithoutFlags
+                flags |= NIIF.LARGE_ICON;
+            }
+            ShowBalloonTip(title, message, flags, customIcon.Handle);
+        }
 
-            iconData.BalloonText = message ?? string.Empty;
-            iconData.BalloonTitle = title ?? string.Empty;
-
-            iconData.BalloonFlags = flags;
+        /// <summary>
+        /// Invokes <see cref="UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM, ref UnmanagedMethods.NOTIFYICONDATA)"/> in order to display
+        /// a given balloon ToolTip.
+        /// </summary>
+        /// <param name="title">The title to display on the balloon tip.</param>
+        /// <param name="message">The text to display on the balloon tip.</param>
+        /// <param name="flags">Indicates what icon to use.</param>
+        /// <param name="balloonIconHandle">A handle to a custom icon, if any, or
+        /// <see cref="IntPtr.Zero"/>.</param>
+        public void ShowBalloonTip(string title, string message, NIIF flags, IntPtr balloonIconHandle)
+        {
+            iconData.szInfo = message ?? string.Empty;
+            iconData.szInfoTitle = title ?? string.Empty;
+            iconData.uFlags = NIF.INFO | NIF.ICON;
             iconData.CustomBalloonIconHandle = balloonIconHandle;
+            iconData.dwInfoFlags = flags;
 
-            UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY,ref iconData);
+            var result = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY, iconData);
         }
 
         /// <summary>
@@ -274,8 +319,8 @@ namespace System.Application.UI
         public void HideBalloonTip()
         {
             // reset balloon by just setting the info to an empty string
-            iconData.BalloonText = iconData.BalloonTitle = string.Empty;
-            UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY, ref iconData);
+            iconData.szInfo = iconData.szInfoTitle = string.Empty;
+            UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY, iconData);
         }
 
         /// <summary>
diff --git a/src/ST.Client.Desktop/UI/INotifyIcon.cs b/src/ST.Client.Desktop/UI/INotifyIcon.cs
index c036124c9..1fe08ce0c 100644
--- a/src/ST.Client.Desktop/UI/INotifyIcon.cs
+++ b/src/ST.Client.Desktop/UI/INotifyIcon.cs
@@ -53,11 +53,26 @@ namespace System.Application.UI
         /// </summary>
         event EventHandler<EventArgs> RightClick;
 
+
         public interface IUIFrameworkHelper
         {
             Stream OpenAsset(Uri uri);
 
             void ForEachMenuItems(TContextMenu menu, Action<(object menuItem, string header, Action activated)> action);
         }
+
+        /// <summary>
+        /// Displays a balloon tip with the specified title,
+        /// text, and icon in the taskbar for the specified time period.
+        /// </summary>
+        /// <param name="title">The title to display on the balloon tip.</param>
+        /// <param name="message">The text to display on the balloon tip.</param>
+        /// <param name="flags">A symbol that indicates the severity.</param>
+        void ShowBalloonTip(string title, string message);
+
+        /// <summary>
+        /// Hides a balloon ToolTip, if any is displayed.
+        /// </summary>
+        void HideBalloonTip();
     }
 }
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
index 3b19131f2..9cbd0b527 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
@@ -277,8 +277,8 @@ namespace System.Application.UI.ViewModels
             //                FileShareTest();
             //            }
             //#endif
-
-            ShowDialogButton_Click1();
+            INotificationService.Instance.Notify("测试Test🎆🎇→→", NotificationType.Announcement);
+            //ShowDialogButton_Click1();
         }
 
 #if DEBUG

From 1ba0c1f785e523873808b027cb95c95b4113e53f Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 5 Aug 2021 16:15:00 +0800
Subject: [PATCH 05/10] Fix

---
 .../Implementation/PlatformNotificationServiceImpl.cs     | 8 ++++++++
 .../Internals/UnmanagedMethods.cs                         | 3 +--
 src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs            | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
index 8cfa5e6a4..808ea8672 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
@@ -17,10 +17,18 @@ namespace System.Application.Services.Implementation
 
         public void Cancel(NotificationType notificationType)
         {
+            if (DI.Platform == Platform.Windows)
+            {
+                INotifyIcon.Instance.HideBalloonTip();
+            }
         }
 
         public void CancelAll()
         {
+            if (DI.Platform == Platform.Windows)
+            {
+                INotifyIcon.Instance.HideBalloonTip();
+            }
         }
 
         public void Notify(string text, NotificationType notificationType, bool autoCancel, string? title, Entrance entrance)
diff --git a/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs b/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
index adfb4ac88..52cdba278 100644
--- a/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
+++ b/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs
@@ -135,7 +135,6 @@ namespace System
             /// </summary>
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
             public string szInfo;
-            public int uVersion;
             public int uTimeoutOrVersion;
             /// <summary>
             /// String containing a title for a balloon ToolTip. This title appears in boldface
@@ -152,7 +151,7 @@ namespace System
             /// flag is set, this icon is used as the balloon icon.<br/>
             /// If this member is NULL, the legacy behavior is carried out.
             /// </summary>
-            public IntPtr CustomBalloonIconHandle;
+            //public IntPtr CustomBalloonIconHandle;
         }
 
         public enum NIM : uint
diff --git a/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs b/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
index dbe44392b..165c79437 100644
--- a/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
+++ b/src/ST.Client.Desktop.Windows/UI/NotifyIcon.cs
@@ -140,7 +140,7 @@ namespace System.Application.UI
                 uFlags = NIF.TIP | NIF.MESSAGE,
                 uCallbackMessage = (int)UnmanagedMethods.CustomWindowsMessage.WM_TRAYMOUSE,
                 hIcon = IntPtr.Zero,
-                uVersion = 2000,
+                uTimeoutOrVersion = 0,
                 szTip = ToolTipText,
             };
         }
@@ -162,6 +162,7 @@ namespace System.Application.UI
             {
                 iconData.uFlags |= NIF.ICON;
                 iconData.hIcon = _icon.Handle;
+                iconData.szTip = ToolTipText;
 
                 if (!_iconAdded)
                 {
@@ -307,7 +308,7 @@ namespace System.Application.UI
             iconData.szInfo = message ?? string.Empty;
             iconData.szInfoTitle = title ?? string.Empty;
             iconData.uFlags = NIF.INFO | NIF.ICON;
-            iconData.CustomBalloonIconHandle = balloonIconHandle;
+            //iconData.CustomBalloonIconHandle = balloonIconHandle;
             iconData.dwInfoFlags = flags;
 
             var result = UnmanagedMethods.Shell_NotifyIcon(UnmanagedMethods.NIM.MODIFY, iconData);

From dab60bcd251b8cc1a48fce3240cb30eb50163d9c Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 5 Aug 2021 16:31:05 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=96=B0=E5=A2=9Esteam=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E9=80=9A=E7=9F=A5=E6=88=91=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Pages/Settings/Settings_Steam.axaml | 99 ++++++++++---------
 .../Models/Settings2/SteamSettings.cs         |  4 +-
 .../Services/Mvvm/SteamConnectService.cs      | 13 ++-
 .../UI/Resx/AppResources.Designer.cs          | 54 ++++++++++
 .../UI/Resx/AppResources.resx                 | 18 ++++
 .../UI/ViewModels/Pages/DebugPageViewModel.cs |  2 +-
 6 files changed, 138 insertions(+), 52 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml
index 901cd20a1..27455246d 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml
@@ -7,57 +7,62 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="System.Application.UI.Views.Pages.Settings_Steam">
-    <ScrollViewer>
-        <StackPanel Orientation="Vertical"
-                HorizontalAlignment="Stretch"
-                Spacing="20">
-            <StackPanel.Styles>
-                <Style Selector="TextBlock">
-                    <Setter Property="FontSize" Value="{StaticResource FontSizeH7}"/>
-                    <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrushKey}" />
-                </Style>
-                <Style Selector="DockPanel > TextBlock">
-                    <Setter Property="Margin" Value="0 0 20 0" />
-                    <Setter Property="VerticalAlignment" Value="Center" />
-                    <Setter Property="(DockPanel.Dock)"  Value="Left" />
-                </Style>
-                <Style Selector="DockPanel > ToggleSwitch">
-                    <Setter Property="Margin" Value="0 0 -12 0" />
-                    <Setter Property="HorizontalAlignment" Value="Right" />
-                    <Setter Property="VerticalAlignment" Value="Center" />
-                    <Setter Property="OnContent" Value="{x:Null}" />
-                    <Setter Property="OffContent" Value="{x:Null}" />
-                </Style>
-            </StackPanel.Styles>
+  <ScrollViewer>
+    <StackPanel Orientation="Vertical"
+            HorizontalAlignment="Stretch"
+            Spacing="20">
+      <StackPanel.Styles>
+        <Style Selector="TextBlock">
+          <Setter Property="FontSize" Value="{StaticResource FontSizeH7}"/>
+          <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrushKey}" />
+        </Style>
+        <Style Selector="DockPanel > TextBlock">
+          <Setter Property="Margin" Value="0 0 20 0" />
+          <Setter Property="VerticalAlignment" Value="Center" />
+          <Setter Property="(DockPanel.Dock)"  Value="Left" />
+        </Style>
+        <Style Selector="DockPanel > ToggleSwitch">
+          <Setter Property="Margin" Value="0 0 -12 0" />
+          <Setter Property="HorizontalAlignment" Value="Right" />
+          <Setter Property="VerticalAlignment" Value="Center" />
+          <Setter Property="OnContent" Value="{x:Null}" />
+          <Setter Property="OffContent" Value="{x:Null}" />
+        </Style>
+      </StackPanel.Styles>
 
-            <DockPanel>
-                <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_AutoRunSteam,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
-                <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsAutoRunSteam},Path=Value, Mode=TwoWay}"/>
-            </DockPanel>
+      <DockPanel>
+        <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_AutoRunSteam,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+        <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsAutoRunSteam},Path=Value, Mode=TwoWay}"/>
+      </DockPanel>
 
-            <DockPanel>
-                <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_RuningMinimize,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
-                <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsRunSteamMinimized},Path=Value, Mode=TwoWay}"/>
-            </DockPanel>
+      <DockPanel>
+        <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_RuningMinimize,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+        <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsRunSteamMinimized},Path=Value, Mode=TwoWay}"/>
+      </DockPanel>
 
-            <DockPanel>
-                <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_NotCheckUpdate,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
-                <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsRunSteamNoCheckUpdate},Path=Value, Mode=TwoWay}"/>
-            </DockPanel>
+      <DockPanel>
+        <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_NotCheckUpdate,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+        <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsRunSteamNoCheckUpdate},Path=Value, Mode=TwoWay}"/>
+      </DockPanel>
 
-            <Separator Classes="Separator"/>
+      <DockPanel>
+        <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_CheckSteamRuningNotification,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+        <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsEnableSteamLaunchNotification},Path=Value, Mode=TwoWay}"/>
+      </DockPanel>
 
-            <StackPanel Spacing="10">
-                <!--<TextBlock Text= "{ReflectionBinding Path=Res.Settings_Steam_SteamStratParameter,Mode=OneWay,Source={x:Static resx:R.Current}}" />-->
-                <TextBox Watermark="{ReflectionBinding Path=Res.Settings_Steam_SteamStratParameter,Mode=OneWay,Source={x:Static resx:R.Current}}" 
-                         UseFloatingWatermark="True"
-                         Text="{ReflectionBinding Source={x:Static ms:SteamSettings.SteamStratParameter},Path=Value, Mode=TwoWay}"
-                         MinHeight="150" 
-                         AcceptsReturn="True" 
-                         TextWrapping="Wrap"></TextBox>
-            </StackPanel>
+      <Separator Classes="Separator"/>
 
-            <Separator Classes="Separator"/>
-        </StackPanel>
-    </ScrollViewer>
+      <StackPanel Spacing="10">
+        <!--<TextBlock Text= "{ReflectionBinding Path=Res.Settings_Steam_SteamStratParameter,Mode=OneWay,Source={x:Static resx:R.Current}}" />-->
+        <TextBox Watermark="{ReflectionBinding Path=Res.Settings_Steam_SteamStratParameter,Mode=OneWay,Source={x:Static resx:R.Current}}"
+                 UseFloatingWatermark="True"
+                 Text="{ReflectionBinding Source={x:Static ms:SteamSettings.SteamStratParameter},Path=Value, Mode=TwoWay}"
+                 MinHeight="150"
+                 AcceptsReturn="True"
+                 TextWrapping="Wrap"></TextBox>
+      </StackPanel>
+
+      <Separator Classes="Separator"/>
+    </StackPanel>
+  </ScrollViewer>
 </UserControl>
diff --git a/src/ST.Client.Desktop/Models/Settings2/SteamSettings.cs b/src/ST.Client.Desktop/Models/Settings2/SteamSettings.cs
index 3110cbdd8..48d4efea8 100644
--- a/src/ST.Client.Desktop/Models/Settings2/SteamSettings.cs
+++ b/src/ST.Client.Desktop/Models/Settings2/SteamSettings.cs
@@ -57,9 +57,9 @@ namespace System.Application.Models.Settings
             = GetProperty(defaultValue: false, autoSave: true);
 
         /// <summary>
-        /// 检测到Steam启动时弹出消息通知
+        /// 检测到Steam登录时弹出消息通知
         /// </summary>
         public static SerializableProperty<bool> IsEnableSteamLaunchNotification { get; }
-            = GetProperty(defaultValue: false, autoSave: true);
+            = GetProperty(defaultValue: true, autoSave: true);
     }
 }
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
index 002475bcb..853c89168 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
@@ -199,9 +199,18 @@ namespace System.Application.Services
                                     IsSteamChinaLauncher = ApiService.IsSteamChinaLauncher();
 
                                     #region 初始化需要steam启动才能使用的功能
-                                    if (GameLibrarySettings.IsAutoAFKApps.Value)
-                                        RunAFKApps();
+                                    if (SteamSettings.IsEnableSteamLaunchNotification.Value)
+                                    {
+                                        INotificationService.Instance.Notify($"{AppResources.Steam_CheckStarted}({(IsSteamChinaLauncher ? AppResources.Steam_SteamChina : AppResources.Steam_SteamWorld)}){Environment.NewLine}{Environment.NewLine}{AppResources.Steam_CurrentUser}{CurrentSteamUser.SteamNickName}{Environment.NewLine}{AppResources.Steam_CurrentIPCountry}{CurrentSteamUser.IPCountry}", NotificationType.Announcement);
+                                    }
 
+
+                                    if (GameLibrarySettings.IsAutoAFKApps.Value)
+                                    {
+                                        RunAFKApps();
+                                    }
+
+                                    //仅在有游戏数据情况下加载登录用户的游戏
                                     if (SteamApps.Items.Any())
                                     {
                                         LoadGames(ApiService.OwnsApps(await ISteamService.Instance.GetAppInfos()));
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
index ff594a63d..35858fc88 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -3222,6 +3222,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 当Steam客户端登录时通知我 的本地化字符串。
+        /// </summary>
+        public static string Settings_Steam_CheckSteamRuningNotification {
+            get {
+                return ResourceManager.GetString("Settings_Steam_CheckSteamRuningNotification", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Steam启动时不检查更新 的本地化字符串。
         /// </summary>
@@ -3339,6 +3348,33 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 检测到启动： 的本地化字符串。
+        /// </summary>
+        public static string Steam_CheckStarted {
+            get {
+                return ResourceManager.GetString("Steam_CheckStarted", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Steam客户端登录区域： 的本地化字符串。
+        /// </summary>
+        public static string Steam_CurrentIPCountry {
+            get {
+                return ResourceManager.GetString("Steam_CurrentIPCountry", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Steam登录用户： 的本地化字符串。
+        /// </summary>
+        public static string Steam_CurrentUser {
+            get {
+                return ResourceManager.GetString("Steam_CurrentUser", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 输入图中验证码 的本地化字符串。
         /// </summary>
@@ -3357,6 +3393,24 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Steam国服 的本地化字符串。
+        /// </summary>
+        public static string Steam_SteamChina {
+            get {
+                return ResourceManager.GetString("Steam_SteamChina", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Steam国际服 的本地化字符串。
+        /// </summary>
+        public static string Steam_SteamWorld {
+            get {
+                return ResourceManager.GetString("Steam_SteamWorld", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Steam用户名 的本地化字符串。
         /// </summary>
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
index 4d954454f..f1d6fe52c 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
@@ -1519,4 +1519,22 @@
   <data name="SetBootAutoStartTrueFail_" xml:space="preserve">
     <value>启用开机自启动失败，原因: {0}</value>
   </data>
+  <data name="Settings_Steam_CheckSteamRuningNotification" xml:space="preserve">
+    <value>当Steam客户端登录时通知我</value>
+  </data>
+  <data name="Steam_CheckStarted" xml:space="preserve">
+    <value>检测到启动：</value>
+  </data>
+  <data name="Steam_CurrentIPCountry" xml:space="preserve">
+    <value>Steam客户端登录区域：</value>
+  </data>
+  <data name="Steam_CurrentUser" xml:space="preserve">
+    <value>Steam登录用户：</value>
+  </data>
+  <data name="Steam_SteamChina" xml:space="preserve">
+    <value>Steam国服</value>
+  </data>
+  <data name="Steam_SteamWorld" xml:space="preserve">
+    <value>Steam国际服</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
index 9cbd0b527..9c2638489 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs
@@ -278,7 +278,7 @@ namespace System.Application.UI.ViewModels
             //            }
             //#endif
             INotificationService.Instance.Notify("测试Test🎆🎇→→", NotificationType.Announcement);
-            //ShowDialogButton_Click1();
+            ShowDialogButton_Click1();
         }
 
 #if DEBUG

From edb2f8affb26e6bd3097c8a3668c6a5e2b573867 Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 5 Aug 2021 16:53:34 +0800
Subject: [PATCH 07/10] Fix

---
 src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs | 2 +-
 src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs     | 2 +-
 src/ST.Client.Desktop/UI/Resx/AppResources.resx            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
index 853c89168..5c478d0f5 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs
@@ -201,7 +201,7 @@ namespace System.Application.Services
                                     #region 初始化需要steam启动才能使用的功能
                                     if (SteamSettings.IsEnableSteamLaunchNotification.Value)
                                     {
-                                        INotificationService.Instance.Notify($"{AppResources.Steam_CheckStarted}({(IsSteamChinaLauncher ? AppResources.Steam_SteamChina : AppResources.Steam_SteamWorld)}){Environment.NewLine}{Environment.NewLine}{AppResources.Steam_CurrentUser}{CurrentSteamUser.SteamNickName}{Environment.NewLine}{AppResources.Steam_CurrentIPCountry}{CurrentSteamUser.IPCountry}", NotificationType.Announcement);
+                                        INotificationService.Instance.Notify($"{AppResources.Steam_CheckStarted}{(IsSteamChinaLauncher ? AppResources.Steam_SteamChina : AppResources.Steam_SteamWorld)}{Environment.NewLine}{AppResources.Steam_CurrentUser}{CurrentSteamUser.SteamNickName}{Environment.NewLine}{AppResources.Steam_CurrentIPCountry}{CurrentSteamUser.IPCountry}", NotificationType.Announcement);
                                     }
 
 
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
index 35858fc88..d6da94ecd 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -3223,7 +3223,7 @@ namespace System.Application.UI.Resx {
         }
         
         /// <summary>
-        ///   查找类似 当Steam客户端登录时通知我 的本地化字符串。
+        ///   查找类似 当Steam客户端登录时弹出通知 的本地化字符串。
         /// </summary>
         public static string Settings_Steam_CheckSteamRuningNotification {
             get {
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
index f1d6fe52c..30b9d2d6f 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
@@ -1520,7 +1520,7 @@
     <value>启用开机自启动失败，原因: {0}</value>
   </data>
   <data name="Settings_Steam_CheckSteamRuningNotification" xml:space="preserve">
-    <value>当Steam客户端登录时通知我</value>
+    <value>当Steam客户端登录时弹出通知</value>
   </data>
   <data name="Steam_CheckStarted" xml:space="preserve">
     <value>检测到启动：</value>

From 1a6438eff6be34c9fd666e698bc02cfd4eb7083d Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Thu, 5 Aug 2021 18:21:41 +0800
Subject: [PATCH 08/10] Android Notification

---
 .../PlatformNotificationServiceImpl`2.cs      | 21 +++++++--------
 .../Services/INotificationService.cs          |  2 +-
 .../Windows/LocalAuthPage/AddAuthWindow.axaml |  7 ++---
 .../MobileAppUpdateServiceImpl.cs             | 26 ++++++++++++++++++-
 .../UI/MainApplication.cs                     |  6 +++++
 ...NotificationType_Channel_EnumExtensions.cs |  2 +-
 src/ST.Client/ST.Client.csproj                | 14 +++++-----
 .../Implementation/AppUpdateServiceImpl.cs    |  2 +-
 src/ST/NotificationType.cs                    |  4 +--
 9 files changed, 57 insertions(+), 27 deletions(-)
 rename src/ST.Client/{ => Extensions}/NotificationType_Channel_EnumExtensions.cs (98%)

diff --git a/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl`2.cs b/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl`2.cs
index 1a0715772..3470ab6e6 100644
--- a/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl`2.cs
+++ b/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl`2.cs
@@ -199,11 +199,9 @@ namespace System.Application.Services.Implementation
            TNotificationType notificationType,
            bool autoCancel,
            string? title,
-           TEntrance entrance)
+           TEntrance? entrance)
         {
-            var notificationEntrance = entrance != null ?
-                GetActivityType(entrance).GetJClass() :
-                R.activities.entrance;
+            var notificationEntrance = (entrance != null ? GetActivityType(entrance)?.GetJClass() : null) ?? R.activities.entrance;
             var context = AndroidApplication.Context;
             var manager = NotificationManagerCompat.From(context);
             var builder = BuildNotify(context, manager, text, notificationType,
@@ -213,24 +211,25 @@ namespace System.Application.Services.Implementation
         }
 
         public Progress<float> NotifyDownload(
-            string text,
+            Func<string> text,
             TNotificationType notificationType,
             string? title)
         {
             var context = AndroidApplication.Context;
             var manager = NotificationManagerCompat.From(context);
             var builder = BuildNotify(context, manager,
-                text: text.Format(0),
+                text: text(),
                 notificationType,
                 title: title);
             // 进度单位说明
             // 通用层采用 float 浮点数作为进度值，范围从0~100，保留两位小数
             // 平台层采用 int 整型作为进度值，范围从0~10000，转换需要 乘 100
             const int unit_convert_multiple = 100; // 从float到int转换单位倍数
-            const int PROGRESS_MAX = 100 * unit_convert_multiple; // 进度条满值
+            const float PROGRESS_MAX = IAppUpdateService.MaxProgressValue * unit_convert_multiple; // 进度条满值
+            int PROGRESS_MAX_INT32 = PROGRESS_MAX.ToInt32();
             // 发出零进度的初始通知
             // Issue the initial notification with zero progress
-            builder.SetProgress(PROGRESS_MAX, 0, false);
+            builder.SetProgress(PROGRESS_MAX_INT32, 0, false);
             var notifyId = GetNotifyId(notificationType);
             manager.Notify(notifyId, builder.Build());
             // 在这里完成跟踪进度的工作。
@@ -248,7 +247,7 @@ namespace System.Application.Services.Implementation
             void Handler(float current)
             {
                 var currentInt32 = (current * unit_convert_multiple).ToInt32();
-                if (currentInt32 >= PROGRESS_MAX)
+                if (currentInt32 >= PROGRESS_MAX_INT32)
                 {
                     // 这将使100%时直接取消通知，并不会在UI上显示
                     // 报告进度值满的操作应当是幂等的
@@ -266,8 +265,8 @@ namespace System.Application.Services.Implementation
                     // 在报告进度值满后不可再更改进度
                     if (builder == null) throw new ArgumentNullException(nameof(builder));
                     if (manager == null) throw new ArgumentNullException(nameof(manager));
-                    builder.SetProgress(PROGRESS_MAX, currentInt32, false);
-                    builder.SetContentText(text.Format(currentInt32));
+                    builder.SetProgress(PROGRESS_MAX_INT32, currentInt32, false);
+                    builder.SetContentText(text());
                     manager.Notify(notifyId, builder.Build());
                 }
             }
diff --git a/src/Common.ClientLib/Application/Services/INotificationService.cs b/src/Common.ClientLib/Application/Services/INotificationService.cs
index 82685e1c9..fd7bd569c 100644
--- a/src/Common.ClientLib/Application/Services/INotificationService.cs
+++ b/src/Common.ClientLib/Application/Services/INotificationService.cs
@@ -45,7 +45,7 @@ namespace System.Application.Services
         /// 下载进度通知
         /// </summary>
         Progress<float> NotifyDownload(
-            string text,
+            Func<string> text,
             TNotificationType notificationType,
             string? title = default);
     }
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
index 7c9b4889b..d22a128b8 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
@@ -2,7 +2,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         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"
+        mc:Ignorable="d" 
+        d:DesignWidth="720" d:DesignHeight="400"
+        MinWidth="720" MinHeight="400"
+        Width="720" Height="400"
         x:Class="System.Application.UI.Views.Windows.AddAuthWindow"
         xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop"
         xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
@@ -10,8 +13,6 @@
         xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
         xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop"
         FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}"
-        MinWidth="600" 
-        MinHeight="400"
         WindowStartupLocation="CenterOwner"
         ExtendClientAreaTitleBarHeightHint="30"
         Background="Transparent"
diff --git a/src/ST.Client.Mobile.Droid/Services/Implementation/MobileAppUpdateServiceImpl.cs b/src/ST.Client.Mobile.Droid/Services/Implementation/MobileAppUpdateServiceImpl.cs
index 13a6d1a96..c2c35d600 100644
--- a/src/ST.Client.Mobile.Droid/Services/Implementation/MobileAppUpdateServiceImpl.cs
+++ b/src/ST.Client.Mobile.Droid/Services/Implementation/MobileAppUpdateServiceImpl.cs
@@ -6,13 +6,16 @@ using System.Application.Models;
 using System.Windows;
 using XEPlatform = Xamarin.Essentials.Platform;
 using static System.Application.UI.Resx.AppResources;
+using static System.Application.Services.IAppUpdateService;
 
 namespace System.Application.Services.Implementation
 {
     internal sealed partial class MobileAppUpdateServiceImpl : AppUpdateServiceImpl
     {
-        public MobileAppUpdateServiceImpl(IToast toast, ICloudServiceClient client, IOptions<AppSettings> options) : base(toast, client, options)
+        readonly INotificationService notification;
+        public MobileAppUpdateServiceImpl(INotificationService notification, IToast toast, ICloudServiceClient client, IOptions<AppSettings> options) : base(toast, client, options)
         {
+            this.notification = notification;
         }
 
         protected override Version OSVersion =>
@@ -46,5 +49,26 @@ namespace System.Application.Services.Implementation
             throw new NotImplementedException();
 #endif
         }
+
+        IProgress<float>? progress;
+        protected override void OnReport(float value, string str)
+        {
+            base.OnReport(value, str);
+            if (value == 0)
+            {
+                progress?.Report(MaxProgressValue);
+                progress = notification.NotifyDownload(() => ProgressString,
+                    NotificationType.NewVersionDownloadProgress);
+            }
+            else if (value == MaxProgressValue)
+            {
+                progress?.Report(MaxProgressValue);
+                progress = null;
+            }
+            else
+            {
+                progress?.Report(value);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ST.Client.Mobile.Droid/UI/MainApplication.cs b/src/ST.Client.Mobile.Droid/UI/MainApplication.cs
index 94002927d..dee91908a 100644
--- a/src/ST.Client.Mobile.Droid/UI/MainApplication.cs
+++ b/src/ST.Client.Mobile.Droid/UI/MainApplication.cs
@@ -13,6 +13,8 @@ using XEPlatform = Xamarin.Essentials.Platform;
 using XEVersionTracking = Xamarin.Essentials.VersionTracking;
 using System.Application.Models.Settings;
 using AndroidX.AppCompat.App;
+using System.Application.Services;
+using System.Application.Services.Implementation;
 #if DEBUG
 using Square.LeakCanary;
 #endif
@@ -79,6 +81,10 @@ namespace System.Application.UI
             Startup.Init(level);
             if (IsMainProcess)
             {
+                if (INotificationService.Instance is PlatformNotificationServiceImpl notification)
+                {
+                    notification.InitNotificationChannels(this);
+                }
                 XEVersionTracking.Track();
                 ImageLoader.Init(this);
                 UISettings.Theme.Subscribe(x =>
diff --git a/src/ST.Client/NotificationType_Channel_EnumExtensions.cs b/src/ST.Client/Extensions/NotificationType_Channel_EnumExtensions.cs
similarity index 98%
rename from src/ST.Client/NotificationType_Channel_EnumExtensions.cs
rename to src/ST.Client/Extensions/NotificationType_Channel_EnumExtensions.cs
index 183a37041..cf3fa2e5a 100644
--- a/src/ST.Client/NotificationType_Channel_EnumExtensions.cs
+++ b/src/ST.Client/Extensions/NotificationType_Channel_EnumExtensions.cs
@@ -1,4 +1,4 @@
-using System.Application.Properties;
+using System.Application.Properties;
 using System.Application.Services;
 
 namespace System.Application
diff --git a/src/ST.Client/ST.Client.csproj b/src/ST.Client/ST.Client.csproj
index bb5015afd..aadc6b3c0 100644
--- a/src/ST.Client/ST.Client.csproj
+++ b/src/ST.Client/ST.Client.csproj
@@ -23,16 +23,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="QRCoder" Version="1.4.1"/>
+    <PackageReference Include="QRCoder" Version="1.4.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\references\ArchiSteamFarm\ArchiSteamFarm.Library\ArchiSteamFarm.Library.csproj"/>
-    <ProjectReference Include="..\..\references\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj"/>
-    <ProjectReference Include="..\Repositories.sqlite-net-pcl\Repositories.sqlite-net-pcl.csproj"/>
-    <ProjectReference Include="..\ST.Services.CloudService\ST.Services.CloudService.csproj"/>
-    <ProjectReference Include="..\Common.ClientLib\Common.ClientLib.csproj"/>
-    <ProjectReference Include="..\ST\ST.csproj"/>
+    <ProjectReference Include="..\..\references\ArchiSteamFarm\ArchiSteamFarm.Library\ArchiSteamFarm.Library.csproj" />
+    <ProjectReference Include="..\..\references\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj" />
+    <ProjectReference Include="..\Repositories.sqlite-net-pcl\Repositories.sqlite-net-pcl.csproj" />
+    <ProjectReference Include="..\ST.Services.CloudService\ST.Services.CloudService.csproj" />
+    <ProjectReference Include="..\Common.ClientLib\Common.ClientLib.csproj" />
+    <ProjectReference Include="..\ST\ST.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
index 90cc4d734..8c54a0862 100644
--- a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
+++ b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
@@ -211,7 +211,7 @@ namespace System.Application.Services.Implementation
         protected void OnReportCalcHashing(float value) => OnReport(value, SR.CalcHashing_.Format(MathF.Round(value, 2)));
         protected void OnReportDecompressing(float value) => OnReport(value, SR.Decompressing_.Format(MathF.Round(value, 2)));
         protected void OnReport(float value = 0f) => OnReport(value, string.Empty);
-        protected void OnReport(float value, string str)
+        protected virtual void OnReport(float value, string str)
         {
             ProgressValue = value;
             ProgressString = str;
diff --git a/src/ST/NotificationType.cs b/src/ST/NotificationType.cs
index c14e2f7b5..f21995962 100644
--- a/src/ST/NotificationType.cs
+++ b/src/ST/NotificationType.cs
@@ -1,4 +1,4 @@
-namespace System.Application
+namespace System.Application
 {
     /// <summary>
     /// 通知类型
@@ -17,7 +17,7 @@
     ///   </item>
     /// </list>
     /// <para>添加新的枚举常量注意事项：</para>
-    /// <para>(客户端)如果要显示在设备的通知栏上，则需要在<see cref="NotificationType_Channel_EnumExtensions.GetChannel(NotificationType)"/>中添加对应渠道</para>
+    /// <para>(客户端)如果要显示在设备的通知栏上，则需要在 src\ST.Client\Extensions\NotificationType_Channel_EnumExtensions.cs 中添加或指定已有渠道</para>
     /// </summary>
     public enum NotificationType
     {

From 0546522eb58e5f491389b40770356a802958c474 Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Thu, 5 Aug 2021 18:35:13 +0800
Subject: [PATCH 09/10] ClearAllPackCacheDir

---
 src/Common.CoreLib/FileEx.cs                  |  2 +
 .../UI/MainApplication.cs                     |  5 ++
 src/ST.Client/Services/IAppUpdateService.cs   | 68 +++++++++++++++++++
 .../Implementation/AppUpdateServiceImpl.cs    | 41 +----------
 .../ScriptManagerServiceImpl.cs               |  4 +-
 5 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/src/Common.CoreLib/FileEx.cs b/src/Common.CoreLib/FileEx.cs
index 10b8006a1..94af590e3 100644
--- a/src/Common.CoreLib/FileEx.cs
+++ b/src/Common.CoreLib/FileEx.cs
@@ -75,6 +75,8 @@ namespace System
 
         public const string MPO = ".mpo";
 
+        public const string DownloadCache = ".download_cache";
+
         public static string Clean(string extension, bool trimLeadingPeriod = false)
         {
             if (string.IsNullOrWhiteSpace(extension))
diff --git a/src/ST.Client.Mobile.Droid/UI/MainApplication.cs b/src/ST.Client.Mobile.Droid/UI/MainApplication.cs
index dee91908a..2139c4e6e 100644
--- a/src/ST.Client.Mobile.Droid/UI/MainApplication.cs
+++ b/src/ST.Client.Mobile.Droid/UI/MainApplication.cs
@@ -86,6 +86,11 @@ namespace System.Application.UI
                     notification.InitNotificationChannels(this);
                 }
                 XEVersionTracking.Track();
+                if (XEVersionTracking.IsFirstLaunchForCurrentVersion)
+                {
+                    // 当前版本第一次启动时，清除存放升级包缓存文件夹的目录
+                    IAppUpdateService.ClearAllPackCacheDir();
+                }
                 ImageLoader.Init(this);
                 UISettings.Theme.Subscribe(x =>
                 {
diff --git a/src/ST.Client/Services/IAppUpdateService.cs b/src/ST.Client/Services/IAppUpdateService.cs
index c8cc153b3..6ade60ff7 100644
--- a/src/ST.Client/Services/IAppUpdateService.cs
+++ b/src/ST.Client/Services/IAppUpdateService.cs
@@ -1,4 +1,6 @@
 using System.Application.Models;
+using System.IO;
+using System.Security.Cryptography;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
@@ -13,6 +15,11 @@ namespace System.Application.Services
 
         const float MaxProgressValue = 100f;
 
+        /// <summary>
+        /// 升级包存放文件夹名称
+        /// </summary>
+        const string PackDirName = "UpgradePackages";
+
         /// <summary>
         /// 进度值
         /// </summary>
@@ -57,6 +64,67 @@ namespace System.Application.Services
         Task CheckUpdateAsync(bool force = false, bool showIsExistUpdateFalse = true);
 
         ICommand StartUpdateCommand { get; }
+
+        /// <summary>
+        /// 根据新版本信息获取升级包路径名
+        /// </summary>
+        /// <param name="m"></param>
+        /// <returns></returns>
+        protected static string GetPackName(AppVersionDTO m, bool isDirOrFile) => $"{m.Version}@{Hashs.String.Crc32(m.Id.ToByteArray())}{(isDirOrFile ? "" : $"{FileEx.TAR_GZ}")}";
+
+        /// <summary>
+        /// 获取存放升级包缓存文件夹的目录
+        /// </summary>
+        /// <param name="onNotExistsCreateDirectory">当目录不存在时是否创建目录</param>
+        /// <param name="exists">目录是否存在</param>
+        /// <returns></returns>
+        protected static string GetPackCacheDirPath(bool onNotExistsCreateDirectory, out bool exists)
+        {
+            var dirPath = Path.Combine(IOPath.CacheDirectory, PackDirName);
+            exists = Directory.Exists(dirPath);
+            if (!exists && onNotExistsCreateDirectory)
+            {
+                Directory.CreateDirectory(dirPath);
+
+            }
+            return dirPath;
+        }
+
+        /// <summary>
+        /// 获取存放升级包缓存文件夹的目录
+        /// </summary>
+        /// <param name="clear">是否需要清理之前的缓存</param>
+        /// <returns></returns>
+        protected static string GetPackCacheDirPath(bool clear)
+        {
+            var dirPath = GetPackCacheDirPath(true, out var exists);
+            if (exists && clear)
+            {
+                var files = Directory.GetFiles(dirPath, "*" + FileEx.DownloadCache);
+                foreach (var item in files)
+                {
+                    IOPath.FileTryDelete(item);
+                }
+            }
+            return dirPath;
+        }
+
+        /// <summary>
+        /// 清理存放升级包缓存文件夹的目录
+        /// </summary>
+        /// <returns></returns>
+        static void ClearAllPackCacheDir()
+        {
+            var dirPath = GetPackCacheDirPath(true, out var exists);
+            if (exists)
+            {
+                var files = Directory.GetFiles(dirPath);
+                foreach (var item in files)
+                {
+                    IOPath.FileTryDelete(item);
+                }
+            }
+        }
     }
 
 #if DEBUG
diff --git a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
index 8c54a0862..d1d407683 100644
--- a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
+++ b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs
@@ -147,43 +147,6 @@ namespace System.Application.Services.Implementation
             isCheckUpdateing = false;
         }
 
-        /// <summary>
-        /// 升级包存放文件夹名称
-        /// </summary>
-        const string PackDirName = "UpgradePackages";
-
-        public const string FileExDownloadCache = ".download_cache";
-
-        /// <summary>
-        /// 根据新版本信息获取升级包路径名
-        /// </summary>
-        /// <param name="m"></param>
-        /// <returns></returns>
-        static string GetPackName(AppVersionDTO m, bool isDirOrFile) => $"{m.Version}@{Hashs.String.Crc32(m.Id.ToByteArray())}{(isDirOrFile ? "" : $"{FileEx.TAR_GZ}")}";
-
-        /// <summary>
-        /// 获取存放升级包缓存文件夹的目录
-        /// </summary>
-        /// <param name="clear">是否需要清理之前的缓存</param>
-        /// <returns></returns>
-        static string GetPackCacheDirPath(bool clear)
-        {
-            var dirPath = Path.Combine(IOPath.CacheDirectory, PackDirName);
-            if (!Directory.Exists(dirPath))
-            {
-                Directory.CreateDirectory(dirPath);
-            }
-            else if (clear)
-            {
-                var files = Directory.GetFiles(dirPath, "*" + FileExDownloadCache);
-                foreach (var item in files)
-                {
-                    IOPath.FileTryDelete(item);
-                }
-            }
-            return dirPath;
-        }
-
         static bool isDownloading;
 
         /// <summary>
@@ -362,7 +325,7 @@ namespace System.Application.Services.Implementation
                         #endregion
 
                         #region 下载文件，并加入 hashFiles 中
-                        var cacheFileDownloadPath = downloadPath + FileExDownloadCache;
+                        var cacheFileDownloadPath = downloadPath + FileEx.DownloadCache;
                         var requestUri = GetSingleFileUrl(item.FileId!);
 
                         var rsp = await client.Download(
@@ -505,7 +468,7 @@ namespace System.Application.Services.Implementation
                             requestUri = GetSingleFileUrl(download.FileIdOrUrl!);
                         }
 
-                        var cacheFilePath = packFilePath + FileExDownloadCache;
+                        var cacheFilePath = packFilePath + FileEx.DownloadCache;
                         OnReportDownloading(0f);
                         var rsp = await client.Download(
                             isAnonymous: true,
diff --git a/src/ST.Client/Services/Implementation/ScriptManagerServiceImpl.cs b/src/ST.Client/Services/Implementation/ScriptManagerServiceImpl.cs
index 6bdd13aa7..73ac5c99a 100644
--- a/src/ST.Client/Services/Implementation/ScriptManagerServiceImpl.cs
+++ b/src/ST.Client/Services/Implementation/ScriptManagerServiceImpl.cs
@@ -362,7 +362,7 @@ namespace System.Application.Services.Implementation
                                     var jspath = await DI.Get<IScriptManagerService>().DownloadScript(basicsInfo.Content.UpdateLink);
                                     if (jspath.state)
                                     {
-                                        var build = await DI.Get<IScriptManagerService>().AddScriptAsync(jspath.path,item, build: false, order: 1, deleteFile: true, pid: basicsInfo.Content.Id, ignoreCache: true);
+                                        var build = await DI.Get<IScriptManagerService>().AddScriptAsync(jspath.path, item, build: false, order: 1, deleteFile: true, pid: basicsInfo.Content.Id, ignoreCache: true);
                                         if (build.state && build.model?.Content != null)
                                             item.Content = build.model!.Content;
                                     }
@@ -394,7 +394,7 @@ namespace System.Application.Services.Implementation
                 try
                 {
                     var md5 = Hashs.String.MD5(scriptInfo);
-                    var cachePath = Path.Combine(IOPath.CacheDirectory, TAG, $"{md5}{AppUpdateServiceImpl.FileExDownloadCache}");
+                    var cachePath = Path.Combine(IOPath.CacheDirectory, TAG, md5 + FileEx.DownloadCache);
                     var fileInfo = new FileInfo(cachePath);
                     if (!fileInfo.Directory.Exists)
                     {

From ca90312476fc29b5a0d16ce2ef27a42757249e2b Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Thu, 5 Aug 2021 18:45:22 +0800
Subject: [PATCH 10/10] fix

---
 .../Services/Implementation/PlatformNotificationServiceImpl.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
index 808ea8672..5e3019f96 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/PlatformNotificationServiceImpl.cs
@@ -42,7 +42,7 @@ namespace System.Application.Services.Implementation
             }
         }
 
-        public Progress<float> NotifyDownload(string text, NotificationType notificationType, string? title)
+        public Progress<float> NotifyDownload(Func<string> text, NotificationType notificationType, string? title)
         {
             // 桌面端不支持带进度的通知，下载新版本改用桌面端的窗口进度条控件，由更新服务桌面端版实现
             //title ??= ThisAssembly.AssemblyTrademark;