Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #947

Browse Source
This commit is contained in:
Lightczx
2023-09-21 15:03:11 +08:00
parent 2a757dce51
commit 22393b612c
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Snap.Hutao/Snap.Hutao/View/Control/WebViewer.xaml.cs
View File

@@ -74,34 +74,39 @@ internal partial class WebViewer : UserControl, IRecipient<UserChangedMessage>
return;
}
CoreWebView2 coreWebView2 = WebView.CoreWebView2;
if (SourceProvider is not null)
// TODO: replace with .NET 8 UnsafeAccessor
try
{
if (UserAndUid.TryFromUser(user, out UserAndUid? userAndUid))
CoreWebView2 coreWebView2 = WebView.CoreWebView2;
if (SourceProvider is not null)
{
string source = SourceProvider.GetSource(userAndUid);
if (!string.IsNullOrEmpty(source))
if (UserAndUid.TryFromUser(user, out UserAndUid? userAndUid))
{
foreach (CoreWebView2Cookie cookie in await coreWebView2.CookieManager.GetCookiesAsync(".mihoyo.com"))
string source = SourceProvider.GetSource(userAndUid);
if (!string.IsNullOrEmpty(source))
{
coreWebView2.CookieManager.DeleteCookie(cookie);
foreach (CoreWebView2Cookie cookie in await coreWebView2.CookieManager.GetCookiesAsync(".mihoyo.com"))
{
coreWebView2.CookieManager.DeleteCookie(cookie);
}
coreWebView2.SetCookie(user.CookieToken, user.LToken, user.SToken).SetMobileUserAgent();
jsInterface = serviceProvider.CreateInstance<MiHoYoJSInterface>(coreWebView2, userAndUid);
CoreWebView2Navigator navigator = new(coreWebView2);
await navigator.NavigateAsync("about:blank").ConfigureAwait(true);
await navigator.NavigateAsync(source).ConfigureAwait(true);
}
coreWebView2.SetCookie(user.CookieToken, user.LToken, user.SToken).SetMobileUserAgent();
jsInterface = serviceProvider.CreateInstance<MiHoYoJSInterface>(coreWebView2, userAndUid);
CoreWebView2Navigator navigator = new(coreWebView2);
await navigator.NavigateAsync("about:blank");
Debug.WriteLine($"Before {source}");
await navigator.NavigateAsync(source);
Debug.WriteLine($"After {WebView.Source}");
}
else
{
serviceProvider.GetRequiredService<IInfoBarService>().Warning(SH.MustSelectUserAndUid);
}
}
else
{
serviceProvider.GetRequiredService<IInfoBarService>().Warning(SH.MustSelectUserAndUid);
}
}
catch (ObjectDisposedException)
{
}
}
}