🚧 Android

2026-10-26 12:09:32 +08:00 · 2023-09-27 16:19:11 +08:00 · 2023-09-26 19:38:58 +08:00 · 2023-09-26 16:30:51 +08:00 · 2023-09-25 14:15:25 +08:00 · 2023-09-25 13:40:19 +08:00
258 changed files with 9805 additions and 1852 deletions
@@ -89,22 +89,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TFM", "TFM", "{3B0CFC2A-F61
 		src\TFM_NETX_WITH_WINDOWS.props = src\TFM_NETX_WITH_WINDOWS.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiSteamFarm.Library", "ref\ArchiSteamFarm\ArchiSteamFarm.Library\ArchiSteamFarm.Library.csproj", "{6981D5CA-837C-47F8-9568-E3BD451A6C68}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibAPNG", "ref\Avalonia.Image2\LibAPNG\LibAPNG.csproj", "{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Gif", "ref\Avalonia.Image2\Avalonia.Gif\Avalonia.Gif.csproj", "{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArchiSteamFarm", "ArchiSteamFarm", "{A3A703CC-F22E-40CE-9064-6DF3E55DD556}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{E5732454-7455-4078-88A2-E727DCC64D26}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReverseProxy", "ReverseProxy", "{4FA9B783-ADAE-46F6-9AAD-ED32F1839F13}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Steam", "Steam", "{99D97BD4-3F51-48BC-8BD2-647F6D268BB0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy", "ref\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj", "{826716DC-65C2-456A-BB6D-5FDEC423E4E6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gameloop.Vdf", "ref\Gameloop.Vdf\Gameloop.Vdf\Gameloop.Vdf.csproj", "{FE91B979-FE45-43F3-B9C4-430F2360FDDF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam4NET", "ref\Steam4NET\Steam4NET\Steam4NET.csproj", "{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}"
@@ -224,6 +216,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam++", "src\BD.WTTS.Clie
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "BD.WTTS.Client.AppHost.Bridge.Package", "src\BD.WTTS.Client.AppHost.Bridge.Package\BD.WTTS.Client.AppHost.Bridge.Package.wapproj", "{27795C79-2994-4514-8656-BA34FCEE8901}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.Client.Avalonia.App.Android", "src\BD.WTTS.Client.Avalonia.App.Android\BD.WTTS.Client.Avalonia.App.Android.csproj", "{C008E17A-1E9D-4695-9FF8-86E5939140B1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -238,26 +232,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x64.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x86.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM64.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x64.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x64.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x86.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x86.Build.0 = Release|Any CPU
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -298,26 +272,6 @@ Global
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}.Release|x64.Build.0 = Release|Any CPU
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}.Release|x86.ActiveCfg = Release|Any CPU
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}.Release|x86.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x64.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x86.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM64.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x64.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x64.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x86.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x86.Build.0 = Release|Any CPU
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1308,6 +1262,36 @@ Global
 		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.ActiveCfg = Release|x86
 		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Build.0 = Release|x86
 		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Deploy.0 = Release|x86
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|ARM64.Deploy.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|x64.Build.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|x86.Build.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|ARM.Build.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|ARM.Deploy.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|ARM64.Build.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|ARM64.Deploy.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|x64.ActiveCfg = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|x64.Build.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|x64.Deploy.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|x86.ActiveCfg = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|x86.Build.0 = Release|Any CPU
+		{C008E17A-1E9D-4695-9FF8-86E5939140B1}.Release|x86.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1317,14 +1301,10 @@ Global
 		{202026AE-894E-4E18-9846-B0739CDBE3E9} = {46259E8D-32A4-4065-953D-D6F835B57A28}
 		{F776BA87-0B9B-4C3C-B04F-688DCC021BF1} = {202026AE-894E-4E18-9846-B0739CDBE3E9}
 		{3B0CFC2A-F61B-4000-AC12-6E0AFB5C475C} = {46259E8D-32A4-4065-953D-D6F835B57A28}
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68} = {A3A703CC-F22E-40CE-9064-6DF3E55DD556}
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3} = {E5732454-7455-4078-88A2-E727DCC64D26}
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29} = {E5732454-7455-4078-88A2-E727DCC64D26}
-		{A3A703CC-F22E-40CE-9064-6DF3E55DD556} = {90E88965-DB90-4B49-94F5-6D2965491988}
 		{E5732454-7455-4078-88A2-E727DCC64D26} = {90E88965-DB90-4B49-94F5-6D2965491988}
-		{4FA9B783-ADAE-46F6-9AAD-ED32F1839F13} = {90E88965-DB90-4B49-94F5-6D2965491988}
 		{99D97BD4-3F51-48BC-8BD2-647F6D268BB0} = {90E88965-DB90-4B49-94F5-6D2965491988}
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6} = {4FA9B783-ADAE-46F6-9AAD-ED32F1839F13}
 		{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}
@@ -10,11 +10,12 @@ Base_Path="/Users/moxiansheng/Documents/GitHub/SteamTools"
 App_Path="$Base_Path/src/BD.WTTS.Client.Avalonia.App"
 Publish_Path="bin/Release/Publish/assemblies"
 Plugins_Release_Path="bin/Release"
-CodesignKey_Name="mossimo CodesignKey"
+CodesignKey_Name="mossimo code"
 App_Modules_Path="$App_Path/$Publish_Path/modules"
 echo "编译主程序"
 cd "$App_Path"
 dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+
 rm -r "$App_Modules_Path"
 mkdir -p "$App_Modules_Path"
 echo "编译插件"
@@ -36,34 +37,34 @@ Plugins_Accelerator_ReverseProxy_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Acc
 cd "$Plugins_Accelerator_ReverseProxy_Path"
 # 根据 Build_Mode 执行不同逻辑
 if [ "$Build_Mode" = "any" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
    lipo -create "$Publish_Path/arm64/Steam++.Accelerator" "$Publish_Path/x64/Steam++.Accelerator" -output "$Publish_Path/Steam++.Accelerator"
    Copy_Plugins "$Publish_Path" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "arm64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
    Copy_Plugins "$Publish_Path/arm64" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "x64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
    Copy_Plugins "$Publish_Path/x64" "Accelerator" "Steam++.Accelerator"
 fi

 echo "编译令牌插件"
 Plugins_Authenticator_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Authenticator"
 cd "$Plugins_Authenticator_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
 Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "Authenticator" "BD.WTTS.Client.Plugins.Authenticator.dll"

 echo "编译账户插件"
 Plugins_GameAccount_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameAccount"
 cd "$Plugins_GameAccount_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
 Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameAccount" "BD.WTTS.Client.Plugins.GameAccount.dll"

 echo "编译游戏库插件"
 Plugins_GameList_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameList"
 cd "$Plugins_GameList_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
 Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameList" "BD.WTTS.Client.Plugins.GameList.dll"

 echo "复制插件到程序目录"
@@ -79,3 +80,17 @@ elif [ "$Build_Mode" = "x64" ]; then
    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/osx-x64/Steam++.app/Contents/MonoBundle"
    cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents"
 fi
+
+echo "代码签名重新手动签名"
+App_Publish_Path="$App_Path/bin/Release/net7.0-macos/Steam++.app"
+# #代码签名重新手动签名
+codesign --remove-signature "$App_Publish_Path"
+codesign --remove-signature "$App_Publish_Path/Contents/MacOS/Steam++"
+dylibs=$(find "$App_Publish_Path/Contents/MonoBundle" -type f -name "*.dylib")
+for dylib in $dylibs; do
+    codesign --remove-signature "$dylib"
+    codesign -f -s "$CodesignKey_Name" "$dylib"
+done
+codesign -f -s   "$CodesignKey_Name" "$App_Publish_Path/Contents/MacOS/Steam++"
+codesign -f -s "$CodesignKey_Name" "$App_Publish_Path"
+sudo xattr -rd com.apple.quarantine "$App_Publish_Path"
@@ -498,7 +498,7 @@
        {
          "TypeName": "bool",
          "PropertyName": "GameInstalledFilter",
-          "DefaultValue": "true",
+          "DefaultValue": "false",
          "DefaultValueIsConst": true,
          "Summary": "已安装游戏筛选",
          "IsRegionOrEndregion": null,
@@ -943,6 +943,24 @@
        },
        {
          "Sharp": "endif"
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "UseDoh",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": true,
+          "Summary": "启用 DNS over HTTPS",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "string",
+          "PropertyName": "CustomDohAddres",
+          "DefaultValue": "null",
+          "DefaultValueIsConst": true,
+          "Summary": "自定义 DNS over HTTPS 地址",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
        }
      ],
      "Usings": ""
