From 021957ba3f4a4b7a4ee8ea3d8773bdcf2b09a283 Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Tue, 12 Jul 2022 00:17:22 +0800
Subject: [PATCH] improvement WebView2

---
 Directory.Packages.props                      |   2 +-
 SteamToolsV2+.sln                             |  33 +++++-
 .../Avalonia.WebView2.csproj                  |  22 ++++
 src/Avalonia.WebView2/WebView2.cs             |  23 ++++
 .../Application/UI/App.WebView2.cs            |   3 -
 .../Application/UI/Views/Controls/Rotator.cs  |   6 +-
 .../Controls/UserControl/WebView2Compat.axaml |  28 +++++
 .../UserControl/WebView2Compat.axaml.cs       | 109 ++++++++++++++++++
 .../UI/Views/Pages/DebugWebViewPage.axaml     |   4 +-
 .../UI/Views/Pages/DebugWebViewPage.axaml.cs  |  24 ++--
 .../ST.Client.Avalonia.csproj                 |  15 +--
 .../UI/Resx/AppResources.Designer.cs          |  20 +++-
 src/ST.Client/UI/Resx/AppResources.en.resx    |   2 +-
 src/ST.Client/UI/Resx/AppResources.es.resx    |   2 +-
 src/ST.Client/UI/Resx/AppResources.it.resx    |   2 +-
 src/ST.Client/UI/Resx/AppResources.ja.resx    |   2 +-
 src/ST.Client/UI/Resx/AppResources.ko.resx    |   2 +-
 src/ST.Client/UI/Resx/AppResources.resx       |  11 +-
 src/ST.Client/UI/Resx/AppResources.ru.resx    |   2 +-
 .../UI/Resx/AppResources.zh-Hant.resx         |   2 +-
 20 files changed, 270 insertions(+), 44 deletions(-)
 create mode 100644 src/Avalonia.WebView2/Avalonia.WebView2.csproj
 create mode 100644 src/Avalonia.WebView2/WebView2.cs
 create mode 100644 src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml
 create mode 100644 src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9f285025c59..5d750602700 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -254,7 +254,7 @@
     <PackageVersion Include="Avalonia.Win32" Version="0.10.16" />
     <PackageVersion Include="Avalonia.X11" Version="0.10.16" />
     <!--<PackageVersion Include="Avalonia.HtmlRenderer" Version="0.10.0" />-->
-    <PackageVersion Include="WebView2.Avalonia" Version="1.0.1264.42-preview.220711.5" />
+    <PackageVersion Include="WebView2.Avalonia" Version="1.0.1264.42-preview.220711.6" />
     <!--Avalonia End-->
 
     <!-- Xamarin.Android -->
diff --git a/SteamToolsV2+.sln b/SteamToolsV2+.sln
index 7025c18ef32..5c1fd4d5e0d 100644
--- a/SteamToolsV2+.sln
+++ b/SteamToolsV2+.sln
@@ -223,6 +223,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.ReverseProxy.Yarp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Windows.ScheduledTasks", "src\ST.Client.Windows.ScheduledTasks\ST.Client.Windows.ScheduledTasks.csproj", "{0EEA90D8-FAB7-48C9-8C15-1E61AEF8AB81}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.WebView2", "src\Avalonia.WebView2\Avalonia.WebView2.csproj", "{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2625,6 +2627,34 @@ Global
 		{0EEA90D8-FAB7-48C9-8C15-1E61AEF8AB81}.Release|x64.Build.0 = Release|Any CPU
 		{0EEA90D8-FAB7-48C9-8C15-1E61AEF8AB81}.Release|x86.ActiveCfg = Release|Any CPU
 		{0EEA90D8-FAB7-48C9-8C15-1E61AEF8AB81}.Release|x86.Build.0 = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Debug|x86.Build.0 = Debug|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|ARM.Build.0 = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|ARM64.Build.0 = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|iPhone.Build.0 = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|x64.Build.0 = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2713,9 +2743,10 @@ Global
 		{92DEBBE5-FF82-4251-ABC6-75FF285E7149} = {327FDEE7-C4C8-4AA4-A7B0-8BCE3D75346F}
 		{D8ED7A17-D693-45FF-B75A-D9B12DAB5A42} = {327FDEE7-C4C8-4AA4-A7B0-8BCE3D75346F}
 		{0EEA90D8-FAB7-48C9-8C15-1E61AEF8AB81} = {E50441E8-75F3-406E-9921-30BFC211B5CE}
+		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70} = {910D6A0F-42AB-4B65-B532-852E864EC006}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9313F2B4-10DA-43AA-A481-CAA7571C740C}
 		RESX_NeutralResourcesLanguage = zh-Hans
