diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs index 0b11f83..c9271c4 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs @@ -53,11 +53,11 @@ namespace 齐越慧眼.UserControls public void OnUrlEnd(string url) { - if (url.Contains("search.jd.com/s_new.php")) + if (url.Contains("s_new.php")) { Task.Factory.StartNew(() => { - lastUrl = url; + lastUrl = "search.jd.com"; DoWork(); }); } @@ -106,7 +106,7 @@ namespace 齐越慧眼.UserControls { StartPage(); } - //web.ShowDevTools(); + web.ShowDevTools(); } } @@ -135,49 +135,56 @@ namespace 齐越慧眼.UserControls t.Start(); } + object lockWork = new object(); private void DoWork() { - while (true) + lock (lockWork) { - Task task = null; - - Application.Current.Dispatcher.Invoke(() => + while (true) { - task = web.EvaluateScriptAsPromiseAsync("return $(document.body).html();"); - }); - - var result = task.Result; + if (string.IsNullOrEmpty(lastUrl)) + break; - //判断是否加载完成 - if (result.Success) - { - AddCss(); + Task task = null; - if (lastUrl.Contains("s.taobao.com")) + Application.Current.Dispatcher.Invoke(() => { - AddTaoBaoOptionDiv(); - CheckTaoBaoPageItem(); - } + task = web.EvaluateScriptAsPromiseAsync("return $(document.body).html();"); + }); + + var result = task.Result; - if (lastUrl.Contains("search.jd.com")) + //判断是否加载完成 + if (result.Success) { - AddJDOptionDiv(); - CheckJDPageItem(); - } + AddCss(); - //if (lastUrl.Contains("s.1688.com")) - //{ - // Add1688OptionDiv(); - // Check1688PageItem(); - // web.ShowDevTools(); - //} + if (lastUrl.Contains("s.taobao.com")) + { + AddTaoBaoOptionDiv(); + CheckTaoBaoPageItem(); + } - lastUrl = string.Empty; - break; - } + if (lastUrl.Contains("search.jd.com")) + { + AddJDOptionDiv(); + CheckJDPageItem(); + } + + //if (lastUrl.Contains("s.1688.com")) + //{ + // Add1688OptionDiv(); + // Check1688PageItem(); + // web.ShowDevTools(); + //} - Thread.Sleep(100); + lastUrl = string.Empty; + break; + } + + Thread.Sleep(100); + } } } @@ -289,7 +296,7 @@ namespace 齐越慧眼.UserControls /// private bool AddAjaxHook() { - return DoJavaScript(@"$(document).ajaxSuccess(function( event, xhr, settings ) {onAjaxHook(settings.url);});").isOk; + return DoJavaScript(@"$(document).ajaxSuccess(function( event, xhr, settings ) {hyCoreModel.onAjaxHook(settings.url);});").isOk; } //object_id@653756566953^