From 7bfdbe969da0b3a132d805cd15e9e83e7f2a8f8a Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期日, 25 六月 2023 11:12:26 +0800
Subject: [PATCH] 将掘金接口抽象出单独的类
---
gui.py | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/gui.py b/gui.py
index d70ee38..f208d78 100644
--- a/gui.py
+++ b/gui.py
@@ -16,7 +16,6 @@
from db import mysql_data, redis_manager
import server
import settings
-from juejin import JueJinManager
from ths.l2_code_operate import L2CodeOperate
from trade.l2_trade_factor import L2TradeFactorUtil
from ocr import ocr_server
@@ -83,8 +82,6 @@
tcpserver.serve_forever()
-def startJueJin(pipe):
- juejin.JueJinManager(pipe).start()
class GUI:
@@ -94,7 +91,6 @@
gs_gui_pipe, gs_server_pipe = multiprocessing.Pipe()
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)
@@ -128,8 +124,6 @@
time.sleep(0.1)
def run(self):
- # TODO
- self.jueJinProcess.start()
self.serverProcess.start()
self.ocrServerProcess.start()
self.jueJinTradeProcess.start()
@@ -230,7 +224,7 @@
sv_num.set("鑾峰彇鍒版敹鐩樹环鏁伴噺锛歿}".format(count))
def re_get_close_price():
- juejin.re_set_price_pres(gpcode_manager.get_gp_list())
+ init.re_set_price_pres(gpcode_manager.get_gp_list())
def get_limit_up_codes_win():
width = 500
@@ -346,7 +340,7 @@
try:
if tool.trade_time_sub(tool.get_now_time_str(), "09:30:00") > 0:
raise Exception("鍙兘9:30涔嬪墠閲嶆柊鍒嗛厤绐楀彛")
- datas = JueJinManager.get_codes_limit_rate(gpcode_manager.get_gp_list())
+ datas = HistoryKDatasUtils.get_codes_limit_rate(gpcode_manager.get_gp_list())
matrix = numpy.array(datas)
codes = matrix[:, 0].tolist()
trade_gui.re_distribute_buy_win(codes)
@@ -376,7 +370,7 @@
cl_win.configure(text="寮傚父:{}".format(str(e)), foreground="#FF7F27")
try:
- juejin_length = JueJinManager.get_listen_codes_lenth()
+ juejin_length = 0
codes_length = len(gpcode_manager.get_gp_list())
cl_codes.configure(text="{}/{}".format(juejin_length, codes_length), foreground="#008000")
except Exception as e:
@@ -605,7 +599,7 @@
win.mainloop()
def init():
- juejin.everyday_init()
+ init.everyday_init()
def set_accept_l2():
settings.set_accept_l2(accept_l2.get())
@@ -870,7 +864,7 @@
if len(account.strip()) < 1 or len(sid.strip()) < 1 or len(token.strip()) < 1:
showinfo('鎻愮ず', "鏁版嵁涓嶅畬鏁�")
return
- juejin.setAccountInfo(account, sid, token)
+ init.setAccountInfo(account, sid, token)
showinfo('鎻愮ず', "璁剧疆鎴愬姛")
# 璁剧疆鎺橀噾淇℃伅
@@ -902,7 +896,7 @@
frame.grid(row=0, column=2, pady=5, padx=5)
# 璁剧疆鍙傛暟
- account, sid, token = juejin.getAccountInfo()
+ account, sid, token = init.getAccountInfo()
account_var.set(account)
sid_var.set(sid)
token_var.set(token)
--
Gitblit v1.8.0