fix: 修复 youqu 命令无法接受带空格的参数的问题;

Description:

Log:
This commit is contained in:
mikigo 2023-10-18 11:47:00 +08:00
parent fd24b175fd
commit b67de7fad1
3 changed files with 57 additions and 139 deletions

View File

@ -1,8 +1,17 @@
# 版本更新记录
## 2.2.5unreleased
**Fix**
- 修复 `youqu` 命令无法接受带空格的参数的问题;感谢 **[@禄烨](https://github.com/lu-xianseng)**
- `OCR` 检测模型升级到 `V4` 之后,在识别某些文本情况下出现不能的问题,暂时先回滚到 `V3`
-----------------------
## 2.2.42023/10/16
new
**New**
- `OCR` 检测模型升级到 `V4` ,中英文场景检测模型准确率提升 4.9%,识别模型准确率提升 2%
@ -10,33 +19,25 @@ new
- 解除子项目的工程名称以 `autotest_` 开头的限制,子项目工程名称可以为任意名称;
配置文件 `globalconfig.ini` 中的 `APP_NAME` 和命令行参数 `-a/--app` 仅支持传入工程名称的全称:
- 配置文件 `globalconfig.ini` 中的 `APP_NAME` 和命令行参数 `-a/--app` 仅支持传入工程名称的全称:
```shell
youqu manage.py run -a autotest_deepin_music
```
```shell
youqu manage.py run -a apps/autotest_deepin_music
```
输入以 `apps` 开头可以获得命令行补全,使用更加便捷。
```shell
youqu manage.py run -a apps/autotest_deepin_music
# 或
youqu manage.py run -a autotest_deepin_music
```
- 新增导入全局配置对象:
```py
from setting import conf
```
```python
from setting import conf
```
这种写法和之前的写法效果是一样的
这种写法和之前的写法效果是一样的
```py
from setting.globalconfig import GlobalConfig
```
主要为了简化代码。
```python
from setting.globalconfig import GlobalConfig
```
- 继续尝试将一些功能模块拆分为独立构件;
@ -44,7 +45,7 @@ new
- 增加执行前显示执行的Python文件数量
fix
**Fix**
- 修复从 `pms` 标签【设备类型】为 `null` 时,同步到 `csv` 文件写入为 `null`
- 修复无法导出 `csv` 文件的问题;
@ -52,17 +53,21 @@ fix
- 修复了 `sniff` 命令报错无法找到 `src` 模块的问题;
- 修复 `assert_ocr_not_exist` 传入多个识别目标逻辑判断错误的问题;
--------------------------
## 2.2.32023/9/15
new
**New**
- 尝试将一些功能模块拆分为独立构件;
fix
**Fix**
- 修复了远程执行传入 `app_name` 无法收集到用例的问题;
- 优化了 `docs` 文档内容及排版;
-----------------------------
## 2.2.12023/9/13
new
@ -75,6 +80,8 @@ fix
- 修复了 `letmego` 在开发调试时也会记录执行过程的问题;
- 优化了在线文档内容和排版;
----------------------------------
## 2.2.02023/9/5
new
@ -122,13 +129,13 @@ fix
- 修复子项目 cv 导入报错的问题;
原因为youqu 的图像识别功能兼容两种情况,一种是面向服务,就是本地测试机不需要安装 `OpenCV`,用例中的图像识别会通过远程服务接口进行图像识别和结果获取;第二种是原生,就是本地直接安装 `OpenCV` 直接用。两个情况的优先级是优先判断本地存在,否则走服务。
原因为youqu 的图像识别功能兼容两种情况,一种是面向服务,就是本地测试机不需要安装 `OpenCV`,用例中的图像识别会通过远程服务接口进行图像识别和结果获取;第二种是原生,就是本地直接安装 `OpenCV` 直接用。两个情况的优先级是优先判断本地存在,否则走服务。
前面我们已经把 OCR 功能做了服务化,基于 1 年多以来的观察,用起来很稳定,再一个就是 `OpenCV` 安装包是比较臃肿的,粗略数了下依赖有 `30+` 个,而且在各架构上依赖包还不尽相同,装载到虚拟环境方案中不太好处理,所以本次 2.0 版本我们大胆的将图像识别的默认功能修改为面向服务的方式,前期测试一切看起来都很和谐。
前面我们已经把 OCR 功能做了服务化,基于 1 年多以来的观察,用起来很稳定,再一个就是 `OpenCV` 安装包是比较臃肿的,粗略数了下依赖有 `30+` 个,而且在各架构上依赖包还不尽相同,装载到虚拟环境方案中不太好处理,所以本次 2.0 版本我们大胆的将图像识别的默认功能修改为面向服务的方式,前期测试一切看起来都很和谐。
但是没注意到之前给海燕姐那边项目单独定制做了个图像识别接口(为了能简单平滑的迁移到 youqu此接口底层没有兼容服务化所以她那边的项目调用此定制接口会报 cv 导入的问题。
但是没注意到之前给海燕姐那边项目单独定制做了个图像识别接口(为了能简单平滑的迁移到 youqu此接口底层没有兼容服务化所以她那边的项目调用此定制接口会报 cv 导入的问题。
由于将这个定制图像识别接口进行服务化兼容改造需要一定时间,改完还需要测试,但本次时间比较紧,因此先把 `OpenCV` 装进虚拟环境,后续版本再考虑针对此接口做修改。
由于将这个定制图像识别接口进行服务化兼容改造需要一定时间,改完还需要测试,但本次时间比较紧,因此先把 `OpenCV` 装进虚拟环境,后续版本再考虑针对此接口做修改。
## 2.0.02023/8/16
@ -150,25 +157,25 @@ sudo pip3 install youqu==2.0.0
- 推荐使用 `sudo pip3` (加 sudo进行安装
如果不加 sudo 有些机器可能 `$HOME/.local/bin` 不在系统 PATH 环境目录下,在不添加环境变量的情况下,会出现 `YouQu` 的初始化工程命令youqu-startproject无法使用的问题
如果不加 sudo 有些机器可能 `$HOME/.local/bin` 不在系统 PATH 环境目录下,在不添加环境变量的情况下,会出现 `YouQu` 的初始化工程命令youqu-startproject无法使用的问题
当然,将上述路径添加到环境变量之后也是可以用的,所以我这里是推荐加 sudo不加 sudo 也是可以的,只是需要关注下环境变量的问题。
当然,将上述路径添加到环境变量之后也是可以用的,所以我这里是推荐加 sudo不加 sudo 也是可以的,只是需要关注下环境变量的问题。
- 推荐指定版本号(`youqu==2.0.0`)安装,如果不指定版本号默认是安装最新发布的 YouQu 版本,你可以在 [PyPI](https://pypi.org/project/youqu/) 上的 Release history 里面查看有哪些版本。
安装之后会自动生成一个系统命令 youqu-startproject使用它可以初始化工程这里以音乐举例
安装之后会自动生成一个系统命令 youqu-startproject使用它可以初始化工程这里以音乐举例
```shell
youqu-startproject autotest_deepin_music
```
```shell
youqu-startproject autotest_deepin_music
```
这样就会在当前目录下生成一个 `autotest_deepin_music` 目录,里面包含了基础框架所有的代码;
这样就会在当前目录下生成一个 `autotest_deepin_music` 目录,里面包含了基础框架所有的代码;
之后,还是在 `apps` 目录下放入子项目的AT代码即可使用方法和过去一样这里就不多介绍。
之后,还是在 `apps` 目录下放入子项目的AT代码即可使用方法和过去一样这里就不多介绍。
另外,除了通过 pip 获取以外,仍然可以通过源码获取(直接 git clone
另外,除了通过 pip 获取以外,仍然可以通过源码获取(直接 git clone
值得一提的是,使用 pip 安装 `YouQu` 时,`YouQu` 包的大小才 `600+` k安装速度起飞。
值得一提的是,使用 pip 安装 `YouQu` 时,`YouQu` 包的大小才 `600+` k安装速度起飞。
**2、新的AT虚拟化环境部署方案**
@ -177,15 +184,15 @@ youqu-startproject autotest_deepin_music
- 过去一段时间咱们经常出现的不同的AT项目在同一台机器上部署环境时依赖版本冲突的问题新方案不同的项目会动态生成自己的虚拟环境相互之间不影响
- 业内为了解决版本冲突问题一般都会使用 `Python` 虚拟环境的工具,但是都有个问题,无法管理 deb 包形式发布的 Python 包,本次我们解决了这个问题,能够完全管理常规的 `Python` 包,也能管理到 deb 包形式发布的 Python 三方包;
虚拟化环境部署使用方法:
虚拟化环境部署使用方法:
```shell
bash env.sh
```
```shell
bash env.sh
```
可以看出来和原来使用方法没有变化,也就是说从使用的角度是完全没有区别的,只是内部做了不同的事情。
可以看出来和原来使用方法没有变化,也就是说从使用的角度是完全没有区别的,只是内部做了不同的事情。
值得一提的是,本机部署的功能仍然保留 `env_dev.sh`,可以作为开发时的环境部署。
值得一提的是,本机部署的功能仍然保留 `env_dev.sh`,可以作为开发时的环境部署。
**3、新的驱动命令**

2
env.sh
View File

@ -167,7 +167,7 @@ rm -rf Pipfile
echo "${python_virtualenv_path}"
pipenv run pip list
system_env
echo "pipenv run python \$*" | sudo tee /usr/bin/youqu > /dev/null 2>&1
echo 'pipenv run python "$@"' | sudo tee /usr/bin/youqu > /dev/null 2>&1
echo "pipenv shell" | sudo tee /usr/bin/youqu-shell > /dev/null 2>&1
sudo chmod +x /usr/bin/youqu
sudo chmod +x /usr/bin/youqu-shell

View File

@ -7,11 +7,11 @@
# pylint: disable=C0114
import letmego
from src.image_utils import ImageUtils
from src import sleep, log
from src import logger
from src import ShortCut
from public.right_menu_public_widget.config import Config
from src import ShortCut
from src import sleep, log
from src.image_utils import ImageUtils
@letmego.mark
@log
@ -36,7 +36,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("always_at_the_top")
logger.info("点击“总在最前”")
@classmethod
def click_close_window_in_right_menu_by_image(cls):
@ -45,7 +44,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("close")
logger.info("点击“关闭”")
@classmethod
def click_reduction_in_right_menu_by_image(cls):
@ -54,7 +52,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("reduction")
logger.info("点击“还原”")
@classmethod
def click_minimize_in_right_menu_by_image(cls):
@ -63,7 +60,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("minimize")
logger.info("点击“最小化”")
@classmethod
def click_change_size_in_right_menu_by_image(cls):
@ -72,7 +68,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("change_size")
logger.info("点击“更改大小”")
@classmethod
def click_move_in_right_menu_by_image(cls):
@ -81,7 +76,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("move")
logger.info("点击“移动”")
@classmethod
def click_maximize_in_right_menu_by_image(cls):
@ -90,7 +84,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("maximize")
logger.info("点击“最大化”")
@classmethod
def click_always_in_the_visible_workspace_in_right_menu_by_image(cls):
@ -99,7 +92,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("always_in_the_visible_workspace")
logger.info("点击“总在可见工作区”")
@classmethod
def click_move_to_left_workspace_in_right_menu_by_image(cls):
@ -108,7 +100,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("move_to_left_workspace")
logger.info("点击“移至左边工作区”")
@classmethod
def click_move_to_right_workspace_in_right_menu_by_image(cls):
@ -117,7 +108,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("move_to_right_workspace")
logger.info("点击“移至右边工作区”")
@classmethod
def click_open_in_right_menu_by_image(cls):
@ -126,7 +116,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("open")
logger.info("点击“打开”")
@classmethod
def click_open_mode_in_right_menu_by_image(cls):
@ -135,7 +124,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("open_mode")
logger.info("点击“打开方式”")
@classmethod
def click_attribute_in_right_menu_by_image(cls):
@ -145,7 +133,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.click_right_menu_by_image("attribute")
sleep(1)
logger.info("点击“属性”")
@classmethod
def click_share_manager_in_right_menu_by_image(cls):
@ -155,7 +142,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.click_right_menu_by_image("share_manager")
sleep(1)
logger.info("点击“共享管理”")
@classmethod
def click_defender_in_right_menu_by_image(cls):
@ -164,7 +150,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("defender")
logger.info("点击“病毒查杀”")
@classmethod
def click_cd_burn_in_right_menu_by_image(cls):
@ -173,7 +158,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("CD_burn")
logger.info("点击“光盘刻录”")
@classmethod
def click_compress_in_right_menu_by_image(cls):
@ -182,7 +166,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("compress")
logger.info("点击“压缩”")
@classmethod
def click_copy_in_right_menu_by_image(cls):
@ -191,7 +174,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("copy")
logger.info("点击“复制”")
@classmethod
def click_uncompress_in_right_menu_by_image(cls):
@ -200,7 +182,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("uncompress")
logger.info("点击“解压”")
@classmethod
def click_paste_in_right_menu_by_image(cls):
@ -209,7 +190,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("paste")
logger.info("点击“粘贴”")
@classmethod
def click_cut_in_right_menu_by_image(cls):
@ -218,7 +198,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("cut")
logger.info("点击“剪切”")
@classmethod
def click_delete_in_right_menu_by_image(cls):
@ -227,7 +206,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("delete")
logger.info("点击“删除”")
@classmethod
def click_create_link_in_right_menu_by_image(cls):
@ -236,7 +214,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("link")
logger.info("点击“创建链接”")
@classmethod
def click_mark_information_in_right_menu_by_image(cls):
@ -245,7 +222,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("mark_information")
logger.info("点击“标记信息”")
@classmethod
def click_new_label_in_right_menu_by_image(cls):
@ -254,7 +230,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("new_label")
logger.info("点击“在新标签中打开”")
@classmethod
def click_copy_path_right_menu_by_image(cls):
@ -263,7 +238,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("copy_path")
logger.info("点击“复制路径”")
@classmethod
def click_edit_path_right_menu_by_image(cls):
@ -272,7 +246,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("edit_path")
logger.info("点击“编辑路径”")
@classmethod
def click_new_window_in_right_menu_by_image(cls):
@ -281,7 +254,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("new_window")
logger.info("点击“新窗口”")
@classmethod
def click_rename_in_right_menu_by_image(cls):
@ -290,7 +262,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("rename")
logger.info("点击“重命名”")
@classmethod
def click_send_to_in_right_menu_by_image(cls):
@ -299,7 +270,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("send_to")
logger.info("点击“发送到”")
@classmethod
def click_send_to_uos_in_right_menu_by_image(cls):
@ -308,7 +278,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("UOS")
logger.info("点击“发送到-UOS”")
@classmethod
def click_send_to_desktop_in_right_menu_by_image(cls):
@ -317,7 +286,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("send_to_desktop")
logger.info("点击“发送到桌面”")
@classmethod
def click_share_folder_in_right_menu_by_image(cls):
@ -327,7 +295,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.click_right_menu_by_image("share_folder")
sleep(1)
logger.info("点击“共享文件夹”")
@classmethod
def click_cancel_share_folder_in_right_menu_by_image(cls):
@ -336,7 +303,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("cancel_share")
logger.info("点击“取消共享文件夹”")
@classmethod
def click_terminal_in_right_menu_by_image(cls):
@ -345,7 +311,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("terminal")
logger.info("点击“终端打开”")
@classmethod
def click_editor_in_right_menu_by_image(cls):
@ -354,7 +319,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("editor")
logger.info("点击“文本编辑器”")
@classmethod
def click_file_manager_in_right_menu_by_image(cls):
@ -363,7 +327,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("file_manager")
logger.info("点击“文件管理器“")
@classmethod
def click_ok_in_right_menu_by_image(cls):
@ -372,7 +335,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("ok")
logger.info("点击“确定”")
@classmethod
def click_add_bookmark_in_right_menu_by_image(cls):
@ -381,7 +343,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("bookmark")
logger.info("点击“添加书签”")
@classmethod
def click_remove_bookmark_in_right_menu_by_image(cls):
@ -390,7 +351,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("remove_bookmark")
logger.info("点击“移除书签”")
@classmethod
def click_select_default_app_in_right_menu_by_image(cls):
@ -399,7 +359,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("select_default_app")
logger.info("点击“选择默认程序”")
@classmethod
def click_open_file_path_in_right_menu_by_image(cls):
@ -408,7 +367,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("open_file_path")
logger.info("点击“选择打开文件位置”")
@classmethod
def click_open_with_edit_in_right_menu_by_image(cls):
@ -417,7 +375,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("deepin-editor")
logger.info("点击“选择文件编辑器打开”")
@classmethod
def click_remove_in_right_menu_by_image(cls):
@ -426,7 +383,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("remove")
logger.info("点击“选择移除”")
@classmethod
def click_recycle_all_in_right_menu_by_image(cls):
@ -435,7 +391,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("recycle_all")
logger.info("点击“全部还原”")
@classmethod
def click_empty_trash_in_right_menu_by_image(cls):
@ -444,7 +399,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("empty_trash")
logger.info("点击“清空回收站”")
@classmethod
def click_show_mode_in_right_menu_by_image(cls):
@ -453,7 +407,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("show_mode")
logger.info("点击“选择显示方式”")
@classmethod
def click_icon_mode_in_right_menu_by_image(cls):
@ -462,7 +415,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("icon_mode")
logger.info("点击“选择图标方式”")
@classmethod
def click_list_mode_in_right_menu_by_image(cls):
@ -471,7 +423,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("list_mode")
logger.info("点击“选择列表方式”")
@classmethod
def click_recycle_in_right_menu_by_image(cls):
@ -480,7 +431,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("recycle")
logger.info("点击“选择还原”")
@classmethod
def click_delete_vault_in_right_menu_by_image(cls):
@ -489,7 +439,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("delete_vault")
logger.info("点击“删除保险箱”")
@classmethod
def click_lock_now_in_right_menu_by_image(cls):
@ -498,7 +447,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("lock_now")
logger.info("点击“立即上锁”")
@classmethod
def click_key_unlock_in_right_menu_by_image(cls):
@ -507,7 +455,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("key_unlock")
logger.info("点击“密钥解锁”")
@classmethod
def click_set_wallpaper_in_right_menu_by_image(cls):
@ -516,7 +463,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("set_wallpaper")
logger.info("点击“设置壁纸”")
@classmethod
def click_open_with_root_in_right_menu_by_image(cls):
@ -525,7 +471,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("open_with_root")
logger.info("点击“以管理打开”")
@classmethod
def click_new_folder_in_right_menu_by_image(cls):
@ -534,7 +479,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("new_folder")
logger.info("点击“新建文件夹”")
@classmethod
def click_auto_sort_in_right_menu_by_image(cls):
@ -543,7 +487,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("auto_sort")
logger.info("点击“自动排序”")
@classmethod
def click_display_setting_in_right_menu_by_image(cls):
@ -552,7 +495,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("display_setting")
logger.info("点击“显示设置”")
@classmethod
def click_excel_in_right_menu_by_image(cls):
@ -561,7 +503,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("excel")
logger.info("点击“表格”")
@classmethod
def click_icon_size_in_right_menu_by_image(cls):
@ -570,7 +511,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("icon_size")
logger.info("点击“图标大小”")
@classmethod
def click_minist_in_right_menu_by_image(cls):
@ -580,7 +520,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.enter()
cls.select_submenu(1)
logger.info("点击“极小”")
@classmethod
def click_mini_in_right_menu_by_image(cls):
@ -591,7 +530,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
# cls.click_image("mini")
cls.enter()
cls.select_submenu(2)
logger.info("点击“小”")
@classmethod
def click_middle_in_right_menu_by_image(cls):
@ -602,7 +540,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
# cls.click_image("middle")
cls.enter()
cls.select_submenu(3)
logger.info("点击“中”")
@classmethod
def click_big_in_right_menu_by_image(cls):
@ -613,7 +550,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
# cls.click_image("big")
cls.enter()
cls.select_submenu(4)
logger.info("点击“大”")
@classmethod
def click_bigist_in_right_menu_by_image(cls):
@ -622,7 +558,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("bigist")
logger.info("点击“极大”")
@classmethod
def click_name_in_right_menu_by_image(cls):
@ -631,7 +566,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("name")
logger.info("点击“名称”")
@classmethod
def click_path_in_right_menu_by_image(cls):
@ -640,7 +574,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("path")
logger.info("点击“路径”")
@classmethod
def click_latest_visit_time_in_right_menu_by_image(cls):
@ -649,7 +582,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("latest_visit_time")
logger.info("点击“最近访问时间”")
@classmethod
def click_new_document_in_right_menu_by_image(cls):
@ -659,7 +591,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.click_right_menu_by_image("new_document")
sleep(1)
logger.info("点击“新建文档”")
@classmethod
def click_ppt_in_right_menu_by_image(cls):
@ -668,7 +599,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("ppt")
logger.info("点击“ppt”")
@classmethod
def click_select_all_in_right_menu_by_image(cls):
@ -677,7 +607,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("select_all")
logger.info("点击“全选”")
@classmethod
def click_size_in_right_menu_by_image(cls):
@ -686,7 +615,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("size")
logger.info("点击“大小”")
@classmethod
def click_word_size_in_right_menu_by_image(cls):
@ -695,7 +623,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("word_size")
logger.info("点击“文件大小”")
@classmethod
def click_word_type_in_right_menu_by_image(cls):
@ -704,7 +631,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("word_type")
logger.info("点击“类型”")
@classmethod
def click_original_path_in_right_menu_by_image(cls):
@ -713,7 +639,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("original_path")
logger.info("点击“原始路径”")
@classmethod
def click_delete_time_in_right_menu_by_image(cls):
@ -723,7 +648,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.click_right_menu_by_image("delete_time")
sleep(1)
logger.info("点击“删除时间”")
@classmethod
def click_sort_method_in_right_menu_by_image(cls):
@ -733,7 +657,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.click_right_menu_by_image("sort_method")
sleep(1)
logger.info("点击“排序方法”")
@classmethod
def click_change_time_in_right_menu_by_image(cls):
@ -742,7 +665,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("time")
logger.info("点击“修改时间”")
@classmethod
def click_txt_in_right_menu_by_image(cls):
@ -751,7 +673,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("txt")
logger.info("点击“txt”")
@classmethod
def click_type_in_right_menu_by_image(cls):
@ -760,7 +681,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("type")
logger.info("点击“类型”")
@classmethod
def click_wallpaper_in_right_menu_by_image(cls):
@ -769,7 +689,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("wallpaper")
logger.info("点击“壁纸”")
@classmethod
def click_word_in_right_menu_by_image(cls):
@ -778,7 +697,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("word")
logger.info("点击“word”")
@classmethod
def click_default_application_by_image(cls):
@ -788,7 +706,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
"""
cls.click_right_menu_by_image("default_application")
sleep(1)
logger.info("点击“选择默认程序”")
@classmethod
def click_add_dir_to_zip_by_image(cls):
@ -797,7 +714,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("add_to_zip")
logger.info("点击 添加到新建文件夹.zip")
@classmethod
def click_add_desktop_zip_by_image(cls):
@ -806,7 +722,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("add_desktop_zip")
logger.info("点击 添加到Desktop.zip")
@classmethod
def click_list_view_in_right_menu_by_image(cls):
@ -815,7 +730,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("list_view")
logger.info("点击“列表视图”")
@classmethod
def click_icon_view_in_right_menu_by_image(cls):
@ -824,7 +738,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("icon_view")
logger.info("点击“图标视图”")
@classmethod
def click_noanonymity_in_right_menu_by_image(cls):
@ -833,7 +746,6 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("no_anonymity")
logger.info("点击不允许下拉框")
@classmethod
def click_anonymity_in_right_menu_by_image(cls):
@ -842,4 +754,3 @@ class RightMenuPublicWidget(ImageUtils, ShortCut):
:return:
"""
cls.click_right_menu_by_image("anonymity")
logger.info("点击下拉框的允许选项")