🐛 Android

AigioL · AigioL · commit 94027eca7309 · 2025-06-09T18:38:13.000+08:00
diff --git a/src/Avalonia.WebView2/Controls/WebView2.Disposable.cs b/src/Avalonia.WebView2/Controls/WebView2.Disposable.cs
@@ -43,7 +43,6 @@ protected virtual void Dispose(bool disposing)
             // 将大型字段设置为 null
 #if IOS || MACCATALYST || (MACOS && !USE_DEPRECATED_WEBVIEW) || ANDROID
             viewHandler = null;
-            platformHandle = null;
 #endif
             disposedValue = true;
         }
diff --git a/src/Avalonia.WebView2/Controls/WebView2.Methods.cs b/src/Avalonia.WebView2/Controls/WebView2.Methods.cs
@@ -36,15 +36,15 @@ public void NavigateToString(string htmlContent)
 
     public void Navigate(string uri)
     {
+        _source = null;
+        _htmlSource = null;
+
 #if !DISABLE_WEBVIEW2_CORE && (WINDOWS || NETFRAMEWORK)
         VerifyBrowserNotCrashedGuard();
         CoreWebView2?.Navigate(uri);
 #elif ANDROID
         var aWebView = AWebView;
-        if (aWebView != null)
-        {
-            aWebView.LoadUrl(uri);
-        }
+        aWebView?.LoadUrl(uri);
 #elif IOS || MACOS || MACCATALYST
         var wkWebView = WKWebView;
         if (wkWebView != null)
diff --git a/src/Avalonia.WebView2/Controls/WebView2.NativeControlHost.cs b/src/Avalonia.WebView2/Controls/WebView2.NativeControlHost.cs
@@ -18,6 +18,19 @@ partial class WebView2
 
     Handler? viewHandler;
 
+    static unsafe Handler CreateViewHandler(WebView2 wv2)
+    {
+        var createViewHandler = CreateViewHandlerDelegate;
+        if (createViewHandler == default)
+        {
+            return new Handler(wv2);
+        }
+        else
+        {
+            return = createViewHandler(wv2);
+        }
+    }
+
     ///// <summary>
     ///// For internal use by the .NET MAUI platform.
     ///// Raised after web navigation completes.
@@ -45,7 +58,7 @@ protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle paren
             var parentContext = GetContext(parent);
             var view = CreatePlatformView(parentContext);
             wv2.SetValue(view);
-            return wv2.platformHandle = new AndroidWebViewControlHandle(view, this);
+            return this;
 #elif IOS || MACCATALYST || (MACOS && !USE_DEPRECATED_WEBVIEW)
             var view = CreatePlatformView();
             wv2.SetValue(view);
diff --git a/src/Avalonia.WebView2/Controls/WebView2.Properties/Source.cs b/src/Avalonia.WebView2/Controls/WebView2.Properties/Source.cs
@@ -38,7 +38,9 @@ public Uri? Source
             {
                 throw new ArgumentException("Only absolute URI is allowed", "Source");
             }
-            else if (_source == null || _source.AbsoluteUri != value.AbsoluteUri)
+            else if (_source == null ||
+                _source.GetType() != value.GetType() || // 允许 Uri 的派生类
+                _source.AbsoluteUri != value.AbsoluteUri)
             {
                 _htmlSource = null;
                 SetAndRaise(SourceProperty, ref _source, value);
diff --git a/src/Avalonia.WebView2/Controls/WebView2.SizeChanged.cs b/src/Avalonia.WebView2/Controls/WebView2.SizeChanged.cs
@@ -175,29 +175,37 @@ protected virtual void OnWindowPositionChanged(Rectangle rectangle)
             _coreWebView2Controller.NotifyParentWindowPositionChanged();
         }
 #elif ANDROID
-        var nwv = AWebView;
-        if (nwv != null)
-        {
-            // https://github.com/AvaloniaUI/Avalonia/blob/11.3.1/src/Android/Avalonia.Android/AvaloniaView.cs
-            // AvaloniaView 使用 FrameLayout 实现
-            if (nwv.LayoutParameters is FrameLayout.LayoutParams layout)
-            {
-                layout.Height = rectangle.Height;
-                layout.Width = rectangle.Width;
-                layout.LeftMargin = rectangle.X;
-                layout.TopMargin = rectangle.Y;
-                nwv.LayoutParameters = layout; // 调用 java set 函数更新布局参数
-                nwv.RequestLayout(); // 重新布局
-#if ANDROID && DEBUG
-                {
-                    global::Android.Util.Log.Warn("WebView2",
-$"""
-OnWindowPositionChanged: x={rectangle.X}, y={rectangle.Y}, w={rectangle.Width}, h={rectangle.Height}
-""");
-                }
-#endif
-            }
-        }
+        //        var nwv = AWebView;
+        //        if (nwv != null)
+        //        {
+        //            // https://github.com/AvaloniaUI/Avalonia/blob/11.3.1/src/Android/Avalonia.Android/AvaloniaView.cs
+        //            // AvaloniaView 使用 FrameLayout 实现
+        //            if (nwv.LayoutParameters is FrameLayout.LayoutParams layout)
+        //            {
+        //                layout.Height = rectangle.Height;
+        //                layout.Width = rectangle.Width;
+        //                layout.LeftMargin = rectangle.X;
+        //                layout.TopMargin = rectangle.Y;
+        //                nwv.LayoutParameters = layout; // 调用 java set 函数更新布局参数
+        //                nwv.RequestLayout(); // 重新布局
+        //#if ANDROID && DEBUG
+        //                {
+        //                    var isUIThread = Dispatcher.UIThread.CheckAccess();
+        //                    var isUIThreadA = (int)global::Android.OS.Build.VERSION.SdkInt >= 23 ?
+        //#pragma warning disable CA1416 // 验证平台兼容性
+        //                        global::Android.OS.Looper.MainLooper!.IsCurrentThread :
+        //#pragma warning restore CA1416 // 验证平台兼容性
+        //                        (global::Android.OS.Looper.MainLooper!.Thread == global::Java.Lang.Thread.CurrentThread());
+        //                    global::Android.Util.Log.Warn("WebView2",
+        //    $"""
+        //OnWindowPositionChanged: x={rectangle.X}, y={rectangle.Y}, w={rectangle.Width}, h={rectangle.Height}
+        //isUIThread: {isUIThread}
+        //isUIThreadA: {isUIThreadA}
+        //""");
+        //                }
+        //#endif
+        //            }
+        //        }
 #elif IOS || MACCATALYST || (MACOS && !USE_DEPRECATED_WEBVIEW)
         var nwv = WKWebView;
         // TODO: 将 xywh 矩阵值传递给本机控件，CGRect 使用浮点型，疑似逻辑值，而不是物理像素值，需要计算 DPI 缩放？
diff --git a/src/Avalonia.WebView2/Controls/WebView2.VisualTree.cs b/src/Avalonia.WebView2/Controls/WebView2.VisualTree.cs
@@ -70,16 +70,11 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
             TopLevel = topLevel;
         }
 #if ANDROID        
