From f805911f4e872beb742e0fc862e56b94e96aa94b Mon Sep 17 00:00:00 2001 From: rmbgame Date: Sun, 27 Dec 2020 12:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E6=9B=B4=E6=96=B0=E6=8C=82?= =?UTF-8?q?=E5=8D=A1=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=89=98?= =?UTF-8?q?=E7=9B=98=E5=90=AF=E5=8A=A8=E5=A4=9A=E4=B8=AA=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SteamTool.Core/HttpServices.cs | 2 +- SteamTools/App.xaml.cs | 2 +- SteamTools/SteamTools.csproj | 3 + .../ViewModels/Control/TaskBarViewModel.cs | 3 - .../Views/Content/CommonGame/GameCommon.xaml | 2 +- SteamTools/Views/MainWindow.xaml | 3 + SteamTools/Views/Pages/AboutPage.xaml.cs | 2 +- .../Pages/ArchiSteamFarmPlusPage.xaml.cs | 2 +- .../Views/Pages/GameRelatedPage.xaml.cs | 2 +- SteamTools/Views/Pages/LocalAuthPage.xaml.cs | 2 +- .../Views/Pages/OtherPlatformPage.xaml.cs | 2 +- SteamTools/Views/Pages/SettingsPage.xaml | 2 +- SteamTools/Views/Pages/SettingsPage.xaml.cs | 2 +- SteamTools/Views/Pages/SteamAppPage.xaml.cs | 2 +- SteamTools/Views/Pages/SteamIdleCardPage.xaml | 65 ++++++++ .../Views/Pages/SteamIdleCardPage.xaml.cs | 30 ++++ SteamTools/Views/Window/AddAuthWindow.xaml | 2 +- SteamTools/Win32/WinInet.cs | 144 ++++++++++-------- release-keylol.md | 17 ++- 19 files changed, 203 insertions(+), 86 deletions(-) create mode 100644 SteamTools/Views/Pages/SteamIdleCardPage.xaml create mode 100644 SteamTools/Views/Pages/SteamIdleCardPage.xaml.cs diff --git a/SteamTool.Core/HttpServices.cs b/SteamTool.Core/HttpServices.cs index cd1c6ff9dfe..a61e14092b9 100644 --- a/SteamTool.Core/HttpServices.cs +++ b/SteamTool.Core/HttpServices.cs @@ -15,7 +15,7 @@ public class HttpServices { private readonly HttpClient _client = new HttpClient(); - public string UserAgent { get; set; } = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36"; + public string UserAgent { get; set; } = "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko"; public string Accept { get; set; } = "application/json"; diff --git a/SteamTools/App.xaml.cs b/SteamTools/App.xaml.cs index e7ae81a8ff3..0fe1c767fc4 100644 --- a/SteamTools/App.xaml.cs +++ b/SteamTools/App.xaml.cs @@ -157,8 +157,8 @@ protected override void OnExit(ExitEventArgs e) //TaskbarService.Current.Taskbar.Icon = null; //避免托盘图标没有自动消失 TaskbarService.Current.Taskbar.Icon.Dispose(); } - base.OnExit(e); this.compositeDisposable.Dispose(); + base.OnExit(e); } private void ProcessCommandLineParameter(string[] args) diff --git a/SteamTools/SteamTools.csproj b/SteamTools/SteamTools.csproj index dcca3dd2551..e4d22f14579 100644 --- a/SteamTools/SteamTools.csproj +++ b/SteamTools/SteamTools.csproj @@ -285,6 +285,9 @@ $(DefaultXamlRuntime) Designer + + $(DefaultXamlRuntime) + $(DefaultXamlRuntime) Designer diff --git a/SteamTools/ViewModels/Control/TaskBarViewModel.cs b/SteamTools/ViewModels/Control/TaskBarViewModel.cs index 3c70f753a75..255629ee97a 100644 --- a/SteamTools/ViewModels/Control/TaskBarViewModel.cs +++ b/SteamTools/ViewModels/Control/TaskBarViewModel.cs @@ -46,9 +46,6 @@ public ICommand ShowWindowCommand CanExecuteFunc = () => true, CommandAction = () => { - App.Current.MainWindow = WindowService.Current.GetMainWindow(); - //if (!App.Current.MainWindow.IsVisible) - // App.Current.MainWindow.Show(); var mainWindow = (WindowService.Current.MainWindow as MainWindowViewModel); mainWindow.IsVisible = true; } diff --git a/SteamTools/Views/Content/CommonGame/GameCommon.xaml b/SteamTools/Views/Content/CommonGame/GameCommon.xaml index 1aef8efeecf..bad0482ed80 100644 --- a/SteamTools/Views/Content/CommonGame/GameCommon.xaml +++ b/SteamTools/Views/Content/CommonGame/GameCommon.xaml @@ -136,7 +136,7 @@ - + diff --git a/SteamTools/Views/MainWindow.xaml b/SteamTools/Views/MainWindow.xaml index 618b6e3087e..d74eeab6c2d 100644 --- a/SteamTools/Views/MainWindow.xaml +++ b/SteamTools/Views/MainWindow.xaml @@ -175,6 +175,9 @@ + + + diff --git a/SteamTools/Views/Pages/AboutPage.xaml.cs b/SteamTools/Views/Pages/AboutPage.xaml.cs index b594186d3b7..8ef36e3b8c4 100644 --- a/SteamTools/Views/Pages/AboutPage.xaml.cs +++ b/SteamTools/Views/Pages/AboutPage.xaml.cs @@ -17,7 +17,7 @@ namespace SteamTools.Views.Pages { /// - /// SwitchTheme.xaml 的交互逻辑 + /// AboutPage.xaml 的交互逻辑 /// public partial class AboutPage : UserControl { diff --git a/SteamTools/Views/Pages/ArchiSteamFarmPlusPage.xaml.cs b/SteamTools/Views/Pages/ArchiSteamFarmPlusPage.xaml.cs index 1d2c4659d9e..1198215eabe 100644 --- a/SteamTools/Views/Pages/ArchiSteamFarmPlusPage.xaml.cs +++ b/SteamTools/Views/Pages/ArchiSteamFarmPlusPage.xaml.cs @@ -16,7 +16,7 @@ namespace SteamTools.Views.Pages { /// - /// SwitchSteamAccount.xaml 的交互逻辑 + /// ArchiSteamFarmPlusPage.xaml 的交互逻辑 /// public partial class ArchiSteamFarmPlusPage : UserControl { diff --git a/SteamTools/Views/Pages/GameRelatedPage.xaml.cs b/SteamTools/Views/Pages/GameRelatedPage.xaml.cs index c33de57ffaf..bab9335e4ea 100644 --- a/SteamTools/Views/Pages/GameRelatedPage.xaml.cs +++ b/SteamTools/Views/Pages/GameRelatedPage.xaml.cs @@ -17,7 +17,7 @@ namespace SteamTools.Views.Pages { /// - /// SwitchTheme.xaml 的交互逻辑 + /// GameRelatedPage.xaml 的交互逻辑 /// public partial class GameRelatedPage : UserControl { diff --git a/SteamTools/Views/Pages/LocalAuthPage.xaml.cs b/SteamTools/Views/Pages/LocalAuthPage.xaml.cs index 5bf68af5850..597f6b122bf 100644 --- a/SteamTools/Views/Pages/LocalAuthPage.xaml.cs +++ b/SteamTools/Views/Pages/LocalAuthPage.xaml.cs @@ -16,7 +16,7 @@ namespace SteamTools.Views.Pages { /// - /// SwitchSteamAccount.xaml 的交互逻辑 + /// LocalAuthPage.xaml 的交互逻辑 /// public partial class LocalAuthPage : UserControl { diff --git a/SteamTools/Views/Pages/OtherPlatformPage.xaml.cs b/SteamTools/Views/Pages/OtherPlatformPage.xaml.cs index b58f7b31533..7ebb899c1d7 100644 --- a/SteamTools/Views/Pages/OtherPlatformPage.xaml.cs +++ b/SteamTools/Views/Pages/OtherPlatformPage.xaml.cs @@ -17,7 +17,7 @@ namespace SteamTools.Views.Pages { /// - /// SwitchTheme.xaml 的交互逻辑 + /// OtherPlatformPage.xaml 的交互逻辑 /// public partial class OtherPlatformPage : UserControl { diff --git a/SteamTools/Views/Pages/SettingsPage.xaml b/SteamTools/Views/Pages/SettingsPage.xaml index d661606dabc..a43e88be50b 100644 --- a/SteamTools/Views/Pages/SettingsPage.xaml +++ b/SteamTools/Views/Pages/SettingsPage.xaml @@ -53,7 +53,7 @@ Style="{StaticResource TabHeaderTextStyleKey}" /> + VerticalScrollBarVisibility="Auto" Background="{DynamicResource ThemeBrushKey}"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SteamTools/Views/Pages/SteamIdleCardPage.xaml.cs b/SteamTools/Views/Pages/SteamIdleCardPage.xaml.cs new file mode 100644 index 00000000000..04662cbec08 --- /dev/null +++ b/SteamTools/Views/Pages/SteamIdleCardPage.xaml.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using MetroRadiance.UI; + +namespace SteamTools.Views.Pages +{ + /// + /// SteamIdleCardPage.xaml 的交互逻辑 + /// + public partial class SteamIdleCardPage : UserControl + { + public SteamIdleCardPage() + { + InitializeComponent(); + } + } + +} diff --git a/SteamTools/Views/Window/AddAuthWindow.xaml b/SteamTools/Views/Window/AddAuthWindow.xaml index 4b72efeddbe..6dfb8247aff 100644 --- a/SteamTools/Views/Window/AddAuthWindow.xaml +++ b/SteamTools/Views/Window/AddAuthWindow.xaml @@ -255,7 +255,7 @@ Prompt="" /> - + [Github](https://github.com/rmbadmin/SteamTools/releases) > 分流下载： > [hide] -> [蓝奏云](https://wws.lanzous.com/iOOpjjqzhcj) -> [百度云](https://pan.baidu.com/s/1wETSvjxaA3LnqlK0tJajIg) -> 提取码：9gxh +> [蓝奏云](https://wws.lanzous.com/i6WLTjr4lsj) +> [百度云](https://pan.baidu.com/s/1v5UGz-VlmsFS-7ISpcXnIw) +> 提取码：33zw > [/hide] > EXE 大小：4.74MB -> MD5：3B5B1E598F0DD8C62E16570CA8F61E65 \ No newline at end of file +> MD5：D658FB5F6E142CB92DAB73BEF929327D +> [查毒链接](https://www.virustotal.com/gui/file/1073fc19c3208228b1a00eb9bceab771cbf77ffbf1a6c2de666a0e9a4967db60/detection) + 虽然没有什么杀毒软件报毒，但是使用过程中可能遇到windows defender误报，您可以选择添加信任。 \ No newline at end of file