+		SolutionGuid = {9313F2B4-10DA-43AA-A481-CAA7571C740C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Avalonia.WebView2/Avalonia.WebView2.csproj b/src/Avalonia.WebView2/Avalonia.WebView2.csproj
new file mode 100644
index 00000000000..1696c9c3f97
--- /dev/null
+++ b/src/Avalonia.WebView2/Avalonia.WebView2.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\..\avalonia.snk</AssemblyOriginatorKeyFile>
+    <!--https://github.com/AvaloniaUI/Avalonia/blob/0.10.10/build/SharedVersion.props#L18-->
+    <IsTrimmable>true</IsTrimmable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.Version.Max.cs">
+      <LinkBase>Properties</LinkBase>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Avalonia.WebView2/WebView2.cs b/src/Avalonia.WebView2/WebView2.cs
new file mode 100644
index 00000000000..14c6164f52d
--- /dev/null
+++ b/src/Avalonia.WebView2/WebView2.cs
@@ -0,0 +1,23 @@
+using System;
+using WebView2BaseType = Avalonia.Controls.Shapes.Rectangle;
+
+namespace Avalonia.Controls;
+
+public partial class WebView2 : WebView2BaseType
+{
+    public static bool IsSupported { get; }
+
+    public static readonly DirectProperty<WebView2, Uri?> SourceProperty =
+            AvaloniaProperty.RegisterDirect<WebView2, Uri?>(
+                nameof(Uri),
+                x => x.source,
+                (x, y) => x.Source = y);
+
+    Uri? source;
+
+    public Uri? Source
+    {
+        get => source;
+        set => SetAndRaise(SourceProperty, ref source, value);
+    }
+}
\ No newline at end of file
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/App.WebView2.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/App.WebView2.cs
index efa782466d2..2db6c79c53a 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/App.WebView2.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/App.WebView2.cs
@@ -34,9 +34,6 @@ static string GetUserDataFolder()
             }
         }
     }
