Skip to content

Commit

Permalink
Merge pull request #146 from shelllet/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
shelllet authored Jul 6, 2024
2 parents f01cf96 + 0c56e63 commit 4a9afcd
Show file tree
Hide file tree
Showing 76 changed files with 149 additions and 125 deletions.
Binary file modified android/AdbDevices.simple
Binary file not shown.
Binary file modified android/AdbInput.simple
Binary file not shown.
Binary file modified android/AdbSwipe.simple
Binary file not shown.
Binary file added android/Adbkeyboard.simple
Binary file not shown.
Binary file modified android/cap.simple
Binary file not shown.
Binary file removed android/capture.simple
Binary file not shown.
Binary file modified android/connect.simple
Binary file not shown.
Binary file modified android/existapp.simple
Binary file not shown.
Binary file modified android/forward.simple
Binary file not shown.
Binary file modified android/install.simple
Binary file not shown.
Binary file modified android/key.simple
Binary file not shown.
Binary file modified android/ls.simple
Binary file not shown.
Binary file modified android/move.simple
Binary file not shown.
Binary file modified android/packages.simple
Binary file not shown.
Binary file modified android/pull.simple
Binary file not shown.
Binary file modified android/push.simple
Binary file not shown.
Binary file modified android/startapp.simple
Binary file not shown.
Binary file removed android/swipe.simple
Binary file not shown.
Binary file modified android/tap.simple
Binary file not shown.
Binary file added assets/672778fe90d3c1f9546cca09a646d409.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 15 additions & 26 deletions docx/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
# [0.35](https://github.com/shelllet/winui/compare/main...dev) (2024-06-05)
# [0.36](https://github.com/shelllet/winui/compare/main...dev) (2024-07-06)

### Changed:
1. 添加图像旋转动作。
2. 修复 安卓中文文字输入时崩溃问题。
3. 优化 [视频下载](./actions/network/VideoDownload.md)动作。
4. 修复其它一些问题。

### Deprecated:

### Note

1. 下载:https://winui.net/_media/winui++0.36.0-setup.x64.exe

## [0.35](https://github.com/shelllet/winui/compare/main...dev) (2024-06-05)

### Changed:

Expand Down Expand Up @@ -258,28 +272,3 @@
### 备注

1. 直接从https://winui.net/ 下载即可下载最新版本


## [0.20](https://github.com/shelllet/winui/compare/main...dev) (2023-05-20)
### Features

1. 添加 *移动并双击* 动作
2. 添加 *窗口标题* 动作
3. 添加 *WindowRect* 动作,获取窗口矩形
4. 支持多语言切换
5. 使用 *Acrylic*( 亚克力背景),提高视觉层次结构。

### Fixed

1. 修复一些崩溃问题。
2. 优化多个动作及动作参数,更容易使用
3. 修复重命名流程崩溃问题
4. 修复右键菜单透明问题


### Deprecated


### 备注

