diff --git a/src/ST.Client.Android/Services/Implementation/DnsAnalysisServiceImpl.cs b/src/ST.Client.Android/Services/Implementation/DnsAnalysisServiceImpl.cs
new file mode 100644
index 000000000..3423e2ec6
--- /dev/null
+++ b/src/ST.Client.Android/Services/Implementation/DnsAnalysisServiceImpl.cs
@@ -0,0 +1,114 @@
+using Android.Content;
+using Android.Net;
+using System.Application.Services;
+using System.Application.Services.Implementation;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading.Tasks;
+using XEPlatform = Xamarin.Essentials.Platform;
+
+namespace System.Application.Services.Implementation
+{
+    internal sealed class DnsAnalysisServiceImpl : IDnsAnalysisService
+    {
+        /// <summary>
+        /// https://developer.android.google.cn/reference/android/net/ConnectivityManager?hl=zh-cn
+        /// </summary>
+        static ConnectivityManager ConnectivityManager
+        {
+            get
+            {
+                var connectivityManager = XEPlatform.CurrentActivity.GetSystemService<ConnectivityManager>(Context.ConnectivityService);
+                return connectivityManager;
+            }
+        }
+
+        public static List<IPEndPoint> GetDnsServers()
+        {
+            List<IPEndPoint> endPoints = new();
+            var connectivityManager = ConnectivityManager;
+
+            var activeConnection = connectivityManager.ActiveNetwork;
+            var linkProperties = connectivityManager.GetLinkProperties(activeConnection);
+
+            if (linkProperties != null)
+            {
+                foreach (var currentAddress in linkProperties.DnsServers)
+                {
+                    var endPoint = new IPEndPoint(IPAddress.Parse(currentAddress.HostAddress), 53);
+                    endPoints.Add(endPoint);
+                }
+            }
+
+            return endPoints;
+        }
+
+        public Task<IPAddress[]?> AnalysisDomainIp(string url, bool isIPv6 = false)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IPAddress[]?> AnalysisDomainIpBy114Dns(string url, bool isIPv6 = false)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IPAddress[]?> AnalysisDomainIpByAliDns(string url, bool isIPv6 = false)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IPAddress[]?> AnalysisDomainIpByCloudflare(string url, bool isIPv6 = false)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IPAddress[]?> AnalysisDomainIpByCustomDns(string url, IPAddress[]? dnsServers = null, bool isIPv6 = false)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IPAddress[]?> AnalysisDomainIpByDnspod(string url, bool isIPv6 = false)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IPAddress[]?> AnalysisDomainIpByGoogleDns(string url, bool isIPv6 = false)
+        {
+            throw new NotImplementedException();
+        }
+
+        public int AnalysisHostnameTime(string url)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<string?> GetHostByIPAddress(IPAddress ip)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<bool> GetIsIpv6Support()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<long> PingHostname(string url)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.Extensions.DependencyInjection
+{
+    partial class ServiceCollectionExtensions
+    {
+        public static IServiceCollection AddDnsAnalysisService(this IServiceCollection services)
+        {
+            services.AddSingleton<IDnsAnalysisService, DnsAnalysisServiceImpl>();
+            return services;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs b/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs
index 91146705f..ec8d7db95 100644
--- a/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs
+++ b/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs
@@ -35,7 +35,7 @@ namespace System.Application.UI.Activities
     [Register(JavaPackageConstants.Activities + nameof(MockSteamAuthTradeActivity))]
     [Activity(Theme = ManifestConstants.MainTheme2_NoActionBar,
         LaunchMode = LaunchMode.SingleTask,
-        //MainLauncher = true,
+        MainLauncher = true,
         Label = "AuthTrade(Mock)",
         ConfigurationChanges = ManifestConstants.ConfigurationChanges)]
     internal sealed class MockSteamAuthTradeActivity : BaseSteamAuthTradeActivity
@@ -154,7 +154,8 @@ namespace System.Application.UI.Activities
                 binding.layoutSteamUserName.Hint = Steam_User;
                 binding.layoutSteamPassword.Hint = Steam_Password;
                 binding.layoutCaptcha.Hint = Steam_ImageCodeTip;
-                binding.tvConfirmConutMessage.Text = ViewModel!.ConfirmationsConutMessage;
+                if (!ViewModel!.IsConfirmationsAny)
+                    binding.tvConfirmConutMessage.Text = ViewModel!.ConfirmationsConutMessage;
                 binding.cbStreamRememberMe.Text = User_Rememberme;
                 binding.btnLogin.Text = Login;
                 binding.tvSteamTradeLoginTip.Text = LocalAuth_SteamTradeLoginTip;
@@ -191,11 +192,18 @@ namespace System.Application.UI.Activities
             ViewModel!.WhenAnyValue(x => x.ConfirmationsConutMessage).SubscribeInMainThread(value =>
             {
                 if (binding == null) return;
-                binding.tvConfirmConutMessage.Text = value;
-                if (ViewModel!.IsConfirmationsEmpty)
+                if (!ViewModel!.IsConfirmationsAny)
                 {
+                    binding.tvConfirmConutMessage.Text = value;
+                    binding.tvConfirmConutMessage.Visibility = ViewStates.Visible;
                     binding.layoutActions.Visibility = ViewStates.Gone;
                 }
+                else
+                {
+                    binding.tvConfirmConutMessage.Visibility = ViewStates.Gone;
+                    binding.layoutActions.Visibility = ViewStates.Visible;
+                    Toast.Show(value, ToastLength.Short);
+                }
             }).AddTo(this);
             ViewModel!.WhenAnyValue(x => x.IsLoading).SubscribeInMainThread(value =>
             {
@@ -205,7 +213,7 @@ namespace System.Application.UI.Activities
                 binding.layoutContentSteamLogin.Visibility = (value || ViewModel!.IsLoggedIn) ? ViewStates.Gone : ViewStates.Visible;
                 binding.layoutLoading.Visibility = state;
                 //binding.swipeRefreshLayout.Refreshing = value;
-                binding.layoutActions.Visibility = (value || !ViewModel!.IsLoggedIn || ViewModel!.IsConfirmationsEmpty) ? ViewStates.Gone : ViewStates.Visible;
+                binding.layoutActions.Visibility = (value || !ViewModel!.IsLoggedIn || !ViewModel!.IsConfirmationsAny) ? ViewStates.Gone : ViewStates.Visible;
             }).AddTo(this);
             ViewModel!.WhenAnyValue(x => x.UnselectAll).SubscribeInMainThread(value =>
             {
@@ -266,7 +274,7 @@ namespace System.Application.UI.Activities
             };
             var layout = new LinearLayoutManager2(this, LinearLayoutManager.Vertical, false);
             binding!.rvConfirmations.SetLayoutManager(layout);
-            binding.rvConfirmations.AddItemDecoration(VerticalItemDecoration2.Get(this, Resource.Dimension.activity_vertical_margin, Resource.Dimension.fab_full_height, noTop: true));
+            binding.rvConfirmations.AddItemDecoration(VerticalItemDecoration2.Get(this, Resource.Dimension.activity_vertical_margin, Resource.Dimension.tab_height, noTop: true));
             binding.rvConfirmations.SetAdapter(adapter);
 
             //var actionItems = Enum2.GetAll<ActionItem>().Where(x => x != ActionItem.Refresh);
diff --git a/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs b/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs
index 484c30dc5..84c532b90 100644
--- a/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs
+++ b/src/ST.Client.Android/UI/Fragments/CommunityFixFragment.cs
@@ -39,7 +39,7 @@ namespace System.Application.UI.Fragments
             proxyS.WhenAnyValue(x => x.AccelerateTime).SubscribeInMainThread(value =>
             {
                 if (binding == null) return;
-                binding.tvAccelerateTime.Text = AppResources.CommunityFix_AlreadyProxy + value.ToString("hh:mm:ss");
+                binding.tvAccelerateTime.Text = AppResources.CommunityFix_AlreadyProxy + value.ToString(@"hh\:mm\:ss");
             }).AddTo(this);
             proxyS.WhenAnyValue(x => x.ProxyStatus).SubscribeInMainThread(value =>
             {
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml
index 889d4b0c1..2a02f294d 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml
@@ -79,10 +79,10 @@
             <StackPanel Spacing="10" Orientation="Horizontal">
               <Button Content="{ReflectionBinding Path=Res.LocalAuth_AuthTrade_ConfirmAll,Mode=OneWay,Source={x:Static resx:R.Current}}"
                       Command="{ReflectionBinding ConfirmAllButton_Click,Mode=OneTime}"
-                      IsEnabled="{Binding IsConfirmationsEmpty}"></Button>
+                      IsEnabled="{Binding IsConfirmationsAny}"></Button>
               <Button Content="{ReflectionBinding Path=Res.LocalAuth_AuthTrade_CancelAll,Mode=OneWay,Source={x:Static resx:R.Current}}"
                       Command="{ReflectionBinding CancelAllButton_Click,Mode=OneTime}"
-                      IsEnabled="{Binding IsConfirmationsEmpty}"></Button>
+                      IsEnabled="{Binding IsConfirmationsAny}"></Button>
               <Button Content="{ReflectionBinding Path=Res.Refresh,Mode=OneWay,Source={x:Static resx:R.Current}}"
                       Command="{ReflectionBinding Refresh_Click,Mode=OneTime}"></Button>
               <Button Content="{ReflectionBinding Path=Res.Logout,Mode=OneWay,Source={x:Static resx:R.Current}}"
@@ -95,7 +95,7 @@
 
         <Panel DockPanel.Dock="Bottom">
           <StackPanel IsVisible="{Binding IsLoading}" VerticalAlignment="Center" Spacing="15" Margin="20 0" x:Name="load">
-            <!--<TextBlock x:Name="EmptyTip" IsVisible="{Binding !IsConfirmationsEmpty}"
+            <!--<TextBlock x:Name="EmptyTip" IsVisible="{Binding !IsConfirmationsAny}"
                                 Text="{ReflectionBinding Path=Res.LocalAuth_AuthTrade_ListNullTip,Mode=OneWay,Source={x:Static resx:R.Current}}"
                                 TextWrapping="WrapWithOverflow"
                                 VerticalAlignment="Center" HorizontalAlignment="Center">
diff --git a/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj b/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj
index 4e6e2fea1..04e8489b9 100644
--- a/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj
+++ b/src/ST.Client.Desktop.Linux/ST.Client.Linux.csproj
@@ -21,6 +21,18 @@
     <Compile Include="..\ST.Client.Desktop.Mac\Internals\UnixHelper.RunShellAsync.cs">
       <LinkBase>Internals</LinkBase>
     </Compile>
+    <Compile Include="..\ST.Client.Desktop.Windows\Services\Implementation\DnsAnalysisServiceImpl.cs">
+      <LinkBase>Services\Implementation</LinkBase>
+    </Compile>
+    <Compile Include="..\ST.Client.Desktop.Windows\Services\Implementation\SteamServiceImpl.cs">
+      <LinkBase>Services\Implementation</LinkBase>
+    </Compile>
+    <Compile Include="..\ST.Client.Desktop.Windows\VdfHelper.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DnsClient" />
+    <PackageReference Include="Gameloop.Vdf" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ST.Client.Desktop.Mac/ST.Client.Mac.csproj b/src/ST.Client.Desktop.Mac/ST.Client.Mac.csproj
index 3dd29653b..c51150c94 100644
--- a/src/ST.Client.Desktop.Mac/ST.Client.Mac.csproj
+++ b/src/ST.Client.Desktop.Mac/ST.Client.Mac.csproj
@@ -26,6 +26,13 @@
       <Link>Properties\InternalsVisibleTo.cs</Link>
     </Compile>
     <Compile Include="..\ST.Client.Desktop\ServiceCollectionExtensions.AddGeneralLogging.cs" />
+    <Compile Include="..\ST.Client.Desktop.Windows\Services\Implementation\DnsAnalysisServiceImpl.cs">
+      <LinkBase>Services\Implementation</LinkBase>
+    </Compile>
+    <Compile Include="..\ST.Client.Desktop.Windows\Services\Implementation\SteamServiceImpl.cs">
+      <LinkBase>Services\Implementation</LinkBase>
+    </Compile>
+    <Compile Include="..\ST.Client.Desktop.Windows\VdfHelper.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac20')) OR $(TargetFramework.Contains('-mac')) ">
@@ -34,6 +41,11 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="DnsClient" />
+    <PackageReference Include="Gameloop.Vdf" />
+  </ItemGroup>
+
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac20')) OR $(TargetFramework.Contains('-mac')) ">
     <PackageReference Include="nor0x.AppCenter" />
     <PackageReference Include="nor0x.AppCenter.Analytics" />
diff --git a/src/ST.Client.Desktop.Windows/ST.Client.Windows.csproj b/src/ST.Client.Desktop.Windows/ST.Client.Windows.csproj
index 1eb307f25..11d3aeddb 100644
--- a/src/ST.Client.Desktop.Windows/ST.Client.Windows.csproj
+++ b/src/ST.Client.Desktop.Windows/ST.Client.Windows.csproj
@@ -38,6 +38,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DnsClient" />
+    <PackageReference Include="Gameloop.Vdf" />
     <PackageReference Include="Aigio.Avalonia.AppCenter" />
     <PackageReference Include="Aigio.Avalonia.AppCenter.Analytics" />
     <PackageReference Include="Aigio.Avalonia.AppCenter.Crashes" />
diff --git a/src/ST.Client/DnsAnalysis.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/DnsAnalysisServiceImpl.cs
similarity index 62%
rename from src/ST.Client/DnsAnalysis.cs
rename to src/ST.Client.Desktop.Windows/Services/Implementation/DnsAnalysisServiceImpl.cs
index a35adecfd..28401e9c6 100644
--- a/src/ST.Client/DnsAnalysis.cs
+++ b/src/ST.Client.Desktop.Windows/Services/Implementation/DnsAnalysisServiceImpl.cs
@@ -1,54 +1,21 @@
 using DnsClient;
 using DnsClient.Protocol;
+using System.Application.Services;
+using System.Application.Services.Implementation;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Threading.Tasks;
+using static System.Application.Services.IDnsAnalysisService;
 
-namespace System.Application
+namespace System.Application.Services.Implementation
 {
-    /// <summary>
-    /// DNS 解析
-    /// </summary>
-    public static class DnsAnalysis
+    internal sealed class DnsAnalysisServiceImpl : IDnsAnalysisService
     {
-        #region DNS常量
-        private const string PrimaryDNS_IPV6_Ali = "2400:3200::1";
-
-        public const string PrimaryDNS_Ali = "223.5.5.5";
-        public const string SecondaryDNS_Ali = "223.6.6.6";
-
-        public const string PrimaryDNS_Dnspod = "119.29.29.29";
-        public const string SecondaryDNS_Dnspod = "182.254.116.116";
-
-        public const string PrimaryDNS_114 = "114.114.114.114";
-        public const string SecondaryDNS_114 = "114.114.115.115";
-
-        public const string PrimaryDNS_Google = "8.8.8.8";
-        public const string SecondaryDNS_Google = "8.8.4.4";
-
-        public const string PrimaryDNS_Cloudflare = "1.1.1.1";
-        public const string SecondaryDNS_Cloudflare = "1.0.0.1";
-
-        public const string PrimaryDNS_Baidu = "180.76.76.76";
-
-
-        private static readonly IPAddress[] DNS_Alis = new[] { IPAddress.Parse(PrimaryDNS_Ali), IPAddress.Parse(SecondaryDNS_Ali) };
-        private static readonly IPAddress[] DNS_Dnspods = new[] { IPAddress.Parse(PrimaryDNS_Dnspod), IPAddress.Parse(SecondaryDNS_Dnspod) };
-        private static readonly IPAddress[] DNS_114s = new[] { IPAddress.Parse(PrimaryDNS_114), IPAddress.Parse(SecondaryDNS_114) };
-        private static readonly IPAddress[] DNS_Googles = new[] { NameServer.GooglePublicDns.Address, NameServer.GooglePublicDns2.Address };
-        private static readonly IPAddress[] DNS_Cloudflares = new[] { NameServer.Cloudflare.Address, NameServer.Cloudflare2.Address };
-        #endregion
-
-
-
-        private const string IPV6_TESTDOMAIN = "ipv6.rmbgame.net";
-        private const string IPV6_TESTDOMAIN_SUCCESS = PrimaryDNS_IPV6_Ali;
-
         private static readonly LookupClient lookupClient = new();
 
-        public static async Task<long> PingHostname(string url)
+        public async Task<long> PingHostname(string url)
         {
             var pin = new Ping();
             var r = await pin.SendPingAsync(url, 30);
@@ -59,7 +26,7 @@ namespace System.Application
             return r.RoundtripTime;
         }
 
-        public static int AnalysisHostnameTime(string url)
+        public int AnalysisHostnameTime(string url)
         {
             if (!string.IsNullOrEmpty(url))
             {
@@ -88,37 +55,37 @@ namespace System.Application
             return null;
         }
 
-        public static async Task<IPAddress[]?> AnalysisDomainIp(string url, bool isIPv6 = false)
+        public async Task<IPAddress[]?> AnalysisDomainIp(string url, bool isIPv6 = false)
         {
             return await AnalysisDomainIpByCustomDns(url, null, isIPv6);
         }
 
-        public static async Task<IPAddress[]?> AnalysisDomainIpByGoogleDns(string url, bool isIPv6 = false)
+        public async Task<IPAddress[]?> AnalysisDomainIpByGoogleDns(string url, bool isIPv6 = false)
         {
             return await AnalysisDomainIpByCustomDns(url, DNS_Googles, isIPv6);
         }
 
-        public static async Task<IPAddress[]?> AnalysisDomainIpByCloudflare(string url, bool isIPv6 = false)
+        public async Task<IPAddress[]?> AnalysisDomainIpByCloudflare(string url, bool isIPv6 = false)
         {
             return await AnalysisDomainIpByCustomDns(url, DNS_Cloudflares, isIPv6);
         }
 
-        public static async Task<IPAddress[]?> AnalysisDomainIpByDnspod(string url, bool isIPv6 = false)
+        public async Task<IPAddress[]?> AnalysisDomainIpByDnspod(string url, bool isIPv6 = false)
         {
             return await AnalysisDomainIpByCustomDns(url, DNS_Dnspods, isIPv6);
         }
 
-        public static async Task<IPAddress[]?> AnalysisDomainIpByAliDns(string url, bool isIPv6 = false)
+        public async Task<IPAddress[]?> AnalysisDomainIpByAliDns(string url, bool isIPv6 = false)
         {
             return await AnalysisDomainIpByCustomDns(url, DNS_Alis, isIPv6);
         }
 
-        public static async Task<IPAddress[]?> AnalysisDomainIpBy114Dns(string url, bool isIPv6 = false)
+        public async Task<IPAddress[]?> AnalysisDomainIpBy114Dns(string url, bool isIPv6 = false)
         {
             return await AnalysisDomainIpByCustomDns(url, DNS_114s, isIPv6);
         }
 
-        public static async Task<IPAddress[]?> AnalysisDomainIpByCustomDns(string url, IPAddress[]? dnsServers = null, bool isIPv6 = false)
+        public async Task<IPAddress[]?> AnalysisDomainIpByCustomDns(string url, IPAddress[]? dnsServers = null, bool isIPv6 = false)
         {
             if (!string.IsNullOrEmpty(url))
             {
@@ -162,7 +129,7 @@ namespace System.Application
             return null;
         }
 
-        public static async Task<string?> GetHostByIPAddress(IPAddress ip)
+        public async Task<string?> GetHostByIPAddress(IPAddress ip)
         {
             //var hostName = Dns.GetHostEntry(IPAddress2.Parse(ip)).HostName;
             var client = lookupClient;
@@ -171,7 +138,7 @@ namespace System.Application
             return hostName;
         }
 
-        public static async Task<bool> GetIsIpv6Support()
+        public async Task<bool> GetIsIpv6Support()
         {
             try
             {
@@ -194,4 +161,17 @@ namespace System.Application
             return false;
         }
     }
+}
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.Extensions.DependencyInjection
+{
+    partial class ServiceCollectionExtensions
+    {
+        public static IServiceCollection AddDnsAnalysisService(this IServiceCollection services)
+        {
+            services.AddSingleton<IDnsAnalysisService, DnsAnalysisServiceImpl>();
+            return services;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/ST.Client/Services/Implementation/SteamServiceImpl.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/SteamServiceImpl.cs
similarity index 98%
rename from src/ST.Client/Services/Implementation/SteamServiceImpl.cs
rename to src/ST.Client.Desktop.Windows/Services/Implementation/SteamServiceImpl.cs
index 95b167fb4..8cb5f393b 100644
--- a/src/ST.Client/Services/Implementation/SteamServiceImpl.cs
+++ b/src/ST.Client.Desktop.Windows/Services/Implementation/SteamServiceImpl.cs
@@ -2,6 +2,8 @@ using Gameloop.Vdf.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Application.Models;
+using System.Application.Services;
+using System.Application.Services.Implementation;
 using System.Application.Settings;
 using System.Application.UI;
 using System.Collections.Generic;
@@ -862,4 +864,22 @@ namespace System.Application.Services.Implementation
             return keys;
         }
     }
+}
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static partial class ServiceCollectionExtensions
+    {
+        /// <summary>
+        /// 添加 Steam 相关助手、工具类服务
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddSteamService(this IServiceCollection services)
+        {
+            services.AddSingleton<ISteamService, SteamServiceImpl>();
+            return services;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/ST.Client/VdfHelper.cs b/src/ST.Client.Desktop.Windows/VdfHelper.cs
similarity index 100%
rename from src/ST.Client/VdfHelper.cs
rename to src/ST.Client.Desktop.Windows/VdfHelper.cs
diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml
index 7944ec165..20c1db0c7 100644
--- a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml
+++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml
@@ -61,6 +61,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:overScrollMode="never"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:itemCount="4"
             tools:listitem="@layout/layout_card_steam_auth_trade_confirmation"
             xamarin:managedType="AndroidX.RecyclerView.Widget.RecyclerView" />
diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_tablayout_viewpager2.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_tablayout_viewpager2.xml
index 7df2f254e..7cefc3758 100644
--- a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_tablayout_viewpager2.xml
+++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_tablayout_viewpager2.xml
@@ -11,10 +11,7 @@
     android:id="@+id/tab_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:tabIndicatorColor="@color/shell_title_color"
-    app:tabSelectedTextColor="@color/shell_title_color"
     app:tabTextAppearance="@style/MainTheme2.TabLayoutTextStyle"
-    app:tabTextColor="@color/shell_title_color"
     xamarin:managedType="Google.Android.Material.Tabs.TabLayout" />
 
   <androidx.viewpager2.widget.ViewPager2
diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_toolbar_tablayout_viewpager2.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_toolbar_tablayout_viewpager2.xml
index 2383bffac..172ed3f4d 100644
--- a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_toolbar_tablayout_viewpager2.xml
+++ b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_toolbar_tablayout_viewpager2.xml
@@ -13,10 +13,7 @@
     android:id="@+id/tab_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:tabIndicatorColor="@color/shell_title_color"
-    app:tabSelectedTextColor="@color/shell_title_color"
     app:tabTextAppearance="@style/MainTheme2.TabLayoutTextStyle"
-    app:tabTextColor="@color/shell_title_color"
     xamarin:managedType="Google.Android.Material.Tabs.TabLayout" />
 
   <androidx.viewpager2.widget.ViewPager2
diff --git a/src/ST.Client/ST.Client.csproj b/src/ST.Client/ST.Client.csproj
index 2ebafd617..feda8747d 100644
--- a/src/ST.Client/ST.Client.csproj
+++ b/src/ST.Client/ST.Client.csproj
@@ -23,8 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DnsClient" />
-    <PackageReference Include="Gameloop.Vdf" />
     <PackageReference Include="NLog" />
     <PackageReference Include="NLog.Extensions.Logging" />
     <PackageReference Include="NotifyIcon.Base" />
diff --git a/src/ST.Client/ServiceCollectionExtensions.cs b/src/ST.Client/ServiceCollectionExtensions.cs
index 6b202fb33..ebe1f1f39 100644
--- a/src/ST.Client/ServiceCollectionExtensions.cs
+++ b/src/ST.Client/ServiceCollectionExtensions.cs
@@ -12,7 +12,7 @@ using System.Windows;
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
-    public static partial class IdentityServiceCollectionExtensions
+    public static partial class ServiceCollectionExtensions
     {
         public static IServiceCollection AddRepositories(this IServiceCollection services)
         {
@@ -107,17 +107,6 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
-        /// <summary>
-        /// 添加 Steam 相关助手、工具类服务
-        /// </summary>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddSteamService(this IServiceCollection services)
-        {
-            services.AddSingleton<ISteamService, SteamServiceImpl>();
-            return services;
-        }
-
         /// <summary>
         /// 尝试添加 Steamworks LocalApi Service
         /// </summary>
diff --git a/src/ST.Client/Services/IDnsAnalysisService.cs b/src/ST.Client/Services/IDnsAnalysisService.cs
new file mode 100644
index 000000000..fe6c4214f
--- /dev/null
+++ b/src/ST.Client/Services/IDnsAnalysisService.cs
@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace System.Application.Services
+{
+    /// <summary>
+    /// DNS 解析服务
+    /// </summary>
+    public interface IDnsAnalysisService
+    {
+        static IDnsAnalysisService Instance => DI.Get<IDnsAnalysisService>();
+
+        #region DNS常量
+        protected const string PrimaryDNS_IPV6_Ali = "2400:3200::1";
+
+        const string PrimaryDNS_Ali = "223.5.5.5";
+        const string SecondaryDNS_Ali = "223.6.6.6";
+
+        const string PrimaryDNS_Dnspod = "119.29.29.29";
+        const string SecondaryDNS_Dnspod = "182.254.116.116";
+
+        const string PrimaryDNS_114 = "114.114.114.114";
+        const string SecondaryDNS_114 = "114.114.115.115";
+
+        const string PrimaryDNS_Google = "8.8.8.8";
+        const string SecondaryDNS_Google = "8.8.4.4";
+
+        const string PrimaryDNS_Cloudflare = "1.1.1.1";
+        const string SecondaryDNS_Cloudflare = "1.0.0.1";
+
+        const string PrimaryDNS_Baidu = "180.76.76.76";
+
+
+        protected static readonly IPAddress[] DNS_Alis = new[] { IPAddress.Parse(PrimaryDNS_Ali), IPAddress.Parse(SecondaryDNS_Ali) };
+        protected static readonly IPAddress[] DNS_Dnspods = new[] { IPAddress.Parse(PrimaryDNS_Dnspod), IPAddress.Parse(SecondaryDNS_Dnspod) };
+        protected static readonly IPAddress[] DNS_114s = new[] { IPAddress.Parse(PrimaryDNS_114), IPAddress.Parse(SecondaryDNS_114) };
+        protected static readonly IPAddress[] DNS_Googles = new[] { NameServer.GooglePublicDns.Address, NameServer.GooglePublicDns2.Address };
+        protected static readonly IPAddress[] DNS_Cloudflares = new[] { NameServer.Cloudflare.Address, NameServer.Cloudflare2.Address };
+
+        private static class NameServer
+        {
+            public static readonly IPEndPoint GooglePublicDns = new(IPAddress.Parse(SecondaryDNS_Google), 53);
+
+            public static readonly IPEndPoint GooglePublicDns2 = new(IPAddress.Parse(PrimaryDNS_Google), 53);
+
+            public static readonly IPEndPoint Cloudflare = new(IPAddress.Parse("1.1.1.1"), 53);
+
+            public static readonly IPEndPoint Cloudflare2 = new IPEndPoint(IPAddress.Parse("1.0.0.1"), 53);
+        }
+        #endregion
+
+        protected const string IPV6_TESTDOMAIN = "ipv6.rmbgame.net";
+        protected const string IPV6_TESTDOMAIN_SUCCESS = PrimaryDNS_IPV6_Ali;
+
+        Task<long> PingHostname(string url);
+
+        int AnalysisHostnameTime(string url);
+
+        Task<IPAddress[]?> AnalysisDomainIp(string url, bool isIPv6 = false);
+
+        Task<IPAddress[]?> AnalysisDomainIpByGoogleDns(string url, bool isIPv6 = false);
+
+        Task<IPAddress[]?> AnalysisDomainIpByCloudflare(string url, bool isIPv6 = false);
+
+        Task<IPAddress[]?> AnalysisDomainIpByDnspod(string url, bool isIPv6 = false);
+
+        Task<IPAddress[]?> AnalysisDomainIpByAliDns(string url, bool isIPv6 = false);
+
+        Task<IPAddress[]?> AnalysisDomainIpBy114Dns(string url, bool isIPv6 = false);
+
+        Task<IPAddress[]?> AnalysisDomainIpByCustomDns(string url, IPAddress[]? dnsServers = null, bool isIPv6 = false);
+
+        Task<string?> GetHostByIPAddress(IPAddress ip);
+
+        Task<bool> GetIsIpv6Support();
+    }
+}
diff --git a/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs b/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
index abd9be50a..efd151aa5 100644
--- a/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
+++ b/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
@@ -30,6 +30,8 @@ namespace System.Application.Services.Implementation
 
         readonly ProxyServer proxyServer = new();
 
+        protected IDnsAnalysisService DnsAnalysis { get; }
+
         public bool IsCertificate => proxyServer.CertificateManager == null || proxyServer.CertificateManager.RootCertificate == null;
 
         public IReadOnlyCollection<AccelerateProjectDTO>? ProxyDomains { get; set; }
@@ -79,9 +81,10 @@ namespace System.Application.Services.Implementation
 
         private static bool IsIpv6Support = false;
 
-        public HttpProxyServiceImpl(IPlatformService platformService)
+        public HttpProxyServiceImpl(IPlatformService platformService, IDnsAnalysisService dnsAnalysis)
         {
             this.platformService = platformService;
+            DnsAnalysis = dnsAnalysis;
             //if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             //    proxyServer.CertificateManager.CertificateEngine = CertificateEngine.DefaultWindows;
             //else
@@ -162,10 +165,9 @@ namespace System.Application.Services.Implementation
             //e.Ok(respone, new List<HttpHeader>() { new HttpHeader("Access-Control-Allow-Origin", e.HttpClient.Request.Headers.GetFirstHeader("Origin")?.Value ?? "*") });
         }
 
-        private static async Task<IPAddress?> GetReverseProxyIp(string url, IPAddress? proxyDns, bool isDomain = false)
+        private async Task<IPAddress?> GetReverseProxyIp(string url, IPAddress? proxyDns, bool isDomain = false)
         {
-            IPAddress? ip;
-            if (isDomain || !IPAddress.TryParse(url, out ip))
+            if (isDomain || !IPAddress.TryParse(url, out var ip))
             {
                 if (proxyDns != null)
                 {
diff --git a/src/ST.Client/Settings/ProxySettings.cs b/src/ST.Client/Settings/ProxySettings.cs
index e289df2df..014372d04 100644
--- a/src/ST.Client/Settings/ProxySettings.cs
+++ b/src/ST.Client/Settings/ProxySettings.cs
@@ -62,7 +62,7 @@ namespace System.Application.Settings
         /// 代理时使用的解析主DNS
         /// </summary>
         public static SerializableProperty<string?> ProxyMasterDns { get; }
-            = GetProperty<string?>(defaultValue: DnsAnalysis.PrimaryDNS_Ali, autoSave: false);
+            = GetProperty<string?>(defaultValue: IDnsAnalysisService.PrimaryDNS_Ali, autoSave: false);
         #endregion
 
         #region 本地代理设置
diff --git a/src/ST.Client/UI/ViewModels/Pages/DebugPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/DebugPageViewModel.cs
index e6b4bb0c3..28443c41c 100644
--- a/src/ST.Client/UI/ViewModels/Pages/DebugPageViewModel.cs
+++ b/src/ST.Client/UI/ViewModels/Pages/DebugPageViewModel.cs
@@ -635,6 +635,7 @@ namespace System.Application.UI.ViewModels
             //    s.AppendLine(item.GetName(R.Culture.LCID));
             //}
             var testdomain = "steampp.net";
+            var DnsAnalysis = IDnsAnalysisService.Instance;
 
             s.AppendLine($"<Support IPV6>: {await DnsAnalysis.GetIsIpv6Support()}");
             s.AppendLine($"<IPV6> ipv6.rmbgame.net: {(await DnsAnalysis.AnalysisDomainIp("ipv6.rmbgame.net"))?.First()}");
diff --git a/src/ST.Client/UI/ViewModels/Windows/CommunityProxyPage/ProxySettingsWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/CommunityProxyPage/ProxySettingsWindowViewModel.cs
index ec544c1dc..5ceff73b5 100644
--- a/src/ST.Client/UI/ViewModels/Windows/CommunityProxyPage/ProxySettingsWindowViewModel.cs
+++ b/src/ST.Client/UI/ViewModels/Windows/CommunityProxyPage/ProxySettingsWindowViewModel.cs
@@ -1,5 +1,6 @@
 using ReactiveUI;
 using System.Application.Models;
+using System.Application.Services;
 using System.Application.UI.Resx;
 using System.Collections.Generic;
 using System.Properties;
@@ -22,12 +23,12 @@ namespace System.Application.UI.ViewModels
         public IEnumerable<string?> ProxyDNSs { get; } = new List<string?>()
         {
             null,
-            DnsAnalysis.PrimaryDNS_114,
-            DnsAnalysis.PrimaryDNS_Ali,
-            DnsAnalysis.PrimaryDNS_Dnspod,
-            DnsAnalysis.PrimaryDNS_Baidu,
-            DnsAnalysis.PrimaryDNS_Google,
-            DnsAnalysis.PrimaryDNS_Cloudflare,
+            IDnsAnalysisService.PrimaryDNS_114,
+            IDnsAnalysisService.PrimaryDNS_Ali,
+            IDnsAnalysisService.PrimaryDNS_Dnspod,
+            IDnsAnalysisService.PrimaryDNS_Baidu,
+            IDnsAnalysisService.PrimaryDNS_Google,
+            IDnsAnalysisService.PrimaryDNS_Cloudflare,
         };
     }
 }
diff --git a/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs
index 4df127497..239f9eb2e 100644
--- a/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs
+++ b/src/ST.Client/UI/ViewModels/Windows/LocalAuthPage/AuthTradeWindowViewModel.cs
@@ -43,7 +43,7 @@ namespace System.Application.UI.ViewModels
               .Bind(out _Confirmations)
               .Subscribe(_ =>
               {
-                  this.RaisePropertyChanged(nameof(IsConfirmationsEmpty));
+                  this.RaisePropertyChanged(nameof(IsConfirmationsAny));
                   this.RaisePropertyChanged(nameof(ConfirmationsConutMessage));
               });
 
@@ -234,10 +234,10 @@ namespace System.Application.UI.ViewModels
             }
         }
 
-        public bool IsConfirmationsEmpty
-        {
-            get => _ConfirmationsSourceList.Items.Any_Nullable();
-        }
+        /// <summary>
+        /// Confirmations SourceList Any
+        /// </summary>
+        public bool IsConfirmationsAny => _ConfirmationsSourceList.Items.Any_Nullable();
 
         public string ConfirmationsConutMessage
         {
@@ -247,7 +247,7 @@ namespace System.Application.UI.ViewModels
                 {
                     return string.Empty;
                 }
-                if (!IsConfirmationsEmpty)
+                if (!IsConfirmationsAny)
                 {
                     return AppResources.LocalAuth_AuthTrade_ListNullTip;
                 }
diff --git a/src/Startup2.cs b/src/Startup2.cs
index 87bc146a1..89812b2a9 100644
--- a/src/Startup2.cs
+++ b/src/Startup2.cs
@@ -150,6 +150,7 @@ namespace System.Application
 #if StartupTrace
             StartupTrace.Restart("DI.ConfigureDemandServices.Calc");
 #endif
+            services.AddDnsAnalysisService();
 #if !CONSOLEAPP
             if (options.HasGUI)
             {
@@ -333,8 +334,10 @@ namespace System.Application
 #endif
             if (options.HasSteam)
             {
+#if !__ANDROID__
                 // Steam 相关助手、工具类服务
                 services.AddSteamService();
+#endif
 
                 // Steamworks LocalApi Service
                 services.TryAddSteamworksLocalApiService();