From ed9e2367eea9baa6c8bea82e0f81c209ffb2a56f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 02 一月 2023 17:55:50 +0800
Subject: [PATCH] 撤单策略再次修改

---
 trade_gui.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/trade_gui.py b/trade_gui.py
index 48a02a1..2cfb049 100644
--- a/trade_gui.py
+++ b/trade_gui.py
@@ -328,12 +328,14 @@
 
     # 鎾や拱
     def cancel_buy(self, code):
+        if constant.TEST:
+            return
         self.buy_cancel_lock.acquire()
         code_input = 0
         try:
             logger_trade_gui.info("寮�濮嬫挙鍗曪細code-{}".format(code))
             win = self.cancel_win
-            if win <= 0:
+            if win <= 0 or not win32gui.IsWindowVisible(win):
                 self.cancel_win = self.getCancelBuyWin()
                 win = self.cancel_win
                 if win <= 0:
@@ -776,7 +778,7 @@
         name = THSGuiUtil.getText(code_name_win)
         if name is not None:
             name=name.replace(" ","")
-        return name
+        return tool.strQ2B(name)
 
     @classmethod
     def fill_codes(cls, codes):
@@ -814,6 +816,7 @@
                     cls.cancel_distribute_win_for_code(code)
                 else:
                     code_name = cls.__get_code_name(win)
+                    #'娣辨尟涓氾肌'
                     if name_codes.get(code_name) != code:
                         cls.cancel_distribute_win_for_code(code)
                 continue
@@ -848,7 +851,7 @@
 
 
 if __name__ == '__main__':
-    THSGuiTrade().buy("002900", "16.18")
+    THSGuiTrade().cancel_buy("000419")
     # GUITest().test_distribute()
     # try:
     #     THSGuiUtil.set_buy_window_code(0x000112D0, "000333")

--
Gitblit v1.8.0