1. 直接从https://winui.net/ 下载即可下载最新版本
21 changes: 11 additions & 10 deletions docx/_sidebar.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- 流程
- [项目属性](./introduction/workflow/property.md)
- [使用逻辑](./introduction/workflow/logic.md)
- [鼠标/键盘宏录制](./introduction/workflow/mk_record)
- [鼠标/键盘宏录制](./introduction/workflow/record)
- [变量](./introduction/workflow/variable.md)
- [流程操作技巧](./introduction/workflow/skill.md)
- [通配符匹配](./introduction/workflow/wildcard.md)
Expand Down Expand Up @@ -87,6 +87,7 @@
- [颜色转换](./actions/image/CvtColor.md)
- [裁切图片](./actions/image/CropImage.md)
- [调整尺寸](./actions/image/ResizeImage.md)
- [图像旋转](./actions/image/ImageRotate.md)
- [中心裁切](./actions/image/CenterCropImage.md)
- [边缘检测](./actions/image/ImageCanny.md)
- [阈值操作](./actions/image/ImageThreshold.md)
Expand Down Expand Up @@ -229,26 +230,25 @@
- [动作链.发送文本](./actions/web/WebActionSendText.md)
- [动作链.暂停](./actions/web/WebActionPause.md)
- 安卓
- [模拟器](./actions/android/AdbDevices.md)
- [启动](./actions/android/AdbStartServer.md)
- [连接](./actions/android/AdbConnect.md)
- [端口转发](./actions/android/AdbForward.md)
- [设备](./actions/android/AdbDevices.md)
- [转发](./actions/android/AdbForward.md)
- [滑动](./actions/android/AdbSwipe.md)
- [输入](./actions/android/AdbInput.md)
- [键盘输入 * 英文](./actions/android/Adbkeyboard.md)
- [输入 * 中文](./actions/android/Adbkeyboard.md)
- [清除文字](./actions/android/AdbClearText.md)
- [按键](./actions/android/AdbKey.md)
- [点击](./actions/android/AdbTap.md)
- [移动](./actions/android/AdbMove.md)
- [截图](./actions/android/AdbScreenCap.md)
- [打开应用](./actions/android/AdbStartApp.md)
- [安装包](./actions/android/AdbPackages.md)
- [应用列表](./actions/android/AdbPackages.md)
- [启动 App](./actions/android/AdbStartApp.md)
- [应用检测](./actions/android/AdbIsInstalled.md)
- [安装应用](./actions/android/AdbInstall.md)
- [移动](./actions/android/AdbMove.md)
- [推送文件](./actions/android/AdbPush.md)
- [拉取文件](./actions/android/AdbPull.md)
- [文件目录](./actions/android/AdbLs.md)
- [启动服务](./actions/android/AdbStartServer.md)
- [终止服务](./actions/android/AdbKillServer.md)
- [文件列表](./actions/android/AdbLs.md)
- 内置类型
- [Boolean](./types/Boolean.md)
- [Number](./types/Number.md)
Expand Down Expand Up @@ -281,6 +281,7 @@
- [GlobOptions](./enums/GlobOptions.md)
- [HandleType](./enums/HandleType.md)
- [KnownWindow](./enums/KnownWindow.md)
- [KnownFolder](./enums/KnownFolder.md)
- [LogicalOperators](./enums/LogicalOperators.md)
- [MessageBoxFlags](./enums/MessageBoxFlags.md)
- [MessagePlaceMode](./enums/MessagePlaceMode.md)
Expand Down
2 changes: 1 addition & 1 deletion docx/actions/android/AdbClearText.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 清除文字
清输处理焦点的输入框中的文本,清除文本之前,自动安装 *ADBKeyboard.apk*。关于*ADBKeyboard.apk*,请参考:https://github.com/senzhk/ADBKeyBoard
清除处于焦点的输入框中的文本,清除文本之前,自动安装 *ADBKeyboard.apk*。关于*ADBKeyboard.apk*,请参考:https://github.com/shelllet/ADBKeyBoard.git

![AdbClearText](./images/18.png ':size=90%')

Expand Down
10 changes: 2 additions & 8 deletions docx/actions/android/AdbConnect.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,11 @@
## 输出

> 日志信息,字符串[`String`](./types/String.md)
```
# : already connected to 192.168.31.170:5555
```


> 设备号,可用在其它書店动作中作为输入参数。
## 资源

示例:https://github.com/shelllet/WinUi/blob/main/android/connect.simple
示例:https://github.com/shelllet/WinUi/blob/main/android/AdbDevices.simple


!> 注意:模拟器需要开启 *ADB本机调试* 或者 *ADB远程调试*
Expand Down
8 changes: 4 additions & 4 deletions docx/actions/android/AdbDevices.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# 设备
查询系统中已经连接的安卓模拟器,支持多模拟器同时操作。
查询系统中已经连接的安卓模拟器或者真机。支持多模拟器同时操作。

![AdbDevices](./images/01.png ':size=90%')

## 子流程