@@ -5,11 +5,13 @@ namespace BD.WTTS;
 /// </summary>
 public static partial class AssemblyInfo
 {
+    const string Version2 = "3.0";
+
    /// <summary>
    /// 语义化应用程序版本
    /// https://semver.org/lang/zh-CN/
    /// </summary>
-    public const string Version = "3.0.0";
+    public const string Version = $"{Version2}.0";

    /// <summary>
    /// 预览版本号，范围 1~9，只增不减
@@ -19,9 +21,9 @@ public static partial class AssemblyInfo
    /// <summary>
    /// RC 版本号，范围 0~9，只增不减
    /// </summary>
-    const string ver_for_rc = "1";
+    const string ver_for_rc = "3";

-    public const string FileVersion = $"{Version}.{ver_for_rc}0{ver_for_preview}";
+    public const string FileVersion = $"{Version2}.{ver_for_rc}0{ver_for_preview}.0";

    //public const string InformationalVersion = Version;
    //public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
@@ -144,4 +146,15 @@ false

 #endif

+#if ANDROID
+    internal static class JavaPkgNames
+    {
+        public const string APPLICATION_ID = "net.steampp.app";
+        public const string Root = APPLICATION_ID + ".";
+        public const string UI = Root + "ui.";
+        public const string Activities = UI + "activities.";
+        public const string Fragments = UI + "fragments.";
+        public const string Services = Root + "services.";
+    }
+#endif
 }
@@ -11,7 +11,7 @@
  <Identity
    Name="4651ED44255E.47979655102CE"
    Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
-    Version="3.0.0.0" />
+    Version="3.0.207.0" />

  <Properties>
    <DisplayName>Watt Toolkit</DisplayName>
@@ -62,9 +62,9 @@

  <Extensions>
    <desktop2:Extension Category="windows.firewallRules">
-      <desktop2:FirewallRules Executable="Steam++\Steam++.exe">
-        <desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all" />
-        <desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all" />
+      <desktop2:FirewallRules Executable="Steam++\modules\Accelerator\Steam++.Accelerator.exe">
+        <desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all"/>
+        <desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all"/>
      </desktop2:FirewallRules>
    </desktop2:Extension>
  </Extensions>
@@ -9,6 +9,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="7.0.10"/>
+		<add key="d" value="7.0.11"/>
 	</appSettings>
 </configuration>
@@ -10,6 +10,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="7.0.10"/>
+		<add key="d" value="7.0.11"/>
 	</appSettings>
 </configuration>
@@ -18,7 +18,7 @@ static unsafe partial class Program
    {
        dotnet_version_major = "7";
        dotnet_version_minor = "0";
-        dotnet_version_build = "10";
+        dotnet_version_build = "11";
        dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
    }

@@ -27,7 +27,7 @@ static unsafe partial class Program
    //#else
    //    public const string dotnet_version_major = "7";
    //    public const string dotnet_version_minor = "0";
-    //    public const string dotnet_version_build = "10";
+    //    public const string dotnet_version_build = "11";
    //    public const string dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
    //#endif

@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
@@ -0,0 +1 @@
+/build
@@ -0,0 +1,69 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "net.steampp.app.design"
+    compileSdk = 33
+
+    defaultConfig {
+        applicationId = "net.steampp.app.design"
+        minSdk = 21
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.3"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
+    implementation("androidx.activity:activity-compose:1.7.0")
+    implementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-graphics")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation("androidx.compose.material3:material3")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
+}
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
@@ -0,0 +1,24 @@
+package net.steampp.app.design
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("net.steampp.app.design", appContext.packageName)
+    }
+}
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.WattToolkit"
+        tools:targetApi="31">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.WattToolkit">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
@@ -0,0 +1,46 @@
+package net.steampp.app.design
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import net.steampp.app.design.ui.theme.WattToolkitTheme
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            WattToolkitTheme {
+                // A surface container using the 'background' color from the theme
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    Greeting("Android")
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Greeting(name: String, modifier: Modifier = Modifier) {
+    Text(
+        text = "Hello $name!",
+        modifier = modifier
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+    WattToolkitTheme {
+        Greeting("Android")
+    }
+}
@@ -0,0 +1,11 @@
+package net.steampp.app.design.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
@@ -0,0 +1,70 @@
+package net.steampp.app.design.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+
+private val DarkColorScheme = darkColorScheme(
+    primary = Purple80,
+    secondary = PurpleGrey80,
+    tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+    primary = Purple40,
+    secondary = PurpleGrey40,
+    tertiary = Pink40
+
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+    */
+)
+
+@Composable
+fun WattToolkitTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            window.statusBarColor = colorScheme.primary.toArgb()
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+        }
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}
@@ -0,0 +1,34 @@
+package net.steampp.app.design.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+    bodyLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp
+    )
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+    */
+)
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/cic_launcher_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/cic_launcher_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#202020</color>
+</resources>
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Watt Toolkit</string>
+</resources>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.WattToolkit" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+	<!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+	<include
+		domain="sharedpref"
+		path="." />
+	<exclude
+		domain="sharedpref"
+		path="${applicationId}.xamarinessentials.xml" />
+</full-backup-content>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
@@ -0,0 +1,17 @@
+package net.steampp.app.design
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
@@ -0,0 +1,5 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id("com.android.application") version "8.1.1" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
+}
@@ -0,0 +1,23 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
@@ -0,0 +1,6 @@
+#Mon Sep 25 16:04:48 CST 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "Watt Toolkit"
+include(":app")
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<application android:allowBackup="true"
+				 android:icon="@mipmap/ic_launcher"
+				 android:label="@string/app_name"
+				 android:roundIcon="@mipmap/ic_launcher_round"
+				 android:supportsRtl="true"
+				 android:fullBackupContent="@xml/backup_rules"
+				 android:dataExtractionRules="@xml/data_extraction_rules">
+	</application>
+	<uses-permission android:name="android.permission.INTERNET" />
+	<!-- Required for API Level 30 to make sure the app can detect browsers and other apps where communication is needed.-->
+	<!--https://developer.android.com/training/basics/intents/package-visibility-use-cases-->
+	<queries>
+		<package android:name="net.steampp.app" />
+		<!-- Required for API Level 30 to make sure the app detect browsers
+      (that don't support custom tabs) -->
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<category android:name="android.intent.category.BROWSABLE" />
+			<data android:scheme="https" />
+		</intent>
+		<!-- Required for API Level 30 to make sure the app can detect browsers that support custom tabs -->
+		<!-- https://developers.google.com/web/updates/2020/07/custom-tabs-android-11#detecting_browsers_that_support_custom_tabs -->
+		<intent>
+			<action android:name="android.support.customtabs.action.CustomTabsService" />
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="http" />
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="https" />
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.SENDTO" />
+			<data android:scheme="mailto" />
+		</intent>
+	</queries>
+</manifest>
@@ -0,0 +1,101 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<RootNamespace>BD.WTTS.Droid</RootNamespace>
+		<!-- ↓ Android 启动项目中 TargetFramework 值引入变量将导致 VS 17.7.4 项目无法启动 -->
+		<TargetFramework>net7.0-android</TargetFramework>
+		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+		<AssemblyName>Assembly-CSharp</AssemblyName>
+		<OutputType>Exe</OutputType>
+		<ApplicationId>net.steampp.app</ApplicationId>
+		<!-- ↓ Version(Major一位+Minor两位+ver_for_rc两位+0+ver_for_preview两位) -->
+		<ApplicationVersion>30003007</ApplicationVersion>
+		<ApplicationDisplayVersion>3.0.0</ApplicationDisplayVersion>
+		<AndroidPackageFormat>apk</AndroidPackageFormat>
+		<AndroidEnableMultiDex>True</AndroidEnableMultiDex>
+		<!--<AndroidCreatePackagePerAbi>True</AndroidCreatePackagePerAbi>-->
+		<RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
+		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+		<UseMauiEssentials>true</UseMauiEssentials>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="..\ImplicitUsings.ANDROID.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.MessagePack.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.JsonProperty.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.SQLite.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.Repositories.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.Services.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.ReactiveUI.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.Models.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.UI.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.UI.ViewModels.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.Settings.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.AutoMapper.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.WTTS.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.MSEX.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.Nito.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.NLog.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.Avalonia.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\ImplicitUsings.UI.Views.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Include="..\BD.WTTS.Client.Avalonia.App\Program.cs" />
+		<Compile Include="..\BD.WTTS.Client.Avalonia.App\Startup.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<!-- PackageReference -->
+		<PackageReference Include="Avalonia.Android" />
+		<PackageReference Include="BD.Common.Essentials.Maui" />
+		<PackageReference Include="Xamarin.Kotlin.StdLib" />
+		<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" />
+		<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk7" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
+		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
+	</ItemGroup>
+</Project>
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/cic_launcher_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/cic_launcher_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#2C3E50</color>
+</resources>
@@ -0,0 +1,4 @@
+<resources>
+	<string name="app_name">Watt Toolkit</string>
+	<string name="app_text">Hello, Android!</string>
+</resources>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+	<!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+	<include
+		domain="sharedpref"
+		path="." />
+	<exclude
+		domain="sharedpref"
+		path="${applicationId}.xamarinessentials.xml" />
+</full-backup-content>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+	<cloud-backup>
+		<!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+	</cloud-backup>
+	<!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
@@ -0,0 +1,14 @@
+using Avalonia;
+using Avalonia.Android;
+
+namespace BD.WTTS.Droid.UI.Activities;
+
+[Register(AssemblyInfo.JavaPkgNames.Activities + nameof(MainActivity))]
+[Activity(Label = "@string/app_name", MainLauncher = true)]
+sealed class MainActivity : AvaloniaMainActivity<App>
+{
+    protected sealed override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+    {
+        return base.CustomizeAppBuilder(builder);
+    }
+}
@@ -0,0 +1,31 @@
+namespace BD.WTTS.Droid.UI;
+
+[Register(AssemblyInfo.JavaPkgNames.UI + nameof(MainApplication))]
+[Application]
+public sealed partial class MainApplication : AndroidApplication
+{
+    public static MainApplication Instance =>
+        Context is MainApplication app ? app :
+        throw new ArgumentNullException(nameof(app));
+
+    public MainApplication(IntPtr javaReference, JniHandleOwnership transfer)
+        : base(javaReference, transfer)
+    {
+
+    }
+
+    public override void OnCreate()
+    {
+        base.OnCreate();
+
+        bool GetIsMainProcess()
+        {
+            // 注意：进程名可以自定义，默认是包名，如果自定义了主进程名，这里就有误，所以不要自定义主进程名！
+            var name = this.GetCurrentProcessName();
+            return name == PackageName;
+        }
+        var isMainProcess = GetIsMainProcess();
+
+        Program.Main(Array.Empty<string>());
+    }
+}
@@ -9,8 +9,10 @@ namespace BD.WTTS;
 partial class Program
 {
    [STAThread]
-    static int Main(string[] args) // Main 函数需要 STA 线程不可更改为 async Task
+    internal static int Main(string[] args) // Main 函数需要 STA 线程不可更改为 async Task
    {
+
+#if WINDOWS || LINUX
        #region 尝试修正 AppContext.BaseDirectory

        try
@@ -39,12 +41,14 @@ partial class Program
        }

        #endregion
+#endif

        instance = new(args);
        var exitCode = instance.StartAsync().GetAwaiter().GetResult();
        return exitCode;
    }

+#if !ANDROID && !IOS
    /// <summary>
    /// 自定义 .NET Host 入口点
    /// <para>https://github.com/dotnet/runtime/blob/v7.0.3/docs/design/features/native-hosting.md#loading-and-calling-managed-components</para>
@@ -70,7 +74,9 @@ partial class Program
        var exitCode = instance.StartAsync().GetAwaiter().GetResult();
        return exitCode;
    }