-        if (IsVisible)
+        if (viewHandler == null)
         {
-            var nwv = AWebView;
-            if (nwv != null)
-            {
-                if (nwv.Visibility != global::Android.Views.ViewStates.Visible)
-                {
-                    nwv.Visibility = global::Android.Views.ViewStates.Visible;
-                }
-            }
+        {
+            viewHandler = CreateViewHandler(this);
+            Child = viewHandler;
         }
 #elif IOS || MACCATALYST || (MACOS && !USE_DEPRECATED_WEBVIEW)
         if (IsVisible)
diff --git a/src/Avalonia.WebView2/Controls/WebView2.cs b/src/Avalonia.WebView2/Controls/WebView2.cs
@@ -37,22 +37,6 @@ public WebView2()
 #if !(WINDOWS || NETFRAMEWORK) && NET8_0_OR_GREATER && !ANDROID && !IOS && !MACOS && !MACCATALYST && !DISABLE_CEFGLUE
         //CefGuleInitialize();
 #endif
-
-#if IOS || MACCATALYST || (MACOS && !USE_DEPRECATED_WEBVIEW) || ANDROID
-        unsafe
-        {
-            var createViewHandler = CreateViewHandlerDelegate;
-            if (createViewHandler == default)
-            {
-                viewHandler = new Handler(this);
-            }
-            else
-            {
-                viewHandler = createViewHandler(this);
-            }
-        }
-        Child = viewHandler;
-#endif
     }
 
 #if IOS || MACCATALYST || (MACOS && !USE_DEPRECATED_WEBVIEW) || ANDROID
diff --git a/src/Avalonia.WebView2/Platforms/Droid/Controls/WebView2.cs b/src/Avalonia.WebView2/Platforms/Droid/Controls/WebView2.cs
@@ -3,6 +3,7 @@
 using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.OS;
+using Android.Runtime;
 using Android.Views;
 using Android.Webkit;
 using AndroidX.Core.View;
@@ -24,8 +25,6 @@ partial class WebView2
     /// </summary>
     partial class Handler
     {
-        public AWebView? PlatformView => wv2.platformHandle?.WebView;
-
         protected virtual WebViewClientCompat CreateWebViewClient() => new WebViewClientCompat2(this);
 
         protected virtual WebChromeClient CreateWebChromeClient() => new WebChromeClient2(this);
@@ -85,25 +84,64 @@ public virtual void DisconnectHandler(AWebView platformView)
         }
     }
 