> 支持,模拟器的设备号会传入子动作当中
> 支持,模拟器的设备号(通常是 *ip* + 端口号)会传入子动作当中
## 运行参数

* 异步
> 可以在子动作中同时操作当前模拟器
> 可以并行执行与设备关联的子动作
## 输出

> 设备号列表 [`Strings`](./types/String.md)
> 设备号列表 [`Strings`](./types/String.md)
## 资源

Expand Down
11 changes: 8 additions & 3 deletions docx/actions/android/AdbForward.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 端口转发
# 转发
把安卓系统的服务端口映射到本地端口,通过此种方式可以调用模拟器中的接口或者服务。

![AdbForward](./images/03.png ':size=90%')
Expand All @@ -15,8 +15,9 @@
* 本地端口
>
* 服务端口
>
* 远程端口
> 模拟器中的服务端口。
## 输出
> 设备日志,字符串[`String`](./types/String.md)
Expand All @@ -25,3 +26,7 @@

示例:https://github.com/shelllet/WinUi/blob/main/android/forward.simple


!> 该动作超出作用范围后会移除转发的端口。

!> WebServer (nanohttpd): https://apkpure.com/webserver-nanohttpd/com.akhiljalagam.androidwebserver/download
4 changes: 2 additions & 2 deletions docx/actions/android/AdbInput.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 键盘输入
在安卓模拟器中模拟文本输入。此动作不支持中文输入,如果需要输入中文请使用动作 [键盘输入](./Adbkeyboard.md)
# 输入
在安卓真机或模拟器中模拟文本输入。此动作不支持中文输入,如果需要输入中文请使用动作 [输入 * 中文](./Adbkeyboard.md)


![AdbInput](./images/05.png ':size=90%')
Expand Down
4 changes: 2 additions & 2 deletions docx/actions/android/AdbKey.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 按键
在安卓模拟器中模拟按键。
在安卓模拟器中模拟按键,支持后台操作


![AdbKey](./images/07.png ':size=90%')
Expand All @@ -17,7 +17,7 @@
* 按键
> 仅支持列表中的按键。
* 按键时间
> 单位 **
> 单位 **,当该值不为 *0* 时,会在该时间内重复触发按键。
## 输出
>
Expand Down
19 changes: 0 additions & 19 deletions docx/actions/android/AdbKillServer.md

This file was deleted.

13 changes: 8 additions & 5 deletions docx/actions/android/AdbLs.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
# 文件目录
获取文件或者文件夹列表
# 文件列表
获取模拟器或真机中的文件或者文件夹列表,类似文件或者文件夹遍历

![AdbLs](./images/04.png ':size=90%')

## 子流程

> 支持,模拟器的设备号会传入子动作当中
> 支持,被遍历的文件或者文件夹会传入子流程当中
## 运行参数

* 设备
> 设备号,如果当前连接的只有一个设备,该值可为空。
* 目录
> 根目录, 可为空,表示 *sd* 卡的根目录。
> 根目录, 可为空,通常 `/mnt/sdcard` 或者 `/storage/emulated/0` 表示根目录。
* 异步迭代
> 遍历到的每个路径都会开启一个线程去执行子流程。
## 输出

> 目录列表,参考: [`Paths`](./types/Path.md)
> 文件或者文件夹列表,参考: [`Paths`](./types/Path.md)
## 资源

Expand Down
4 changes: 2 additions & 2 deletions docx/actions/android/AdbMove.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
> 设备号,如果当前连接的只有一个设备,该值可为空。
* 起始位置
> 在模拟器屏幕当中,按下的位置,比如 *移动盘*的位置,
> 在模拟器屏幕当中,按下的位置,例如 *移动盘*的位置,
* 方向
> 参考: [Direction](./enums/Directions.md)
* 时间
> 按键时间,单位 **
> 移动时间,单位 **
## 输出
>
Expand Down
4 changes: 2 additions & 2 deletions docx/actions/android/AdbPackages.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 应用列表
获取安卓模拟器当中的所有已经安装的包名
获取安卓模拟器当中的所有已经安装的包名称