+#endif

+#if !ANDROID && !IOS
    // Avalonia configuration, don't remove; also used by visual designer.
    [MethodImpl(MethodImplOptions.NoInlining)]
    public static AppBuilder BuildAvaloniaApp()
@@ -247,9 +253,11 @@ partial class Program
            throw;
        }
    }
+#endif

    protected override void StartUIApplication()
    {
+#if !ANDROID && !IOS
        if (!Environment.UserInteractive)
            return;

@@ -257,5 +265,7 @@ partial class Program
        builder.StartWithClassicDesktopLifetime2(
            Array.Empty<string>(),
            ShutdownMode.OnLastWindowClose);
+#else
+#endif
    }
 }
@@ -1,8 +1,7 @@
 {
  "profiles": {
    "BD.WTTS.Client.Avalonia.App": {
-      "commandName": "Project",
-      "commandLineArgs": "-clt devtools -steamrun"
+      "commandName": "Project"
    }
  }
 }
@@ -38,19 +38,19 @@ sealed partial class Program : Startup
        services.AddGeneralLogging();
 #if ANDROID || IOS
        // 添加运行时权限
-        services.AddPlatformPermissions();
+        //services.AddPlatformPermissions();
 #endif
        // 添加 app 配置项
        services.TryAddSingleton(Options.Create(AppSettings.Instance));
-#if MAUI || ANDROID || IOS
-        // 键值对存储 - 由 Essentials 提供
-        services.TryAddEssentialsSecureStorage();
-#else
+        //#if MAUI || ANDROID || IOS
+        //        // 键值对存储 - 由 Essentials 提供
+        //        services.TryAddEssentialsSecureStorage();
+        //#else
        // 键值对存储 - 由 Repository 提供
        services.TryAddRepositorySecureStorage();
        // 首选项(Preferences) - 由 Repository 提供
        services.AddRepositoryPreferences();
-#endif
+        //#endif

        // 添加主线程助手(MainThreadDesktop)
        services.AddMainThreadPlatformService();
@@ -65,7 +65,11 @@ sealed partial class Program : Startup
        services.AddSingleton<IDeviceInfoPlatformService, AvaWinDeviceInfoPlatformServiceImpl>();
 #endif
 #endif
+#if ANDROID || IOS
+        services.TryAddSingleton<IApplicationVersionService, Essentials_AppVerS>();
+#else
        services.TryAddEssentials<Essentials_AppVerS>();
+#endif
 #endif

        // 添加安全服务
@@ -73,11 +77,15 @@ sealed partial class Program : Startup

        if (IsMainProcess)
        {
+#if !ANDROID && !IOS
            services.AddSingleton<IPCMainProcessService, IPCMainProcessServiceImpl>();
+#endif
        }
        else if (HasIPCRoot)
        {
+#if !ANDROID && !IOS
            services.AddSingleton(_ => IPCSubProcessService.Instance);
+#endif
        }
    }