-
-    // WebView2AutoInstaller
-    // https://github.com/ProKn1fe/WebView2.Runtime/blob/62011b09436944143996fdb0039cd2c5dbb5c300/WebView2.Runtime.AutoInstaller/WebView2.Runtime.AutoInstaller/WebView2AutoInstaller.cs
 }
 
 #endif
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Rotator.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Rotator.cs
index f8083af8b1f..968a26fe13e 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Rotator.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Rotator.cs
@@ -33,7 +33,7 @@ public Rotator()
             // Prepare render loop task for use.
             _loopTask = new RenderLoopClock();
             _loopTask.Subscribe(
-                delegate(TimeSpan renderTime)
+                renderTime =>
                 {
                     var delta = renderTime - _prev;
                     _rotateDegree += _speed * delta.TotalMilliseconds;
@@ -54,8 +54,8 @@ public double Speed
 
         public static readonly DirectProperty<Rotator, double> SpeedProperty =
             AvaloniaProperty.RegisterDirect(nameof(Speed),
-                delegate(Rotator rotator) { return rotator._speed; },
-                delegate(Rotator rotator, double v)
+                rotator => rotator._speed,
+                (Rotator rotator, double v) =>
                 {
                     rotator._speed = v;
                     OnSpeedChanged(rotator, v);
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml
new file mode 100644
index 00000000000..422e6c94c20
--- /dev/null
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml
@@ -0,0 +1,28 @@
+<UserControl
+    x:Class="System.Application.UI.Views.Controls.WebView2Compat"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="using:System.Application.UI.Resx"
+    xmlns:wv2="clr-namespace:Avalonia.Controls;assembly=Avalonia.WebView2"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+  <Panel>
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+      <TextBlock x:Name="TbContent"
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          FontSize="24" />
+      <Button x:Name="BtnDownloadAndInstall"
+          Margin="0,24,0,0"
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          Content="{ReflectionBinding Path=Res.DownloadAndInstall,
+                                            Mode=OneWay,
+                                            Source={x:Static resx:R.Current}}" />
+    </StackPanel>
+    <wv2:WebView2 x:Name="WebView2" />
+  </Panel>
+</UserControl>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs
new file mode 100644
index 00000000000..c825d22d080
--- /dev/null
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs
@@ -0,0 +1,109 @@
+using Avalonia;
+using Avalonia.Interactivity;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System.Application.UI.Resx;
+#if WINDOWS
+using Microsoft.Web.WebView2.Core;
+#endif
+
+namespace System.Application.UI.Views.Controls;
+
+public partial class WebView2Compat : UserControl
+{
+    public readonly TextBlock TbContent;
+    public readonly Button BtnDownloadAndInstall;
+    public readonly WebView2 WebView2;
+
+    public WebView2Compat()
+    {
+        InitializeComponent();
+
+        TbContent = this.FindControl<TextBlock>("TbContent");
+        BtnDownloadAndInstall = this.FindControl<Button>("BtnDownloadAndInstall");
+        WebView2 = this.FindControl<WebView2>("WebView2");
+        WebView2.IsVisible = false;
+#if WINDOWS
+        WebView2.DOMContentLoaded += WebView2_DOMContentLoaded;
+#endif
+
+        var webView2IsSupported = WebView2.IsSupported;
+        TbContent.Text = webView2IsSupported ? AppResources.Loading : AppResources.YouNeedInstallWebView2Runtime;
+        if (BtnDownloadAndInstall.IsVisible = !webView2IsSupported)
+        {
+            BtnDownloadAndInstall.Click += BtnDownloadAndInstall_Click;
+        }
+
+        this.GetPropertyChangedObservable(SourceProperty).Subscribe(OnSourceChanged);
+        this.GetPropertyChangedObservable(HtmlSourceProperty).Subscribe(OnHtmlSourceChanged);
+    }
+
+    bool isNotFirstLoad;
+
+#if WINDOWS
+    void WebView2_DOMContentLoaded(object? sender, CoreWebView2DOMContentLoadedEventArgs e)
+    {
+        if (!isNotFirstLoad) isNotFirstLoad = true;
+        WebView2.IsVisible = true;
+    }
+#endif
+
+    void BtnDownloadAndInstall_Click(object? sender, RoutedEventArgs e)
+    {
+        // WebView2AutoInstaller
+        // https://github.com/ProKn1fe/WebView2.Runtime/blob/62011b09436944143996fdb0039cd2c5dbb5c300/WebView2.Runtime.AutoInstaller/WebView2.Runtime.AutoInstaller/WebView2AutoInstaller.cs
+    }
+
+    void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    public static readonly DirectProperty<WebView2Compat, Uri?> SourceProperty =
+           AvaloniaProperty.RegisterDirect<WebView2Compat, Uri?>(
+               nameof(Source),
+               x => x._Source,
+               (x, y) => x.Source = y);
+
+    Uri? _Source;
+
+    public Uri? Source
+    {
+        get => _Source;
+        set => SetAndRaise(SourceProperty, ref _Source, value);
+    }
+
+    void OnSourceChanged(EventArgs e)
+    {
+        if (!isNotFirstLoad) WebView2.IsVisible = true;
+        WebView2.Source = Source;
+        if (!isNotFirstLoad) WebView2.IsVisible = false;
+    }
+
+    public static readonly DirectProperty<WebView2Compat, string?> HtmlSourceProperty =
+           AvaloniaProperty.RegisterDirect<WebView2Compat, string?>(
+               nameof(HtmlSource),
+               x => x._HtmlSource,
+               (x, y) => x.HtmlSource = y);
+
+    string? _HtmlSource;
+
+    public string? HtmlSource
+    {
+        get => _HtmlSource;
+        set => SetAndRaise(HtmlSourceProperty, ref _HtmlSource, value);
+    }
+
+    void OnHtmlSourceChanged(EventArgs e)
+    {
+#if WINDOWS
+        var htmlString = _HtmlSource;
+        if (!string.IsNullOrWhiteSpace(htmlString))
+        {
+            if (!isNotFirstLoad) WebView2.IsVisible = true;
+            WebView2.NavigateToString(htmlString);
+            if (!isNotFirstLoad) WebView2.IsVisible = false;
+        }
+#endif
+    }
+}
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml
index f9aabd1b136..35642c68c4a 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml
@@ -3,11 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:wv2="clr-namespace:Avalonia.Controls;assembly=Avalonia.WebView2"
+             xmlns:controls="using:System.Application.UI.Views.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="System.Application.UI.Views.Pages.DebugWebViewPage">
   <Grid RowDefinitions="Auto,*">
     <TextBox x:Name="urlTextBox" Watermark="Input Url Press Enter..."></TextBox>
-    <wv2:WebView2 Grid.Row="1" x:Name="webView" />
+    <controls:WebView2Compat Grid.Row="1" x:Name="webView" />
   </Grid>
 </UserControl>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs
index 4f615a9dce2..706bd7ea808 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs
@@ -4,6 +4,9 @@
 using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
+using Microsoft.Web.WebView2.Core;
+using System.Application.Services;
+using System.Application.UI.Resx;
 using System.Application.UI.ViewModels;
 using System.Application.UI.Views.Controls;
 using static System.Common.Constants;
@@ -12,20 +15,28 @@ namespace System.Application.UI.Views.Pages
 {
     public class DebugWebViewPage : ReactiveUserControl<DebugWebViewPageViewModel>/*, IDisposable*/
     {
-        readonly WebView2 webView;
+        readonly WebView2Compat webViewCompat;
         readonly TextBox urlTextBox;
 
         public DebugWebViewPage()
         {
             InitializeComponent();
 
-            webView = this.FindControl<WebView2>("webView");
-            webView.Source = new(UrlConstants.GitHub_Repository);
+            webViewCompat = this.FindControl<WebView2Compat>("webView");
+            webViewCompat.Source = new(R.IsChineseSimplified ? UrlConstants.Gitee_Repository : UrlConstants.GitHub_Repository);
+            //webViewCompat.WebView2.DOMContentLoaded += WebView2_DOMContentLoaded;
 
             urlTextBox = this.FindControl<TextBox>("urlTextBox");
             urlTextBox.KeyUp += UrlTextBox_KeyUp;
         }
 
+        //async void WebView2_DOMContentLoaded(object? sender, CoreWebView2DOMContentLoadedEventArgs e)
+        //{
+        //    webViewCompat.WebView2.DOMContentLoaded -= WebView2_DOMContentLoaded;
+        //    var userAgent = await webViewCompat.WebView2.ExecuteScriptAsync("window.navigator.userAgent");
+        //    // "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.114 Safari/537.36 Edg/103.0.1264.49"
+        //}
+
         private void UrlTextBox_KeyUp(object? sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
@@ -35,15 +46,10 @@ private void UrlTextBox_KeyUp(object? sender, KeyEventArgs e)
                 var array = url.Split('/');
                 if (array.Length < 3) return;
                 if (!array[2].Contains('.')) return;
-                webView.CoreWebView2?.Navigate(url);
+                webViewCompat.Source = new(url);
             }
         }
 
-        //private async void WebView_BrowserCreated(object sender, EventArgs e)
-        //{
-        //    var value = await webView.GetUserAgentAsync();
-        //}
-
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
diff --git a/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj b/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj
index a818227d260..9270881b35a 100644
--- a/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj
+++ b/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj
@@ -112,19 +112,8 @@
     <PackageReference Include="WebView2.Avalonia" />
   </ItemGroup>
 
-  <ItemGroup>
-    <AvaloniaResource Update="Application\UI\Styles\Controls\TreeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Application\UI\Views\Controls\AdDialog.axaml.cs">
-      <DependentUpon>AdDialog.axaml</DependentUpon>
-    </Compile>
-    <Compile Update="Application\UI\Views\Windows\GameListPage\CloudArchiveWindow.axaml.cs">
-      <DependentUpon>CloudArchiveWindow.axaml</DependentUpon>
-    </Compile>
+  <ItemGroup Condition=" !$(TargetFramework.Contains('-windows')) ">
+    <ProjectReference Include="..\Avalonia.WebView2\Avalonia.WebView2.csproj" />
   </ItemGroup>
 
   <Import Condition=" $(TargetFramework.Contains('-windows')) " Project="..\..\WindowsPlatform.props" />
diff --git a/src/ST.Client/UI/Resx/AppResources.Designer.cs b/src/ST.Client/UI/Resx/AppResources.Designer.cs
index b9396b23ba9..b9f2f318486 100644
--- a/src/ST.Client/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client/UI/Resx/AppResources.Designer.cs
@@ -1814,6 +1814,15 @@ public static string Download_Success_FileNameTip {
             }
         }
         
+        /// <summary>
+        ///   查找类似 下载并安装 的本地化字符串。
+        /// </summary>
+        public static string DownloadAndInstall {
+            get {
+                return ResourceManager.GetString("DownloadAndInstall", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 已下载 的本地化字符串。
         /// </summary>
@@ -2923,7 +2932,7 @@ public static string LinuxSudoTips {
         }
         
         /// <summary>
-        ///   查找类似 加载中 的本地化字符串。
+        ///   查找类似 加载中… 的本地化字符串。
         /// </summary>
         public static string Loading {
             get {
@@ -6601,6 +6610,15 @@ public static string WorkingDir {
             }
         }
         
+        /// <summary>
+        ///   查找类似 你需要安装 Microsoft Edge WebView2 Runtime 才能使用此功能 的本地化字符串。
+        /// </summary>
+        public static string YouNeedInstallWebView2Runtime {
+            get {
+                return ResourceManager.GetString("YouNeedInstallWebView2Runtime", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 需要登录 Watt Toolkit 账号才能获取 UID 的本地化字符串。
         /// </summary>
diff --git a/src/ST.Client/UI/Resx/AppResources.en.resx b/src/ST.Client/UI/Resx/AppResources.en.resx
index 6bac46999ec..612193551ec 100644
--- a/src/ST.Client/UI/Resx/AppResources.en.resx
+++ b/src/ST.Client/UI/Resx/AppResources.en.resx
@@ -782,7 +782,7 @@
     <comment>Comment=;Author=沙中金</comment>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>Loading</value>
+    <value>Loading…</value>
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="LocalAuth" xml:space="preserve">
diff --git a/src/ST.Client/UI/Resx/AppResources.es.resx b/src/ST.Client/UI/Resx/AppResources.es.resx
index a9de6921a9e..474dba735e6 100644
--- a/src/ST.Client/UI/Resx/AppResources.es.resx
+++ b/src/ST.Client/UI/Resx/AppResources.es.resx
@@ -782,7 +782,7 @@
     <comment>Comment=;Author=EspRoy</comment>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>Carga</value>
+    <value>Carga…</value>
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="LocalAuth" xml:space="preserve">
diff --git a/src/ST.Client/UI/Resx/AppResources.it.resx b/src/ST.Client/UI/Resx/AppResources.it.resx
index 479bf8b06df..9a55bb12953 100644
--- a/src/ST.Client/UI/Resx/AppResources.it.resx
+++ b/src/ST.Client/UI/Resx/AppResources.it.resx
@@ -782,7 +782,7 @@
     <comment>Comment=;Author=Zhengye</comment>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>Caricamento</value>
+    <value>Caricamento…</value>
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="LocalAuth" xml:space="preserve">
diff --git a/src/ST.Client/UI/Resx/AppResources.ja.resx b/src/ST.Client/UI/Resx/AppResources.ja.resx
index 32525074050..8ca5e953de6 100644
--- a/src/ST.Client/UI/Resx/AppResources.ja.resx
+++ b/src/ST.Client/UI/Resx/AppResources.ja.resx
@@ -782,7 +782,7 @@
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>読み込み中</value>
+    <value>読み込み中…</value>
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="LocalAuth" xml:space="preserve">
diff --git a/src/ST.Client/UI/Resx/AppResources.ko.resx b/src/ST.Client/UI/Resx/AppResources.ko.resx
index f26d0b51897..7d1c7a21f5f 100644
--- a/src/ST.Client/UI/Resx/AppResources.ko.resx
+++ b/src/ST.Client/UI/Resx/AppResources.ko.resx
@@ -782,7 +782,7 @@
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>로드</value>
+    <value>로드…</value>
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="LocalAuth" xml:space="preserve">
diff --git a/src/ST.Client/UI/Resx/AppResources.resx b/src/ST.Client/UI/Resx/AppResources.resx
index 844cbf1ac7f..e7a75c391ba 100644
--- a/src/ST.Client/UI/Resx/AppResources.resx
+++ b/src/ST.Client/UI/Resx/AppResources.resx
@@ -751,7 +751,7 @@ AAAAA-BBBBB-CCCC3</value>
     <value>导入</value>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>加载中</value>
+    <value>加载中…</value>
   </data>
   <data name="LocalAuth" xml:space="preserve">
     <value>本地令牌</value>
@@ -2305,9 +2305,6 @@ AAAAA-BBBBB-CCCC3</value>
   <data name="Upload" xml:space="preserve">
     <value>上传</value>
   </data>
-  <data name="Download" xml:space="preserve">
-    <value>下载</value>
-  </data>
   <data name="Download_Failed_FileNameTip" xml:space="preserve">
     <value>下载 {0} 失败</value>
   </data>
@@ -2326,4 +2323,10 @@ AAAAA-BBBBB-CCCC3</value>
   <data name="DownloadFlow" xml:space="preserve">
     <value>下行流量</value>
   </data>
+  <data name="DownloadAndInstall" xml:space="preserve">
+    <value>下载并安装</value>
+  </data>
+  <data name="YouNeedInstallWebView2Runtime" xml:space="preserve">
+    <value>你需要安装 Microsoft Edge WebView2 Runtime 才能使用此功能</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/ST.Client/UI/Resx/AppResources.ru.resx b/src/ST.Client/UI/Resx/AppResources.ru.resx
index bfce24cc312..99f0ee0cd0f 100644
--- a/src/ST.Client/UI/Resx/AppResources.ru.resx
+++ b/src/ST.Client/UI/Resx/AppResources.ru.resx
@@ -954,7 +954,7 @@ AAAAA-BBBBB-CCCC3</value>
     <comment>Comment=;Author=vanja-san</comment>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>Загрузка</value>
+    <value>Загрузка…</value>
     <comment>Comment=;Author=vanja-san</comment>
   </data>
   <data name="LocalAuth" xml:space="preserve">
diff --git a/src/ST.Client/UI/Resx/AppResources.zh-Hant.resx b/src/ST.Client/UI/Resx/AppResources.zh-Hant.resx
index d689405684b..f0a5940b363 100644
--- a/src/ST.Client/UI/Resx/AppResources.zh-Hant.resx
+++ b/src/ST.Client/UI/Resx/AppResources.zh-Hant.resx
@@ -782,7 +782,7 @@
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="Loading" xml:space="preserve">
-    <value>載入中</value>
+    <value>載入中…</value>
     <comment>Comment=;Author=MicrosoftTranslator</comment>
   </data>
   <data name="LocalAuth" xml:space="preserve">