From 751183dcd74207a50834cacc575f0dfccb41658c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 06 六月 2023 18:13:05 +0800
Subject: [PATCH] 交易优化，看盘接口完善
---
gui.py | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/gui.py b/gui.py
index 9fe9591..80ee053 100644
--- a/gui.py
+++ b/gui.py
@@ -19,7 +19,7 @@
import settings
from juejin import JueJinManager
from l2_code_operate import L2CodeOperate
-from trade import l2_trade_util
+from trade import l2_trade_util, trade_juejin
from trade.l2_trade_factor import L2TradeFactorUtil
from ocr import ocr_server
from third_data import data_server, kpl_data_manager, kpl_util
@@ -67,8 +67,6 @@
t1.setDaemon(True)
t1.start()
-
-
laddr = "", 9001
tcpserver = MyThreadingTCPServer(laddr, MyBaseRequestHandle, pipe_juejin=pipe_juejin) # 娉ㄦ剰锛氬弬鏁版槸MyBaseRequestHandle
# tcpserver.handle_request() # 鍙帴鍙椾竴涓鎴风杩炴帴
@@ -80,10 +78,12 @@
tcpserver = ocr_server.run("", 9002)
tcpserver.serve_forever()
+
def createDataServer():
print("create OCRServer")
tcpserver = data_server.run("", 9004)
tcpserver.serve_forever()
+
def startJueJin(pipe):
juejin.JueJinManager(pipe).start()
@@ -97,8 +97,8 @@
self.serverProcess = multiprocessing.Process(target=createServer, args=(p1, gs_server_pipe,))
self.jueJinProcess = multiprocessing.Process(target=startJueJin, args=(p2,))
+ self.jueJinTradeProcess = multiprocessing.Process(target=trade_juejin.run)
self.ocrServerProcess = multiprocessing.Process(target=createOCRServer)
-
self.p1 = p1
self.p2 = p2
@@ -134,6 +134,7 @@
self.jueJinProcess.start()
self.serverProcess.start()
self.ocrServerProcess.start()
+ self.jueJinTradeProcess.start()
L2CodeOperate.get_instance()
# 瀹㈡埛绔槦鍒楁搷浣�
@@ -304,6 +305,7 @@
# table.model.setValueAt(data["apply_time"], index, 2)
index += 1
table.redraw()
+
# 鍒锋柊寮�鐩樺暒鏁版嵁
def refresh_kpl_data():
kpl_data_manager.KPLDataManager().get_data(kpl_util.KPLDataType.LIMIT_UP)
@@ -311,7 +313,6 @@
kpl_data_manager.KPLDataManager().get_data(kpl_util.KPLDataType.BEST_FENG_KOU)
kpl_data_manager.KPLDataManager().get_data(kpl_util.KPLDataType.FENG_KOU)
kpl_data_manager.KPLDataManager().get_data(kpl_util.KPLDataType.FENG_XIANG)
-
start_y = 225
btn = FlatButton(frame, text="鍒锋柊鏀剁洏浠�", command=refresh_close_price_data)
@@ -323,7 +324,7 @@
btn = FlatButton(frame, text="閲嶆柊鑾峰彇鏀剁洏浠�", command=re_get_close_price)
btn.place(x=80, y=start_y)
- kpl_data = Label(text="娑ㄥ仠锛歕n鐐告澘锛歕n鏈�寮猴細\n椋庡悜锛歕n椋庡彛锛�",bg="#DDDDDD",fg="#666666")
+ kpl_data = Label(text="娑ㄥ仠锛歕n鐐告澘锛歕n鏈�寮猴細\n椋庡悜锛歕n椋庡彛锛�", bg="#DDDDDD", fg="#666666")
kpl_data.place(x=190, y=start_y)
trade_win_datas = []
@@ -634,7 +635,7 @@
width = 800
height = 360
frame = Frame(root, {"height": height, "width": width, "bg": "#DDDDDD"})
- trade_info= ""
+ trade_info = ""
for_color = "#008000"
if constant.TEST:
trade_info += "娴嬭瘯鐜"
@@ -648,7 +649,7 @@
trade_info += "鍒濆绂佹浜ゆ槗"
for_color = "#FF7F27"
- cl = Label(frame, text=f"{trade_info}", bg="#DDDDDD",foreground=f"{for_color}")
+ cl = Label(frame, text=f"{trade_info}", bg="#DDDDDD", foreground=f"{for_color}")
cl.place(x=5, y=5)
accept_l2 = IntVar()
@@ -684,10 +685,10 @@
menu.add_command(label="鐜妫�娴�", command=check_env)
menu.add_command(label="鍚岃姳椤烘祴閫�", command=ths_test_speed)
- device_index =0
+ device_index = 0
for key in self.l2_codes:
device_index += 1
- client_lb = Label(frame, text="璁惧:{} ID:{}".format(device_index,key), background="#DDDDDD")
+ client_lb = Label(frame, text="璁惧:{} ID:{}".format(device_index, key), background="#DDDDDD")
client_lb.place(x=38, y=40 + l2_client_count * 30)
btn = FlatButton(frame, text="妫�娴�", command=key)
btn.bind('<Button-3>', lambda event: pop_menu(event))
@@ -766,16 +767,17 @@
index = 0
for data in datas:
table_trade.model.addRow()
- table_trade.model.setValueAt(data["code"], index, 0)
- table_trade.model.setValueAt(data["time"], index, 1)
- table_trade.model.setValueAt(data["num"], index, 2)
- table_trade.model.setValueAt(data["price"], index, 3)
- table_trade.model.setValueAt(data["money"], index, 4)
- table_trade.model.setValueAt(data["trade_num"], index, 5)
if int(data["type"]) > 0:
- table_trade.model.setValueAt("鍗栧嚭", index, 6)
+ table_trade.model.setValueAt("鍗栧嚭", index, 0)
else:
- table_trade.model.setValueAt("涔板叆", index, 6)
+ table_trade.model.setValueAt("涔板叆", index, 0)
+ table_trade.model.setValueAt(data["code"], index, 1)
+ table_trade.model.setValueAt(data["time"], index, 2)
+ table_trade.model.setValueAt(data["num"], index, 3)
+ table_trade.model.setValueAt(data["price"], index, 4)
+ table_trade.model.setValueAt(data["money"], index, 5)
+ table_trade.model.setValueAt(data["trade_num"], index, 6)
+
index += 1
table_trade.redraw()
@@ -846,12 +848,12 @@
cl.place(x=width - 70, y=30)
trade_datas = {}
- trade_datas["row{}".format(0)] = {'璇佸埜浠ｇ爜': '', '鎴愪氦鏃堕棿': '', '鎴愪氦鏁伴噺': '', '鎴愪氦鍧囦环': '', '鎴愪氦閲戦': '',
- '鍚堝悓缂栧彿': '', '鎿嶄綔': ''}
+ trade_datas["row{}".format(0)] = {'鏂瑰悜': '', '璇佸埜浠ｇ爜': '', '鎴愪氦鏃堕棿': '', '鎴愪氦鏁伴噺': '', '鎴愪氦鍧囦环': '', '鎴愪氦閲戦': '',
+ '鍚堝悓缂栧彿': ''}
table_frame = Frame(frame, {"height": table_height, "width": table_width, "bg": "#DDDDDD"})
table_frame.place(x=width / 2, y=52)
- table_trade = create_table(table_frame, trade_datas, 90)
+ table_trade = create_table(table_frame, trade_datas, 70)
table_trade.show()
frame.grid(row=2, column=1, padx=5, pady=5, rowspan=2)
--
Gitblit v1.8.0