@@ -135,10 +143,6 @@ sealed partial class Program : Startup

        if (HasHttpClientFactory)
        {
-#if ANDROID || IOS
-            // 添加 HttpClientFactory 平台原生实现
-            services.AddNativeHttpClient();
-#endif
            // 通用 Http 服务
            Fusillade.NetCache.RequestCache = this;
            services.AddFusilladeHttpClient();
@@ -202,8 +206,10 @@ sealed partial class Program : Startup

        if (HasHosts || HasIPCRoot)
        {
+#if !ANDROID && !IOS
            // hosts 文件助手服务
            services.AddHostsFileService();
+#endif
 #if STARTUP_WATCH_TRACE || DEBUG
            WatchTrace.Record("ConfigureDemandServices.Hosts");
 #endif
@@ -248,7 +254,7 @@ sealed partial class Program : Startup

    sealed class Essentials_AppVerS : IApplicationVersionService
    {
-        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.Version;
+        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.FileVersion;

        string IApplicationVersionService.AssemblyTrademark => AssemblyInfo.Trademark;
    }
@@ -299,6 +305,10 @@ sealed partial class Program : Startup
        var app = UI.App.Instance;
        var window = app.GetFirstOrDefaultWindow();
        var screens = window?.Screens;
+#elif ANDROID || IOS
+        int mainDisplayInfoW = 0;
+        int mainDisplayInfoH = 0;
+        var mainDisplayInfo = new { Density = 0, };
 #else
        var mainDisplayInfo = DeviceDisplay.MainDisplayInfo;
        var mainDisplayInfoH = mainDisplayInfo.Height.ToInt32(NumberToInt32Format.Ceiling);
@@ -6,12 +6,18 @@
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
 	</PropertyGroup>

+	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+		<UseMauiEssentials>true</UseMauiEssentials>
+		<!--<DisableMauiImplicitPackageReferences>true</DisableMauiImplicitPackageReferences>
+		<DisableMauiImplicitFrameworkReferences>true</DisableMauiImplicitFrameworkReferences>-->
+	</PropertyGroup>
+
 	<ItemGroup>
 		<AvaloniaResource Include="UI\Assets\**\*" />
 	</ItemGroup>

 	<ItemGroup>
-	  <None Remove="UI\Assets\Fonts\HarmonyOS_Sans_SC_Regular.ttf" />
+		<None Remove="UI\Assets\Fonts\HarmonyOS_Sans_SC_Regular.ttf" />
 	</ItemGroup>

 	<ItemGroup>
@@ -106,12 +112,16 @@
 		<PackageReference Include="JumpLists.Win32.Avalonia" />
 	</ItemGroup>

+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' ">
+		<!-- macOS/MacCatalyst Only -->
+		<PackageReference Include="BD.Common.Essentials.Maui.Runtime" />
+	</ItemGroup>
+
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' ">
 		<!-- iOS/macOS/MacCatalyst Only -->
 		<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" />
 	</ItemGroup>

 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
@@ -124,9 +134,10 @@
 	<ItemGroup>
 		<ProjectReference Include="..\Avalonia.Skia.Internals\Avalonia.Skia.Internals.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
+		<ProjectReference Include="..\..\ref\SteamClient\src\BD.SteamClient\BD.SteamClient.csproj" />
 	</ItemGroup>

-	<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
+	<Import Project="..\TFM_NETX_WITH_ALL.props" />

 </Project>

@@ -5,46 +5,19 @@ namespace BD.WTTS.Services.Implementation;
 /// <inheritdoc cref="IAppUpdateService"/>
 sealed class AvaloniaApplicationUpdateServiceImpl : AppUpdateServiceBaseImpl
 {
-    readonly IWindowManager windowManager;
-
    public AvaloniaApplicationUpdateServiceImpl(
        IApplication application,
        INotificationService notificationService,
-        IWindowManager windowManager,
        IToast toast,
        IMicroServiceClient client,
        IOptions<AppSettings> options) : base(application, notificationService, toast, client, options)
    {
-        this.windowManager = windowManager;
+
    }

-    protected override async Task ShowNewVersionWindowAsync()
+    protected override bool HasActiveWindow()
    {
-        await windowManager.ShowAsync(typeof(object), AppEndPoint.NewVersion, isParent: false);
-    }
-
-    public override async void OnMainOpenTryShowNewVersionWindow()
-    {
-        if (ShowNewVersionWindowOnMainOpen)
-        {
-            ShowNewVersionWindowOnMainOpen = false;
-            await ShowNewVersionWindowAsync();
-        }
-    }
-
-    protected override async void OnExistNewVersion()
-    {
-        base.OnExistNewVersion();
-
        var hasActiveWindow = App.Instance.HasActiveWindow();
-        if (hasActiveWindow)
-        {
-            await ShowNewVersionWindowAsync();
-        }
-        else
-        {
-            ShowNewVersionWindowOnMainOpen = true;
-            notification.Notify(AppResources.NewVersionUpdateNotifyText_.Format(NewVersionInfo?.Version), NotificationType.NewVersion);
-        }
+        return hasActiveWindow;
    }
 }
@@ -10,7 +10,9 @@ public sealed class NavigationService : INavigationService
 {
    public static NavigationService Instance { get; } = (NavigationService)Ioc.Get<INavigationService>();

-    public Control? PreviousPage { get; set; }
+    //public Type? PreviousPage { get; set; }
+
+    public Type? CurrnetPage => _frame?.CurrentSourcePageType;

    public object? GetViewModelToPageContent(object viewModel, bool isCreateInstance = true)
    {
@@ -54,7 +56,8 @@ public sealed class NavigationService : INavigationService

    public void Navigate(Type? t, NavigationTransitionEffect effect = NavigationTransitionEffect.None, bool useCache = true)
    {
-        _frame.ThrowIsNull();
+        if (_frame == null)
+            return;

        var navOptions = new FrameNavigationOptions
        {
@@ -1,12 +1,16 @@
+using Avalonia.Controls;
 using BD.SteamClient.Services;
 using BD.WTTS.Client.Resources;
 using BD.WTTS.Converters;
+using System.Collections.Specialized;
 using static BD.WTTS.Services.INotificationService;

 namespace BD.WTTS.UI;

 partial class App
 {
+    public Dictionary<string, TrayMenuItem> TrayMenus { get; } = new Dictionary<string, TrayMenuItem>();
+
    public TrayIcons TrayIcons { get; init; } = new TrayIcons();

    readonly Dictionary<string, ICommand> trayIconMenus = new();
@@ -15,6 +19,7 @@ partial class App

    void InitTrayIcon()
    {
+#if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
        if (ApplicationLifetime is not
            IClassicDesktopStyleApplicationLifetime classicDesktopStyleApplicationLifetime)
            return;
@@ -32,51 +37,11 @@ partial class App
                    ToolTipText = AssemblyInfo.Trademark,
                    Command = ReactiveCommand.Create(RestoreMainWindow),
                    //[!TrayIcon.IsVisibleProperty] = new Binding { Path = "Value", Source = GeneralSettings.IsEnableTrayIcon, Mode = BindingMode.OneWay },
-                    Menu = new NativeMenu
-                    {
-                        //new NativeMenuItem
-                        //{
-                        //    Header = "Test",
-                        //},
-                        //new NativeMenuItemSeparator(),
-                        new NativeMenuItem
-                        {
-                            [!NativeMenuItem.HeaderProperty] = new MultiBinding {
-                                Bindings = new List<Avalonia.Data.IBinding>()
-                                {
-                                    new Binding { Path = "IsRunningSteamProcess", Source = SteamConnectService.Current, Mode = BindingMode.OneWay },
-                                    new Binding { Path = "Res.CloseSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                                    new Binding { Path = "Res.StartSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                                },
-                                Converter = (VisbleStringConverter)App.Instance.FindResource("VisbleStringConverter")!,
-                            },
-                            Command = ReactiveCommand.Create(() =>
-                            {
-                                if(ISteamService.Instance.IsRunningSteamProcess)
-                                {
-                                    ISteamService.Instance.TryKillSteamProcess();
-                                }
-                                else
-                                {
-                                    ISteamService.Instance.StartSteamWithParameter();
-                                }
-                            })
-                        },
-                        new NativeMenuItemSeparator(),
-                        new NativeMenuItem
-                        {
-                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.OpenMainWindow", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                            Command = ReactiveCommand.Create(RestoreMainWindow)
-                        },
-                        new NativeMenuItemSeparator(),
-                        new NativeMenuItem
-                        {
-                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.Exit", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                            Command = ReactiveCommand.Create(() => { Shutdown(); })
-                        }
-                    }
+                    Menu = new NativeMenu(),
                });

+                UpdateMenuItems();
+
                //IViewModelManager.Instance.InitTaskBarWindowViewModel();
                //NotifyIconHelper.Init(this,
                //    notifyIconClick: (_, _) => RestoreMainWindow());
@@ -101,5 +66,114 @@ partial class App
 #endif

        }
+#endif
+    }
+
+    public void UpdateMenuItems()
+    {
+#if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
+        MainThread2.BeginInvokeOnMainThread(() =>
+        {
+            var menus = TrayIcons.FirstOrDefault()?.Menu;
+
+            if (menus != null)
+            {
+                menus.Items.Clear();
+
+                var defaultTrayMenus = new List<NativeMenuItemBase>()
+                    {
+                        new NativeMenuItem
+                        {
+                            [!NativeMenuItem.HeaderProperty] = new MultiBinding {
+                                Bindings = new List<Avalonia.Data.IBinding>()
+                                {
+                                    new Binding { Path = "IsRunningSteamProcess", Source = SteamConnectService.Current, Mode = BindingMode.OneWay },
+                                    new Binding { Path = "Res.CloseSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                                    new Binding { Path = "Res.StartSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                                },
+                                Converter = (VisbleStringConverter)App.Instance.FindResource("VisbleStringConverter")!,
+                            },
+                            Command = ReactiveCommand.Create(async () =>
+                            {
+                                if(ISteamService.Instance.IsRunningSteamProcess)
+                                {
+                                   await ISteamService.Instance.TryKillSteamProcess();
+                                }
+                                else
+                                {
+                                    ISteamService.Instance.StartSteamWithParameter();
+                                }
+                            }),
+                        },
+                        //new NativeMenuItemSeparator(),
+                        new NativeMenuItem
+                        {
+                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.OpenMainWindow", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                            Command = ReactiveCommand.Create(RestoreMainWindow),
+                        },
+                        new NativeMenuItemSeparator(),
+                        new NativeMenuItem
+                        {
+                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.Exit", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                            Command = ReactiveCommand.Create(() => { Shutdown(); })
+                        },
+                    };
+
+                if (TrayMenus.Any_Nullable())
+                {
+                    foreach (var item in TrayMenus)
+                    {
+                        NativeMenu? subMenu = null;
+                        if (item.Value.Items.Any_Nullable())
+                        {
+                            subMenu = new NativeMenu();
+                            foreach (var sub in item.Value.Items)
+                                subMenu.Add(new NativeMenuItem
+                                {
+                                    Header = sub.Name,
+                                    Command = sub.Command,
+                                    CommandParameter = sub.CommandParameter,
+                                });
+                            menus.Add(new NativeMenuItem
+                            {
+                                Header = item.Value.Name,
+                                Menu = subMenu,
+                            });
+                        }
+                        else
+                        {
+                            menus.Add(new NativeMenuItem
+                            {
+                                Header = item.Value.Name,
+                                Command = item.Value.Command,
+                                CommandParameter = item.Value.CommandParameter,
+                            });
+                        }
+                    }
+                    menus.Add(new NativeMenuItemSeparator());
+                }
+
+                foreach (var item in defaultTrayMenus)
+                {
+                    menus.Add(item);
+                }
+            }
+        });
+#endif
+    }
+
+    public void UpdateMenuItems(string menuKey, TrayMenuItem trayMenuItem)
+    {
+#if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
+        if (TrayMenus != null)
+        {
+            if (TrayMenus.ContainsKey(menuKey))
+                TrayMenus[menuKey] = trayMenuItem;
+            else
+                TrayMenus.Add(menuKey, trayMenuItem);
+
+            UpdateMenuItems();
+        }
+#endif
    }
 }
@@ -44,6 +44,8 @@ public sealed partial class App : Application
            AvaloniaXamlLoader.Load(this);

 #if WINDOWS || LINUX || MACOS
+            if (GeneralSettings.MinimizeOnStartup.Value)
+                Startup.Instance.IsMinimize = true;
            if (Startup.Instance.IsSteamRun)
            {
                try
@@ -90,8 +92,17 @@ public sealed partial class App : Application
    {
        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
        {
-            MainWindow = InitializeMainWindow?.Invoke(this);
-            desktop.MainWindow = MainWindow ??= new MainWindow();
+            MainWindow = InitializeMainWindow?.Invoke(this) ?? new MainWindow();
+            desktop.MainWindow =
+#if !UI_DEMO
+                Startup.Instance.IsMinimize ? null :
+#endif
+                MainWindow;
+
+            if (Startup.Instance.IsMinimize && MainWindow is AppWindow appWindow)
+            {
+                Task2.InBackground(() => appWindow.SplashScreen.RunTasks(CancellationToken.None));
+            }
        }
        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
        {
@@ -73,15 +73,19 @@ public sealed partial class MainView : ReactiveUserControl<MainWindowViewModel>

        NavView.SelectedItem = null;

-        foreach (var nvi in NavView.MenuItemsSource)
-        {
-            SetSelectedItem(nvi);
-        }
+        var menuItemsSource = NavView.MenuItemsSource;
+        if (menuItemsSource != null)
+            foreach (var nvi in menuItemsSource)
+            {
+                SetSelectedItem(nvi);
+            }

-        foreach (var nvi in NavView.FooterMenuItemsSource)
-        {
-            SetSelectedItem(nvi);
-        }
+        var footerMenuItemsSource = NavView.FooterMenuItemsSource;
+        if (footerMenuItemsSource != null)
+            foreach (var nvi in footerMenuItemsSource)
+            {
+                SetSelectedItem(nvi);
+            }

        if (FrameView.BackStackDepth > 0 && !NavView.IsBackButtonVisible)
        {
@@ -13,6 +13,7 @@
    mc:Ignorable="d">
    <Panel>
        <TextBlock
+            Margin="20"
            HorizontalAlignment="Center"
            VerticalAlignment="Center"
            IsVisible="{Binding Path=!!!Notices.Count, Mode=OneWay, Source={x:Static s:NoticeService.Current}}"
@@ -31,26 +31,42 @@ public sealed partial class MainWindow : ReactiveAppWindow<MainWindowViewModel>
        }
        base.OnClosing(e);

+#if WINDOWS || LINUX || MACOS
        if (Steamworks.SteamClient.IsValid)
        {
            Steamworks.SteamFriends.ClearRichPresence();
        }
+#endif
    }

    protected override void OnOpened(EventArgs e)
    {
        base.OnOpened(e);
+#if WINDOWS || LINUX || MACOS
        if (Steamworks.SteamClient.IsValid)
        {
            Steamworks.SteamFriends.SetRichPresence("steam_display", "#Status_AtMainMenu");
        }
+#endif
        if (AppSplashScreen.IsInitialized)
        {
+            if (NavigationService.Instance.CurrnetPage == null)
+            {
+                INavigationService.Instance.Navigate(typeof(HomePage));
+            }
            Task2.InBackground(async () =>
            {
                await AdvertiseService.Current.RefrshAdvertiseAsync();
                NoticeService.Current.GetNewsAsync();
            });
+            try // 在主窗口显示时调用此函数检查是否需要显示新版本通知窗口
+            {
+                Ioc.Get_Nullable<IAppUpdateService>()?.OnMainOpenTryShowNewVersionWindow();
+            }
+            catch
+            {
+
+            }
        }
    }
 }
@@ -78,134 +94,139 @@ public sealed class AppSplashScreen : IApplicationSplashScreen
    {
        return Task.Run(
            async () =>
-         {
+            {
+                if (!AppSplashScreen.IsInitialized)
+                {
 #if STARTUP_WATCH_TRACE || DEBUG
-             WatchTrace.Start();
+                    WatchTrace.Start();
 #endif

-             var s = Instance;
-             if (s.IsMainProcess)
-             {
-                 VersionTracking2.Track();
+                    var s = Instance;
+                    if (s.IsMainProcess)
+                    {
+                        VersionTracking2.Track();
 #if STARTUP_WATCH_TRACE || DEBUG
-                 WatchTrace.Record("VersionTracking2.Track");
+                        WatchTrace.Record("VersionTracking2.Track");
 #endif

-                 Migrations.Up();
+                        Migrations.Up();
 #if STARTUP_WATCH_TRACE || DEBUG
-                 WatchTrace.Record("Migrations.Up");
+                        WatchTrace.Record("Migrations.Up");
 #endif

-                 // 仅在主进程中启动 IPC 服务端
-                 IPCMainProcessService.Instance.Run();
+                        // 仅在主进程中启动 IPC 服务端
+                        IPCMainProcessService.Instance.Run();
 #if STARTUP_WATCH_TRACE || DEBUG
-                 WatchTrace.Record("IPC.StartServer");
+                        WatchTrace.Record("IPC.StartServer");
 #endif
-             }
+                    }

-             LiveCharts.Configure(config =>
-             {
-                 config
-                     // registers SkiaSharp as the library backend
-                     // REQUIRED unless you build your own
-                     .AddSkiaSharp();
-                 // adds the default supported types
-                 // OPTIONAL but highly recommend
-                 //.AddDefaultMappers()
+                    LiveCharts.Configure(config =>
+                    {
+                        config
+                            // registers SkiaSharp as the library backend
+                            // REQUIRED unless you build your own
+                            .AddSkiaSharp();
+                        // adds the default supported types
+                        // OPTIONAL but highly recommend
+                        //.AddDefaultMappers()

-                 // select a theme, default is Light
-                 // OPTIONAL
-                 //.AddDarkTheme()
+                        // select a theme, default is Light
+                        // OPTIONAL
+                        //.AddDarkTheme()

-                 // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
-                 config.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')); // <- Chinese // mark
-                                                                                        //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
-                                                                                        //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
-                                                                                        //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark
-                                                                                        //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('Ж'))  // <- Russian // mark
+                        // In case you need a non-Latin based font, you must register a typeface for SkiaSharp
+                        config.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('汉')); // <- Chinese // mark
+                                                                                               //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('أ'))  // <- Arabic // mark
+                                                                                               //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('あ')) // <- Japanese // mark
+                                                                                               //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('헬')) // <- Korean // mark
+                                                                                               //.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('Ж'))  // <- Russian // mark

-                 if (App.Instance.Theme != AppTheme.FollowingSystem)
-                 {
-                     if (App.Instance.Theme == AppTheme.Light)
-                         config.AddLightTheme();
-                     else
-                         config.AddDarkTheme();
-                 }
-                 else
-                 {
-                     var dps = IPlatformService.Instance;
-                     var isLightOrDarkTheme = dps.IsLightOrDarkTheme;
-                     if (isLightOrDarkTheme.HasValue)
-                     {
-                         var mThemeFS = IApplication.GetAppThemeByIsLightOrDarkTheme(isLightOrDarkTheme.Value);
-                         if (mThemeFS == AppTheme.Light)
-                             config.AddLightTheme();
-                         else
-                             config.AddDarkTheme();
-                     }
-                 }
-             });
+                        if (App.Instance.Theme != AppTheme.FollowingSystem)
+                        {
+                            if (App.Instance.Theme == AppTheme.Light)
+                                config.AddLightTheme();
+                            else
+                                config.AddDarkTheme();
+                        }
+                        else
+                        {
+                            var dps = IPlatformService.Instance;
+                            var isLightOrDarkTheme = dps.IsLightOrDarkTheme;
+                            if (isLightOrDarkTheme.HasValue)
+                            {
+                                var mThemeFS = IApplication.GetAppThemeByIsLightOrDarkTheme(isLightOrDarkTheme.Value);
+                                if (mThemeFS == AppTheme.Light)
+                                    config.AddLightTheme();
+                                else
+                                    config.AddDarkTheme();
+                            }
+                        }
+                    });

-             AdvertiseService.Current.InitAdvertise();
-             NoticeService.Current.GetNewsAsync();
+                    AdvertiseService.Current.InitAdvertise();
+                    NoticeService.Current.GetNewsAsync();

-             var mainWindow = App.Instance.MainWindow;
-             mainWindow.ThrowIsNull();
+                    var mainWindow = App.Instance.MainWindow;
+                    mainWindow.ThrowIsNull();

 #pragma warning disable SA1114 // Parameter list should follow declaration
-             IViewModelManager.Instance.InitViewModels(new TabItemViewModel[]
-             {
+                    IViewModelManager.Instance.InitViewModels(new TabItemViewModel[]
+                    {
                new MenuTabItemViewModel("Welcome")
                {
                   PageType = typeof(HomePage),
                   IsResourceGet = true,
                   IconKey = "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/home.ico",
                },
-             }, ImmutableArray.Create<TabItemViewModel>(
+                    }, ImmutableArray.Create<TabItemViewModel>(
 #if DEBUG
-             new MenuTabItemViewModel("Debug")
-             {
-                 PageType = typeof(DebugPage),
-                 IsResourceGet = false,
-                 IconKey = "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/bug.ico",
-             },
-#endif       
-             new MenuTabItemViewModel("Plugin_Store")
-             {
-                 PageType = null,
-                 IsResourceGet = true,
-                 IconKey = "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/store.ico",
-             },
-             new MenuTabItemViewModel("Settings")
-             {
-                 PageType = typeof(SettingsPage),
-                 IsResourceGet = true,
-                 IconKey = "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/settings.ico",
-             }));
+                    new MenuTabItemViewModel("Debug")
+                    {
+                        PageType = typeof(DebugPage),
+                        IsResourceGet = false,
+                        IconKey = "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/bug.ico",
+                    },
+#endif
+                    new MenuTabItemViewModel("Plugin_Store")
+                    {
+                        PageType = null,
+                        IsResourceGet = true,
+                        IconKey = "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/store.ico",
+                    },
+                    new MenuTabItemViewModel("Settings")
+                    {
+                        PageType = typeof(SettingsPage),
+                        IsResourceGet = true,
+                        IconKey = "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/settings.ico",
+                    }));
 #pragma warning restore SA1114 // Parameter list should follow declaration
-             IViewModelManager.Instance.MainWindow.ThrowIsNull();
+                    IViewModelManager.Instance.MainWindow.ThrowIsNull();

-             await Dispatcher.UIThread.InvokeAsync(() =>
-             {
-                 mainWindow.DataContext = IViewModelManager.Instance.MainWindow;
-                 s.InitSettingSubscribe();
+                    await Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        mainWindow.DataContext = IViewModelManager.Instance.MainWindow;
+                        s.InitSettingSubscribe();

-                 INavigationService.Instance.Navigate(typeof(HomePage));
-             });
+                        INavigationService.Instance.Navigate(typeof(HomePage));
+                    });
 #if STARTUP_WATCH_TRACE || DEBUG
-             WatchTrace.Record("InitMainWindowViewModel");
+                    WatchTrace.Record("InitMainWindowViewModel");
 #endif

 #if STARTUP_WATCH_TRACE || DEBUG
-             WatchTrace.Stop();
+                    WatchTrace.Stop();
 #endif
-             s.OnStartup();
-             await IViewModelManager.Instance.MainWindow.Initialize();
+                    s.OnStartup();
+                    await IViewModelManager.Instance.MainWindow.Initialize();

-             App.Instance.CompositeDisposable.Add(IViewModelManager.Instance.MainWindow);
-             App.Instance.CompositeDisposable.Add(SteamConnectService.Current.Dispose);
+                    App.Instance.CompositeDisposable.Add(IViewModelManager.Instance.MainWindow);
+#if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
+                    App.Instance.CompositeDisposable.Add(SteamConnectService.Current.Dispose);
+#endif

-             IsInitialized = true;
-         }, cancellationToken: token);
+                    IsInitialized = true;
+                }
+            }, cancellationToken: token);
    }
 }
@@ -1,3 +1,4 @@
+#if !ANDROID && !IOS
 using dotnetCampus.Ipc.CompilerServices.GeneratedProxies;
 using dotnetCampus.Ipc.Context;
 using dotnetCampus.Ipc.Pipes;
@@ -120,3 +121,4 @@ public sealed class IPCSubProcessServiceImpl : IPCSubProcessService
        GC.SuppressFinalize(this);
    }
 }
