修复登录 UI线程bug

This commit is contained in:
chfei committed 2026-09-01 14:55:43 +08:00
1 parent 0eae9f7706
commit 20bfd2c22c
1 file changed
+19 -11
@@ -165,8 +165,11 @@ namespace _29WxOrderWpf.ViewModels
} }
}); });
} }
Task.Run(() =>
{
AutoLogin(); AutoLogin();
});
} }
/// <summary> /// <summary>
@@ -180,11 +183,12 @@ namespace _29WxOrderWpf.ViewModels
/// <summary> /// <summary>
/// 自动登录店铺后台 /// 自动登录店铺后台
/// </summary> /// </summary>
private void AutoLogin() private async void AutoLogin()
{ {
if (OpenType != EnumOpenType.login && buyer == null) if (OpenType != EnumOpenType.login && buyer == null)
return; return;
_ = Application.Current.Dispatcher.InvokeAsync(async () =>
{
if (CefWebBrowser == null) if (CefWebBrowser == null)
{ {
if (!string.IsNullOrEmpty(InitUrl)) if (!string.IsNullOrEmpty(InitUrl))
@@ -220,11 +224,11 @@ namespace _29WxOrderWpf.ViewModels
{ {
} }
Task.Run(() =>
{
// cef138必须init后方可设置或删除cookie // cef138必须init后方可设置或删除cookie
while (!CefWebBrowser.IsBrowserInitialized || !CefWebBrowser.GetBrowser().MainFrame.IsValid) while (!CefWebBrowser.IsBrowserInitialized || !CefWebBrowser.GetBrowser().MainFrame.IsValid)
Thread.Sleep(20); await Task.Delay(20);
WPFCEFBrowser.DeleteCookie(CefWebBrowser.GetCookieManager(null)); WPFCEFBrowser.DeleteCookie(CefWebBrowser.GetCookieManager(null));
//cef 138 如果没有设置RequestContext 可能为空,直接getCookieManager //cef 138 如果没有设置RequestContext 可能为空,直接getCookieManager
@@ -259,22 +263,26 @@ namespace _29WxOrderWpf.ViewModels
for (int i = 0; i < 50; i++) for (int i = 0; i < 50; i++)
{ {
if (CefWebBrowser.IsLoading) if (CefWebBrowser.IsLoading)
Thread.Sleep(100); await Task.Delay(100);
//Thread.Sleep(100);
} }
Thread.Sleep(Randomx.GetId(1500, 2000)); await Task.Delay(Randomx.GetId(1500, 2000));
if (!_isWindowLoaded) if (!_isWindowLoaded)
return; return;
while (!CefWebBrowser.Address.StartsWith(shopLoginUrl)) while (!CefWebBrowser.Address?.StartsWith(shopLoginUrl) ?? false)
{ {
Thread.Sleep(1000); await Task.Delay(1000);
if (!_isWindowLoaded) if (!_isWindowLoaded)
return; return;
} }
}
}); });
} }
}
private void CefWebBrowser_LoadError(object sender, CefSharp.LoadErrorEventArgs e) private void CefWebBrowser_LoadError(object sender, CefSharp.LoadErrorEventArgs e)
{ {