From ded8af9ca0f1b328d76d83582ddbdbe3805ed82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=C2=B7=C3=A6?= <279202647@qq.com>
Date: Thu, 28 Oct 2021 22:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=AC=E4=B8=9C=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=8D=8A=E9=83=A8=E5=88=86=E7=9A=84=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserControls/BrowerControl.xaml.cs        | 75 ++++++++++---------
 1 file changed, 41 insertions(+), 34 deletions(-)

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<JavascriptResponse> 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<JavascriptResponse> 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
         /// <returns></returns>
         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^