+#endif
@@ -1,8 +1,11 @@
+#if !ANDROID && !IOS
 using dotnetCampus.Ipc.Pipes;
+#endif
 using static BD.WTTS.Services.IPCSubProcessModuleService.Constants;

 namespace BD.WTTS.Services;

+#if !ANDROID && !IOS
 /// <summary>
 /// 子进程的 IPC 服务实现
 /// </summary>
@@ -248,10 +251,8 @@ sealed partial record class SubProcessArgumentIndex2Model
    public string CacheDirectory { get; init; } = null!;
 }

-sealed class IPCSubProcessFileSystem : IOPath.FileSystemBase
+partial class IPCSubProcessFileSystem
 {
-    private IPCSubProcessFileSystem() { }
-
    [MethodImpl(MethodImplOptions.AggressiveInlining)]
    public static void InitFileSystem(SubProcessArgumentIndex2Model model, string pluginName)
    {
@@ -259,6 +260,12 @@ sealed class IPCSubProcessFileSystem : IOPath.FileSystemBase
        var cacheDirectory = GetPluginsDirectory(pluginName, model.CacheDirectory);
        InitFileSystem(() => appDataDirectory, () => cacheDirectory);
    }
+}
+#endif
+
+sealed partial class IPCSubProcessFileSystem : IOPath.FileSystemBase
+{
+    private IPCSubProcessFileSystem() { }

    public const LogLevel DefaultLoggerMinLevel = AssemblyInfo.Debuggable ? LogLevel.Debug : LogLevel.Error;

@@ -358,4 +365,4 @@ sealed class IPCSubProcessFileSystem : IOPath.FileSystemBase
        if (watchTrace) Startup.WatchTrace.Record("InitLog.End");
 #endif
    }