+    partial class Handler : IPlatformHandle, INativeControlHostDestroyableControlHandle
+    {
+        nint IPlatformHandle.Handle => webView == default ? default : webView.Handle;
+
+        string? IPlatformHandle.HandleDescriptor => "android.view.View";
+
+        bool disposedValue;
+        protected AWebView? webView;
+
+        protected bool DisposedValue => disposedValue;
+
+        public AWebView? PlatformView => webView;
+
+        void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    // 释放托管状态(托管对象)
+                    if (webView != null)
+                    {
+                        DisconnectHandler(webView);
+                        webView.Destroy(); // 销毁平台控件
+                        webView.Dispose();
+                    }
+                }
+
+                // 释放未托管的资源(未托管的对象)并重写终结器
+                // 将大型字段设置为 null
+                webView = null;
+                disposedValue = true;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Destroy()
+        {
+            // 不要更改此代码。请将清理代码放入“Dispose(bool disposing)”方法中
+            Dispose(disposing: true);
+        }
+    }
+
 
     public static Context? GetContext(IPlatformHandle platformHandle)
     {
         if (platformHandle is AndroidViewControlHandle viewControlHandle)
         {
             return viewControlHandle.View?.Context;
         }
-        else if (platformHandle is AndroidWebViewControlHandle webView2ControlHandle)
-        {
-            return webView2ControlHandle.WebView?.Context;
-        }
         return null;
     }
 
     public AWebView? AWebView
     {
         get
         {
-            var result = platformHandle?.WebView;
+            var result = viewHandler?.PlatformView;
             if (result.IsAlive())
             {
                 return result;
@@ -112,8 +150,6 @@ public AWebView? AWebView
         }
     }
 
-    AndroidWebViewControlHandle? platformHandle;
-
     protected virtual void SetValue(AWebView webView)
     {
         if (_source != null)
@@ -245,51 +281,6 @@ public void LoadDataWithBaseURL(AWebView webView)
     }
 }
 
-sealed class AndroidWebViewControlHandle : PlatformHandle, INativeControlHostDestroyableControlHandle
-{
-    bool disposedValue;
-    AWebView? webView;
-    WebView2.Handler? handler;
-
-    internal AndroidWebViewControlHandle(AWebView webView, WebView2.Handler handler) : base(webView.Handle, "android.webkit.WebView")
-    {
-        this.webView = webView;
-        this.handler = handler;
-    }
-
-    public AWebView? WebView => webView;
-
-    void Dispose(bool disposing)
-    {
-        if (!disposedValue)
-        {
-            if (disposing)
-            {
-                // 释放托管状态(托管对象)
-                if (webView != null)
-                {
-                    handler?.DisconnectHandler(webView);
-                    webView.Destroy(); // 销毁平台控件
-                    webView.Dispose();
-                }
-            }
-
-            // 释放未托管的资源(未托管的对象)并重写终结器
-            // 将大型字段设置为 null
-            webView = null;
-            handler = null;
-            disposedValue = true;
-        }
-    }
-
-    /// <inheritdoc/>
-    public void Destroy()
-    {
-        // 不要更改此代码。请将清理代码放入“Dispose(bool disposing)”方法中
-        Dispose(disposing: true);
-    }
-}
-
 static class JavaObjectExtensions
 {
     public static bool IsDisposed(this global::Java.Lang.Object obj)

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ protected virtual void Dispose(bool disposing)`
`43`	`43`	`// 将大型字段设置为 null`
`44`	`44`	`#if IOS \|\| MACCATALYST \|\| (MACOS && !USE_DEPRECATED_WEBVIEW) \|\| ANDROID`
`45`	`45`	`viewHandler = null;`
`46`		`- platformHandle = null;`
`47`	`46`	`#endif`
`48`	`47`	`disposedValue = true;`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@ public Uri? Source`
`38`	`38`	`{`
`39`	`39`	`throw new ArgumentException("Only absolute URI is allowed", "Source");`
`40`	`40`	`}`
`41`		`- else if (_source == null \|\| _source.AbsoluteUri != value.AbsoluteUri)`
	`41`	`+ else if (_source == null \|\|`
	`42`	`+ _source.GetType() != value.GetType() \|\| // 允许 Uri 的派生类`
	`43`	`+ _source.AbsoluteUri != value.AbsoluteUri)`
`42`	`44`	`{`
`43`	`45`	`_htmlSource = null;`
`44`	`46`	`SetAndRaise(SourceProperty, ref _source, value);`