diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
index 255dedc10..2dfb2ee88 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -150,15 +150,6 @@ namespace System.Application.UI
#if StartupTrace
StartupTrace.Restart("SettingsHost.Init");
#endif
-
-#if !UI_DEMO
- if (GeneralSettings.IsStartupAppMinimized.Value)
- {
- Program.IsMinimize = true;
- if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
- desktop.MainWindow = null;
- }
-#endif
Theme = (AppTheme)UISettings.Theme.Value;
#if StartupTrace
StartupTrace.Restart("Theme");
@@ -185,6 +176,14 @@ namespace System.Application.UI
compositeDisposable.Add(SteamConnectService.Current.Dispose);
#endregion
+#if !UI_DEMO
+ if (GeneralSettings.IsStartupAppMinimized.Value)
+ {
+ Program.IsMinimize = true;
+ if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ desktop.MainWindow = null;
+ }
+#endif
MainWindow = new MainWindow
{
DataContext = windowService.MainWindow,
diff --git a/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj
index 49907c73b..33e08f970 100644
--- a/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj
+++ b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj
@@ -1,103 +1,103 @@
-
- WinExe
-
- net6.0
- false
-
- System.Application.UI
- Steam++
- Properties\app.manifest
-
+
+ WinExe
+
+ net6.0
+ false
+
+ System.Application.UI
+ Steam++
+ Properties\app.manifest
+
-
- Exe
-
+
+ Exe
+
-
-
-
-
- WINDOWS;$(DefineConstants)
- ..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico
- Properties\app.manifest
-
- AnyCPU;x86
- x86
-
- win7-x86
-
-
-
+ AnyCPU;x86
+ x86
+
+ win7-x86
+
+
+
-
- MAC;$(DefineConstants)
-
+
+ MAC;$(DefineConstants)
+
-
- true
- false
-
- false
- link
- true
-
- false
- false
- false
- false
- false
- false
- true
- none
- false
-
+
+ true
+ false
+
+ false
+ link
+ true
+
+ false
+ false
+ false
+ false
+ false
+ false
+ true
+ none
+ false
+
-
-
-
-
- Properties\AssemblyInfo.cs
-
-
+
+
+
+ Properties\AssemblyInfo.cs
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
- %(Filename)
-
-
- Designer
-
-
-
+
+
+ %(Filename)
+
+
+ Designer
+
+
+
-
-
-
- steam++.visualelementsmanifest.xml
- PreserveNewest
-
-
- Assets\VisualElements_150.png
- PreserveNewest
-
-
- Assets\VisualElements_70.png
- PreserveNewest
-
-
+
+
+
+ steam++.visualelementsmanifest.xml
+ PreserveNewest
+
+
+ Assets\VisualElements_150.png
+ PreserveNewest
+
+
+ Assets\VisualElements_70.png
+ PreserveNewest
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml
index da4c257c1..c9c113a27 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml
@@ -89,8 +89,8 @@
-
-
+
+
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml
index 4cfc9903b..6ec947683 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml
@@ -22,58 +22,58 @@
x:DataType="vm:LoginOrRegisterWindowViewModel"
x:CompileBindings="True"
Title="{Binding Title}">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
index 12fe3b46d..f3da47272 100644
--- a/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
+++ b/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
@@ -1,4 +1,4 @@
-using ReactiveUI;
+using ReactiveUI;
using System;
using System.Application.Mvvm;
using System.Application.UI.ViewModels;
@@ -26,15 +26,22 @@ namespace System.Application.Services.Implementation
public void Init()
{
- if (appidUnlockAchievement.HasValue)
+ try
{
- achievementWindow = new AchievementWindowViewModel(appidUnlockAchievement.Value);
- MainWindow = achievementWindow;
+ if (appidUnlockAchievement.HasValue)
+ {
+ achievementWindow = new AchievementWindowViewModel(appidUnlockAchievement.Value);
+ MainWindow = achievementWindow;
+ }
+ else
+ {
+ mainWindow = new MainWindowViewModel();
+ MainWindow = mainWindow;
+ }
}
- else
+ catch (Exception ex)
{
- mainWindow = new MainWindowViewModel();
- MainWindow = mainWindow;
+ Log.Error("WindowService", ex, "Init WindowViewModel");
}
}
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
index 991cc9f26..cb9909aa5 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -558,7 +558,7 @@ namespace System.Application.UI.Resx {
}
///
- /// 查找类似 Hosts代理模式 的本地化字符串。
+ /// 查找类似 Hosts代理模式(推荐) 的本地化字符串。
///
public static string CommunityFix_ProxyMode_Hosts {
get {
@@ -566,6 +566,15 @@ namespace System.Application.UI.Resx {
}
}
+ ///
+ /// 查找类似 修改Hosts文件来监听本机请求实现代理，此方式速度更快且只会影响加速的网站，效果最好。 的本地化字符串。
+ ///
+ public static string CommunityFix_ProxyMode_HostsTip {
+ get {
+ return ResourceManager.GetString("CommunityFix_ProxyMode_HostsTip", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Windows系统代理模式 的本地化字符串。
///
@@ -575,6 +584,15 @@ namespace System.Application.UI.Resx {
}
}
+ ///
+ /// 查找类似 设置Windows系统代理来监听请求，此方式会全局代理本机所有流量，如果你使用Hosts方式没有问题，那就不需要使用此模式。 的本地化字符串。
+ ///
+ public static string CommunityFix_ProxyMode_WinSystemTip {
+ get {
+ return ResourceManager.GetString("CommunityFix_ProxyMode_WinSystemTip", resourceCulture);
+ }
+ }
+
///
/// 查找类似 加速模式: 的本地化字符串。
///
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
index 351246a82..62ac5d019 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
@@ -289,11 +289,17 @@
加速模式:
- Hosts代理模式
+ Hosts代理模式(推荐)
+
+
+ 修改Hosts文件来监听本机请求实现代理，此方式速度更快且只会影响加速的网站，效果最好。
Windows系统代理模式
+
+ 设置Windows系统代理来监听请求，此方式会全局代理本机所有流量，如果你使用Hosts方式没有问题，那就不需要使用此模式。
+
管理脚本
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs
index 6757a9bf3..9471ca26d 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs
@@ -13,7 +13,7 @@ namespace System.Application.UI.ViewModels
public class ChangeBindPhoneNumberWindowViewModel : WindowViewModel
{
readonly IReadOnlyDictionary sendSmsUIViewModels;
- public ChangeBindPhoneNumberWindowViewModel()
+ public ChangeBindPhoneNumberWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.User_ChangePhoneNum;
sendSmsUIViewModels = new Dictionary
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/AchievementWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/AchievementWindowViewModel.cs
index d4f285b07..a0969ad32 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/AchievementWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/AchievementWindowViewModel.cs
@@ -86,7 +86,7 @@ namespace System.Application.UI.ViewModels
};
}
- public AchievementWindowViewModel(int appid)
+ public AchievementWindowViewModel(int appid) : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.AchievementManage;
@@ -160,12 +160,12 @@ namespace System.Application.UI.ViewModels
ToastService.Current.Notify(AppResources.Achievement_LoadSucces.Format(_AchievementsSourceList.Count, _StatisticsSourceList.Count));
});
- Task.Run(async () =>
+ Task.Run(() =>
{
while (true)
{
ISteamworksLocalApiService.Instance.RunCallbacks(false);
- await Task.Delay(2000);
+ Threading.Thread.Sleep(2000);
}
}).Forget();
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/EditAppInfoWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/EditAppInfoWindowViewModel.cs
index 260e9735b..f1a82b4a6 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/EditAppInfoWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/EditAppInfoWindowViewModel.cs
@@ -9,7 +9,7 @@ namespace System.Application.UI.ViewModels
{
private readonly SteamApp? _App;
- public EditAppInfoWindowViewModel()
+ public EditAppInfoWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.GameList_EditAppInfo;
}
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AddAuthWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AddAuthWindowViewModel.cs
index 7dfcf3b2e..7866a87a6 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AddAuthWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AddAuthWindowViewModel.cs
@@ -1,4 +1,4 @@
-using ReactiveUI;
+using ReactiveUI;
using System.Application.Models;
using System.Application.Services;
using System.Application.UI.Resx;
@@ -14,7 +14,7 @@ namespace System.Application.UI.ViewModels
{
readonly IHttpService httpService = DI.Get();
- public AddAuthWindowViewModel()
+ public AddAuthWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.LocalAuth_AddAuth;
}
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs
index a8ba85f2b..668679293 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs
@@ -21,7 +21,7 @@ namespace System.Application.UI.ViewModels
private readonly MyAuthenticator MyAuthenticator;
private readonly GAPAuthenticatorValueDTO.SteamAuthenticator _Authenticator;
- public AuthTradeWindowViewModel()
+ public AuthTradeWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.LocalAuth_SteamAuthTrade;
_ConfirmationsSourceList = new SourceList();
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/ShowAuthWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/ShowAuthWindowViewModel.cs
index 04bb09f46..5c1f4d47e 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/ShowAuthWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/ShowAuthWindowViewModel.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
using System.Application.Models;
using System.Application.UI.Resx;
using System.Properties;
@@ -9,7 +9,7 @@ namespace System.Application.UI.ViewModels
{
private readonly GAPAuthenticatorValueDTO.SteamAuthenticator? _Authenticator;
- public ShowAuthWindowViewModel()
+ public ShowAuthWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.LocalAuth_AuthData;
}
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs
index 5cb7508aa..5d9d2bc65 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs
@@ -14,7 +14,7 @@ namespace System.Application.UI.ViewModels
{
public class LoginOrRegisterWindowViewModel : WindowViewModel, SendSmsUIHelper.IViewModel
{
- public LoginOrRegisterWindowViewModel()
+ public LoginOrRegisterWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.LoginAndRegister;
}
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/ProxyScriptManagePage/ScriptStoreWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/ProxyScriptManagePage/ScriptStoreWindowViewModel.cs
index 3e12d821f..c1e2762db 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/ProxyScriptManagePage/ScriptStoreWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/ProxyScriptManagePage/ScriptStoreWindowViewModel.cs
@@ -1,4 +1,4 @@
-using DynamicData;
+using DynamicData;
using DynamicData.Binding;
using Newtonsoft.Json.Linq;
using ReactiveUI;
@@ -13,8 +13,8 @@ namespace System.Application.UI.ViewModels
{
public class ScriptStoreWindowViewModel : WindowViewModel
{
- public ScriptStoreWindowViewModel()
- {
+ public ScriptStoreWindowViewModel() : base()
+ {
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.ScriptStore;
_ScriptsSourceList = new SourceList();
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs
index 5306ac251..9629406ac 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs
@@ -15,7 +15,7 @@ namespace System.Application.UI.ViewModels
byte[]? userInfoValue;
UserInfoDTO? userInfoSource;
readonly IUserManager userManager;
- public UserProfileWindowViewModel()
+ public UserProfileWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.UserProfile;
userManager = DI.Get();