-}
+}
@@ -101,6 +101,9 @@
 		<PackageReference Include="Aigio.Any.AppCenter" />
 		<PackageReference Include="Aigio.Any.AppCenter.Analytics" />
 		<PackageReference Include="Aigio.Any.AppCenter.Crashes" />
+		<PackageReference Include="System.Drawing.Common" />
+		<PackageReference Include="System.Runtime.Caching" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
 	</ItemGroup>

 	<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
@@ -6,8 +6,8 @@ public static partial class ServiceCollectionExtensions
    [MethodImpl(MethodImplOptions.AggressiveInlining)]
    public static IServiceCollection AddDnsAnalysisService(this IServiceCollection services)
    {
-        //services.AddSingleton<IDnsAnalysisService, DnsDohAnalysisService>();
-        services.AddSingleton<IDnsAnalysisService, DnsAnalysisServiceImpl>();
+        services.AddSingleton<DnsDohAnalysisService>();
+        services.AddSingleton<DnsAnalysisServiceImpl>();
        return services;
    }
 }
@@ -89,6 +89,7 @@ static void ConfigureServices(IServiceCollection services)

    services.AddHttpClient();
    services.AddCommonHttpClientFactory();
+    services.AddSingleton<IHttpPlatformHelperService, HttpPlatformHelperConsoleService>();

    services.AddDnsAnalysisService();
    // 添加反向代理服务（子进程实现）
