mirror of
https://github.com/BeyondDimension/SteamTools.git
synced 2026-10-26 12:09:32 +08:00
Compare commits
63
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
579666be50 | ||
|
|
c96c30fa40 | ||
|
|
b76f77c017 | ||
|
|
74b2c3b3e7 | ||
|
|
be6b58f7f0 | ||
|
|
651a229a24 | ||
|
|
6db92b60ce | ||
|
|
b25c682e55 | ||
|
|
c457037a09 | ||
|
|
c222ae2a57 | ||
|
|
e2a5e7ef11 | ||
|
|
32d3fa92ca | ||
|
|
db30652b22 | ||
|
|
cb00861532 | ||
|
|
64f60440a3 | ||
|
|
0465f6f578 | ||
|
|
a8701adbb4 | ||
|
|
d954e99f12 | ||
|
|
ab1dcbdcaf | ||
|
|
7e4319695f | ||
|
|
6a78e9aa71 | ||
|
|
ece1768b2a | ||
|
|
c749fad3be | ||
|
|
25afcb2b3f | ||
|
|
45683c78a8 | ||
|
|
a477cd87cf | ||
|
|
a2cf95f0c1 | ||
|
|
88ddc7a320 | ||
|
|
e5463f44d2 | ||
|
|
816d1c9b0c | ||
|
|
69296f9587 | ||
|
|
6577ed9fa0 | ||
|
|
a54e988441 | ||
|
|
db508a04f0 | ||
|
|
eb065d7c7e | ||
|
|
1b639291e4 | ||
|
|
c8810f7926 | ||
|
|
073b5885c6 | ||
|
|
ed6df52998 | ||
|
|
88b4aac622 | ||
|
|
9504413ff7 | ||
|
|
0f28de1e94 | ||
|
|
ad11654cb4 | ||
|
|
f43aa16c6a | ||
|
|
c0e757dc12 | ||
|
|
fcecb2c14c | ||
|
|
408911de4a | ||
|
|
23932298fc | ||
|
|
7c554190af | ||
|
|
2f2065e453 | ||
|
|
1480b5d4df | ||
|
|
9ae326ce9f | ||
|
|
3dd83886b8 | ||
|
|
3a1a256198 | ||
|
|
84f9ae5227 | ||
|
|
ce85b39328 | ||
|
|
6c23ac30a3 | ||
|
|
bbe9596d8d | ||
|
|
5c42a2336d | ||
|
|
afa4ad9e91 | ||
|
|
50a3c7624e | ||
|
|
b84fd825b3 | ||
|
|
1732c84606 |
@@ -40,3 +40,9 @@
|
||||
[submodule "ref/appcenter-sdk-dotnet"]
|
||||
path = ref/appcenter-sdk-dotnet
|
||||
url = https://github.com/BeyondDimension/appcenter-sdk-dotnet.git
|
||||
[submodule "ref/Fusillade"]
|
||||
path = ref/Fusillade
|
||||
url = https://github.com/reactiveui/Fusillade
|
||||
[submodule "ref/Avalonia8"]
|
||||
path = ref/Avalonia8
|
||||
url = https://github.com/BeyondDimension/Avalonia8
|
||||
|
||||
+2
-3
@@ -71,13 +71,12 @@ See details [./doc/download-guide.en.md](./doc/download-guide.en.md)
|
||||
Read what we [milestones](https://github.com/BeyondDimension/SteamTools/milestones), and feel free to ask questions.
|
||||
|
||||
## ⌨️ Development Environment
|
||||
[Visual Studio 2022](https://visualstudio.microsoft.com/vs)
|
||||
[Visual Studio 2022 for Mac](https://visualstudio.microsoft.com/vs/mac)
|
||||
[Visual Studio 2026](https://visualstudio.microsoft.com/vs)
|
||||
[JetBrains Rider](https://www.jetbrains.com/rider)
|
||||
[Visual Studio Code](https://code.visualstudio.com)
|
||||
[OpenJDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
|
||||
[Android Studio Electric Eel Or Higher](https://developer.android.com/studio)
|
||||
[Xcode 14 Or Higher](https://developer.apple.com/xcode)
|
||||
[Xcode 26 Or Higher](https://developer.apple.com/xcode)
|
||||
|
||||
## 🏗️ Project Structure
|
||||
See details [./src/README.md](./src/README.md)
|
||||
|
||||
@@ -93,28 +93,12 @@
|
||||
查看这个 [milestones](https://github.com/BeyondDimension/SteamTools/milestones) 来了解我们下一步的开发计划,并随时提出问题。
|
||||
|
||||
## ⌨️ 开发环境
|
||||
[Visual Studio 2022](https://visualstudio.microsoft.com/zh-hans/vs) 或 [Visual Studio 2022 for Mac](https://visualstudio.microsoft.com/zh-hans/vs/mac)
|
||||
- 系统要求
|
||||
- [Windows 11 版本 21H2 或更高版本:家庭版、专业版、专业教育版、专业工作站版、企业版和教育版](https://learn.microsoft.com/zh-cn/visualstudio/releases/2022/system-requirements)
|
||||
- [macOS Big Sur 11.0 或更高版本](https://learn.microsoft.com/zh-cn/visualstudio/releases/2022/mac-system-requirements)
|
||||
- 工作负荷
|
||||
- Web 和云
|
||||
- ASP.NET 和 Web 开发
|
||||
- 桌面应用和移动应用
|
||||
- 使用 .NET 的移动开发 / .NET Multi-platform App UI 开发
|
||||
- .NET 桌面开发
|
||||
- 通用 Windows 平台开发
|
||||
- 单个组件
|
||||
- GitHub Extension for Visual Studio(可选)
|
||||
- [Visual Studio Marketplace](https://marketplace.visualstudio.com)
|
||||
- [Avalonia for Visual Studio(可选)](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaVS)
|
||||
- [NUnit VS Templates(可选)](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTemplatesforVisualStudio)
|
||||
|
||||
[Visual Studio 2026](https://visualstudio.microsoft.com/zh-hans/vs)
|
||||
[JetBrains Rider](https://www.jetbrains.com/rider)
|
||||
[Visual Studio Code](https://code.visualstudio.com)
|
||||
[OpenJDK 17](https://learn.microsoft.com/zh-cn/java/openjdk/download#openjdk-17)
|
||||
[Android Studio Electric Eel 或更高版本](https://developer.android.google.cn/studio)
|
||||
[Xcode 14 或更高版本](https://developer.apple.com/xcode)
|
||||
[Xcode 26 或更高版本](https://developer.apple.com/xcode)
|
||||
|
||||
## 🏗️ [项目结构](./src/README.md)
|
||||
详见 [./src/README.md](./src/README.md)
|
||||
|
||||
+381
-25
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.5.33414.496
|
||||
# Visual Studio Version 18
|
||||
VisualStudioVersion = 18.2.11415.280
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Root", "0.Root", "{46259E8D-32A4-4065-953D-D6F835B57A28}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
@@ -101,8 +101,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gameloop.Vdf", "ref\Gameloo
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam4NET", "ref\Steam4NET\Steam4NET\Steam4NET.csproj", "{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SAM.API", "ref\SteamAchievementManager\SAM.API\SAM.API.csproj", "{123F532B-4178-4D03-A4EE-2A8F3E01433F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.UnitTest", "src\BD.WTTS.UnitTest\BD.WTTS.UnitTest.csproj", "{B1131172-0748-4003-83ED-71574FD6331A}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.Client", "src\BD.WTTS.Client\BD.WTTS.Client.csproj", "{125FB003-F154-425F-AD3F-A1D92977D353}"
|
||||
@@ -222,6 +220,42 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Any", "ref\app
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Analytics.Any", "ref\appcenter-sdk-dotnet\SDK\AppCenterAnalytics\BD.AppCenter.Analytics.Any\BD.AppCenter.Analytics.Any.csproj", "{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{61CECBB5-7E07-46D4-A23A-06ED11B1F71C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common", "ref\Common\src\BD.Common\BD.Common.csproj", "{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Area", "ref\Common\src\BD.Common.Area\BD.Common.Area.csproj", "{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Security", "ref\Common\src\BD.Common.Security\BD.Common.Security.csproj", "{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Mvvm", "ref\Common\src\BD.Common.Mvvm\BD.Common.Mvvm.csproj", "{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Mvvm.ReactiveUI", "ref\Common\src\BD.Common.Mvvm.ReactiveUI\BD.Common.Mvvm.ReactiveUI.csproj", "{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Primitives", "ref\Common\src\BD.Common.Primitives\BD.Common.Primitives.csproj", "{235D1EB8-06EF-0AAC-AFB0-807E56F04111}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Settings", "ref\Common\src\BD.Common.Settings\BD.Common.Settings.csproj", "{F3114DB9-E688-5A87-5B08-6628D177B864}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Repositories.SQLitePCL", "ref\Common\src\BD.Common.Repositories.SQLitePCL\BD.Common.Repositories.SQLitePCL.csproj", "{3306A160-729E-89C8-2604-7D35E02068BF}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials", "ref\Common\src\BD.Common.Essentials\BD.Common.Essentials.csproj", "{E6010D8A-453B-4E2A-E8E7-E8FC91738377}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Primitives", "ref\Common\src\BD.Common.Essentials.Primitives\BD.Common.Essentials.Primitives.csproj", "{E57DEBBD-4BAA-08DB-3E90-C51634522F47}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Utils", "ref\Common\src\BD.Common.Essentials.Utils\BD.Common.Essentials.Utils.csproj", "{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Preferences.SQLite", "ref\Common\src\BD.Common.Essentials.Preferences.SQLite\BD.Common.Essentials.Preferences.SQLite.csproj", "{EA6C9CDF-2982-C015-912B-C33416857D54}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Pinyin", "ref\Common\src\BD.Common.Pinyin\BD.Common.Pinyin.csproj", "{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Pinyin.TinyPinyin", "ref\Common\src\BD.Common.Pinyin.TinyPinyin\BD.Common.Pinyin.TinyPinyin.csproj", "{641E23B1-E2D1-C15B-7961-0AF918EFEED1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Maui.Runtime", "ref\Common\src\BD.Common.Essentials.Maui.Runtime\BD.Common.Essentials.Maui.Runtime.csproj", "{9AB88008-7763-89C1-97AC-41C80EEA410C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Avalonia8.Image2.Compat", "src\BD.Avalonia8.Image2.Compat\BD.Avalonia8.Image2.Compat.csproj", "{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}"
|
||||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "OSShuttingDownHelper", "src\OSShuttingDownHelper\OSShuttingDownHelper.shproj", "{DB1FD07E-1D67-4A4A-A9D9-E2A271DB647F}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -316,26 +350,6 @@ Global
|
||||
{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}.Release|x64.Build.0 = Release|Any CPU
|
||||
{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}.Release|x86.Build.0 = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{B1131172-0748-4003-83ED-71574FD6331A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B1131172-0748-4003-83ED-71574FD6331A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B1131172-0748-4003-83ED-71574FD6331A}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
@@ -1296,6 +1310,326 @@ Global
|
||||
{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x64.Build.0 = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x86.Build.0 = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x64.Build.0 = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x86.Build.0 = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x64.Build.0 = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x86.Build.0 = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x64.Build.0 = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x86.Build.0 = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x64.Build.0 = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x86.Build.0 = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x64.Build.0 = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x86.Build.0 = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x64.Build.0 = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x86.Build.0 = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x64.Build.0 = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x86.Build.0 = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x64.Build.0 = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x64.Build.0 = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x86.Build.0 = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x64.Build.0 = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x86.Build.0 = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x64.Build.0 = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x64.Build.0 = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -1311,7 +1645,6 @@ Global
|
||||
{99D97BD4-3F51-48BC-8BD2-647F6D268BB0} = {90E88965-DB90-4B49-94F5-6D2965491988}
|
||||
{FE91B979-FE45-43F3-B9C4-430F2360FDDF} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
|
||||
{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
|
||||
{123F532B-4178-4D03-A4EE-2A8F3E01433F} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
|
||||
{B1131172-0748-4003-83ED-71574FD6331A} = {6AF591CA-B0C4-425B-9293-9E62F5BE9B3D}
|
||||
{125FB003-F154-425F-AD3F-A1D92977D353} = {CE475939-6363-4144-B18F-2F91CC297E91}
|
||||
{1BD19276-7DEF-4659-9DBF-28E8E5078698} = {CE475939-6363-4144-B18F-2F91CC297E91}
|
||||
@@ -1365,8 +1698,31 @@ Global
|
||||
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {90E88965-DB90-4B49-94F5-6D2965491988}
|
||||
{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||
{9611DBE7-EDF0-9EB0-EE93-B158981BE48F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||
{61CECBB5-7E07-46D4-A23A-06ED11B1F71C} = {90E88965-DB90-4B49-94F5-6D2965491988}
|
||||
{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{5D76878D-FAE2-72DF-10C1-6466FC15CB0F} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{235D1EB8-06EF-0AAC-AFB0-807E56F04111} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{F3114DB9-E688-5A87-5B08-6628D177B864} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{3306A160-729E-89C8-2604-7D35E02068BF} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{E6010D8A-453B-4E2A-E8E7-E8FC91738377} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{E57DEBBD-4BAA-08DB-3E90-C51634522F47} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{9A9F6A35-18D8-F980-CEE0-155AB2A2695F} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{EA6C9CDF-2982-C015-912B-C33416857D54} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{1EFEACE0-C0DB-0252-383F-4CBE5414D08D} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{641E23B1-E2D1-C15B-7961-0AF918EFEED1} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{9AB88008-7763-89C1-97AC-41C80EEA410C} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
|
||||
{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD} = {CE475939-6363-4144-B18F-2F91CC297E91}
|
||||
{DB1FD07E-1D67-4A4A-A9D9-E2A271DB647F} = {CE475939-6363-4144-B18F-2F91CC297E91}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {567F588F-E95C-4286-8B30-DB3B2200221C}
|
||||
EndGlobalSection
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
src\OSShuttingDownHelper\OSShuttingDownHelper.projitems*{125fb003-f154-425f-ad3f-a1d92977d353}*SharedItemsImports = 5
|
||||
src\OSShuttingDownHelper\OSShuttingDownHelper.projitems*{521d4676-8e8a-4a4c-9835-b09ff4affbbc}*SharedItemsImports = 5
|
||||
src\OSShuttingDownHelper\OSShuttingDownHelper.projitems*{db1fd07e-1d67-4a4a-a9d9-e2a271db647f}*SharedItemsImports = 13
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -997,6 +997,15 @@
|
||||
"Summary": "加速后自动唤起 Watt 加速器界面",
|
||||
"IsRegionOrEndregion": null,
|
||||
"IsValueType": null
|
||||
},
|
||||
{
|
||||
"TypeName": "bool",
|
||||
"PropertyName": "ProxyBeforeDNSCheck",
|
||||
"DefaultValue": "true",
|
||||
"DefaultValueIsConst": true,
|
||||
"Summary": "加速前进行 DNS 可用性检查",
|
||||
"IsRegionOrEndregion": null,
|
||||
"IsValueType": null
|
||||
}
|
||||
],
|
||||
"Usings": ""
|
||||
|
||||
+1
-1
Submodule ref/Avalonia.Image2 updated: b8fe54e56b...0f01b21e70
Submodule
+1
Submodule ref/Avalonia8 added at 1260f0054f
+1
-1
Submodule ref/Common updated: 9b75e1c591...11feb59275
+1
-1
Submodule ref/DirectoryPackages updated: adcb50a330...60eff6f705
+1
-1
Submodule ref/Facepunch.Steamworks updated: 4463739be5...0c8f17e363
Submodule
+1
Submodule ref/Fusillade added at e53e10aef3
+1
-1
Submodule ref/Gameloop.Vdf updated: 8e3d3dca40...68728bcec8
+1
-1
Submodule ref/Steam4NET updated: 04f4acd815...693c53d6f3
Submodule ref/SteamAchievementManager updated: 39dbdc9678...881a31e110
+1
-1
Submodule ref/SteamClient updated: d276f9eefa...460d55c092
Submodule ref/WTTS.MicroServices.ClientSDK updated: 213b92d243...d4be4aba64
+1
-1
Submodule ref/WinAuth updated: 4e698bc59d...79763b9908
+1
-1
Submodule ref/appcenter-sdk-dotnet updated: 72d75433df...6f7e91c8ea
@@ -5,29 +5,31 @@ namespace BD.WTTS;
|
||||
/// </summary>
|
||||
public static partial class AssemblyInfo
|
||||
{
|
||||
const string Version2 = "3.0";
|
||||
const string Version2 = "3.1";
|
||||
|
||||
/// <summary>
|
||||
/// 语义化应用程序版本
|
||||
/// https://semver.org/lang/zh-CN/
|
||||
/// </summary>
|
||||
public const string Version = $"{Version2}.0";
|
||||
public const string Version = $"{Version2}.{VersionBuild}";
|
||||
|
||||
const string VersionBuild = "0";
|
||||
|
||||
/// <summary>
|
||||
/// 预览版本号,范围 1~9,只增不减
|
||||
/// </summary>
|
||||
const string ver_for_preview = "9";
|
||||
const string ver_for_preview = "1";
|
||||
|
||||
/// <summary>
|
||||
/// RC 版本号,范围 0~9,只增不减
|
||||
/// </summary>
|
||||
const string ver_for_rc = "13";
|
||||
const string ver_for_rc = "0";
|
||||
|
||||
public const string FileVersion = $"{Version2}.{ver_for_rc}1{ver_for_preview}.0";
|
||||
public const string FileVersion = $"{Version2}.{VersionBuild}.{ver_for_rc}2{ver_for_preview}";
|
||||
|
||||
//public const string InformationalVersion = Version;
|
||||
public const string InformationalVersion = Version;
|
||||
//public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
|
||||
public const string InformationalVersion = $"{Version}-rc.{ver_for_rc}";
|
||||
//public const string InformationalVersion = $"{Version}-rc.{ver_for_rc}";
|
||||
|
||||
#if !APP_HOST
|
||||
/// <summary>
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace Avalonia.Controls;
|
||||
public static class AvaloniaControlsInternalsWindowExtensions
|
||||
{
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static void CloseCore_(this Window window, WindowCloseReason reason, bool isProgrammatic) => window.CloseCore(reason, isProgrammatic);
|
||||
public static void CloseCore_(this Window window, WindowCloseReason reason, bool isProgrammatic, bool ignoreCancel) => window.CloseCore(reason, isProgrammatic, ignoreCancel);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static void HandleResized_(this Window window, Size clientSize, WindowResizeReason reason) => window.HandleResized(clientSize, reason);
|
||||
|
||||
@@ -174,7 +174,7 @@ namespace Avalonia.Controls.ApplicationLifetimes
|
||||
{
|
||||
if (w.Owner is null)
|
||||
{
|
||||
w.CloseCore_(WindowCloseReason.ApplicationShutdown, isProgrammatic);
|
||||
w.CloseCore_(WindowCloseReason.ApplicationShutdown, isProgrammatic, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net$(DotNet_Version)</TargetFramework>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Description>提供动图控件,支持 Gif/Apng</Description>
|
||||
<AssemblyName>BD.Avalonia8.Image2</AssemblyName>
|
||||
<RootNamespace>BD.Avalonia8.Image2</RootNamespace>
|
||||
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
|
||||
<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
|
||||
<GenerateAssemblyInformationalVersionAttribute>true</GenerateAssemblyInformationalVersionAttribute>
|
||||
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Avalonia -->
|
||||
<PropertyGroup>
|
||||
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\Sdk\Links\LibAPNG.props" />
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="..\ImplicitUsings.Common.cs" />
|
||||
<Compile Remove="..\AssemblyInfo.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\BD.Avalonia8.Image2\**\*.cs">
|
||||
<LinkBase></LinkBase>
|
||||
</Compile>
|
||||
<Compile Remove="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\BD.Avalonia8.Image2\bin\**\*.cs" />
|
||||
<Compile Remove="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\BD.Avalonia8.Image2\obj\**\*.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia" />
|
||||
<PackageReference Include="ReactiveUI" />
|
||||
<PackageReference Include="ReactiveUI.Fody" />
|
||||
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common.Mvvm\BD.Common.Mvvm.csproj" />
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common\BD.Common.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -0,0 +1,41 @@
|
||||
// Common\src\BD.Common8.Bcl\Extensions\StreamExtensions.cs
|
||||
|
||||
namespace System.Extensions;
|
||||
|
||||
/// <summary>
|
||||
/// 提供对 <see cref="Stream"/> 类型的扩展函数
|
||||
/// </summary>
|
||||
internal static partial class StreamExtensions
|
||||
{
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static int ReadInt32(this Stream stream)
|
||||
{
|
||||
Span<byte> data = stackalloc byte[sizeof(int)];
|
||||
stream.ReadExactly(data);
|
||||
return BitConverter.ToInt32(data);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static ushort ReadUInt16(this Stream stream)
|
||||
{
|
||||
Span<byte> data = stackalloc byte[sizeof(ushort)];
|
||||
stream.ReadExactly(data);
|
||||
return BitConverter.ToUInt16(data);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static uint ReadUInt32(this Stream stream)
|
||||
{
|
||||
Span<byte> data = stackalloc byte[sizeof(uint)];
|
||||
stream.ReadExactly(data);
|
||||
return BitConverter.ToUInt32(data);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static void WriteUInt32(this Stream stream, uint value)
|
||||
{
|
||||
Span<byte> data = stackalloc byte[sizeof(uint)];
|
||||
BitConverter.TryWriteBytes(data, value);
|
||||
stream.Write(data);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
|
||||
<ReactiveUI />
|
||||
</Weavers>
|
||||
@@ -0,0 +1,4 @@
|
||||
// steampp
|
||||
using Avalonia.Metadata;
|
||||
|
||||
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.Avalonia8.Image2")]
|
||||
@@ -0,0 +1,24 @@
|
||||
// <auto-generated/>
|
||||
global using Avalonia;
|
||||
global using Avalonia.Animation;
|
||||
global using Avalonia.Controls;
|
||||
global using Avalonia.Logging;
|
||||
global using Avalonia.Media;
|
||||
global using Avalonia.Media.Imaging;
|
||||
global using Avalonia.Metadata;
|
||||
global using Avalonia.Platform;
|
||||
global using Avalonia.Rendering.Composition;
|
||||
global using Avalonia.Threading;
|
||||
global using Avalonia.VisualTree;
|
||||
global using BD.Avalonia8.Image2;
|
||||
global using BD.Avalonia8.Image2.Decoding;
|
||||
global using System.Extensions;
|
||||
global using System.Numerics;
|
||||
global using System.Reactive.Linq;
|
||||
global using AvaBitmap = Avalonia.Media.Imaging.Bitmap;
|
||||
global using AvaPixelFormat = Avalonia.Platform.PixelFormat;
|
||||
global using AvaPoint = Avalonia.Point;
|
||||
global using AvaRect = Avalonia.Rect;
|
||||
global using AvaSize = Avalonia.Size;
|
||||
global using AvaVector = Avalonia.Vector;
|
||||
global using CommonImageSource = BD.Common.UI.ViewModels.ImageSource.ClipStream;
|
||||
@@ -0,0 +1,5 @@
|
||||
// attributes that are applied to this project.
|
||||
// Project-level suppressions either have no target or are given
|
||||
// a specific target and scoped to a namespace, type, member, etc.
|
||||
|
||||
[assembly: SuppressMessage("Style", "IDE0005:Using 指令是不需要的。", Justification = "<挂起>")]
|
||||
@@ -9,6 +9,6 @@
|
||||
<legacyCorruptedStateExceptionsPolicy enabled="true"/>
|
||||
</runtime>
|
||||
<appSettings>
|
||||
<add key="d" value="7.0.11"/>
|
||||
<add key="d" value="10.0.2"/>
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -10,6 +10,6 @@
|
||||
<legacyCorruptedStateExceptionsPolicy enabled="true"/>
|
||||
</runtime>
|
||||
<appSettings>
|
||||
<add key="d" value="9.0.0"/>
|
||||
<add key="d" value="10.0.2"/>
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -16,9 +16,9 @@ static unsafe partial class Program
|
||||
{
|
||||
static Program()
|
||||
{
|
||||
dotnet_version_major = "9";
|
||||
dotnet_version_major = "10";
|
||||
dotnet_version_minor = "0";
|
||||
dotnet_version_build = "0";
|
||||
dotnet_version_build = "2";
|
||||
dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
|
||||
}
|
||||
|
||||
|
||||
@@ -295,33 +295,42 @@ sealed partial class Program : Startup
|
||||
|
||||
protected override ActiveUserRecordDTO GetActiveUserRecord()
|
||||
{
|
||||
#if !__MOBILE__ && !MAUI
|
||||
var app = UI.App.Instance;
|
||||
var window = app.GetFirstOrDefaultWindow();
|
||||
var screens = window?.Screens;
|
||||
#else
|
||||
var mainDisplayInfo = DeviceDisplay.MainDisplayInfo;
|
||||
var mainDisplayInfoH = mainDisplayInfo.Height.ToInt32(NumberToInt32Format.Ceiling);
|
||||
var mainDisplayInfoW = mainDisplayInfo.Width.ToInt32(NumberToInt32Format.Ceiling);
|
||||
#endif
|
||||
var result = new ActiveUserRecordDTO
|
||||
{
|
||||
#if __MOBILE__ || MAUI
|
||||
ScreenCount = 1,
|
||||
PrimaryScreenPixelDensity = mainDisplayInfo.Density,
|
||||
PrimaryScreenWidth = mainDisplayInfoW,
|
||||
PrimaryScreenHeight = mainDisplayInfoH,
|
||||
SumScreenWidth = mainDisplayInfoW,
|
||||
SumScreenHeight = mainDisplayInfoH,
|
||||
#else
|
||||
ScreenCount = screens?.ScreenCount ?? default,
|
||||
PrimaryScreenPixelDensity = screens?.Primary?.Scaling ?? default,
|
||||
PrimaryScreenWidth = screens?.Primary?.Bounds.Width ?? default,
|
||||
PrimaryScreenHeight = screens?.Primary?.Bounds.Height ?? default,
|
||||
SumScreenWidth = screens?.All.Sum(x => x.Bounds.Width) ?? default,
|
||||
SumScreenHeight = screens?.All.Sum(x => x.Bounds.Height) ?? default,
|
||||
#endif
|
||||
};
|
||||
SetScreen(result);
|
||||
static void SetScreen(ActiveUserRecordDTO m)
|
||||
{
|
||||
try
|
||||
{
|
||||
#if !__MOBILE__ && !MAUI
|
||||
var app = UI.App.Instance;
|
||||
var window = app.GetFirstOrDefaultWindow();
|
||||
var screens = window?.Screens;
|
||||
|
||||
m.ScreenCount = screens?.ScreenCount ?? default;
|
||||
m.PrimaryScreenPixelDensity = screens?.Primary?.Scaling ?? default;
|
||||
m.PrimaryScreenWidth = screens?.Primary?.Bounds.Width ?? default;
|
||||
m.PrimaryScreenHeight = screens?.Primary?.Bounds.Height ?? default;
|
||||
m.SumScreenWidth = screens?.All?.Sum(x => x.Bounds.Width) ?? default;
|
||||
m.SumScreenHeight = screens?.All?.Sum(x => x.Bounds.Height) ?? default;
|
||||
#else
|
||||
var mainDisplayInfo = DeviceDisplay.MainDisplayInfo;
|
||||
var mainDisplayInfoH = mainDisplayInfo.Height.ToInt32(NumberToInt32Format.Ceiling);
|
||||
var mainDisplayInfoW = mainDisplayInfo.Width.ToInt32(NumberToInt32Format.Ceiling);
|
||||
|
||||
m.ScreenCount = 1;
|
||||
m.PrimaryScreenPixelDensity = mainDisplayInfo.Density;
|
||||
m.PrimaryScreenWidth = mainDisplayInfoW;
|
||||
m.PrimaryScreenHeight = mainDisplayInfoH;
|
||||
m.SumScreenWidth = mainDisplayInfoW;
|
||||
m.SumScreenHeight = mainDisplayInfoH;
|
||||
#endif
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -73,36 +73,34 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="BD.Common" />
|
||||
<PackageReference Include="BD.Common.Primitives" />
|
||||
<PackageReference Include="BD.Common.Essentials" />
|
||||
<PackageReference Include="Avalonia" />
|
||||
<PackageReference Include="Avalonia.ReactiveUI" />
|
||||
<PackageReference Include="ReactiveUI.Avalonia" />
|
||||
<PackageReference Include="Avalonia.Controls.DataGrid" />
|
||||
<PackageReference Include="Avalonia.Controls.ItemsRepeater" />
|
||||
<PackageReference Include="Avalonia.Xaml.Behaviors" />
|
||||
<PackageReference Include="Xaml.Behaviors.Avalonia" />
|
||||
<PackageReference Include="Avalonia.AvaloniaEdit" />
|
||||
<PackageReference Include="AvaloniaEdit.TextMate" />
|
||||
<!--<PackageReference Include="Markdown.Avalonia" />-->
|
||||
<PackageReference Include="FluentAvaloniaUI" />
|
||||
<PackageReference Include="Avalonia.Controls.ColorPicker" />
|
||||
<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" />
|
||||
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
||||
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
|
||||
<!--ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
|
||||
<ProjectReference Include="..\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />-->
|
||||
<ProjectReference Include="..\Avalonia.Desktop\Avalonia.Desktop.csproj" />
|
||||
<ProjectReference Include="..\..\ref\Avalonia.Image2\Avalonia.Gif\Avalonia.Gif.csproj" />
|
||||
<ProjectReference Include="..\BD.Avalonia8.Image2.Compat\BD.Avalonia8.Image2.Compat.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
|
||||
<!-- Windows Only -->
|
||||
<ProjectReference Include="..\Avalonia.X11\Avalonia.X11.csproj" />
|
||||
<ProjectReference Include="..\Avalonia.Native\Avalonia.Native.csproj" />
|
||||
<PackageReference Include="Aigio.Avalonia.AppCenter" />
|
||||
<!--<PackageReference Include="Aigio.Avalonia.AppCenter" />
|
||||
<PackageReference Include="Aigio.Avalonia.AppCenter.Analytics" />
|
||||
<PackageReference Include="Aigio.Avalonia.AppCenter.Crashes" />
|
||||
<PackageReference Include="Aigio.Avalonia.AppCenter.Crashes" />-->
|
||||
<PackageReference Include="Avalonia.Win32" />
|
||||
<PackageReference Include="BD.Common.Essentials.Maui.Runtime" />
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common.Essentials.Maui.Runtime\BD.Common.Essentials.Maui.Runtime.csproj" />
|
||||
<PackageReference Include="JumpLists.Win32.Avalonia" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -111,7 +109,7 @@
|
||||
<ProjectReference Include="..\Avalonia.X11\Avalonia.X11.csproj" />
|
||||
<ProjectReference Include="..\Avalonia.Win32\Avalonia.Win32.csproj" />
|
||||
<PackageReference Include="Avalonia.Native" />
|
||||
<PackageReference Include="BD.Common.Essentials.Maui.Runtime" />
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common.Essentials.Maui.Runtime\BD.Common.Essentials.Maui.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
|
||||
|
||||
@@ -45,7 +45,7 @@ public sealed partial class App : Application
|
||||
{
|
||||
if (ApplicationLifetime is ClassicDesktopStyleApplicationLifetime classicDesktopStyleApplicationLifetime)
|
||||
{
|
||||
window = classicDesktopStyleApplicationLifetime.Windows.FirstOrDefault(x => x != null);
|
||||
window = classicDesktopStyleApplicationLifetime.Windows?.FirstOrDefault(x => x != null);
|
||||
}
|
||||
}
|
||||
return window;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:ms="https://steampp.net/settings"
|
||||
xmlns:sys="using:System"
|
||||
xmlns:ui="using:FluentAvalonia.UI.Controls"
|
||||
x:CompileBindings="True">
|
||||
<Styles.Resources>
|
||||
<ResourceDictionary>
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
<UserControl
|
||||
d:DesignHeight="900"
|
||||
d:DesignWidth="1080"
|
||||
mc:Ignorable="d"
|
||||
x:Class="BD.WTTS.UI.Views.Pages.HomePage"
|
||||
x:CompileBindings="True"
|
||||
x:DataType="spp:HomePageViewModel"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:col="using:System.Collections.Generic"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:s="https://steampp.net/services"
|
||||
xmlns:spp="https://steampp.net/ui"
|
||||
xmlns:ui="using:FluentAvalonia.UI.Controls"
|
||||
d:DesignHeight="900"
|
||||
d:DesignWidth="1080"
|
||||
x:CompileBindings="True"
|
||||
x:DataType="spp:HomePageViewModel"
|
||||
mc:Ignorable="d">
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<!--<spp:PageBase.PreviewImage>
|
||||
<ui:ImageIconSource Source="{Binding IconKey, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}" />
|
||||
</spp:PageBase.PreviewImage>-->
|
||||
@@ -70,87 +70,87 @@
|
||||
<ScrollViewer Padding="20">
|
||||
<!--<spp:ContentLoader IsLoading="False">-->
|
||||
<StackPanel
|
||||
x:Name="HomeRoot"
|
||||
MaxWidth="1080"
|
||||
Spacing="20">
|
||||
Spacing="20"
|
||||
x:Name="HomeRoot">
|
||||
<spp:Snackbar
|
||||
VerticalAlignment="Top"
|
||||
IsClosable="False"
|
||||
IsOpen="True"
|
||||
IsVisible="{spp:OnPlatform !GA}"
|
||||
Message="当前使用的程序版本为测试版本,可能会有各种各样不可言明的 Bug,遇到问题请理性反馈,谢谢。"
|
||||
Severity="Warning" />
|
||||
Severity="Warning"
|
||||
VerticalAlignment="Top" />
|
||||
<spp:Snackbar
|
||||
VerticalAlignment="Top"
|
||||
IsClosable="False"
|
||||
IsOpen="True"
|
||||
IsVisible="{spp:OnPlatform !GA}"
|
||||
Message="如果您不喜欢当前主页为默认启动页面可以在【设置-界面设置-启动时默认打开页面】处更改" />
|
||||
Message="如果您不喜欢当前主页为默认启动页面可以在【设置-界面设置-启动时默认打开页面】处更改"
|
||||
VerticalAlignment="Top" />
|
||||
<spp:Snackbar
|
||||
Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Top"
|
||||
IsClosable="False"
|
||||
IsOpen="True"
|
||||
IsVisible="{Binding !!!MainWindow2.PluginCount, Mode=OneWay, Source={x:Static s:IViewModelManager.Instance}}"
|
||||
Message="检测到你没有安装插件,请去下载插件即可使用更多功能。"
|
||||
Severity="Warning" />
|
||||
Severity="Warning"
|
||||
Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Top" />
|
||||
|
||||
<WrapPanel Margin="5,0">
|
||||
<WrapPanel IsVisible="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser, Mode=OneWay, Converter={StaticResource IsNullConverter}, ConverterParameter=invert}">
|
||||
<spp:Image2
|
||||
Width="36"
|
||||
DecodeWidth="36"
|
||||
Height="36"
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
DecodeWidth="36"
|
||||
Source="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.AvatarMedium, Mode=OneWay}"
|
||||
Stretch="Uniform">
|
||||
Stretch="Uniform"
|
||||
VerticalAlignment="Center"
|
||||
Width="36">
|
||||
<spp:Image2.Clip>
|
||||
<EllipseGeometry Rect="0,0,36,36" />
|
||||
</spp:Image2.Clip>
|
||||
</spp:Image2>
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.SteamNickName, Mode=OneWay}"
|
||||
Theme="{StaticResource SubtitleTextBlockStyle}" />
|
||||
Theme="{StaticResource SubtitleTextBlockStyle}"
|
||||
VerticalAlignment="Center" />
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
IsVisible="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.IPCountry, Mode=OneWay, Converter={StaticResource IsNullConverter}, ConverterParameter=invert}"
|
||||
Text="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.IPCountry, Mode=OneWay, StringFormat={}({0})}"
|
||||
Theme="{StaticResource SubtitleTextBlockStyle}" />
|
||||
Theme="{StaticResource SubtitleTextBlockStyle}"
|
||||
VerticalAlignment="Center" />
|
||||
<TextBlock
|
||||
Margin="0,0,10,0"
|
||||
VerticalAlignment="Center"
|
||||
Text=","
|
||||
Theme="{StaticResource SubtitleTextBlockStyle}" />
|
||||
Theme="{StaticResource SubtitleTextBlockStyle}"
|
||||
VerticalAlignment="Center" />
|
||||
</WrapPanel>
|
||||
<TextBlock VerticalAlignment="Center" Theme="{StaticResource SubtitleTextBlockStyle}">
|
||||
<TextBlock Theme="{StaticResource SubtitleTextBlockStyle}" VerticalAlignment="Center">
|
||||
<Run Text="{Binding Path=Res.Welcome_User_, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
</TextBlock>
|
||||
</WrapPanel>
|
||||
|
||||
<Grid Margin="0,-10,0,0" RowDefinitions="Auto,*">
|
||||
<spp:CarouselBanner
|
||||
MinHeight="350"
|
||||
HorizontalContentAlignment="Stretch"
|
||||
VerticalContentAlignment="Stretch"
|
||||
ItemsSource="{Binding NavigationBanners}">
|
||||
ItemsSource="{Binding NavigationBanners}"
|
||||
MinHeight="350"
|
||||
VerticalContentAlignment="Stretch">
|
||||
<spp:CarouselBanner.ItemTemplate>
|
||||
<DataTemplate DataType="spp:AdvertisementDTO">
|
||||
<spp:AppItem
|
||||
Title="{Binding Describe}"
|
||||
Height="350"
|
||||
Classes="Banner Scale"
|
||||
ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
|
||||
ClickCommandParameter="{Binding Url}"
|
||||
Description="{Binding Name}"
|
||||
Height="350"
|
||||
Title="{Binding Describe}"
|
||||
ToolTip.Tip="{Binding Describe}">
|
||||
<spp:AppItem.Status>
|
||||
<Border
|
||||
Padding="20,10"
|
||||
Background="{DynamicResource AccentFillColorSelectedTextBackgroundBrush}"
|
||||
ClipToBounds="True"
|
||||
CornerRadius="{StaticResource ControlCornerRadius}">
|
||||
CornerRadius="{StaticResource ControlCornerRadius}"
|
||||
Padding="20,10">
|
||||
<TextBlock FontSize="16" Text="阅读更多" />
|
||||
</Border>
|
||||
</spp:AppItem.Status>
|
||||
@@ -176,22 +176,22 @@
|
||||
Spacing="10">
|
||||
<DockPanel>
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
Text="最新消息"
|
||||
Theme="{StaticResource TitleTextBlockStyle}" />
|
||||
Theme="{StaticResource TitleTextBlockStyle}"
|
||||
VerticalAlignment="Center" />
|
||||
<Button
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Command="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
|
||||
CommandParameter="{x:Static spp:HomePageViewModel.OfficialWebsite_Article}"
|
||||
Content="查看更多"
|
||||
DockPanel.Dock="Right"
|
||||
Theme="{StaticResource HyperlinkButton}" />
|
||||
HorizontalAlignment="Right"
|
||||
Theme="{StaticResource HyperlinkButton}"
|
||||
VerticalAlignment="Center" />
|
||||
</DockPanel>
|
||||
|
||||
<Grid Margin="0,0,0,20" ColumnDefinitions="*,10,*,10,*">
|
||||
<Grid ColumnDefinitions="*,10,*,10,*" Margin="0,0,0,20">
|
||||
<Grid.Styles>
|
||||
<Style x:DataType="spp:ArticleItemDTO" Selector="spp|AppItem">
|
||||
<Style Selector="spp|AppItem" x:DataType="spp:ArticleItemDTO">
|
||||
<Setter Property="Cursor" Value="Hand" />
|
||||
<Setter Property="Title" Value="{Binding Title}" />
|
||||
<Setter Property="Description" Value="{Binding Introduction}" />
|
||||
@@ -225,13 +225,13 @@
|
||||
</Grid.Styles>
|
||||
<spp:AppItem Classes="Vertical Scale" DataContext="{Binding Articles[0]}" />
|
||||
<spp:AppItem
|
||||
Grid.Column="2"
|
||||
Classes="Vertical Scale"
|
||||
DataContext="{Binding Articles[1]}" />
|
||||
DataContext="{Binding Articles[1]}"
|
||||
Grid.Column="2" />
|
||||
<spp:AppItem
|
||||
Grid.Column="4"
|
||||
Classes="Vertical Scale"
|
||||
DataContext="{Binding Articles[2]}" />
|
||||
DataContext="{Binding Articles[2]}"
|
||||
Grid.Column="4" />
|
||||
</Grid>
|
||||
|
||||
<!--<spp:CarouselItems ItemsPerPage="3" ItemsSource="{Binding Articles}">
|
||||
@@ -265,34 +265,34 @@
|
||||
|
||||
<DockPanel>
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
Text="精选"
|
||||
Theme="{StaticResource TitleTextBlockStyle}" />
|
||||
Theme="{StaticResource TitleTextBlockStyle}"
|
||||
VerticalAlignment="Center" />
|
||||
<Button
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Command="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
|
||||
CommandParameter="{x:Static spp:HomePageViewModel.WattGameUrl}"
|
||||
Content="访问 WattGame 商城"
|
||||
DockPanel.Dock="Right"
|
||||
Theme="{StaticResource HyperlinkButton}" />
|
||||
HorizontalAlignment="Right"
|
||||
Theme="{StaticResource HyperlinkButton}"
|
||||
VerticalAlignment="Center" />
|
||||
</DockPanel>
|
||||
|
||||
<spp:CarouselItems
|
||||
MinHeight="250"
|
||||
ItemsPerPage="4"
|
||||
ItemsSource="{Binding Shops}">
|
||||
ItemsSource="{Binding Shops}"
|
||||
MinHeight="250">
|
||||
<spp:CarouselItems.ItemTemplate>
|
||||
<DataTemplate x:DataType="spp:ShopRecommendGoodItem">
|
||||
<!--<Border spp:Animations.EnableAnimations="True">-->
|
||||
<spp:AppItem
|
||||
Title="{Binding Name}"
|
||||
MinHeight="250"
|
||||
MaxWidth="260"
|
||||
Classes="Vertical Scale"
|
||||
ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
|
||||
Cursor="Hand"
|
||||
MaxWidth="260"
|
||||
MinHeight="250"
|
||||
Tags="{Binding GoodsAllCategorysText}"
|
||||
Title="{Binding Name}"
|
||||
ToolTip.Tip="{Binding Brief}">
|
||||
<spp:AppItem.ClickCommandParameter>
|
||||
<MultiBinding Converter="{StaticResource StringFormatConverter}">
|
||||
@@ -310,31 +310,31 @@
|
||||
<Border Classes="Status">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
|
||||
IsVisible="{Binding !!DiscountValue}"
|
||||
Text="{Binding Mktprice, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}"
|
||||
TextDecorations="Strikethrough" />
|
||||
TextDecorations="Strikethrough"
|
||||
VerticalAlignment="Center" />
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
FontSize="14"
|
||||
Text="{Binding Price, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}" />
|
||||
Text="{Binding Price, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}"
|
||||
VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</spp:AppItem.Status>
|
||||
<spp:AppItem.ActionButton>
|
||||
<Border
|
||||
Height="24"
|
||||
Padding="8,0"
|
||||
Background="#4c6b22"
|
||||
ClipToBounds="True"
|
||||
CornerRadius="4"
|
||||
IsVisible="{Binding !!DiscountValue}">
|
||||
Height="24"
|
||||
IsVisible="{Binding !!DiscountValue}"
|
||||
Padding="8,0">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
Foreground="#beee11"
|
||||
Text="{Binding DiscountValue, StringFormat={}-{0}%}" />
|
||||
Text="{Binding DiscountValue, StringFormat={}-{0}%}"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
</spp:AppItem.ActionButton>
|
||||
</spp:AppItem>
|
||||
@@ -522,9 +522,9 @@
|
||||
<ItemsControl ItemsSource="{Binding MainWindow2.TabItems, Mode=OneWay, Source={x:Static s:IViewModelManager.Instance}}">
|
||||
<ItemsControl.Resources>
|
||||
<ControlTheme
|
||||
x:Key="NavButtonStyle"
|
||||
BasedOn="{StaticResource {x:Type Button}}"
|
||||
TargetType="Button">
|
||||
TargetType="Button"
|
||||
x:Key="NavButtonStyle">
|
||||
<Setter Property="Width" Value="120" />
|
||||
<Setter Property="Padding" Value="0" />
|
||||
<Setter Property="Margin" Value="6" />
|
||||
@@ -543,28 +543,28 @@
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="spp:TabItemViewModel">
|
||||
<Border spp:Animations.EnableAnimations="True">
|
||||
<Border spp:Animations.EnableAnimations="False">
|
||||
<Button
|
||||
Command="{Binding $parent[spp:HomePage].((spp:HomePageViewModel)DataContext).NavgationToMenuPageCommand}"
|
||||
CommandParameter="{Binding}"
|
||||
Theme="{StaticResource NavButtonStyle}">
|
||||
<Grid RowDefinitions="3*,*">
|
||||
<Border
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
CornerRadius="4 4 0 0"
|
||||
RenderOptions.BitmapInterpolationMode="HighQuality">
|
||||
HorizontalAlignment="Stretch"
|
||||
RenderOptions.BitmapInterpolationMode="HighQuality"
|
||||
VerticalAlignment="Stretch">
|
||||
<spp:Image2
|
||||
Width="96"
|
||||
Height="96"
|
||||
Margin="0,10,0,0"
|
||||
Source="{Binding IconKey}"
|
||||
Stretch="Uniform" />
|
||||
Stretch="Uniform"
|
||||
Width="96" />
|
||||
</Border>
|
||||
<TextBlock
|
||||
FontWeight="SemiBold"
|
||||
Grid.Row="1"
|
||||
Margin="12"
|
||||
FontWeight="SemiBold"
|
||||
Text="{Binding Name}" />
|
||||
</Grid>
|
||||
</Button>
|
||||
@@ -703,9 +703,9 @@
|
||||
</TabControl>-->
|
||||
|
||||
<TextBlock
|
||||
Margin="0,30"
|
||||
HorizontalAlignment="Center"
|
||||
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,30"
|
||||
Text="不忘初心,方得始终。"
|
||||
Theme="{StaticResource SubtitleTextBlockStyle}" />
|
||||
</StackPanel>
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="spp:TabItemViewModel">
|
||||
<Border spp:Animations.EnableAnimations="True">
|
||||
<Border spp:Animations.EnableAnimations="False">
|
||||
<Button
|
||||
Command="{Binding $parent[spp:PluginStorePage].((spp:PluginStorePageViewModel)DataContext).NavgationToMenuPageCommand}"
|
||||
CommandParameter="{Binding}"
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
<UserControl
|
||||
d:DesignHeight="680"
|
||||
d:DesignWidth="1080"
|
||||
mc:Ignorable="d"
|
||||
x:Class="BD.WTTS.UI.Views.Pages.Settings_UI"
|
||||
x:CompileBindings="True"
|
||||
x:DataType="spp:SettingsPageViewModel"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:com="https://steampp.net/common"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:enum="using:BD.WTTS.Enums"
|
||||
@@ -11,11 +15,7 @@
|
||||
xmlns:s="https://steampp.net/services"
|
||||
xmlns:spp="https://steampp.net/ui"
|
||||
xmlns:ui="using:FluentAvalonia.UI.Controls"
|
||||
d:DesignHeight="680"
|
||||
d:DesignWidth="1080"
|
||||
x:CompileBindings="True"
|
||||
x:DataType="spp:SettingsPageViewModel"
|
||||
mc:Ignorable="d">
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<StackPanel Spacing="{StaticResource SettingsSpacing}">
|
||||
<TextBlock
|
||||
Margin="0,0,0,10"
|
||||
@@ -82,125 +82,125 @@
|
||||
<StackPanel Orientation="Horizontal" Spacing="10">
|
||||
<RadioButton Content="{Binding Path=Res.Settings_UI_SystemDefault, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" IsChecked="{Binding Source={x:Static ms:UISettings.UseSystemThemeAccent}, Path=Value, Mode=TwoWay}" />
|
||||
<RadioButton
|
||||
x:Name="AccentCustom"
|
||||
Content="{Binding Path=Res.Settings_UI_Custom, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
IsChecked="{Binding Source={x:Static ms:UISettings.UseSystemThemeAccent}, Path=!Value, Mode=OneWay}" />
|
||||
IsChecked="{Binding Source={x:Static ms:UISettings.UseSystemThemeAccent}, Path=!Value, Mode=OneWay}"
|
||||
x:Name="AccentCustom" />
|
||||
</StackPanel>
|
||||
</spp:OptionsDisplayItem.ActionButton>
|
||||
<spp:OptionsDisplayItem.Content>
|
||||
<StackPanel Spacing="4">
|
||||
<DockPanel Margin="24,0,0,6" LastChildFill="False">
|
||||
<DockPanel LastChildFill="False" Margin="24,0,0,6">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Left"
|
||||
Text="{Binding Path=Res.Settings_UI_PreviewColor, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Text="{Binding Path=Res.Settings_UI_PreviewColor, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
|
||||
<Grid
|
||||
HorizontalAlignment="Left"
|
||||
ColumnDefinitions="*,*"
|
||||
DockPanel.Dock="Right"
|
||||
HorizontalAlignment="Left"
|
||||
RowDefinitions="*,*,*,*">
|
||||
<Border
|
||||
Background="{DynamicResource SystemAccentColor}"
|
||||
Grid.ColumnSpan="2"
|
||||
Height="40"
|
||||
Background="{DynamicResource SystemAccentColor}">
|
||||
Height="40">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
|
||||
Text="SystemAccentColor" />
|
||||
HorizontalAlignment="Center"
|
||||
Text="SystemAccentColor"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Background="{DynamicResource SystemAccentColorLight1}"
|
||||
Grid.Column="0"
|
||||
Grid.Row="1"
|
||||
Grid.Column="0"
|
||||
Width="90"
|
||||
Height="40"
|
||||
Background="{DynamicResource SystemAccentColorLight1}">
|
||||
Width="90">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
|
||||
Text="Light1" />
|
||||
HorizontalAlignment="Center"
|
||||
Text="Light1"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
<Border
|
||||
Background="{DynamicResource SystemAccentColorLight2}"
|
||||
Grid.Column="0"
|
||||
Grid.Row="2"
|
||||
Grid.Column="0"
|
||||
Width="90"
|
||||
Height="40"
|
||||
Background="{DynamicResource SystemAccentColorLight2}">
|
||||
Width="90">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
|
||||
Text="Light2" />
|
||||
HorizontalAlignment="Center"
|
||||
Text="Light2"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="3"
|
||||
Background="{DynamicResource SystemAccentColorLight3}"
|
||||
Grid.Column="0"
|
||||
Width="90"
|
||||
Grid.Row="3"
|
||||
Height="40"
|
||||
Background="{DynamicResource SystemAccentColorLight3}">
|
||||
Width="90">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
|
||||
Text="Light3" />
|
||||
HorizontalAlignment="Center"
|
||||
Text="Light3"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Background="{DynamicResource SystemAccentColorDark1}"
|
||||
Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Width="90"
|
||||
Height="40"
|
||||
Background="{DynamicResource SystemAccentColorDark1}">
|
||||
Width="90">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
|
||||
Text="Dark1" />
|
||||
HorizontalAlignment="Center"
|
||||
Text="Dark1"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
<Border
|
||||
Background="{DynamicResource SystemAccentColorDark2}"
|
||||
Grid.Column="1"
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Width="90"
|
||||
Height="40"
|
||||
Background="{DynamicResource SystemAccentColorDark2}">
|
||||
Width="90">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
|
||||
Text="Dark2" />
|
||||
HorizontalAlignment="Center"
|
||||
Text="Dark2"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="3"
|
||||
Background="{DynamicResource SystemAccentColorDark3}"
|
||||
Grid.Column="1"
|
||||
Width="90"
|
||||
Grid.Row="3"
|
||||
Height="40"
|
||||
Background="{DynamicResource SystemAccentColorDark3}">
|
||||
Width="90">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
|
||||
Text="Dark3" />
|
||||
HorizontalAlignment="Center"
|
||||
Text="Dark3"
|
||||
VerticalAlignment="Center" />
|
||||
</Border>
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
|
||||
<Border
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
|
||||
Height="1"
|
||||
Margin="-20"
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}" />
|
||||
Margin="-20" />
|
||||
|
||||
|
||||
<TextBlock Margin="24,24,0,0" Text="Windows 颜色" />
|
||||
|
||||
<ListBox
|
||||
Name="ColorListBox"
|
||||
MaxWidth="441"
|
||||
Margin="24,0,24,12"
|
||||
HorizontalAlignment="Left"
|
||||
AutoScrollToSelectedItem="False"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="24,0,24,12"
|
||||
MaxWidth="441"
|
||||
Name="ColorListBox"
|
||||
SelectedItem="{Binding Source={x:Static ms:UISettings.ThemeAccent}, Converter={StaticResource ColorStringToBrushConverter}, Path=Value, Mode=TwoWay}">
|
||||
<ListBox.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
@@ -218,22 +218,22 @@
|
||||
<ControlTemplate>
|
||||
<Panel>
|
||||
<Border
|
||||
Name="Root"
|
||||
BorderThickness="2"
|
||||
CornerRadius="{StaticResource ControlCornerRadius}">
|
||||
CornerRadius="{StaticResource ControlCornerRadius}"
|
||||
Name="Root">
|
||||
<Border.Background>
|
||||
<SolidColorBrush Color="{Binding}" />
|
||||
</Border.Background>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Name="Check"
|
||||
Width="20"
|
||||
Background="{DynamicResource FocusStrokeColorOuter}"
|
||||
Height="20"
|
||||
Margin="0,2,2,0"
|
||||
HorizontalAlignment="Right"
|
||||
Margin="0,2,2,0"
|
||||
Name="Check"
|
||||
VerticalAlignment="Top"
|
||||
Background="{DynamicResource FocusStrokeColorOuter}">
|
||||
Width="20">
|
||||
<ui:SymbolIcon
|
||||
FontSize="18"
|
||||
Foreground="{DynamicResource SystemAccentColor}"
|
||||
@@ -261,26 +261,17 @@
|
||||
</ListBox>
|
||||
|
||||
<Border
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
|
||||
Height="1"
|
||||
Margin="-20"
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}" />
|
||||
Margin="-20" />
|
||||
|
||||
<DockPanel Margin="24,6,0,0" LastChildFill="False">
|
||||
<DockPanel LastChildFill="False" Margin="24,6,0,0">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Left"
|
||||
Text="{Binding Path=Res.Settings_UI_CustomColor, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Text="{Binding Path=Res.Settings_UI_CustomColor, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
|
||||
<ui:ColorPickerButton
|
||||
DockPanel.Dock="Right"
|
||||
IsCompact="True"
|
||||
IsMoreButtonVisible="True"
|
||||
ShowAcceptDismissButtons="True"
|
||||
UseColorPalette="False"
|
||||
UseColorTriangle="False"
|
||||
UseColorWheel="False"
|
||||
UseSpectrum="True"
|
||||
Color="{Binding Source={x:Static ms:UISettings.ThemeAccent}, Converter={StaticResource ColorStringToBrushConverter}, Path=Value, Mode=TwoWay}" />
|
||||
<ColorPicker Color="{Binding Source={x:Static ms:UISettings.ThemeAccent}, Converter={StaticResource ColorStringToBrushConverter}, Path=Value, Mode=TwoWay}" DockPanel.Dock="Right" />
|
||||
</DockPanel>
|
||||
</StackPanel>
|
||||
</spp:OptionsDisplayItem.Content>
|
||||
@@ -298,7 +289,7 @@
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<DataTemplate.DataType>
|
||||
<x:Type x:TypeArguments="x:String, x:String" TypeName="generic:KeyValuePair" />
|
||||
<x:Type TypeName="generic:KeyValuePair" x:TypeArguments="x:String, x:String" />
|
||||
</DataTemplate.DataType>
|
||||
<TextBlock Text="{Binding Value, Mode=OneWay}" />
|
||||
</DataTemplate>
|
||||
@@ -321,7 +312,7 @@
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<DataTemplate.DataType>
|
||||
<x:Type x:TypeArguments="x:String, x:String" TypeName="generic:KeyValuePair" />
|
||||
<x:Type TypeName="generic:KeyValuePair" x:TypeArguments="x:String, x:String" />
|
||||
</DataTemplate.DataType>
|
||||
<TextBlock FontFamily="{Binding Value, Mode=OneWay, Converter={StaticResource NameToFontFamilyConverter}}" Text="{Binding Key, Mode=OneWay}" />
|
||||
</DataTemplate>
|
||||
@@ -360,8 +351,8 @@
|
||||
</spp:OptionsDisplayItem.Icon>
|
||||
<spp:OptionsDisplayItem.ActionButton>
|
||||
<Slider
|
||||
MinWidth="250"
|
||||
Maximum="1.0"
|
||||
MinWidth="250"
|
||||
Minimum="0"
|
||||
Value="{Binding Value, Source={x:Static ms:UISettings.WindowBackgroundOpacity}, Mode=TwoWay}" />
|
||||
</spp:OptionsDisplayItem.ActionButton>
|
||||
@@ -381,72 +372,72 @@
|
||||
|
||||
<spp:OptionsDisplayItem.Content>
|
||||
<StackPanel Spacing="4">
|
||||
<DockPanel Margin="24,0,0,6" LastChildFill="False">
|
||||
<DockPanel LastChildFill="False" Margin="24,0,0,6">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Left"
|
||||
Text="{Binding Path=Res.PreviewPictures, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Text="{Binding Path=Res.PreviewPictures, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
|
||||
<Image
|
||||
Width="250"
|
||||
DockPanel.Dock="Right"
|
||||
Height="150"
|
||||
HorizontalAlignment="Left"
|
||||
DockPanel.Dock="Right"
|
||||
RenderOptions.BitmapInterpolationMode="HighQuality"
|
||||
Source="{Binding Source={x:Static ms:UISettings.WindowBackgroundCustomImagePath}, Path=Value, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}"
|
||||
Stretch="{Binding Source={x:Static ms:UISettings.WindowBackgroundCustomImageStretch}, Path=Value, Mode=OneWay, Converter={StaticResource EnumConverter}, ConverterParameter={x:Type Stretch}}" />
|
||||
Stretch="{Binding Source={x:Static ms:UISettings.WindowBackgroundCustomImageStretch}, Path=Value, Mode=OneWay, Converter={StaticResource EnumConverter}, ConverterParameter={x:Type Stretch}}"
|
||||
Width="250" />
|
||||
</DockPanel>
|
||||
|
||||
<Border
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
|
||||
Height="1"
|
||||
Margin="-20"
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}" />
|
||||
Margin="-20" />
|
||||
|
||||
|
||||
<DockPanel Margin="24,6,0,6" LastChildFill="False">
|
||||
<DockPanel LastChildFill="False" Margin="24,6,0,6">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Left"
|
||||
Text="{Binding Path=Res.Settings_UI_BackgroundImageOpacity, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Text="{Binding Path=Res.Settings_UI_BackgroundImageOpacity, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
<Slider
|
||||
MinWidth="250"
|
||||
DockPanel.Dock="Right"
|
||||
Maximum="1.0"
|
||||
MinWidth="250"
|
||||
Minimum="0"
|
||||
Value="{Binding Value, Source={x:Static ms:UISettings.WindowBackgroundCustomImageOpacity}, Mode=TwoWay}" />
|
||||
</DockPanel>
|
||||
|
||||
<Border
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
|
||||
Height="1"
|
||||
Margin="-20"
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}" />
|
||||
Margin="-20" />
|
||||
|
||||
|
||||
<DockPanel Margin="24,6,0,6" LastChildFill="False">
|
||||
<DockPanel LastChildFill="False" Margin="24,6,0,6">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Left"
|
||||
Text="{Binding Path=Res.SelectPicture, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Text="{Binding Path=Res.SelectPicture, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
<Button
|
||||
MinWidth="150"
|
||||
Command="{Binding SelectImage_Click}"
|
||||
Content="{Binding Path=Res.Settings_UI_SelectImage, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
DockPanel.Dock="Right" />
|
||||
DockPanel.Dock="Right"
|
||||
MinWidth="150" />
|
||||
</DockPanel>
|
||||
|
||||
<Border
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
|
||||
Height="1"
|
||||
Margin="-20"
|
||||
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}" />
|
||||
Margin="-20" />
|
||||
|
||||
<DockPanel Margin="24,6,0,0" LastChildFill="False">
|
||||
<DockPanel LastChildFill="False" Margin="24,6,0,0">
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Left"
|
||||
Text="{Binding Path=Res.PictureZoom, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Text="{Binding Path=Res.PictureZoom, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
<ComboBox
|
||||
MinWidth="150"
|
||||
DockPanel.Dock="Right"
|
||||
MinWidth="150"
|
||||
SelectedItem="{Binding Source={x:Static ms:UISettings.WindowBackgroundCustomImageStretch}, Path=Value, Mode=TwoWay}">
|
||||
<ComboBox.Items>
|
||||
<spp:XamlMediaStretch>Fill</spp:XamlMediaStretch>
|
||||
@@ -472,21 +463,21 @@
|
||||
<ListBoxItem>
|
||||
<Grid ColumnDefinitions="Auto,*,Auto">
|
||||
<ui:ImageIcon
|
||||
Width="24"
|
||||
Height="24"
|
||||
Margin="8"
|
||||
Source="{Binding IconKey, Converter={StaticResource BitmapAssetValueConverter}}"
|
||||
VerticalAlignment="Center"
|
||||
Source="{Binding IconKey, Converter={StaticResource BitmapAssetValueConverter}}" />
|
||||
Width="24" />
|
||||
<TextBlock
|
||||
Grid.Column="1"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Name}" />
|
||||
Text="{Binding Name}"
|
||||
VerticalAlignment="Center" />
|
||||
<Viewbox
|
||||
Grid.Column="2"
|
||||
Width="18"
|
||||
Height="18"
|
||||
Margin="8,0"
|
||||
VerticalAlignment="Center">
|
||||
VerticalAlignment="Center"
|
||||
Width="18">
|
||||
<ui:FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{StaticResource Move}" />
|
||||
</Viewbox>
|
||||
</Grid>
|
||||
|
||||
@@ -190,7 +190,7 @@ public sealed class AppSplashScreen : IApplicationSplashScreen
|
||||
});
|
||||
|
||||
AdvertiseService.Current.InitAdvertise();
|
||||
await NoticeService.Current.GetNewsAsync();
|
||||
NoticeService.Current.GetNews();
|
||||
|
||||
var mainWindow = App.Instance.MainWindow;
|
||||
mainWindow.ThrowIsNull();
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<!-- PackageReference -->
|
||||
<PackageReference Include="BD.Common" />
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common\BD.Common.csproj" />
|
||||
<PackageReference Include="dotnetCampus.Ipc" />
|
||||
<PackageReference Include="NLog" />
|
||||
<PackageReference Include="NLog.Extensions.Logging" />
|
||||
|
||||
+8
-4
@@ -92,8 +92,10 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="BD.Common" />
|
||||
<PackageReference Include="BD.Common.Repositories.SQLitePCL" />
|
||||
<!--<PackageReference Include="BD.Common" />
|
||||
<PackageReference Include="BD.Common.Repositories.SQLitePCL" />-->
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common.Repositories.SQLitePCL\BD.Common.Repositories.SQLitePCL.csproj" />
|
||||
<ProjectReference Include="..\..\ref\Common\src\BD.Common\BD.Common.csproj" />
|
||||
<PackageReference Include="NLog" />
|
||||
<PackageReference Include="System.Linq.Async" />
|
||||
<PackageReference Include="Ae.DNS.Client" />
|
||||
@@ -101,9 +103,9 @@
|
||||
<PackageReference Include="DnsClient" />
|
||||
<PackageReference Include="Yarp.ReverseProxy" />
|
||||
<PackageReference Include="NLog.Web.AspNetCore" />
|
||||
<PackageReference Include="Aigio.Any.AppCenter" />
|
||||
<!--<PackageReference Include="Aigio.Any.AppCenter" />
|
||||
<PackageReference Include="Aigio.Any.AppCenter.Analytics" />
|
||||
<PackageReference Include="Aigio.Any.AppCenter.Crashes" />
|
||||
<PackageReference Include="Aigio.Any.AppCenter.Crashes" />-->
|
||||
<PackageReference Include="System.Drawing.Common" />
|
||||
<PackageReference Include="System.Runtime.Caching" />
|
||||
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
|
||||
@@ -119,6 +121,8 @@
|
||||
<ProjectReference Include="..\BD.WTTS.Client.IPC\BD.WTTS.Client.IPC.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\OSShuttingDownHelper\OSShuttingDownHelper.projitems" Label="Shared" />
|
||||
|
||||
<!-- 此项目不使用平台 TFM !!! -->
|
||||
<Import Project="..\TFM_NETX.props" />
|
||||
|
||||
|
||||
+2
-1
@@ -35,6 +35,7 @@ public static class KestrelServerOptionsExtensions
|
||||
|
||||
options.Listen(IReverseProxyService.Constants.Instance.ProxyIp, httpProxyPort, listen =>
|
||||
{
|
||||
listen.Protocols = HttpProtocols.Http1AndHttp2AndHttp3;
|
||||
var proxyMiddleware = options.ApplicationServices.GetRequiredService<HttpProxyMiddleware>();
|
||||
var tunnelMiddleware = options.ApplicationServices.GetRequiredService<TunnelMiddleware>();
|
||||
|
||||
@@ -123,7 +124,7 @@ public static class KestrelServerOptionsExtensions
|
||||
var httpsPort = IReverseProxyConfig.HttpsPort;
|
||||
options.Listen(IReverseProxyService.Constants.Instance.ProxyIp, httpsPort, listen =>
|
||||
{
|
||||
listen.Protocols = HttpProtocols.Http1AndHttp2;
|
||||
listen.Protocols = HttpProtocols.Http1AndHttp2AndHttp3;
|
||||
listen.UseFlowAnalyze();
|
||||
listen.UseTls();
|
||||
});
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using BD.Common.Repositories.Abstractions;
|
||||
using dotnetCampus.Ipc.CompilerServices.GeneratedProxies;
|
||||
using Windows.Win32;
|
||||
using KeyValuePair = BD.Common.Entities.KeyValuePair;
|
||||
|
||||
const string moduleName = AssemblyInfo.Accelerator;
|
||||
@@ -35,6 +36,12 @@ static bool IsProcessElevated_DEBUG_Only()
|
||||
return principal.IsInRole(WindowsBuiltInRole.Administrator);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (OSShuttingDownHelper.IsSystemShuttingDown())
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var exitCode = await IPCSubProcessService.MainAsync(moduleName, pluginName, ConfigureServices, static ipcProvider =>
|
||||
@@ -77,7 +84,7 @@ static void ConfigureServices(IServiceCollection services)
|
||||
services.AddLogging(l =>
|
||||
{
|
||||
l.ClearProviders();
|
||||
l.AddNLog(LogManager.Configuration); // 添加 NLog 日志
|
||||
l.AddNLog(LogManager.Configuration!); // 添加 NLog 日志
|
||||
#if DEBUG
|
||||
l.AddConsole();
|
||||
#endif
|
||||
|
||||
+2
-1
@@ -36,7 +36,7 @@ sealed class ReverseProxyHttpClientHandler : DelegatingHandler
|
||||
|
||||
// 设置请求头 host,因为连接中已带端口号故 修改协议为 http
|
||||
request.Headers.Host = uri.Host;
|
||||
request.RequestUri = new UriBuilder(uri) { Scheme = Uri.UriSchemeHttp }.Uri;
|
||||
//request.RequestUri = new UriBuilder(uri) { Scheme = Uri.UriSchemeHttp }.Uri;
|
||||
|
||||
if (domainConfig.Timeout != null)
|
||||
{
|
||||
@@ -61,6 +61,7 @@ sealed class ReverseProxyHttpClientHandler : DelegatingHandler
|
||||
AutomaticDecompression = DecompressionMethods.None,
|
||||
ConnectCallback = ConnectCallback,
|
||||
EnableMultipleHttp2Connections = true,
|
||||
EnableMultipleHttp3Connections = true,
|
||||
RequestHeaderEncodingSelector = (_, _) => Encoding.UTF8,
|
||||
ResponseHeaderEncodingSelector = (_, _) => Encoding.UTF8,
|
||||
};
|
||||
|
||||
+36
-15
@@ -2,6 +2,7 @@
|
||||
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Yarp.ReverseProxy.Forwarder;
|
||||
using HttpVersion = System.Net.HttpVersion;
|
||||
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace BD.WTTS.Services.Implementation;
|
||||
@@ -30,6 +31,27 @@ sealed partial class HttpReverseProxyMiddleware
|
||||
this.logger = logger;
|
||||
}
|
||||
|
||||
static ArgumentOutOfRangeException GetUnknownHttpVersionException(string? actualValue, [CallerArgumentExpression(nameof(actualValue))] string? paramName = null) => new(
|
||||
$"""
|
||||
Version doesn't map to a known HTTP protocol. (Parameter '{paramName}')
|
||||
Actual value was {actualValue}.
|
||||
""");
|
||||
|
||||
static Version GetHttpVersion(string requestProtocol) =>
|
||||
(requestProtocol != null && requestProtocol.Length >= 6) ? requestProtocol[5] switch
|
||||
{
|
||||
// 参考 Microsoft.AspNetCore.Http.HttpProtocol.GetHttpProtocol
|
||||
'1' => requestProtocol.Length >= 8 ? requestProtocol[7] switch
|
||||
{
|
||||
'0' => HttpVersion.Version10,
|
||||
'1' => HttpVersion.Version11,
|
||||
_ => throw GetUnknownHttpVersionException(requestProtocol),
|
||||
} : throw GetUnknownHttpVersionException(requestProtocol),
|
||||
'2' => HttpVersion.Version20,
|
||||
'3' => HttpVersion.Version30,
|
||||
_ => throw GetUnknownHttpVersionException(requestProtocol),
|
||||
} : throw GetUnknownHttpVersionException(requestProtocol);
|
||||
|
||||
/// <summary>
|
||||
/// 处理请求
|
||||
/// </summary>
|
||||
@@ -60,12 +82,7 @@ sealed partial class HttpReverseProxyMiddleware
|
||||
var destinationPrefix = GetDestinationPrefix(context.Request.Scheme, context.Request.Host, null);
|
||||
var forwarderRequestConfig = new ForwarderRequestConfig()
|
||||
{
|
||||
Version = context.Request.Protocol switch
|
||||
{
|
||||
var protocol when protocol.StartsWith("HTTP/2") => System.Net.HttpVersion.Version20,
|
||||
var protocol when protocol.StartsWith("HTTP/3") => System.Net.HttpVersion.Version30,
|
||||
_ => System.Net.HttpVersion.Version11,
|
||||
},
|
||||
Version = GetHttpVersion(context.Request.Protocol),
|
||||
};
|
||||
var error = await httpForwarder.SendAsync(context, destinationPrefix, httpClient, forwarderRequestConfig, HttpTransformer.Empty);
|
||||
if (error != ForwarderError.None)
|
||||
@@ -119,19 +136,23 @@ sealed partial class HttpReverseProxyMiddleware
|
||||
context.Request.Headers.UserAgent = domainConfig.UserAgent.Replace("${origin}", context.Request.Headers.UserAgent, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
var forwarderRequestConfig = new ForwarderRequestConfig()
|
||||
{
|
||||
Version = context.Request.Protocol switch
|
||||
{
|
||||
var protocol when protocol.StartsWith("HTTP/2") => System.Net.HttpVersion.Version20,
|
||||
var protocol when protocol.StartsWith("HTTP/3") => System.Net.HttpVersion.Version30,
|
||||
_ => System.Net.HttpVersion.Version11,
|
||||
},
|
||||
};
|
||||
ForwarderRequestConfig forwarderRequestConfig;
|
||||
|
||||
if (domainConfig.IsServerSideProxy)
|
||||
{
|
||||
SetWattHeaders(context, reverseProxyConfig.Service.ServerSideProxyToken);
|
||||
forwarderRequestConfig = new ForwarderRequestConfig()
|
||||
{
|
||||
Version = HttpVersion.Version30,
|
||||
VersionPolicy = HttpVersionPolicy.RequestVersionOrLower
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
forwarderRequestConfig = new ForwarderRequestConfig()
|
||||
{
|
||||
Version = GetHttpVersion(context.Request.Protocol),
|
||||
};
|
||||
}
|
||||
|
||||
var error = await httpForwarder.SendAsync(context, destinationPrefix, httpClient, forwarderRequestConfig, HttpTransformer.Empty);
|
||||
|
||||
+83
-21
@@ -48,26 +48,41 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
|
||||
platformService,
|
||||
CertificateManager);
|
||||
|
||||
X509Certificate2? cer = CertificateManager.RootCertificatePackable;
|
||||
if (cer is not null && DateTime.Now <= cer.NotAfter && cer.NotAfter <= DateTime.Now.AddMonths(1))
|
||||
try
|
||||
{
|
||||
var interval = cer.NotAfter - DateTime.Now;
|
||||
|
||||
_certificateTimer = new System.Timers.Timer(interval)
|
||||
X509Certificate2? cer = CertificateManager.RootCertificatePackable;
|
||||
if (cer is not null &&
|
||||
DateTime.Now <= cer.NotAfter && cer.NotAfter <= DateTime.Now.AddMilliseconds(int.MaxValue))
|
||||
{
|
||||
AutoReset = false,
|
||||
};
|
||||
var interval = cer.NotAfter - DateTime.Now;
|
||||
|
||||
_certificateTimer.Elapsed += async (_, _) =>
|
||||
{
|
||||
ICertificateManager.Constants.CheckRootCertificate(
|
||||
platformService,
|
||||
CertificateManager);
|
||||
_certificateTimer = new System.Timers.Timer(interval)
|
||||
{
|
||||
AutoReset = false,
|
||||
};
|
||||
|
||||
await StopProxyAsync();
|
||||
await StartProxyImpl();
|
||||
};
|
||||
_certificateTimer.Start();
|
||||
_certificateTimer.Elapsed += async (_, _) =>
|
||||
{
|
||||
try
|
||||
{
|
||||
ICertificateManager.Constants.CheckRootCertificate(
|
||||
platformService,
|
||||
CertificateManager);
|
||||
|
||||
await StopProxyAsync();
|
||||
await StartProxyImpl();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.LogAndShowT(TAG, msg: "CheckRootCertificate in Timer.Elapsed Error");
|
||||
}
|
||||
};
|
||||
_certificateTimer.Start();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.LogAndShowT(TAG, msg: "CheckRootCertificate Error");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -83,8 +98,58 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
|
||||
|
||||
protected override Task<StartProxyResult> StartProxyImpl() => Task.FromResult(StartProxyCore());
|
||||
|
||||
readonly string[] allowedHosts = ["*",];
|
||||
|
||||
#if WINDOWS
|
||||
/// <summary>
|
||||
/// https://learn.microsoft.com/zh-cn/dotnet/core/extensions/globalization-icu#determine-if-your-app-is-using-icu
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
static bool ICUMode()
|
||||
{
|
||||
SortVersion sortVersion = CultureInfo.InvariantCulture.CompareInfo.Version;
|
||||
byte[] bytes = sortVersion.SortId.ToByteArray();
|
||||
int version = bytes[3] << 24 | bytes[2] << 16 | bytes[1] << 8 | bytes[0];
|
||||
return version != 0 && version == sortVersion.FullVersion;
|
||||
}
|
||||
|
||||
static bool IcuTest(IEnumerable<string> incoming)
|
||||
{
|
||||
if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0, 18362) && ICUMode())
|
||||
{
|
||||
// https://learn.microsoft.com/zh-cn/dotnet/core/extensions/globalization-icu#icu-on-windows
|
||||
// 与 .NET 6 和 .NET 5 相比,.NET 7 及更高版本能够在早期 Windows 版本上加载 ICU
|
||||
// 通常问题出在 1703 ~ 1903 之间的 Windows 版本
|
||||
try
|
||||
{
|
||||
// https://github.com/dotnet/aspnetcore/blob/v9.0.2/src/Middleware/HostFiltering/src/MiddlewareConfigurationManager.cs#L67
|
||||
foreach (var entry in incoming)
|
||||
{
|
||||
// Punycode. Http.Sys requires you to register Unicode hosts, but the headers contain punycode.
|
||||
var host = new HostString(entry).ToUriComponent();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
StartProxyResult StartProxyCore()
|
||||
{
|
||||
#if WINDOWS
|
||||
if (!IcuTest(allowedHosts))
|
||||
{
|
||||
return StartProxyResultCode.IcuTestFail;
|
||||
}
|
||||
#endif
|
||||
// https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub/Program.cs#L29
|
||||
try
|
||||
{
|
||||
@@ -98,13 +163,10 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
|
||||
|
||||
builder.Logging.AddProvider(new LogConsoleService.Utf8StringLoggerProvider(AssemblyInfo.Accelerator));
|
||||
|
||||
builder.Services.Configure<HostFilteringOptions>(static o =>
|
||||
builder.Services.Configure<HostFilteringOptions>(o =>
|
||||
{
|
||||
o.AllowEmptyHosts = true;
|
||||
o.AllowedHosts = new List<string>
|
||||
{
|
||||
"*",
|
||||
};
|
||||
o.AllowedHosts = allowedHosts;
|
||||
});
|
||||
|
||||
builder.Host.UseNLog();
|
||||
|
||||
+7
-1
@@ -179,7 +179,7 @@ public partial interface IReverseProxySettings
|
||||
string? ServerSideProxyToken { get; set; }
|
||||
}
|
||||
|
||||
[MP2Obj(SerializeLayout.Explicit)]
|
||||
[MP2Obj(GenerateType.VersionTolerant, SerializeLayout.Explicit)]
|
||||
public readonly partial record struct ReverseProxySettings(
|
||||
[property: MP2Key(0)]
|
||||
IReadOnlyCollection<AccelerateProjectDTO>? ProxyDomains,
|
||||
@@ -341,6 +341,12 @@ public enum StartProxyResultCode : byte
|
||||
/// 绑定端口错误
|
||||
/// </summary>
|
||||
BindPortError,
|
||||
|
||||
/// <summary>
|
||||
/// 早期 Windows 版本且缺少 Windows 更新补丁,Icu 存在 Bug 导致,要么更新操作系统,要么更改配置使用 NLS 重启程序
|
||||
/// <para>https://learn.microsoft.com/zh-cn/dotnet/core/extensions/globalization-icu#use-nls-instead-of-icu</para>
|
||||
/// </summary>
|
||||
IcuTestFail = 127, // 值与 Mobius 保持一致
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
+8
-11
@@ -9,7 +9,7 @@ internal partial class NetworkTestService : INetworkTestService
|
||||
#region 常量
|
||||
|
||||
// 默认测试地址
|
||||
const string DEFAULT_TESTSERVER_HOSTNAME = "stun.syncthing.net";
|
||||
internal const string DEFAULT_TESTSERVER_HOSTNAME = "stun.miwifi.com";
|
||||
|
||||
const int DEFAULT_PORT = 3478;
|
||||
const int DEFAULT_TLSPORT = 5349;
|
||||
@@ -202,8 +202,6 @@ internal partial class NetworkTestService : INetworkTestService
|
||||
|
||||
#region RFC3489
|
||||
|
||||
StunClient3489? _stunClient;
|
||||
|
||||
/// <summary>
|
||||
/// 测试 STUN 客户端 基于 RFC3489
|
||||
/// </summary>
|
||||
@@ -217,19 +215,17 @@ internal partial class NetworkTestService : INetworkTestService
|
||||
string? testServerHostName = DEFAULT_TESTSERVER_HOSTNAME,
|
||||
int? testServerPort = DEFAULT_TESTSTUN3489_PORT,
|
||||
IPEndPoint? localIPEndPoint = null,
|
||||
bool force = false,
|
||||
CancellationToken cancellationToken = default
|
||||
)
|
||||
{
|
||||
testServerHostName ??= DEFAULT_TESTSERVER_HOSTNAME;
|
||||
testServerPort ??= DEFAULT_TESTSTUN3489_PORT;
|
||||
|
||||
if (_stunClient == null || force)
|
||||
_stunClient = await GetStunClient3489Async(testServerHostName, testServerPort.Value, localIPEndPoint);
|
||||
using var stunClient = await GetStunClient3489Async(testServerHostName, testServerPort.Value, localIPEndPoint);
|
||||
|
||||
try
|
||||
{
|
||||
await _stunClient.QueryAsync(cancellationToken);
|
||||
await stunClient.QueryAsync(cancellationToken);
|
||||
}
|
||||
catch (OperationCanceledException) { throw; }
|
||||
catch (Exception ex)
|
||||
@@ -238,7 +234,7 @@ internal partial class NetworkTestService : INetworkTestService
|
||||
return null;
|
||||
}
|
||||
|
||||
return _stunClient.State;
|
||||
return stunClient.State;
|
||||
}
|
||||
|
||||
private async ValueTask<StunClient3489> GetStunClient3489Async(string serverHostName, int port, IPEndPoint? localIPEndPoint = null)
|
||||
@@ -289,7 +285,7 @@ internal partial class NetworkTestService : INetworkTestService
|
||||
testServerHostName ??= DEFAULT_TESTSERVER_HOSTNAME;
|
||||
testServerPort ??= DEFAULT_TESTSTUN5389_PORT;
|
||||
|
||||
IStunClient5389 client = await GetStunClient5389Async(protocol, testServerHostName, testServerPort.Value, localIPEndPoint);
|
||||
using var client = await GetStunClient5389Async(protocol, testServerHostName, testServerPort.Value, localIPEndPoint);
|
||||
|
||||
if (client == null)
|
||||
return null;
|
||||
@@ -345,7 +341,8 @@ internal partial class NetworkTestService : INetworkTestService
|
||||
)
|
||||
{
|
||||
using UdpClient udpClient = new UdpClient(dnsServerIp, dnsServerPort);
|
||||
|
||||
udpClient.Client.SendTimeout = 3000;
|
||||
udpClient.Client.ReceiveTimeout = 3000;
|
||||
var query = new DnsQueryUdpRequest(testDomain, dnsRecordType);
|
||||
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
@@ -382,7 +379,7 @@ internal partial class NetworkTestService : INetworkTestService
|
||||
Proxy = HttpNoProxy.Instance,
|
||||
};
|
||||
using HttpClient client = new HttpClient(handler);
|
||||
|
||||
client.Timeout = TimeSpan.FromSeconds(3);
|
||||
string queryUrl = $"{dohServer}?name={testDomain}&type={dnsRecordType}";
|
||||
|
||||
Stopwatch watch = Stopwatch.StartNew();
|
||||
|
||||
@@ -91,14 +91,12 @@ internal interface IStunTestService
|
||||
/// <param name="testServerHostName">STUN 服务地址</param>
|
||||
/// <param name="testServerPort">STUN 服务端口</param>
|
||||
/// <param name="localIPEndPoint">本机IP</param>
|
||||
/// <param name="force">刷新测试 Client</param>
|
||||
/// <remarks></remarks>
|
||||
/// <returns></returns>
|
||||
Task<ClassicStunResult?> TestStunClient3489Async(
|
||||
string? testServerHostName = default,
|
||||
int? testServerPort = default,
|
||||
IPEndPoint? localIPEndPoint = default,
|
||||
bool force = false,
|
||||
CancellationToken cancellationToken = default
|
||||
);
|
||||
|
||||
|
||||
@@ -307,6 +307,7 @@ public sealed partial class GameAcceleratorService
|
||||
Games.AddOrUpdate(CurrentAcceleratorGame);
|
||||
|
||||
//加速后
|
||||
TracepointHelper.TrackEvent("AcceleratorGameSuccess");
|
||||
Toast.Show(ToastIcon.Success, "加速成功");
|
||||
if (ProxySettings.AutoShowWattAcceleratorWindow.Value)
|
||||
{
|
||||
@@ -630,42 +631,7 @@ public sealed partial class GameAcceleratorService
|
||||
|
||||
td.Opened += async (s, e) =>
|
||||
{
|
||||
await foreach (var item in install)
|
||||
{
|
||||
if (item.HandleUI(out var content))
|
||||
{
|
||||
switch (content)
|
||||
{
|
||||
case < 100:
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"正在下载 {item.Content}%"; });
|
||||
td.SetProgressBarState(item.Content, TaskDialogProgressState.Normal);
|
||||
break;
|
||||
case 100:
|
||||
td.SetProgressBarState(item.Content, TaskDialogProgressState.Indeterminate);
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"下载完成,正在安装..."; });
|
||||
break;
|
||||
case (int)XunYouDownLoadCode.安装成功:
|
||||
//处理成功
|
||||
//Dispatcher.UIThread.Post(() => { td.Content = $"安装完成"; });
|
||||
Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); });
|
||||
td.Hide();
|
||||
break;
|
||||
case int n when n > 101 && n < (int)XunYouDownLoadCode.启动安装程序失败:
|
||||
//处理失败
|
||||
break;
|
||||
// Code 和进度重叠 递进 1000 XunYouInstallOrStartCode.默认 XunYouInstallOrStartCode.已安装
|
||||
case 1000:
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"默认"; });
|
||||
// XunYouInstallOrStartCode.默认
|
||||
break;
|
||||
case 1001:
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"已安装"; });
|
||||
// XunYouInstallOrStartCode.已安装
|
||||
Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); });
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
await DownloadCallbackAsync(td, install);
|
||||
};
|
||||
|
||||
//_ = Task.Run(() => { XunYouSDK.InstallAsync(progress, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WattAccelerator")); });
|
||||
@@ -674,6 +640,47 @@ public sealed partial class GameAcceleratorService
|
||||
}
|
||||
}
|
||||
|
||||
private static async Task DownloadCallbackAsync(TaskDialog td, IAsyncEnumerable<ApiRsp<int>> install)
|
||||
{
|
||||
await foreach (var item in install)
|
||||
{
|
||||
if (item.HandleUI(out var content))
|
||||
{
|
||||
switch (content)
|
||||
{
|
||||
case < 100:
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"正在下载 {item.Content}%"; });
|
||||
td.SetProgressBarState(item.Content, TaskDialogProgressState.Normal);
|
||||
break;
|
||||
case 100:
|
||||
td.SetProgressBarState(item.Content, TaskDialogProgressState.Indeterminate);
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"下载完成,正在安装..."; });
|
||||
break;
|
||||
case (int)XunYouDownLoadCode.安装成功:
|
||||
//处理成功
|
||||
//Dispatcher.UIThread.Post(() => { td.Content = $"安装完成"; });
|
||||
TracepointHelper.TrackEvent("DownloadInstallSuccess");
|
||||
Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); });
|
||||
td.Hide();
|
||||
break;
|
||||
case int n when n > 101 && n < (int)XunYouDownLoadCode.启动安装程序失败:
|
||||
//处理失败
|
||||
break;
|
||||
// Code 和进度重叠 递进 1000 XunYouInstallOrStartCode.默认 XunYouInstallOrStartCode.已安装
|
||||
case 1000:
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"默认"; });
|
||||
// XunYouInstallOrStartCode.默认
|
||||
break;
|
||||
case 1001:
|
||||
Dispatcher.UIThread.Post(() => { td.Content = $"已安装"; });
|
||||
// XunYouInstallOrStartCode.已安装
|
||||
Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); });
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static async void UninstallAccelerator()
|
||||
{
|
||||
var xunYouIsInstall = await Ioc.Get<IAcceleratorService>().XY_IsInstall();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
// ReSharper disable once CheckNamespace
|
||||
using BD.WTTS.Helpers;
|
||||
using BD.WTTS.Services.Implementation;
|
||||
|
||||
namespace BD.WTTS.Services;
|
||||
|
||||
@@ -73,6 +74,18 @@ partial class ProxyService
|
||||
bool useDoh = ProxySettings.UseDoh.Value;
|
||||
string? customDohAddres = ProxySettings.CustomDohAddres2.Value;
|
||||
|
||||
if (ProxySettings.ProxyBeforeDNSCheck.Value)
|
||||
{
|
||||
if (useDoh)
|
||||
{
|
||||
customDohAddres = await GetFastestDNSAsync(ProxySettingsWindowViewModel.DohAddress);
|
||||
}
|
||||
else
|
||||
{
|
||||
proxyDNS = await GetFastestDNSAsync(ProxySettingsWindowViewModel.ProxyDNSs.Skip(1));
|
||||
}
|
||||
}
|
||||
|
||||
Lazy<IPAddress> proxyIp_ = new(() => ReverseProxySettings.GetProxyIp(proxyIp));
|
||||
void SetProxyIp(IPAddress proxyIPAddress)
|
||||
{
|
||||
@@ -393,8 +406,10 @@ partial class ProxyService
|
||||
if (!string.IsNullOrEmpty(proxyTokenCache))
|
||||
return proxyTokenCache;
|
||||
|
||||
using CancellationTokenSource cts = new();
|
||||
cts.CancelAfter(TimeSpan.FromSeconds(4.99D)); // 5 秒超时
|
||||
var resp = await IMicroServiceClient.Instance.Account
|
||||
.GenerateServerSideProxyToken();
|
||||
.GenerateServerSideProxyToken(cts.Token);
|
||||
|
||||
if (resp != null && !string.IsNullOrEmpty(resp.Content?.AccessToken))
|
||||
{
|
||||
@@ -403,11 +418,14 @@ partial class ProxyService
|
||||
|
||||
return proxyTokenCache;
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ex.LogAndShowT();
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -418,7 +436,7 @@ partial class ProxyService
|
||||
{
|
||||
public static implicit operator OperateProxyServiceResult(string error) => new(error);
|
||||
|
||||
public static implicit operator OperateProxyServiceResult(Exception exception) => new(null, exception);
|
||||
public static implicit operator OperateProxyServiceResult(Exception exception) => new(exception.Message, exception);
|
||||
|
||||
/// <summary>
|
||||
/// 将返回结果使用 Toast 显示并且返回当前应设置的代理状态
|
||||
@@ -463,4 +481,69 @@ partial class ProxyService
|
||||
return proxyStatus;
|
||||
}
|
||||
}
|
||||
|
||||
async Task<(long delayMs, string dns)> GetValidDNSAsync(string dns, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var testDomain = "dnscheck-test.steampp.net";
|
||||
try
|
||||
{
|
||||
long delayMs;
|
||||
IPAddress[] address;
|
||||
if (ProxySettings.UseDoh.Value)
|
||||
{
|
||||
(delayMs, address) = await INetworkTestService.Instance.TestDNSOverHttpsAsync(testDomain, dns, cancellationToken: cancellationToken);
|
||||
}
|
||||
else
|
||||
{
|
||||
(delayMs, address) = await INetworkTestService.Instance.TestDNSAsync(testDomain, dns, 53, cancellationToken: cancellationToken);
|
||||
}
|
||||
if (address.Length == 0)
|
||||
throw new Exception("Parsing failed. Return empty ip address.");
|
||||
|
||||
return (delayMs, dns);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Log.Error(nameof(StartOrStopProxyService), ex.ToString(), "DNS检测出错");
|
||||
return (0, dns);
|
||||
}
|
||||
}
|
||||
|
||||
async Task<string?> GetFastestDNSAsync(IEnumerable<string> dnsAddresses, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
|
||||
var tasks = new List<Task<(long delayMs, string dns)>>();
|
||||
|
||||
foreach (var dns in dnsAddresses)
|
||||
{
|
||||
tasks.Add(GetValidDNSAsync(dns, cts.Token));
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// 等待任意一个任务完成
|
||||
var completedTask = await Task.WhenAny(tasks);
|
||||
|
||||
// 获取任务结果
|
||||
var (delayMs, dns) = await completedTask;
|
||||
_ = cts.CancelAsync(); // 取消其他任务
|
||||
|
||||
// 如果任务成功完成(假设 delayMs > 0 表示成功)
|
||||
if (delayMs > 0)
|
||||
{
|
||||
return dns; // 返回第一个成功的 DNS 地址
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
// 任务被取消,忽略
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Log.Error(nameof(StartOrStopProxyService), ex.ToString(), "DNS检测出错");
|
||||
}
|
||||
|
||||
// 如果没有有效结果,返回默认值
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -163,8 +163,35 @@ public sealed partial class ProxyService
|
||||
return [];
|
||||
var data = ProxyDomains.Items
|
||||
.Where(x => x.Items != null)
|
||||
.SelectMany(s => s.Items!.Where(w => w.ThreeStateEnable != false));
|
||||
//return data.Concat(data.SelectMany(s => GetProxyDomainsItems(s)));
|
||||
.SelectMany(s => s.Items!.Where(w => w.ThreeStateEnable != false))
|
||||
.Select(item =>
|
||||
{
|
||||
//过滤部分选中的子项
|
||||
if (item.Items.Any_Nullable())
|
||||
{
|
||||
return new AccelerateProjectDTO
|
||||
{
|
||||
Name = item.Name,
|
||||
Port = item.Port,
|
||||
MatchDomainNames = item.MatchDomainNames,
|
||||
ForwardDomainNames = item.ForwardDomainNames,
|
||||
IgnoreSSLCertVerification = item.IgnoreSSLCertVerification,
|
||||
FakeServerName = item.FakeServerName,
|
||||
ProxyType = item.ProxyType,
|
||||
ListenDomainNames = item.ListenDomainNames,
|
||||
Checked = item.Checked,
|
||||
Id = item.Id,
|
||||
Order = item.Order,
|
||||
FakeUserAgent = item.FakeUserAgent,
|
||||
Version = item.Version,
|
||||
ThreeStateEnable = item.ThreeStateEnable,
|
||||
// 递归过滤子项
|
||||
Items = item.Items.Where(x => x.ThreeStateEnable != false).ToList()
|
||||
};
|
||||
}
|
||||
return item;
|
||||
});
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
|
||||
@@ -165,6 +165,11 @@ public partial interface IProxySettings
|
||||
/// </summary>
|
||||
bool AutoShowWattAcceleratorWindow { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 加速前进行 DNS 可用性检查
|
||||
/// </summary>
|
||||
bool ProxyBeforeDNSCheck { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 启用脚本自动检查更新的默认值
|
||||
/// </summary>
|
||||
@@ -290,4 +295,9 @@ public partial interface IProxySettings
|
||||
/// </summary>
|
||||
const bool DefaultAutoShowWattAcceleratorWindow = true;
|
||||
|
||||
/// <summary>
|
||||
/// 加速前进行 DNS 可用性检查的默认值
|
||||
/// </summary>
|
||||
const bool DefaultProxyBeforeDNSCheck = true;
|
||||
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ internal partial class GameAcceleratorSettingsContext : JsonSerializerContext
|
||||
=> instance ??= new GameAcceleratorSettingsContext(ISettings.GetDefaultOptions());
|
||||
}
|
||||
|
||||
[MPObj, MP2Obj(SerializeLayout.Explicit)]
|
||||
[MP2Obj(SerializeLayout.Explicit)]
|
||||
public sealed partial class GameAcceleratorSettings_ : ISettings, ISettings<GameAcceleratorSettings_>
|
||||
{
|
||||
public const string Name = nameof(GameAcceleratorSettings);
|
||||
|
||||
@@ -209,6 +209,12 @@ public sealed partial class ProxySettings_ : IProxySettings, ISettings, ISetting
|
||||
[MPKey(24), MP2Key(24), JsonPropertyOrder(24)]
|
||||
public bool AutoShowWattAcceleratorWindow { get; set; } = IProxySettings.DefaultAutoShowWattAcceleratorWindow;
|
||||
|
||||
/// <summary>
|
||||
/// 加速前进行 DNS 可用性检查
|
||||
/// </summary>
|
||||
[MPKey(25), MP2Key(25), JsonPropertyOrder(25)]
|
||||
public bool ProxyBeforeDNSCheck { get; set; } = IProxySettings.DefaultProxyBeforeDNSCheck;
|
||||
|
||||
}
|
||||
|
||||
public static partial class ProxySettings
|
||||
@@ -383,4 +389,10 @@ public static partial class ProxySettings
|
||||
public static SettingsStructProperty<bool, ProxySettings_> AutoShowWattAcceleratorWindow { get; }
|
||||
= new(DefaultAutoShowWattAcceleratorWindow);
|
||||
|
||||
/// <summary>
|
||||
/// 加速前进行 DNS 可用性检查
|
||||
/// </summary>
|
||||
public static SettingsStructProperty<bool, ProxySettings_> ProxyBeforeDNSCheck { get; }
|
||||
= new(DefaultProxyBeforeDNSCheck);
|
||||
|
||||
}
|
||||
|
||||
@@ -21,16 +21,17 @@ public sealed partial class AcceleratorPageViewModel
|
||||
{
|
||||
// Create new ProxyEnableDomain for 加速服务 page
|
||||
var enableGroupDomain = ProxyService.Current.ProxyDomainsList
|
||||
.Where(list => list.ThreeStateEnable == true || list.ThreeStateEnable == null)
|
||||
.Where(list => list.ThreeStateEnable != false)
|
||||
.Select(list => new ProxyDomainGroupViewModel
|
||||
{
|
||||
Name = list.Name,
|
||||
IconUrl = list.IconUrl ?? string.Empty,
|
||||
EnableProxyDomainVMs = new(
|
||||
list.Items!
|
||||
.Where(i => i.ThreeStateEnable == true)
|
||||
.Where(i => i.ThreeStateEnable != false)
|
||||
.Select(i => new ProxyDomainViewModel(i.Name, i.ProxyType, "https://" + i.ListenDomainNames.Split(";")[0],
|
||||
i.Items?
|
||||
.Where(x => x.ThreeStateEnable != false)
|
||||
.Select(c => new ProxyDomainViewModel(c.Name, c.ProxyType, "https://" + c.ListenDomainNames.Split(';')[0]))
|
||||
.ToList()))
|
||||
.ToList()),
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ namespace BD.WTTS.UI.ViewModels;
|
||||
|
||||
public sealed partial class AcceleratorPageViewModel : TabItemViewModel
|
||||
{
|
||||
public override string Name => Strings.Welcome;
|
||||
public override string Name => Strings.CommunityFix;
|
||||
|
||||
[Reactive]
|
||||
public ReadOnlyCollection<ProxyDomainGroupViewModel>? EnableProxyDomainGroupVMs { get; set; }
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ namespace BD.WTTS.UI.ViewModels;
|
||||
|
||||
public sealed partial class GameAcceleratorPageViewModel : TabItemViewModel
|
||||
{
|
||||
public override string Name => Strings.Welcome;
|
||||
public override string Name => Strings.GameAccelerator;
|
||||
|
||||
private readonly ReadOnlyObservableCollection<XunYouGameViewModel>? _Games;
|
||||
|
||||
|
||||
+69
-54
@@ -31,10 +31,9 @@ public partial class NetworkCheckControlViewModel : ViewModelBase
|
||||
|
||||
public string[] STUNAddress { get; } =
|
||||
[
|
||||
"stun.syncthing.net",
|
||||
NetworkTestService.DEFAULT_TESTSERVER_HOSTNAME,
|
||||
"stun.hot-chilli.net",
|
||||
"stun.fitauto.ru",
|
||||
"stun.miwifi.com",
|
||||
];
|
||||
|
||||
[ObservableAsProperty]
|
||||
@@ -90,28 +89,7 @@ public partial class NetworkCheckControlViewModel : ViewModelBase
|
||||
{
|
||||
SelectedSTUNAddress = STUNAddress[0];
|
||||
|
||||
NATCheckCommand = ReactiveCommand.CreateFromTask(async () =>
|
||||
{
|
||||
var natCheckResult = await _networkTestService.TestStunClient3489Async(testServerHostName: SelectedSTUNAddress) ?? new ClassicStunResult { NatType = NatType.Unknown };
|
||||
var (netSucc, _) = await _networkTestService.TestOpenUrlAsync("https://www.baidu.com");
|
||||
|
||||
var publicEndPoint = natCheckResult.PublicEndPoint?.Address.ToString() ?? "Unknown";
|
||||
var localEndPoint = natCheckResult.LocalEndPoint?.Address.ToString() ?? "Unknown";
|
||||
|
||||
var (natLevel, natTypeTip) = natCheckResult.NatType switch
|
||||
{
|
||||
// Open
|
||||
NatType.OpenInternet or NatType.FullCone => ("开放 NAT", "您可与在其网络上具有任意 NAT 类型的用户玩多人游戏和发起多人游戏。"),
|
||||
// Moderate
|
||||
NatType.RestrictedCone or NatType.PortRestrictedCone or NatType.SymmetricUdpFirewall => ("中等 NAT", "您可与一些用户玩多人游戏;但是,并且通常你将不会被选为比赛的主持人。"),
|
||||
// Strict
|
||||
NatType.Symmetric or NatType.UdpBlocked => ("严格 NAT", "您只能与具有开放 NAT 类型的用户玩多人游戏。您不能被选为比赛的主持人。"),
|
||||
// Unknown
|
||||
NatType.Unknown or NatType.UnsupportedServer or _ => ("不可用 NAT", "如果 NAT 不可用,您将无法使用群聊天或连接到某些 Xbox 游戏的多人游戏。"),
|
||||
};
|
||||
|
||||
return new NATFetchResult(publicEndPoint, localEndPoint, natLevel, natTypeTip, netSucc);
|
||||
});
|
||||
NATCheckCommand = ReactiveCommand.CreateFromTask(NATCheckAsync);
|
||||
NATCheckCommand
|
||||
.IsExecuting
|
||||
.ToPropertyEx(this, x => x.IsNATChecking);
|
||||
@@ -145,36 +123,7 @@ public partial class NetworkCheckControlViewModel : ViewModelBase
|
||||
|
||||
var canDNSCheck = this.WhenAnyValue(x => x.DomainPendingTest)
|
||||
.Select(domain => domain == string.Empty || DomainRegExp().IsMatch(domain));
|
||||
DNSCheckCommand = ReactiveCommand.CreateFromTask(async () =>
|
||||
{
|
||||
var testDomain = DomainPendingTest == string.Empty ? DefaultTestDomain : DomainPendingTest;
|
||||
try
|
||||
{
|
||||
long delayMs;
|
||||
IPAddress[] address;
|
||||
if (ProxySettings.UseDoh)
|
||||
{
|
||||
var configDoh = ProxySettings.CustomDohAddres2.Value ?? ProxySettingsWindowViewModel.DohAddress.FirstOrDefault() ?? string.Empty;
|
||||
(delayMs, address) = await _networkTestService.TestDNSOverHttpsAsync(testDomain, configDoh);
|
||||
}
|
||||
else
|
||||
{
|
||||
var configDns = ProxySettings.ProxyMasterDns.Value ?? string.Empty;
|
||||
(delayMs, address) = await _networkTestService.TestDNSAsync(testDomain, configDns, 53);
|
||||
}
|
||||
if (address.Length == 0)
|
||||
throw new Exception("Parsing failed. Return empty ip address.");
|
||||
|
||||
DNSTestDelay = delayMs + "ms ";
|
||||
DNSTestResult = string.Empty + address.FirstOrDefault();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Log.Error(nameof(AcceleratorPageViewModel), ex.ToString());
|
||||
DNSTestDelay = string.Empty;
|
||||
DNSTestResult = "error";
|
||||
}
|
||||
}, canDNSCheck);
|
||||
DNSCheckCommand = ReactiveCommand.CreateFromTask(DNSCheckAsync, canDNSCheck);
|
||||
DNSCheckCommand
|
||||
.IsExecuting
|
||||
.ToPropertyEx(this, x => x.IsDNSChecking);
|
||||
@@ -199,4 +148,70 @@ public partial class NetworkCheckControlViewModel : ViewModelBase
|
||||
|
||||
IPv6CheckCommand.Execute().Subscribe();
|
||||
}
|
||||
|
||||
async Task<NATFetchResult> NATCheckAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
return await NATCheckCoreAsync();
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new("", "", "", "", false);
|
||||
}
|
||||
}
|
||||
|
||||
async Task<NATFetchResult> NATCheckCoreAsync()
|
||||
{
|
||||
var natCheckResult = await _networkTestService.TestStunClient3489Async(testServerHostName: SelectedSTUNAddress) ?? new ClassicStunResult { NatType = NatType.Unknown };
|
||||
var (netSucc, _) = await _networkTestService.TestOpenUrlAsync("https://www.baidu.com");
|
||||
|
||||
var publicEndPoint = natCheckResult.PublicEndPoint?.Address.ToString() ?? "Unknown";
|
||||
var localEndPoint = natCheckResult.LocalEndPoint?.Address.ToString() ?? "Unknown";
|
||||
|
||||
var (natLevel, natTypeTip) = natCheckResult.NatType switch
|
||||
{
|
||||
// Open
|
||||
NatType.OpenInternet or NatType.FullCone => ("开放 NAT", "您可与在其网络上具有任意 NAT 类型的用户玩多人游戏和发起多人游戏。"),
|
||||
// Moderate
|
||||
NatType.RestrictedCone or NatType.PortRestrictedCone or NatType.SymmetricUdpFirewall => ("中等 NAT", "您可与一些用户玩多人游戏;但是,并且通常你将不会被选为比赛的主持人。"),
|
||||
// Strict
|
||||
NatType.Symmetric or NatType.UdpBlocked => ("严格 NAT", "您只能与具有开放 NAT 类型的用户玩多人游戏。您不能被选为比赛的主持人。"),
|
||||
// Unknown
|
||||
NatType.Unknown or NatType.UnsupportedServer or _ => ("不可用 NAT", "如果 NAT 不可用,您将无法使用群聊天或连接到某些 Xbox 游戏的多人游戏。"),
|
||||
};
|
||||
|
||||
return new NATFetchResult(publicEndPoint, localEndPoint, natLevel, natTypeTip, netSucc);
|
||||
}
|
||||
|
||||
async Task DNSCheckAsync()
|
||||
{
|
||||
var testDomain = DomainPendingTest == string.Empty ? DefaultTestDomain : DomainPendingTest;
|
||||
try
|
||||
{
|
||||
long delayMs;
|
||||
IPAddress[] address;
|
||||
if (ProxySettings.UseDoh)
|
||||
{
|
||||
var configDoh = ProxySettings.CustomDohAddres2.Value ?? ProxySettingsWindowViewModel.DohAddress.FirstOrDefault() ?? string.Empty;
|
||||
(delayMs, address) = await _networkTestService.TestDNSOverHttpsAsync(testDomain, configDoh);
|
||||
}
|
||||
else
|
||||
{
|
||||
var configDns = ProxySettings.ProxyMasterDns.Value ?? string.Empty;
|
||||
(delayMs, address) = await _networkTestService.TestDNSAsync(testDomain, configDns, 53);
|
||||
}
|
||||
if (address.Length == 0)
|
||||
throw new Exception("Parsing failed. Return empty ip address.");
|
||||
|
||||
DNSTestDelay = delayMs + "ms ";
|
||||
DNSTestResult = string.Empty + address.FirstOrDefault();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Log.Error(nameof(AcceleratorPageViewModel), ex.ToString());
|
||||
DNSTestDelay = string.Empty;
|
||||
DNSTestResult = "error";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ namespace BD.WTTS.UI.ViewModels;
|
||||
|
||||
public partial class ScriptPageViewModel : TabItemViewModel
|
||||
{
|
||||
public override string Name => Strings.Welcome;
|
||||
public override string Name => Strings.ScriptConfig;
|
||||
|
||||
protected readonly ReadOnlyObservableCollection<ScriptDTO>? _ProxyScripts;
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Platform.Storage;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
using BD.WTTS.Helpers;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Controls;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Controls;
|
||||
|
||||
|
||||
@@ -213,27 +213,31 @@
|
||||
Binding="{Binding PingValue}"
|
||||
ComparisonCondition="GreaterThan"
|
||||
Value="120">
|
||||
<ia:ChangePropertyAction
|
||||
PropertyName="Fill"
|
||||
TargetObject="PingEllipse"
|
||||
Value="#FF4F58" />
|
||||
<ia:ChangePropertyAction
|
||||
PropertyName="Foreground"
|
||||
TargetObject="PingText"
|
||||
Value="#FF4F58" />
|
||||
<ia:ChangePropertyAction PropertyName="Fill" TargetObject="PingEllipse">
|
||||
<ia:ChangePropertyAction.Value>
|
||||
<SolidColorBrush Color="#FF4F58" />
|
||||
</ia:ChangePropertyAction.Value>
|
||||
</ia:ChangePropertyAction>
|
||||
<ia:ChangePropertyAction PropertyName="Foreground" TargetObject="PingText">
|
||||
<ia:ChangePropertyAction.Value>
|
||||
<SolidColorBrush Color="#FF4F58" />
|
||||
</ia:ChangePropertyAction.Value>
|
||||
</ia:ChangePropertyAction>
|
||||
</ia:DataTriggerBehavior>
|
||||
<ia:DataTriggerBehavior
|
||||
Binding="{Binding PingValue}"
|
||||
ComparisonCondition="LessThanOrEqual"
|
||||
Value="120">
|
||||
<ia:ChangePropertyAction
|
||||
PropertyName="Fill"
|
||||
TargetObject="PingEllipse"
|
||||
Value="#47A42B" />
|
||||
<ia:ChangePropertyAction
|
||||
PropertyName="Foreground"
|
||||
TargetObject="PingText"
|
||||
Value="#47A42B" />
|
||||
<ia:ChangePropertyAction PropertyName="Fill" TargetObject="PingEllipse">
|
||||
<ia:ChangePropertyAction.Value>
|
||||
<SolidColorBrush Color="#47A42B" />
|
||||
</ia:ChangePropertyAction.Value>
|
||||
</ia:ChangePropertyAction>
|
||||
<ia:ChangePropertyAction PropertyName="Foreground" TargetObject="PingText">
|
||||
<ia:ChangePropertyAction.Value>
|
||||
<SolidColorBrush Color="#47A42B" />
|
||||
</ia:ChangePropertyAction.Value>
|
||||
</ia:ChangePropertyAction>
|
||||
</ia:DataTriggerBehavior>
|
||||
</i:Interaction.Behaviors>
|
||||
<TextBlock
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Data;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
using System.CommandLine;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Controls;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Controls;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
@@ -88,6 +88,12 @@
|
||||
</ui:SettingsExpanderItem.Footer>
|
||||
</ui:SettingsExpanderItem>
|
||||
|
||||
<ui:SettingsExpanderItem>
|
||||
<TextBlock Text="启动加速时检查 DNS 可用性" />
|
||||
<ui:SettingsExpanderItem.Footer>
|
||||
<ToggleSwitch Classes="LeftContent" IsChecked="{Binding Source={x:Static ms:ProxySettings.ProxyBeforeDNSCheck}, Path=Value, Mode=TwoWay}" />
|
||||
</ui:SettingsExpanderItem.Footer>
|
||||
</ui:SettingsExpanderItem>
|
||||
<!--<DockPanel>
|
||||
<Label Content="自定义根证书密码"></Label>
|
||||
<TextBox></TextBox>
|
||||
@@ -98,7 +104,7 @@
|
||||
<Button Content="选择证书"/>
|
||||
</DockPanel>-->
|
||||
|
||||
<ui:SettingsExpanderItem Description="*该选项勾选后会导致程序的加速完全不生效,请确认是配合二级代理实现仅需要脚本功能后再启用">
|
||||
<ui:SettingsExpanderItem Description="*该选项勾选后会导致程序的加速失效,请确认是配合二级代理实现仅需要脚本功能后再启用">
|
||||
<TextBlock Text="{Binding Path=Res.CommunityFix_ProxyOnlyOnScript, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
<ui:SettingsExpanderItem.Footer>
|
||||
<ToggleSwitch Classes="LeftContent" IsChecked="{Binding Source={x:Static ms:ProxySettings.OnlyEnableProxyScript}, Path=Value, Mode=TwoWay}" />
|
||||
@@ -108,7 +114,7 @@
|
||||
|
||||
|
||||
<ui:SettingsExpander
|
||||
Description="*改动后需重启加速才能生效"
|
||||
Description="*请在有正确二级代理的情况下才考虑启用该选项,否则会导致程序的加速失效,改动后需重启加速才能生效"
|
||||
Header="{Binding Path=Res.Settings_Proxy_TwoLevelAgent, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
IsExpanded="True">
|
||||
<ui:SettingsExpander.Footer>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
</ItemsRepeater.Layout>
|
||||
<ItemsRepeater.ItemTemplate>
|
||||
<DataTemplate DataType="spp:ScriptDTO">
|
||||
<Border spp:Animations.EnableAnimations="True">
|
||||
<Border spp:Animations.EnableAnimations="False">
|
||||
<spp:AppItem
|
||||
Title="{Binding Name}"
|
||||
MaxWidth="135"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
-4
@@ -135,10 +135,6 @@
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Settings\" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
|
||||
|
||||
</Project>
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ using BD.WTTS.UI.Views.Controls;
|
||||
|
||||
namespace BD.WTTS.UI.ViewModels;
|
||||
|
||||
public sealed partial class ArchiSteamFarmPlusPageViewModel : ViewModelBase
|
||||
public sealed partial class ArchiSteamFarmPlusPageViewModel
|
||||
{
|
||||
|
||||
private readonly IArchiSteamFarmService asfService = IArchiSteamFarmService.Instance;
|
||||
|
||||
+3
-1
@@ -2,8 +2,10 @@ using ArchiSteamFarm.Steam;
|
||||
|
||||
namespace BD.WTTS.UI.ViewModels;
|
||||
|
||||
public sealed partial class ArchiSteamFarmPlusPageViewModel
|
||||
public sealed partial class ArchiSteamFarmPlusPageViewModel : TabItemViewModel
|
||||
{
|
||||
public override string Name => "ASF";
|
||||
|
||||
/// <summary>
|
||||
/// 选择 ASF 可执行文件路径
|
||||
/// </summary>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Interactivity;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
using BD.WTTS.UI.Views.Controls;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
@@ -98,10 +98,6 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Services\" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--<Import Project="..\TFM_NETX_WITH_ALL.props" />-->
|
||||
<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using Avalonia.Gif;
|
||||
using BD.Avalonia8.Image2;
|
||||
using BD.WTTS.UI.Views.Pages;
|
||||
using System.Threading;
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ using BD.WTTS.UI.Views.Controls;
|
||||
|
||||
namespace BD.WTTS.UI.ViewModels;
|
||||
|
||||
public sealed partial class AuthenticatorHomePageViewModel : ViewModelBase
|
||||
public sealed partial class AuthenticatorHomePageViewModel
|
||||
{
|
||||
const int MAX_SYNC_VALUE = 100;
|
||||
|
||||
|
||||
+3
-1
@@ -2,8 +2,10 @@ using KeyValuePair = BD.Common.Entities.KeyValuePair;
|
||||
|
||||
namespace BD.WTTS.UI.ViewModels;
|
||||
|
||||
public partial class AuthenticatorHomePageViewModel
|
||||
public partial class AuthenticatorHomePageViewModel : TabItemViewModel
|
||||
{
|
||||
public override string Name => Strings.LocalAuth;
|
||||
|
||||
[Reactive]
|
||||
public bool IsLoading { get; set; }
|
||||
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
<Border
|
||||
Width="200"
|
||||
Margin="3"
|
||||
spp:Animations.EnableAnimations="True">
|
||||
spp:Animations.EnableAnimations="False">
|
||||
<spp:AppItem
|
||||
Title="{Binding Name}"
|
||||
Classes="Vertical"
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
using BD.WTTS.UI.Views.Controls;
|
||||
using FluentAvalonia.UI.Controls;
|
||||
using FluentAvalonia.UI.Media.Animation;
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
using BD.WTTS.UI.Views.Controls;
|
||||
using KeyEventArgs = Avalonia.Input.KeyEventArgs;
|
||||
|
||||
|
||||
@@ -103,10 +103,4 @@
|
||||
|
||||
<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
|
||||
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
namespace BD.WTTS.Models;
|
||||
|
||||
[MessagePackObjectAttribute]
|
||||
[MP2Obj(SerializeLayout.Explicit)]
|
||||
public partial class PlatformSettings : BaseNotifyPropertyChanged
|
||||
{
|
||||
[MessagePack.Key(0)]
|
||||
[Reactive, MP2Key(0)]
|
||||
public string? PlatformPath { get; set; }
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"PlatformIds": [ "e", "epg", "epic", "epicgames" ],
|
||||
"ExesToEnd": [ "EpicGamesLauncher.exe" ],
|
||||
"LoginFiles": {
|
||||
"%LocalAppData%\\EpicGamesLauncher\\Saved\\Config\\Windows\\GameUserSettings.ini": "GameUserSettings.ini",
|
||||
"%LocalAppData%\\EpicGamesLauncher\\Saved\\Config\\WindowsEditor\\GameUserSettings.ini": "GameUserSettings.ini",
|
||||
"REG:HKCU\\Software\\Epic Games\\Unreal Engine\\Identifiers:AccountId": "UNIQUE_ID"
|
||||
},
|
||||
"ClearPaths": [ "SAME_AS_LOGIN_FILES" ],
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ public sealed partial class GameAccountPageViewModel : TabItemViewModel
|
||||
{
|
||||
static readonly Uri PlatformsPath = new("avares://BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json");
|
||||
|
||||
public override string Name => Strings.Welcome;
|
||||
public override string Name => Strings.UserFastChange;
|
||||
|
||||
[Reactive]
|
||||
public ObservableCollection<PlatformAccount>? GamePlatforms { get; set; }
|
||||
|
||||
@@ -211,7 +211,7 @@
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="spp:IAccount">
|
||||
<Border Margin="5" spp:Animations.EnableAnimations="True">
|
||||
<Border Margin="5" spp:Animations.EnableAnimations="False">
|
||||
<spp:AppItem
|
||||
x:Name="Item"
|
||||
Title="{Binding DisplayName}"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
using BD.SteamClient.Helpers;
|
||||
using FluentAvalonia.UI.Controls;
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
<spp:PageBase
|
||||
Description="{Binding Description, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
|
||||
Subtitle="{Binding Author, Source={x:Static s:Plugin.Instance}, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter=Plugin_Author}"
|
||||
Title="{Binding Name, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="800"
|
||||
mc:Ignorable="d"
|
||||
x:Class="BD.WTTS.UI.Views.Pages.GameAccountPage"
|
||||
x:CompileBindings="True"
|
||||
x:DataType="spp:GameAccountPageViewModel"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
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"
|
||||
xmlns:ms="https://steampp.net/settings"
|
||||
xmlns:s="https://steampp.net/services"
|
||||
xmlns:spp="https://steampp.net/ui"
|
||||
xmlns:ui="using:FluentAvalonia.UI.Controls"
|
||||
Title="{Binding Name, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="800"
|
||||
x:CompileBindings="True"
|
||||
x:DataType="spp:GameAccountPageViewModel"
|
||||
Description="{Binding Description, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
|
||||
Subtitle="{Binding Author, Source={x:Static s:Plugin.Instance}, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter=Plugin_Author}"
|
||||
mc:Ignorable="d">
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<spp:PageBase.PreviewImage>
|
||||
<ui:ImageIconSource Source="{Binding Icon, Source={x:Static s:Plugin.Instance}, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}" />
|
||||
</spp:PageBase.PreviewImage>
|
||||
@@ -34,97 +34,97 @@
|
||||
<spp:PageBase.ActionContent>
|
||||
<StackPanel Orientation="Horizontal" Spacing="2">
|
||||
<Button
|
||||
Padding="8,4"
|
||||
Command="{Binding LoginNewCommand}"
|
||||
DockPanel.Dock="Right"
|
||||
Padding="8,4"
|
||||
Theme="{StaticResource TransparentButton}">
|
||||
<Panel>
|
||||
<Viewbox
|
||||
Width="16"
|
||||
Height="16"
|
||||
HorizontalAlignment="Left">
|
||||
HorizontalAlignment="Left"
|
||||
Width="16">
|
||||
<ui:SymbolIcon Symbol="Add" />
|
||||
</Viewbox>
|
||||
<TextBlock
|
||||
Margin="28,4,0,4"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Path=Res.UserChange_LoginNewAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Margin="28,4,0,4"
|
||||
Text="{Binding Path=Res.UserChange_LoginNewAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
</Panel>
|
||||
</Button>
|
||||
<Button
|
||||
Padding="8,4"
|
||||
Command="{Binding SaveCurrentUserCommand}"
|
||||
DockPanel.Dock="Right"
|
||||
IsVisible="{Binding !IsSelectedSteam}"
|
||||
Padding="8,4"
|
||||
Theme="{StaticResource TransparentButton}">
|
||||
<Panel>
|
||||
<Viewbox
|
||||
Width="16"
|
||||
Height="16"
|
||||
HorizontalAlignment="Left">
|
||||
HorizontalAlignment="Left"
|
||||
Width="16">
|
||||
<ui:SymbolIcon Symbol="Save" />
|
||||
</Viewbox>
|
||||
<TextBlock
|
||||
Margin="28,4,0,4"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Path=Res.GameAccount_SaveCurrentAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Margin="28,4,0,4"
|
||||
Text="{Binding Path=Res.GameAccount_SaveCurrentAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
</Panel>
|
||||
</Button>
|
||||
<!-- <Button -->
|
||||
<!-- Command="{Binding ShareManageCommand}" -->
|
||||
<!-- DockPanel.Dock="Right" -->
|
||||
<!-- IsVisible="{Binding IsSelectedSteam}" -->
|
||||
<!-- Padding="8,4" -->
|
||||
<!-- Theme="{StaticResource TransparentButton}"> -->
|
||||
<!-- <Panel> -->
|
||||
<!-- <Viewbox -->
|
||||
<!-- Height="16" -->
|
||||
<!-- HorizontalAlignment="Left" -->
|
||||
<!-- Width="16"> -->
|
||||
<!-- <ui:SymbolIcon Symbol="ShareAndroid" /> -->
|
||||
<!-- </Viewbox> -->
|
||||
<!-- <TextBlock -->
|
||||
<!-- HorizontalAlignment="Left" -->
|
||||
<!-- Margin="28,4,0,4" -->
|
||||
<!-- Text="{Binding Path=Res.AccountChange_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" -->
|
||||
<!-- VerticalAlignment="Center" /> -->
|
||||
<!-- </Panel> -->
|
||||
<!-- </Button> -->
|
||||
<Button
|
||||
Padding="8,4"
|
||||
Command="{Binding ShareManageCommand}"
|
||||
DockPanel.Dock="Right"
|
||||
IsVisible="{Binding IsSelectedSteam}"
|
||||
Theme="{StaticResource TransparentButton}">
|
||||
<Panel>
|
||||
<Viewbox
|
||||
Width="16"
|
||||
Height="16"
|
||||
HorizontalAlignment="Left">
|
||||
<ui:SymbolIcon Symbol="ShareAndroid" />
|
||||
</Viewbox>
|
||||
<TextBlock
|
||||
Margin="28,4,0,4"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Path=Res.AccountChange_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
</Panel>
|
||||
</Button>
|
||||
<Button
|
||||
Padding="8,4"
|
||||
Command="{Binding RefreshCommand}"
|
||||
DockPanel.Dock="Right"
|
||||
Padding="8,4"
|
||||
Theme="{StaticResource TransparentButton}">
|
||||
<Panel>
|
||||
<Viewbox
|
||||
Width="16"
|
||||
Height="16"
|
||||
HorizontalAlignment="Left">
|
||||
HorizontalAlignment="Left"
|
||||
Width="16">
|
||||
<ui:SymbolIcon Symbol="Refresh" />
|
||||
</Viewbox>
|
||||
<TextBlock
|
||||
Margin="28,4,0,4"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Path=Res.Refresh, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
|
||||
Margin="28,4,0,4"
|
||||
Text="{Binding Path=Res.Refresh, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
|
||||
VerticalAlignment="Center" />
|
||||
</Panel>
|
||||
</Button>
|
||||
<DropDownButton
|
||||
Padding="8"
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Content="{StaticResource More}"
|
||||
FontFamily="{StaticResource SymbolThemeFontFamily}"
|
||||
FontSize="20"
|
||||
Theme="{StaticResource TransparentButton}">
|
||||
HorizontalContentAlignment="Center"
|
||||
Padding="8"
|
||||
Theme="{StaticResource TransparentButton}"
|
||||
VerticalContentAlignment="Center">
|
||||
<DropDownButton.Flyout>
|
||||
<ui:FAMenuFlyout Placement="BottomEdgeAlignedRight">
|
||||
<ui:MenuFlyoutItem
|
||||
x:Name="PlatformSettingButton"
|
||||
IsVisible="{Binding !IsSelectedSteam}"
|
||||
Text="平台设置" />
|
||||
Text="平台设置"
|
||||
x:Name="PlatformSettingButton" />
|
||||
<!--<ui:MenuFlyoutItem x:Name="PluginSettingButton" Text="{Binding Path=Res.Settings_Plugin, Mode=OneWay,Source={x:Static s:ResourceService.Current}}" />-->
|
||||
<ui:ToggleMenuFlyoutItem
|
||||
IsChecked="{Binding Source={x:Static ms:GameAccountSettings.IsShowAccountName}, Path=Value, Mode=TwoWay}"
|
||||
@@ -154,23 +154,23 @@
|
||||
</StackPanel>
|
||||
</spp:PageBase.ActionContent>
|
||||
<ui:TabView
|
||||
Padding="0"
|
||||
VerticalAlignment="Stretch"
|
||||
Background="Transparent"
|
||||
CloseButtonOverlayMode="OnPointerOver"
|
||||
IsAddTabButtonVisible="False"
|
||||
Padding="0"
|
||||
SelectedItem="{Binding SelectedPlatform}"
|
||||
SelectionChanged="TabView_SelectedItemChanged"
|
||||
TabCloseRequested="TabView_TabCloseRequested"
|
||||
TabItems="{Binding GamePlatforms}"
|
||||
TabWidthMode="Equal">
|
||||
TabWidthMode="Equal"
|
||||
VerticalAlignment="Stretch">
|
||||
<ui:TabView.TabStripFooter>
|
||||
<Button
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content=""
|
||||
FontFamily="{StaticResource SymbolThemeFontFamily}"
|
||||
Theme="{StaticResource TabViewButtonStyle}">
|
||||
HorizontalAlignment="Left"
|
||||
Theme="{StaticResource TabViewButtonStyle}"
|
||||
VerticalAlignment="Center">
|
||||
<Button.Flyout>
|
||||
<MenuFlyout Placement="BottomEdgeAlignedLeft">
|
||||
<MenuItem
|
||||
@@ -178,7 +178,7 @@
|
||||
IsVisible="{Binding !!AddGamePlatforms.Count}"
|
||||
ItemsSource="{Binding AddGamePlatforms}">
|
||||
<MenuItem.Styles>
|
||||
<Style x:DataType="spp:PlatformAccount" Selector="MenuItem">
|
||||
<Style Selector="MenuItem" x:DataType="spp:PlatformAccount">
|
||||
<Setter Property="Header" Value="{Binding FullName}" />
|
||||
<Setter Property="Icon">
|
||||
<Setter.Value>
|
||||
@@ -239,7 +239,7 @@
|
||||
</Button>
|
||||
</ui:TabView.TabStripFooter>
|
||||
<ui:TabView.Styles>
|
||||
<Style x:DataType="spp:PlatformAccount" Selector="ui|TabViewItem">
|
||||
<Style Selector="ui|TabViewItem" x:DataType="spp:PlatformAccount">
|
||||
<!--<Setter Property="IconSource">
|
||||
<ui:FontIconSource Glyph="{Binding Icon}" />
|
||||
</Setter>-->
|
||||
@@ -255,14 +255,14 @@
|
||||
<DataTemplate DataType="spp:PlatformAccount">
|
||||
<DockPanel>
|
||||
<PathIcon
|
||||
Width="16"
|
||||
Data="{Binding Icon, Converter={StaticResource ResourceKeyValueConverter}}"
|
||||
DockPanel.Dock="Left"
|
||||
Height="16"
|
||||
Margin="0,0,8,0"
|
||||
Data="{Binding Icon, Converter={StaticResource ResourceKeyValueConverter}}"
|
||||
DockPanel.Dock="Left" />
|
||||
Width="16" />
|
||||
<TextBlock DockPanel.Dock="Right" Text="{Binding FullName}" />
|
||||
</DockPanel>
|
||||
</DataTemplate>
|
||||
</ui:TabView.TabItemTemplate>
|
||||
</ui:TabView>
|
||||
</spp:PageBase>
|
||||
</spp:PageBase>
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
@@ -221,6 +221,7 @@
|
||||
FileStream="{Binding App.EditHeaderLogoStream, Mode=TwoWay}">
|
||||
<spp:Image2
|
||||
DecodeHeight="260"
|
||||
KeepSourceStreamOpen="True"
|
||||
Source="{Binding App.EditHeaderLogoStream}"
|
||||
Stretch="Uniform" />
|
||||
</spp:CustomFilePicker>
|
||||
@@ -275,6 +276,7 @@
|
||||
FileStream="{Binding App.EditLibraryGridStream, Mode=TwoWay}">
|
||||
<spp:Image2
|
||||
DecodeHeight="260"
|
||||
KeepSourceStreamOpen="True"
|
||||
Source="{Binding App.EditLibraryGridStream}"
|
||||
Stretch="Uniform" />
|
||||
</spp:CustomFilePicker>
|
||||
@@ -329,6 +331,7 @@
|
||||
FileStream="{Binding App.EditLibraryHeroStream, Mode=TwoWay}">
|
||||
<spp:Image2
|
||||
DecodeHeight="260"
|
||||
KeepSourceStreamOpen="True"
|
||||
Source="{Binding App.EditLibraryHeroStream}"
|
||||
Stretch="Uniform" />
|
||||
</spp:CustomFilePicker>
|
||||
@@ -381,6 +384,7 @@
|
||||
FileStream="{Binding App.EditLibraryLogoStream, Mode=TwoWay}">
|
||||
<spp:Image2
|
||||
DecodeWidth="220"
|
||||
KeepSourceStreamOpen="True"
|
||||
Source="{Binding App.EditLibraryLogoStream}"
|
||||
Stretch="Uniform" />
|
||||
</spp:CustomFilePicker>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Primitives;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
using Avalonia.VisualTree;
|
||||
using BD.SteamClient.Enums.SteamGridDB;
|
||||
using BD.SteamClient.Models.SteamGridDB;
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="spp:SteamApp">
|
||||
<Border Margin="5" spp:Animations.EnableAnimations="True">
|
||||
<Border Margin="5" spp:Animations.EnableAnimations="False">
|
||||
<spp:AppItem
|
||||
Title="{Binding DisplayName}"
|
||||
Height="270"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Pages;
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:i="using:Avalonia.Xaml.Interactivity"
|
||||
xmlns:ia="using:Avalonia.Xaml.Interactions.Core"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:ms="https://steampp.net/settings"
|
||||
xmlns:s="https://steampp.net/services"
|
||||
@@ -141,7 +139,7 @@
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="spp:SteamApp">
|
||||
<Border Margin="5" spp:Animations.EnableAnimations="True">
|
||||
<Border Margin="5" spp:Animations.EnableAnimations="False">
|
||||
<spp:AppItem
|
||||
Title="{Binding DisplayName}"
|
||||
Height="270"
|
||||
@@ -190,7 +188,15 @@
|
||||
</spp:AppItem.ActionButton>-->
|
||||
<spp:AppItem.Image>
|
||||
<Panel x:Name="ItemImage">
|
||||
<i:Interaction.Behaviors>
|
||||
<Panel.Styles>
|
||||
<Style Selector="Panel#ItemBox">
|
||||
<Setter Property="Opacity" Value="0" />
|
||||
</Style>
|
||||
<Style Selector="Panel#ItemBox:pointerover">
|
||||
<Setter Property="Opacity" Value="0.8" />
|
||||
</Style>
|
||||
</Panel.Styles>
|
||||
<!--<i:Interaction.Behaviors>
|
||||
<ia:EventTriggerBehavior EventName="PointerEntered" SourceObject="{Binding #ItemImage}">
|
||||
<ia:ChangePropertyAction
|
||||
PropertyName="IsVisible"
|
||||
@@ -203,7 +209,7 @@
|
||||
TargetObject="{Binding #ItemBox}"
|
||||
Value="False" />
|
||||
</ia:EventTriggerBehavior>
|
||||
</i:Interaction.Behaviors>
|
||||
</i:Interaction.Behaviors>-->
|
||||
<Panel MinWidth="{Binding $parent[spp:AppItem].MinWidth}" MaxWidth="{Binding $parent[spp:AppItem].MaxWidth}">
|
||||
<spp:Image2
|
||||
Name="AppImage"
|
||||
@@ -247,11 +253,7 @@
|
||||
</DockPanel>
|
||||
</Border>
|
||||
</Panel>
|
||||
<Panel
|
||||
x:Name="ItemBox"
|
||||
Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
|
||||
IsVisible="False"
|
||||
Opacity="0.8">
|
||||
<Panel x:Name="ItemBox" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}">
|
||||
<Button
|
||||
Padding="0"
|
||||
HorizontalAlignment="Center"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Windows;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.ReactiveUI;
|
||||
using ReactiveUI.Avalonia;
|
||||
|
||||
namespace BD.WTTS.UI.Views.Windows;
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
</ControlTheme>
|
||||
</ScrollViewer.Resources>
|
||||
<WrapPanel>
|
||||
<Border spp:Animations.EnableAnimations="True">
|
||||
<Border spp:Animations.EnableAnimations="False">
|
||||
<Button
|
||||
Click="GameToolsPage_Click"
|
||||
IsEnabled="{spp:OnPlatform Windows}"
|
||||
@@ -130,7 +130,7 @@
|
||||
</Button>
|
||||
</Border>
|
||||
|
||||
<Border spp:Animations.EnableAnimations="True">
|
||||
<Border spp:Animations.EnableAnimations="False">
|
||||
<Button
|
||||
Click="GameToolsPage_Click"
|
||||
IsEnabled="{spp:OnPlatform Windows}"
|
||||
@@ -160,7 +160,7 @@
|
||||
</Button>
|
||||
</Border>
|
||||
|
||||
<Border spp:Animations.EnableAnimations="True">
|
||||
<Border spp:Animations.EnableAnimations="False">
|
||||
<Button
|
||||
Click="GameToolsPage_Click"
|
||||
IsEnabled="{spp:OnPlatform Windows}"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user