From 9cacd9bb9931802d0857363e36f6f1f521801d25 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 08 六月 2023 10:25:53 +0800
Subject: [PATCH] 华鑫日志接入

---
 main.py |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/main.py b/main.py
index 1b59245..5b6dfe8 100644
--- a/main.py
+++ b/main.py
@@ -20,16 +20,15 @@
 freeze_support()
 
 
-class JSBridgeClass(QObject):
+class BaseBridgeClass(QObject):
     signal_request = pyqtSignal(str, str, str)
 
     def __request_result_callback(self, method, key, result):
-        self.webview.page().runJavaScript(f"{method}('{key}','{result}')")
+        self.__webview.page().runJavaScript(f"{method}('{key}','{result}')")
 
-    def __init__(self, window, webview):
+    def __init__(self, webview):
         super().__init__()
-        self.window = window
-        self.webview = webview
+        self.__webview = webview
         self.signal_request.connect(self.__request_result_callback)
 
     def __http_request(self, url, callback_info):
@@ -57,6 +56,14 @@
     def socket_request(self, text):
         print("socket_request", text)
         return network_util.socket_request(json.loads(text))
+
+
+class JSBridgeClass(BaseBridgeClass):
+
+    def __init__(self, window, webview):
+        super().__init__(webview)
+        self.window = window
+        self.webview = webview
 
     @pyqtSlot(str)
     def show_info(self, msg):
@@ -104,11 +111,17 @@
         self.webview.page().setZoomFactor(1)
         self.setCentralWidget(self.webview)
 
-        self.signal_update_kpl.connect(self.set_kpl_data)
+        # JS妗ヨ缃�
+        channel = QWebChannel(self.webview.page())
+        self.webview.page().setWebChannel(channel)
+        self.python_bridge = BaseBridgeClass(self.webview)
+        channel.registerObject("Bridge", self.python_bridge)
 
-        t1 = threading.Thread(target=self.update_kpl_func)
-        t1.setDaemon(True)
-        t1.start()
+        # self.signal_update_kpl.connect(self.set_kpl_data)
+
+        # t1 = threading.Thread(target=self.update_kpl_func)
+        # t1.setDaemon(True)
+        # t1.start()
 
     def loadUrl(self, url):
         self.webview.load(QUrl(url))

--
Gitblit v1.8.0