@@ -147,4 +148,11 @@ sealed class RepositorySecureStorage : Repository<KeyValuePair, string>, ISecure
        var item = await FirstOrDefaultAsync(x => x.Id == key);
        return item != null;
    }
+}
+
+sealed class HttpPlatformHelperConsoleService : HttpPlatformHelperService
+{
+    new const string DefaultUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36 Edg/90.0.818.51";
+
+    public override string UserAgent => DefaultUserAgent;
 }
@@ -23,6 +23,20 @@ sealed partial class CertificateManagerImpl : ICertificateManager

    public X509CertificatePackable RootCertificatePackable { get; set; }

+    readonly object lock_RootCertificatePackable = new();
+
+    byte[]? ICertificateManager.RootCertificatePackable
+    {
+        get
+        {
+            lock (lock_RootCertificatePackable)
+            {
+                RootCertificate ??= LoadRootCertificate();
+            }
+            return RootCertificate == default ? default : Serializable.SMP2(RootCertificatePackable);
+        }
+    }
+
    /// <inheritdoc cref="ICertificateManager.PfxPassword"/>
    public byte[]? PfxPassword { get; set; }

@@ -74,6 +88,7 @@ sealed partial class CertificateManagerImpl : ICertificateManager
        }
    }

+    [Obsolete("use ICertificateManager.Constants.TrustRootCertificate")]
    void SharedTrustRootCertificate()
    {
        if (RootCertificate == null)
@@ -180,7 +195,12 @@ sealed partial class CertificateManagerImpl : ICertificateManager
        {
            if (!File.Exists(filePath))
            {
-                if (!GenerateCertificateUnlock(filePath)) return null;
+                if (!GenerateCertificateUnlock(filePath))
+                    return null;
+            }
+            else if (RootCertificate == null)
+            {
+                RootCertificate = LoadRootCertificate();
            }
            return filePath;
        }
@@ -222,44 +242,66 @@ sealed partial class CertificateManagerImpl : ICertificateManager
        }
    }

-    public void TrustRootCertificate()
+    bool? ICertificateManager.GenerateCertificate()
    {
-        try
-        {
-            if (OperatingSystem.IsWindows())
-            {
-                try
-                {
-                    SharedTrustRootCertificate();
-                }
-#if DEBUG
-                catch (Exception e)
-                {
-                    Log.Error(TAG, e, "SharedTrustRootCertificate Error");
-                }
-#else
-        catch { }
-#endif
-            }
-            else if (OperatingSystem.IsMacOS())
-            {
-                TrustRootCertificateMacOS();
-            }
-            else if (OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid())
-            {
-                TrustRootCertificateLinux();
-            }
-        }
-#if DEBUG
-        catch (Exception e)
-        {
-            e.LogAndShowT(TAG, msg: "PlatformTrustRootCertificateGuide Error");
-        }
-#else
-        catch { }
-#endif
+        return GenerateCertificate(null);
    }

+    //    public void TrustRootCertificate()
+    //    {
+    //        try
+    //        {
+    //            if (OperatingSystem.IsWindows())
+    //            {
+    //                try
+    //                {
+    //                    SharedTrustRootCertificate();
+    //                }
+    //#if DEBUG
+    //                catch (Exception e)
+    //                {
+    //                    Log.Error(TAG, e, "SharedTrustRootCertificate Error");
+    //                }
+    //#else
+    //        catch { }
+    //#endif
+    //            }
+    //            else if (OperatingSystem.IsMacOS())
+    //            {
+    //                TrustRootCertificateMacOS();
+    //            }
+    //            else if (OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid())
+    //            {
+    //                TrustRootCertificateLinux();
+    //            }
+    //        }
+    //#if DEBUG
+    //        catch (Exception e)
+    //        {
+    //            e.LogAndShowT(TAG, msg: "PlatformTrustRootCertificateGuide Error");
+    //        }
+    //#else
+    //        catch { }
+    //#endif
+    //    }
+
+    public void TrustRootCertificate()
+    {
+        if (RootCertificate == null)
+        {
+            GenerateCertificate();
+        }
+
+        if (RootCertificate == null)
+        {
+            throw new ApplicationException(
+                "Could not install certificate as it is null or empty.");
+        }
+
+        ICertificateManager.Constants.TrustRootCertificate(GetCerFilePathGeneratedWhenNoFileExists, platformService, RootCertificate);
+    }
+
+    [Obsolete("use ICertificateManager.Constants.TrustRootCertificate")]
    [SupportedOSPlatform("macOS")]
    void TrustRootCertificateMacOS()
    {
@@ -271,6 +313,7 @@ sealed partial class CertificateManagerImpl : ICertificateManager
            TrustRootCertificateMacOS();
    }

