From 6e71fbcb119e7068ba35380edaa5cc66e7c71f1b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 27 十月 2022 16:21:05 +0800
Subject: [PATCH] 交易体系完善
---
gui.py | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/gui.py b/gui.py
index d4fc3aa..95bb543 100644
--- a/gui.py
+++ b/gui.py
@@ -7,16 +7,14 @@
import win32gui
-import alert_util
import data_export_util
import multiprocessing
-import global_util
-import log
import mysql_data
import redis_manager
import server
import trade_gui
+from juejin import JueJinManager
from l2_code_operate import L2CodeOperate
from l2_trade_factor import L2TradeFactorUtil
@@ -47,7 +45,7 @@
def createServer(pipe_juejin, pipe_gui):
print("create SocketServer")
# 鍒濆鍖栧弬鏁�
- global_util.init()
+ global_data_loader.init()
t1 = threading.Thread(target=lambda: __read_server_pipe(pipe_gui))
# 鍚庡彴杩愯
@@ -285,6 +283,16 @@
except Exception as e:
normal = False
cl_win.configure(text="寮傚父:{}".format(str(e)), foreground="#FF7F27")
+
+ try:
+ juejin_length= JueJinManager.get_listen_codes_lenth()
+ codes_length = len(gpcode_manager.get_gp_list())
+ cl_codes.configure(text="{}/{}".format(juejin_length,codes_length), foreground="#008000")
+ except Exception as e:
+ pass
+
+
+
# 鐘舵�佹湁闂锛岄渶瑕佹姤璀�
if not normal:
alert_util.alarm()
@@ -322,6 +330,11 @@
cl_win = Label(frame, text="鏈煡", bg="#DDDDDD")
cl_win.place(x=300, y=y_)
+ cl = Label(frame, text="鎺橀噾浠ｇ爜鍥炶皟鏁伴噺锛�", bg="#DDDDDD")
+ cl.place(x=350, y=y_)
+ cl_codes = Label(frame, text="鏈煡", bg="#DDDDDD")
+ cl_codes.place(x=450, y=y_)
+
refresh_data()
# 娣诲姞鏇存柊绾跨▼
t1 = threading.Thread(target=lambda: update_data())
@@ -343,8 +356,8 @@
def refresh_data():
for client_id in code_sv_map:
- ip = data_process.getActiveClientIP(client_id)
- ths_dead = data_process.getTHSState(client_id)
+ ip = client_manager.getActiveClientIP(client_id)
+ ths_dead = client_manager.getTHSState(client_id)
if ip is not None and len(ip) > 0:
if ths_dead:
client_state[client_id].configure(text="(鍦ㄧ嚎锛歿})".format(ip), foreground="#FF7F27")
@@ -355,7 +368,9 @@
for i in range(0, 8):
code = gpcode_manager.get_listen_code_by_pos(client_id, i)
- data_count = l2_data_manager.get_l2_data_latest_count(code)
+ data_count = l2_data_util.get_l2_latest_data_number(code)
+ if data_count is None:
+ data_count=0
if code is not None and len(code) > 0:
code_sv_map[client_id][i].set(code + "({})".format(data_count))
else:
@@ -735,7 +750,7 @@
showinfo("鎻愮ず", "瀵煎嚭瀹屾垚")
def compute_m(code):
- m = L2TradeFactorUtil.compute_m_value(code)
+ m,msg = L2TradeFactorUtil.compute_m_value(code)
showinfo("鎻愮ず", "{}".format(m))
def clear_l2(code):
--
Gitblit v1.8.0