From da413be342bad2f81d67f008fb8a7bfcd21d7878 Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Sat, 8 May 2021 21:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98=20=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8D=A0=E7=94=A8=E6=8F=90=E7=A4=BA=E5=8D=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E8=BF=9B=E7=A8=8B=20=E5=8D=87=E7=BA=A7nuget=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ST.Client.Desktop.Avalonia.csproj                  | 10 +++++-----
 src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs    |  6 ++++--
 src/ST.Client.Desktop/Services/Mvvm/UserService.cs     |  2 ++
 src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs |  2 +-
 src/ST.Client.Desktop/UI/Resx/AppResources.resx        |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
index 713339f02..b2081e8c8 100644
--- a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
+++ b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
@@ -44,17 +44,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.999-cibuild0013977-beta" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0013977-beta" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.999-cibuild0013977-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0013977-beta" />
+    <PackageReference Include="Avalonia" Version="0.10.999-cibuild0013988-beta" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0013988-beta" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.999-cibuild0013988-beta" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0013988-beta" />
     <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.0" />
     <!--<PackageReference Include="CefNet.Avalonia" Version="88.1.21022.1657" />-->
     <PackageReference Include="LibVLCSharp.Avalonia" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0013977-beta" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0013988-beta" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs b/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs
index 17b3e45d5..d88b367d1 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs
@@ -147,9 +147,11 @@ namespace System.Application.Services
 
                         if (!ProxySettings.EnableWindowsProxy.Value)
                         {
-                            if (httpProxyService.PortInUse(443))
+                            var p = DI.Get<IDesktopPlatformService>().GetProcessByPortOccupy(443, true);
+
+                            if (p != null)
                             {
-                                Toast.Show(AppResources.CommunityFix_StartProxyFaild443);
+                                Toast.Show(string.Format(AppResources.CommunityFix_StartProxyFaild443, p.ProcessName));
                                 return;
                             }
                         }
diff --git a/src/ST.Client.Desktop/Services/Mvvm/UserService.cs b/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
index f73199aa3..8dc2005b6 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
@@ -102,6 +102,8 @@ namespace System.Application.Services
             userManager.OnSignOut += () =>
             {
                 User = null;
+                CurrentSteamUser = null;
+                AvaterPath = DefaultAvaterPath;
             };
 
             //ShowWindow = ReactiveCommand.Create<CustomWindow>(n => ShowWindowF(n));
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
index 0c5ec42a9..91a982376 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -657,7 +657,7 @@ namespace System.Application.UI.Resx {
         }
         
         /// <summary>
-        ///   查找类似 加速服务启动失败，443端口被占用。请检查您的443端口或者尝试使用Windows代理模式。 的本地化字符串。
+        ///   查找类似 加速服务启动失败，443端口被{0}占用。请检查您的443端口或者尝试使用Windows代理模式。 的本地化字符串。
         /// </summary>
         public static string CommunityFix_StartProxyFaild443 {
             get {
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
index 9017f74bf..009cf2050 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
@@ -319,7 +319,7 @@
     <value>启动加速服务失败，证书安装失败。</value>
   </data>
   <data name="CommunityFix_StartProxyFaild443" xml:space="preserve">
-    <value>加速服务启动失败，443端口被占用。请检查您的443端口或者尝试使用Windows代理模式。</value>
+    <value>加速服务启动失败，443端口被{0}占用。请检查您的443端口或者尝试使用Windows代理模式。</value>
   </data>
   <data name="CommunityFix_StartProxySuccess" xml:space="preserve">
     <value>加速已启动成功</value>