![AdbPackages](./images/12.png ':size=90%')

Expand All @@ -15,7 +15,7 @@

## 输出
> 安装包列表。[`Strings`](./types/String.md) 类型
> 安装包列表。[`Strings`](./types/String.md) 类型

## 资源
Expand Down
4 changes: 2 additions & 2 deletions docx/actions/android/AdbPull.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 拉取文件
从设备复制文件/目录到本地计算机。
从安卓设备复制文件/目录到本地计算机。

![AdbPull](./images/15.png ':size=90%')

Expand All @@ -12,7 +12,7 @@
> 设备号,如果当前连接的只有一个设备,该值可为空。
*
> Android*设备中的文件或目录。
> *Android*设备中的文件或目录。通常 `/mnt/sdcard` 或者 `/storage/emulated/0` 表示根目录
* 目标
> 本地计算机当中的目录。
Expand Down
2 changes: 1 addition & 1 deletion docx/actions/android/AdbPush.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
> 本地文件或目录
* 目标
> *Android* 设备中目录。
> *Android* 设备中目录。通常 `/mnt/sdcard` 或者 `/storage/emulated/0` 表示根目录。 比如 *下载目录*`/mnt/sdcard/Download``/storage/emulated/0/Download`

## 输出
Expand Down
6 changes: 2 additions & 4 deletions docx/actions/android/AdbStartApp.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 打开应用
# 启动 App
打开安卓设备上已经安装的 *App*

![AdbStartApp](./images/10.png ':size=90%')
Expand All @@ -13,9 +13,7 @@
> 设备号,如果当前连接的只有一个设备,该值可为空。
* 安装包
> 已经安装的 *App* 包名。点击红色指示的按钮,可以打安装包选择窗口。如下图:
![AdbStartApp](./images/11.png ':size=90%')
> 已经安装的 *App* 包名。可以配合应用列表,获取安装包名称。例如:`com.android.adbkeyboard`

## 输出
Expand Down
4 changes: 3 additions & 1 deletion docx/actions/android/AdbStartServer.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ emulator-5557 device
> 设备日志,字符串[`String`](./types/String.md)

## 资源
## 资源

!> 该动作超出作用范围后,会终止 *adb*服务。
2 changes: 1 addition & 1 deletion docx/actions/android/AdbTap.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 点击
在安卓设备中模拟点击。
在安卓设备中模拟点击,支持后台操作

![AdbTap](./images/08.png ':size=90%')

Expand Down
6 changes: 3 additions & 3 deletions docx/actions/android/Adbkeyboard.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 键盘输入
在安卓模拟器中模拟文本输入。此动作支持中文输入,输入中文字符之前,安装 *ADBKeyboard.apk*。关于*ADBKeyboard.apk*,请参考:https://github.com/senzhk/ADBKeyBoard
# 输入 * 中文
在安卓真机或模拟器中模拟文本输入。此动作支持中文输入,输入中文字符之前,安装 *ADBKeyboard.apk*。关于*ADBKeyboard.apk*,请参考:https://github.com/shelllet/ADBKeyBoard.git


![Adbkeyboard](./images/06.png ':size=90%')
Expand All @@ -22,4 +22,4 @@

### 资源

示例:https://github.com/shelllet/WinUi/blob/main/android/AdbInput.simple
示例:https://github.com/shelllet/WinUi/blob/main/android/Adbkeyboard.simple
Binary file modified docx/actions/android/images/01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/09.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docx/actions/android/images/11.png
Binary file not shown.
Binary file modified docx/actions/android/images/12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docx/actions/android/images/17.png
Binary file not shown.
Binary file modified docx/actions/android/images/18.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docx/actions/android/images/21.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions docx/actions/filesystem/StandardPath.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,4 @@
> 路径,参考:[Path](./types/Path.md)

## 脚本调用

```python
import simple;

```

## 资源
Loading

0 comments on commit 4a9afcd

Please sign in to comment.