+    [Obsolete("use ICertificateManager.Constants.TrustRootCertificate")]
    [SupportedOSPlatform("Linux")]
    void TrustRootCertificateLinux()
    {
@@ -390,12 +433,13 @@ sealed partial class CertificateManagerImpl : ICertificateManager
    {
        get
        {
-            if (RootCertificate == null)
-                if (GetCerFilePathGeneratedWhenNoFileExists() == null) return false;
-            return IsCertificateInstalled(RootCertificatePackable);
+            var result = ICertificateManager.Constants.IsRootCertificateInstalled(this, platformService, RootCertificatePackable);
+            return result;
        }
    }

+    bool? ICertificateManager.IsRootCertificateInstalled2 => IsRootCertificateInstalled;
+
    /// <summary>
    /// 检查证书是否已安装并信任
    /// </summary>
@@ -403,21 +447,7 @@ sealed partial class CertificateManagerImpl : ICertificateManager
    /// <returns></returns>
    bool IsCertificateInstalled(X509CertificatePackable packable)
    {
-        X509Certificate2? certificate2 = packable;
-        if (certificate2 == null)
-            return false;
-        if (certificate2.NotAfter <= DateTime.Now)
-            return false;
-
-        if (OperatingSystem.IsAndroid() || OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
-        {
-            return platformService.IsCertificateInstalled(packable);
-        }
-        else
-        {
-            using var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine);
-            store.Open(OpenFlags.ReadOnly);
-            return store.Certificates.Contains(certificate2);
-        }
+        var result = ICertificateManager.Constants.IsCertificateInstalled(platformService, packable);
+        return result;
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aigio Liu	d8f36eb207	🚧 Android	2023-09-27 16:19:11 +08:00
Aigio Liu	8cb63f0f94	🚧 Android	2023-09-26 19:38:58 +08:00
Aigio Liu	0cb0981105	🚧 Android	2023-09-26 16:30:51 +08:00
Aigio Liu	7f06198bb6	⬆️ DirectoryPackages	2023-09-25 14:15:25 +08:00
Aigio Liu	8202df3a65	🚧 Misc	2023-09-25 13:40:19 +08:00
Aigio Liu	5033261a64	⬆️ DirectoryPackages	2023-09-25 13:27:41 +08:00
Aigio Liu	191c957a23	🚧 3.0.0-rc.3	2023-09-25 13:21:55 +08:00
Aigio Liu	9eb5def6f0	🚧 Misc	2023-09-23 16:40:51 +08:00
Mossimo	2467ce9bb4	🐛 Fix macOS 加速错误等待输入密码过长导致 IPC 异常闪退	2023-09-23 15:41:33 +08:00
Aigio Liu	f968f3f66a	🐛 SetBootAutoStart PrivilegedProcess	2023-09-23 13:50:08 +08:00
Aigio Liu	511a2fa366	🚧 Migrations.MoveAccelerator	2023-09-23 13:24:30 +08:00
RMBGAME	5ed54bd72e	🚧 托盘	2023-09-22 17:19:32 +08:00
Aigio Liu	91ecfa342a	🚧 ReverseProxy	2023-09-22 15:38:42 +08:00
RMBGAME	be1481d063	✨ 托盘改进	2023-09-22 15:18:59 +08:00
Aigio Liu	fce80b18ee	🐛 GameAccount	2023-09-22 10:30:28 +08:00
Aigio Liu	211daa428a	🎨 Authenticator	2023-09-21 19:19:06 +08:00
Aigio Liu	781fd9489f	🐛 Authenticator	2023-09-21 18:52:45 +08:00
Aigio Liu	680586b6e9	🐛 InitializeScriptAsync	2023-09-21 18:14:59 +08:00
Aigio Liu	35ee526efc	🐛 -clt steam -account	2023-09-21 15:08:35 +08:00
Aigio Liu	2f0090d571	⬆️ DirectoryPackages	2023-09-21 14:52:26 +08:00
Aigio Liu	2f6ad43382	🐛 Misc	2023-09-21 14:31:57 +08:00
Aigio Liu	20056583a3	🚧 ASF	2023-09-20 16:50:11 +08:00
Aigio Liu	77dc0abd2a	🐛 Accelerator	2023-09-20 14:25:31 +08:00
Aigio Liu	ddf6486af6	🚧 ASF	2023-09-20 14:25:31 +08:00
Aigio Liu	0229003e19	🐛 Cert	2023-09-19 16:37:43 +08:00
Aigio Liu	8486edf6b8	🎨 Cert	2023-09-19 16:01:03 +08:00
RMBGAME	fe941e1271	✨ 托盘改进	2023-09-19 15:44:40 +08:00
RMBGAME	81129afc8f	🚧 托盘菜单	2023-09-18 18:51:08 +08:00
Aigio Liu	566cc4c017	🚧 Misc	2023-09-18 17:56:06 +08:00
Aigio Liu	0925ec9104	🐛 DoH	2023-09-16 18:03:02 +08:00
Aigio Liu	cac4a9370a	🧪 DoH	2023-09-16 17:42:27 +08:00
Aigio Liu	e32fade0ea	🚧 DNS over HTTPS	2023-09-16 15:52:42 +08:00
Aigio Liu	f6554a3b21	🎨 IDnsAnalysisService	2023-09-16 12:20:45 +08:00
Aigio Liu	d00572d97d	💄 DNS over HTTPS	2023-09-16 11:44:05 +08:00
Aigio Liu	56e3563634	✨ DNS over HTTPS	2023-09-15 19:42:06 +08:00
Aigio Liu	9355c317ac	🔥 StartAsAdministratorByBypassUAC	2023-09-15 14:22:03 +08:00
Aigio Liu	35b5edd09a	🚧 Misc	2023-09-14 16:31:05 +08:00
Aigio Liu	ab22ea1113	🐛 GameAccount	2023-09-14 16:07:45 +08:00
Aigio Liu	62c015ad0b	🚧 Ｍisc	2023-09-14 15:38:57 +08:00
Aigio Liu	195f5269be	⬆️ .NET 7.0.11 & SDK 7.0.401 & VS 17.7.4	2023-09-14 14:32:43 +08:00
Aigio Liu	b1fa5b4a4d	🐛 AppUpdate	2023-09-14 12:06:58 +08:00
Mossimo	7778854007	🐛修复迁移后脚本缓存路径问题	2023-09-13 18:00:25 +08:00
Aigio Liu	68bbd8b3e3	🐛 macOS AppCenter	2023-09-13 17:33:15 +08:00
Aigio Liu	137a2dcde9	🚧 Misc	2023-09-12 19:08:44 +08:00
Aigio Liu	ef239c5dc2	🐛 SetBootAutoStart	2023-09-12 19:03:23 +08:00
ff m	1fd4d4e35a	🐛 修复 macOS 代码签名	2023-09-12 16:41:12 +08:00
Aigio Liu	a71ff13d49	🐛 Misc	2023-09-12 14:46:24 +08:00
Aigio Liu	56f9be173a	🐛 dotnetfx	2023-09-12 14:36:44 +08:00
Aigio Liu	6e3e84c9c3	🐛	2023-09-12 14:27:04 +08:00
RMBGAME	a55e28600f	🐛 SDA某些情况下导入错误修复	2023-09-12 13:56:34 +08:00
RMBGAME	31dd805a6d	修改启动时加速UI	2023-09-11 21:49:50 +08:00
Aigio Liu	aeac99fc1c	🎨 IPCMainProcessServiceImpl / IpcLogger	2023-09-09 10:36:07 +08:00
RMBGAME	5b9bc9e00b	🚑 Misc	2023-09-09 03:17:27 +08:00
RMBGAME	5c3ab25271	🐛 修复因 HTTP/2 导致 discord websocket 验证失败问题	2023-09-09 03:14:37 +08:00
RMBGAME	1e8d373df5	🐛 修复最小化启动无效	2023-09-08 17:55:10 +08:00
Aigio Liu	f226aeb8a9	🐛 fix #2830	2023-09-08 17:41:20 +08:00
Aigio Liu	3f0422cfbb	✨ pub hash command	2023-09-08 17:05:05 +08:00
john.jiang	af89dddc4c	🎨 doh	2023-09-08 16:19:25 +08:00
Aigio Liu	55f2c519b2	🚧 3.0.207.0	2023-09-08 10:32:22 +08:00
Aigio Liu	527f5fb8a4	🐛 AvaloniaApplicationUpdateServiceImpl	2023-09-08 10:27:04 +08:00
Aigio Liu	8139a7414d	🚧 3.0.0-rc.2	2023-09-08 10:10:16 +08:00