Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

easytrader forked from shidenggui/easytrader #1

Open
wants to merge 293 commits into
base: master
Choose a base branch
from

Conversation

toughie88
Copy link
Owner

No description provided.

shidenggui and others added 30 commits October 9, 2017 16:23
* fix connect common trade window error when trade window title isn't default ths titile
* update docs
* update version
shidenggui and others added 30 commits June 1, 2020 22:17
# Conflicts:
#	docs/usage.md
一、修复同花顺“刷新”
改为模拟点击工具栏“刷新”按钮。
二、去除对win32gui的引用
1)将所有对SetForegroundWindow, ShowWindow, win32defines的引用全部集中到easytrader.utils.win_gui
2)win_gui.py中,删除对win32gui的引用,改为对pywinauto的引用。(若引用pywinauto有问题,则可以把注释掉的对win32gui的引用瞬间恢复起来)。
[flake8](http://flake8.pycqa.org) testing of https://github.com/shidenggui/easytrader on Python 3.8.3

$ __flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics__
```
./easytrader/webtrader.py:237:37: F821 undefined name 'easytrader'
                        item[key] = easytrader.utils.misc.str2num(
                                    ^
./easytrader/webtrader.py:241:37: F821 undefined name 'easytrader'
                        item[key] = easytrader.utils.misc.str2num(
                                    ^
2     F821 undefined name 'easytrader'
2
```
https://flake8.pycqa.org/en/latest/user/error-codes.html

On the flake8 test selection, this PR does _not_ focus on "_style violations_" (the majority of flake8 error codes that [__psf/black__](https://github.com/psf/black) can autocorrect).  Instead these tests are focus on runtime safety and correctness:
* E9 tests are about Python syntax errors usually raised because flake8 can not build an Abstract Syntax Tree (AST).  Often these issues are a sign of unused code or code that has not been ported to Python 3.  These would be compile-time errors in a compiled language but in a dynamic language like Python they result in the script halting/crashing on the user.
* F63 tests are usually about the confusion between identity and equality in Python.  Use ==/!= to compare str, bytes, and int literals is the classic case.  These are areas where __a == b__ is True but __a is b__ is False (or vice versa).  Python >= 3.8 will raise SyntaxWarnings on these instances.
* F7 tests logic errors and syntax errors in type hints
* F82 tests are almost always _undefined names_ which are usually a sign of a typo, missing imports, or code that has not been ported to Python 3.  These also would be compile-time errors in a compiled language but in Python a __NameError__ is raised which will halt/crash the script on the user.
自动打新必须先点击"新股申购",然后"批量新股申购"

原来的code是找到item批量新股申购然后click,这样有时候不成功
换成select()可以解决这个问题

Signed-off-by: Xiaowei Wang <[email protected]>
* 1,加入了针对 广发证券客户端的支持。 此客户端,为同花顺定制版本;
2,加入了 cancel_all_entrusts 函数,实现批量取消;
3,在_switch_left_menus/_switch_left_menus_by_shortcut中,加入了close_pop_windows函数,避免意外弹窗导致函数失败;
4,完善了edit空间输入字符串功能

* 1,完善readme

* Revert "1,完善readme"

This reverts commit ef64162
华泰证券在登入的过程中会出现死锁,这个死锁问题在单CPU的平台更容易出现
出现问题的步骤:
1,自动输入用户名和密码
2,调用self._app.top_window().wait_not("exists",
100),等待登入窗口消失,CPU进入睡眠,CPU调度去干别的事情了
3,华泰证券登入成功,登入窗口消失,主窗口出现
4,CPU调度回来,继续执行self._app.top_window().wait_not("exists",
100),问题是,现在的top_window()不再是登入窗口,而是主窗口,程序一直死等主窗口消失。死锁了

修复办法:
不是dengd登入窗口消失,而是等待主窗口变成visible

Signed-off-by: Xiaowei Wang <[email protected]>
原来代码中,选中“批量新股申购”菜单后会模拟“ESC”键和“F5”键输入。但在通用版同花顺里,“ESC”键输入会导致“批量新股申购”菜单失选,故删除该语句。
用通用版同花顺登陆国联证券账户测试自动打新成功,另测试海通证券客户端无影响。

Signed-off-by: Jack Huang <[email protected]>
测试国联证券、申万宏源证券通过

Signed-off-by: Jack Huang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.