assistsx-js 0.0.1334 → 0.0.1340

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Ven
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. 

package/README.md

@@ -13,6 +13,8 @@
 
 > 下载安装后会默认安装一个示例插件，可长按删除
 
+**[Assistsx源码](https://github.com/ven-coder/assistsx)**
+
 # 快速开始
 ## 1. 创建项目
 - 创建`vite`模版项目：`npm create vite@latest assistsx-helloword -- --template vue`

package/dist/AssistsX.d.ts

@@ -72,7 +72,7 @@ export declare class AssistsX {
      */
     static takeScreenshotNodes(nodes: Node[], overlayHiddenScreenshotDelayMillis?: number): Promise<string[]>;
     static scanQR(): Promise<string>;
-    static addWebFloatingWindow(url: string, options?: WebFloatingWindowOptions): Promise<any>;
+    static loadWebViewOverlay(url: string, options?: WebFloatingWindowOptions): Promise<any>;
     /**
      * 点击节点
      * @param node 要点击的节点
@@ -213,7 +213,7 @@ export declare class AssistsX {
      * @param duration 持续时间
      * @returns 是否成功
      */
-    static gestureClick(x: number, y: number, duration: number): boolean;
+    static clickByGesture(x: number, y: number, duration: number): Promise<boolean>;
     /**
      * 返回操作
      * @returns 是否成功
@@ -270,7 +270,7 @@ export declare class AssistsX {
      * @param clickDuration 点击持续时间
      * @returns 是否成功
      */
-    static nodeGestureClick(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration }?: {
+    static clickNodeByGesture(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration }?: {
         offsetX?: number;
         offsetY?: number;
         switchWindowIntervalDelay?: number;
@@ -286,13 +286,30 @@ export declare class AssistsX {
      * @param clickInterval 点击间隔
      * @returns 是否成功
      */
-    static nodeGestureClickByDouble(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval }?: {
+    static doubleClickNodeByGesture(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval }?: {
         offsetX?: number;
         offsetY?: number;
         switchWindowIntervalDelay?: number;
         clickDuration?: number;
         clickInterval?: number;
     }): Promise<boolean>;
+    /**
+     * 执行线型手势
+     * @param startPoint
+     * @param endPoint
+     * @param param2
+     * @returns
+     */
+    static performLinearGesture(startPoint: {
+        x: number;
+        y: number;
+    }, endPoint: {
+        x: number;
+        y: number;
+    }, { duration }?: {
+        duration?: number;
+    }): Promise<boolean>;
+    static getAppInfo(packageName: string): Promise<any>;
     /**
      * 获取屏幕尺寸
      * @returns 屏幕尺寸对象

package/dist/AssistsX.js

@@ -144,9 +144,9 @@ export class AssistsX {
         const data = response.getDataOrDefault({ value: "" });
         return data.value;
     }
-    static async addWebFloatingWindow(url, options = {}) {
+    static async loadWebViewOverlay(url, options = {}) {
         const { initialWidth, initialHeight, minWidth, minHeight, maxWidth, maxHeight, initialCenter } = options;
-        const response = await this.asyncCall(CallMethod.addWebFloatingWindow, { args: { url, initialWidth, initialHeight, minWidth, minHeight, maxWidth, maxHeight, initialCenter } });
+        const response = await this.asyncCall(CallMethod.loadWebViewOverlay, { args: { url, initialWidth, initialHeight, minWidth, minHeight, maxWidth, maxHeight, initialCenter } });
         const data = response.getDataOrDefault({});
         return data;
     }
@@ -323,8 +323,8 @@ export class AssistsX {
      * @param duration 持续时间
      * @returns 是否成功
      */
-    static gestureClick(x, y, duration) {
-        const response = this.call(CallMethod.gestureClick, { args: { x, y, duration } });
+    static async clickByGesture(x, y, duration) {
+        const response = await this.asyncCall(CallMethod.clickByGesture, { args: { x, y, duration } });
         return response.getDataOrDefault(false);
     }
     /**
@@ -407,8 +407,8 @@ export class AssistsX {
      * @param clickDuration 点击持续时间
      * @returns 是否成功
      */
-    static async nodeGestureClick(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration } = {}) {
-        const response = await this.asyncCall(CallMethod.nodeGestureClick, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration } });
+    static async clickNodeByGesture(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration } = {}) {
+        const response = await this.asyncCall(CallMethod.clickNodeByGesture, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration } });
         return response.getDataOrDefault(false);
     }
     /**
@@ -421,10 +421,25 @@ export class AssistsX {
      * @param clickInterval 点击间隔
      * @returns 是否成功
      */
-    static async nodeGestureClickByDouble(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } = {}) {
-        const response = await this.asyncCall(CallMethod.nodeGestureClickByDouble, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } });
+    static async doubleClickNodeByGesture(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } = {}) {
+        const response = await this.asyncCall(CallMethod.doubleClickNodeByGesture, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } });
         return response.getDataOrDefault(false);
     }
+    /**
+     * 执行线型手势
+     * @param startPoint
+     * @param endPoint
+     * @param param2
+     * @returns
+     */
+    static async performLinearGesture(startPoint, endPoint, { duration } = {}) {
+        const response = await this.asyncCall(CallMethod.performLinearGesture, { args: { startPoint, endPoint, duration } });
+        return response.getDataOrDefault(false);
+    }
+    static async getAppInfo(packageName) {
+        const response = await this.asyncCall(CallMethod.getAppInfo, { args: { packageName } });
+        return response.getDataOrDefault({});
+    }
     /**
      * 获取屏幕尺寸
      * @returns 屏幕尺寸对象

package/dist/CallMethod.d.ts

@@ -13,12 +13,10 @@ export declare const CallMethod: {
     readonly getNodes: "getNodes";
     readonly findFirstParentClickable: "findFirstParentClickable";
     readonly getChildren: "getChildren";
-    readonly dispatchGesture: "dispatchGesture";
     readonly getBoundsInScreen: "getBoundsInScreen";
     readonly isVisible: "isVisible";
     readonly click: "click";
     readonly longClick: "longClick";
-    readonly gestureClick: "gestureClick";
     readonly back: "back";
     readonly home: "home";
     readonly notifications: "notifications";
@@ -30,11 +28,14 @@ export declare const CallMethod: {
     readonly getPackageName: "getPackageName";
     readonly getScreenSize: "getScreenSize";
     readonly getAppScreenSize: "getAppScreenSize";
-    readonly nodeGestureClick: "nodeGestureClick";
-    readonly nodeGestureClickByDouble: "nodeGestureClickByDouble";
     readonly scrollBackward: "scrollBackward";
     readonly setOverlayFlags: "setOverlayFlags";
     readonly scanQR: "scanQR";
-    readonly addWebFloatingWindow: "addWebFloatingWindow";
+    readonly loadWebViewOverlay: "loadWebViewOverlay";
+    readonly clickByGesture: "clickByGesture";
+    readonly clickNodeByGesture: "clickNodeByGesture";
+    readonly doubleClickNodeByGesture: "doubleClickNodeByGesture";
+    readonly performLinearGesture: "performLinearGesture";
+    readonly getAppInfo: "getAppInfo";
 };
 export type CallMethodType = typeof CallMethod[keyof typeof CallMethod];

package/dist/CallMethod.js

@@ -14,12 +14,10 @@ export const CallMethod = {
     getNodes: "getNodes",
     findFirstParentClickable: "findFirstParentClickable",
     getChildren: "getChildren",
-    dispatchGesture: "dispatchGesture",
     getBoundsInScreen: "getBoundsInScreen",
     isVisible: "isVisible",
     click: "click",
     longClick: "longClick",
-    gestureClick: "gestureClick",
     back: "back",
     home: "home",
     notifications: "notifications",
@@ -31,10 +29,13 @@ export const CallMethod = {
     getPackageName: "getPackageName",
     getScreenSize: "getScreenSize",
     getAppScreenSize: "getAppScreenSize",
-    nodeGestureClick: "nodeGestureClick",
-    nodeGestureClickByDouble: "nodeGestureClickByDouble",
     scrollBackward: "scrollBackward",
     setOverlayFlags: "setOverlayFlags",
     scanQR: "scanQR",
-    addWebFloatingWindow: "addWebFloatingWindow"
+    loadWebViewOverlay: "loadWebViewOverlay",
+    clickByGesture: "clickByGesture",
+    clickNodeByGesture: "clickNodeByGesture",
+    doubleClickNodeByGesture: "doubleClickNodeByGesture",
+    performLinearGesture: "performLinearGesture",
+    getAppInfo: "getAppInfo",
 };

package/dist/Node.d.ts

@@ -63,7 +63,7 @@ export declare class Node {
      * @param clickDuration 点击持续时间
      * @returns 是否点击成功
      */
-    nodeGestureClick({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration }?: {
+    clickNodeByGesture({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration }?: {
         offsetX?: number;
         offsetY?: number;
         switchWindowIntervalDelay?: number;
@@ -78,7 +78,7 @@ export declare class Node {
      * @param clickInterval 点击间隔
      * @returns 是否双击成功
      */
-    nodeGestureClickByDouble({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval }?: {
+    doubleClickNodeByGesture({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval }?: {
         offsetX?: number;
         offsetY?: number;
         switchWindowIntervalDelay?: number;

package/dist/Node.js

@@ -25,9 +25,9 @@ export class Node {
      * @param clickDuration 点击持续时间
      * @returns 是否点击成功
      */
-    async nodeGestureClick({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration } = {}) {
+    async clickNodeByGesture({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration } = {}) {
         Step.assert(this.stepId);
-        const result = await AssistsX.nodeGestureClick(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration });
+        const result = await AssistsX.clickNodeByGesture(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration });
         Step.assert(this.stepId);
         return result;
     }
@@ -40,9 +40,9 @@ export class Node {
      * @param clickInterval 点击间隔
      * @returns 是否双击成功
      */
-    async nodeGestureClickByDouble({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } = {}) {
+    async doubleClickNodeByGesture({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } = {}) {
         Step.assert(this.stepId);
-        const result = await AssistsX.nodeGestureClickByDouble(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval });
+        const result = await AssistsX.doubleClickNodeByGesture(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval });
         Step.assert(this.stepId);
         return result;
     }

package/dist/Step.d.ts

@@ -3,6 +3,7 @@ export declare class Step {
     static delayMsDefault: number;
     static readonly repeatCountInfinite: number;
     static repeatCountMaxDefault: number;
+    static showLog: boolean;
     /**
      * 当前执行步骤的ID
      */
@@ -231,7 +232,17 @@ export declare class Step {
      * @param duration 持续时间(毫秒)
      * @returns 是否成功
      */
-    gestureClick(x: number, y: number, duration: number): boolean;
+    clickByGesture(x: number, y: number, duration: number): Promise<boolean>;
+    getAppInfo(packageName: string): Promise<any>;
+    performLinearGesture(startPoint: {
+        x: number;
+        y: number;
+    }, endPoint: {
+        x: number;
+        y: number;
+    }, { duration }?: {
+        duration?: number;
+    }): Promise<boolean>;
     /**
      * 返回操作
      * @returns 是否成功

package/dist/Step.js

@@ -24,16 +24,22 @@ export class Step {
             let step = new Step({ stepId: this._stepId, impl, tag, data, delayMs });
             while (true) {
                 if (step.delayMs) {
-                    console.log(`延迟${step.delayMs}毫秒`);
+                    if (Step.showLog) {
+                        console.log(`延迟${step.delayMs}毫秒`);
+                    }
                     await step.delay(step.delayMs);
                     Step.assert(step.stepId);
                 }
                 //执行步骤
                 implnName = step.impl.name;
-                console.log(`执行步骤${implnName}，重复次数${step.repeatCount}`);
+                if (Step.showLog) {
+                    console.log(`执行步骤${implnName}，重复次数${step.repeatCount}`);
+                }
                 const nextStep = await step.impl(step);
                 if (step.repeatCountMax > Step.repeatCountInfinite && step.repeatCount > step.repeatCountMax) {
-                    console.log(`重复次数${step.repeatCount}超过最大次数${step.repeatCountMax}，停止执行`);
+                    if (Step.showLog) {
+                        console.log(`重复次数${step.repeatCount}超过最大次数${step.repeatCountMax}，停止执行`);
+                    }
                     break;
                 }
                 Step.assert(step.stepId);
@@ -46,7 +52,9 @@ export class Step {
             }
         }
         catch (e) {
-            console.error(`步骤${implnName}执行出错`, e);
+            if (Step.showLog) {
+                console.error(`步骤${implnName}执行出错`, e);
+            }
             //步骤执行出错
             const errorMsg = JSON.stringify({
                 impl: implnName,
@@ -341,9 +349,21 @@ export class Step {
      * @param duration 持续时间(毫秒)
      * @returns 是否成功
      */
-    gestureClick(x, y, duration) {
+    async clickByGesture(x, y, duration) {
+        Step.assert(this.stepId);
+        const result = await AssistsX.clickByGesture(x, y, duration);
+        Step.assert(this.stepId);
+        return result;
+    }
+    async getAppInfo(packageName) {
+        Step.assert(this.stepId);
+        const result = await AssistsX.getAppInfo(packageName);
+        Step.assert(this.stepId);
+        return result;
+    }
+    async performLinearGesture(startPoint, endPoint, { duration } = {}) {
         Step.assert(this.stepId);
-        const result = AssistsX.gestureClick(x, y, duration);
+        const result = await AssistsX.performLinearGesture(startPoint, endPoint, { duration });
         Step.assert(this.stepId);
         return result;
     }
@@ -411,6 +431,7 @@ export class Step {
 Step.delayMsDefault = 1000;
 Step.repeatCountInfinite = -1;
 Step.repeatCountMaxDefault = Step.repeatCountInfinite;
+Step.showLog = false;
 /**
  * 当前执行步骤的ID
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistsx-js",
-  "version": "0.0.1334",
+  "version": "0.0.1340",
   "description": "assistsx-js自动化开发SDK",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -33,7 +33,7 @@
     "dev"
   ],
   "author": "Ven",
-  "license": "ISC",
+  "license": "MIT",
   "devDependencies": {
     "typescript": "^5.3.3"
   },

package/src/AssistsX.ts

@@ -175,10 +175,10 @@ export class AssistsX {
         const data = response.getDataOrDefault({ value: "" });
         return data.value;
     }
-    public static async addWebFloatingWindow(url: string, options: WebFloatingWindowOptions = {}): Promise<any> {
+    public static async loadWebViewOverlay(url: string, options: WebFloatingWindowOptions = {}): Promise<any> {
         const { initialWidth, initialHeight, minWidth, minHeight, maxWidth, maxHeight, initialCenter } = options;
         const response = await this.asyncCall(
-            CallMethod.addWebFloatingWindow,
+            CallMethod.loadWebViewOverlay,
             { args: { url, initialWidth, initialHeight, minWidth, minHeight, maxWidth, maxHeight, initialCenter } }
         );
         const data = response.getDataOrDefault({});
@@ -375,8 +375,8 @@ export class AssistsX {
      * @param duration 持续时间
      * @returns 是否成功
      */
-    public static gestureClick(x: number, y: number, duration: number): boolean {
-        const response = this.call(CallMethod.gestureClick, { args: { x, y, duration } });
+    public static async clickByGesture(x: number, y: number, duration: number): Promise<boolean> {
+        const response = await this.asyncCall(CallMethod.clickByGesture, { args: { x, y, duration } });
         return response.getDataOrDefault(false);
     }
 
@@ -468,8 +468,8 @@ export class AssistsX {
      * @param clickDuration 点击持续时间
      * @returns 是否成功
      */
-    public static async nodeGestureClick(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration }: { offsetX?: number, offsetY?: number, switchWindowIntervalDelay?: number, clickDuration?: number } = {}): Promise<boolean> {
-        const response = await this.asyncCall(CallMethod.nodeGestureClick, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration } });
+    public static async clickNodeByGesture(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration }: { offsetX?: number, offsetY?: number, switchWindowIntervalDelay?: number, clickDuration?: number } = {}): Promise<boolean> {
+        const response = await this.asyncCall(CallMethod.clickNodeByGesture, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration } });
         return response.getDataOrDefault(false);
     }
 
@@ -483,11 +483,26 @@ export class AssistsX {
      * @param clickInterval 点击间隔
      * @returns 是否成功
      */
-    public static async nodeGestureClickByDouble(node: Node,
+    public static async doubleClickNodeByGesture(node: Node,
         { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval }: { offsetX?: number, offsetY?: number, switchWindowIntervalDelay?: number, clickDuration?: number, clickInterval?: number } = {}): Promise<boolean> {
-        const response = await this.asyncCall(CallMethod.nodeGestureClickByDouble, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } });
+        const response = await this.asyncCall(CallMethod.doubleClickNodeByGesture, { node, args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval } });
         return response.getDataOrDefault(false);
     }
+    /**
+     * 执行线型手势
+     * @param startPoint 
+     * @param endPoint 
+     * @param param2 
+     * @returns 
+     */
+    public static async performLinearGesture(startPoint: { x: number, y: number }, endPoint: { x: number, y: number }, { duration }: { duration?: number } = {}): Promise<boolean> {
+        const response = await this.asyncCall(CallMethod.performLinearGesture, { args: { startPoint, endPoint, duration } });
+        return response.getDataOrDefault(false);
+    }
+    public static async getAppInfo(packageName: string): Promise<any> {
+        const response = await this.asyncCall(CallMethod.getAppInfo, { args: { packageName } });
+        return response.getDataOrDefault({});
+    }
 
     /**
      * 获取屏幕尺寸

package/src/CallMethod.ts

@@ -14,12 +14,10 @@ export const CallMethod = {
     getNodes: "getNodes",
     findFirstParentClickable: "findFirstParentClickable",
     getChildren: "getChildren",
-    dispatchGesture: "dispatchGesture",
     getBoundsInScreen: "getBoundsInScreen",
     isVisible: "isVisible",
     click: "click",
     longClick: "longClick",
-    gestureClick: "gestureClick",
     back: "back",
     home: "home",
     notifications: "notifications",
@@ -31,12 +29,17 @@ export const CallMethod = {
     getPackageName: "getPackageName",
     getScreenSize: "getScreenSize",
     getAppScreenSize: "getAppScreenSize",
-    nodeGestureClick: "nodeGestureClick",
-    nodeGestureClickByDouble: "nodeGestureClickByDouble",
     scrollBackward: "scrollBackward",
     setOverlayFlags: "setOverlayFlags",
     scanQR: "scanQR",
-    addWebFloatingWindow: "addWebFloatingWindow"
+    loadWebViewOverlay: "loadWebViewOverlay",
+
+    clickByGesture: "clickByGesture",
+    clickNodeByGesture: "clickNodeByGesture",
+    doubleClickNodeByGesture: "doubleClickNodeByGesture",
+    performLinearGesture: "performLinearGesture",
+
+    getAppInfo: "getAppInfo",
 } as const;
 
 // 导出类型定义

package/src/Node.ts

@@ -87,9 +87,9 @@ export class Node {
      * @param clickDuration 点击持续时间
      * @returns 是否点击成功
      */
-    public async nodeGestureClick({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration }: { offsetX?: number, offsetY?: number, switchWindowIntervalDelay?: number, clickDuration?: number } = {}): Promise<boolean> {
+    public async clickNodeByGesture({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration }: { offsetX?: number, offsetY?: number, switchWindowIntervalDelay?: number, clickDuration?: number } = {}): Promise<boolean> {
         Step.assert(this.stepId);
-        const result = await AssistsX.nodeGestureClick(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration });
+        const result = await AssistsX.clickNodeByGesture(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration });
         Step.assert(this.stepId);
         return result;
     }
@@ -102,9 +102,9 @@ export class Node {
      * @param clickInterval 点击间隔
      * @returns 是否双击成功
      */
-    public async nodeGestureClickByDouble({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval }: { offsetX?: number, offsetY?: number, switchWindowIntervalDelay?: number, clickDuration?: number, clickInterval?: number } = {}): Promise<boolean> {
+    public async doubleClickNodeByGesture({ offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval }: { offsetX?: number, offsetY?: number, switchWindowIntervalDelay?: number, clickDuration?: number, clickInterval?: number } = {}): Promise<boolean> {
         Step.assert(this.stepId);
-        const result = await AssistsX.nodeGestureClickByDouble(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval });
+        const result = await AssistsX.doubleClickNodeByGesture(this, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval });
         Step.assert(this.stepId);
         return result;
     }

package/src/Step.ts

@@ -14,6 +14,7 @@ export class Step {
     static delayMsDefault: number = 1000;
     static readonly repeatCountInfinite: number = -1;
     static repeatCountMaxDefault: number = Step.repeatCountInfinite;
+    static showLog: boolean = false;
 
     /**
      * 当前执行步骤的ID
@@ -38,16 +39,22 @@ export class Step {
             let step = new Step({ stepId: this._stepId, impl, tag, data, delayMs });
             while (true) {
                 if (step.delayMs) {
-                    console.log(`延迟${step.delayMs}毫秒`)
+                    if (Step.showLog) {
+                        console.log(`延迟${step.delayMs}毫秒`)
+                    }
                     await step.delay(step.delayMs);
                     Step.assert(step.stepId);
                 }
                 //执行步骤
                 implnName = step.impl.name
-                console.log(`执行步骤${implnName}，重复次数${step.repeatCount}`)
+                if (Step.showLog) {
+                    console.log(`执行步骤${implnName}，重复次数${step.repeatCount}`)
+                }
                 const nextStep = await step.impl(step);
                 if (step.repeatCountMax > Step.repeatCountInfinite && step.repeatCount > step.repeatCountMax) {
-                    console.log(`重复次数${step.repeatCount}超过最大次数${step.repeatCountMax}，停止执行`)
+                    if (Step.showLog) {
+                        console.log(`重复次数${step.repeatCount}超过最大次数${step.repeatCountMax}，停止执行`)
+                    }
                     break;
                 }
 
@@ -60,7 +67,9 @@ export class Step {
             }
 
         } catch (e: any) {
-            console.error(`步骤${implnName}执行出错`, e)
+            if (Step.showLog) {
+                console.error(`步骤${implnName}执行出错`, e)
+            }
             //步骤执行出错
             const errorMsg = JSON.stringify({
                 impl: implnName,
@@ -395,9 +404,21 @@ export class Step {
      * @param duration 持续时间(毫秒)
      * @returns 是否成功
      */
-    public gestureClick(x: number, y: number, duration: number): boolean {
+    public async clickByGesture(x: number, y: number, duration: number): Promise<boolean> {
+        Step.assert(this.stepId);
+        const result = await AssistsX.clickByGesture(x, y, duration);
+        Step.assert(this.stepId);
+        return result;
+    }
+    public async getAppInfo(packageName: string): Promise<any> {
+        Step.assert(this.stepId);
+        const result = await AssistsX.getAppInfo(packageName);
+        Step.assert(this.stepId);
+        return result;
+    }
+    public async performLinearGesture(startPoint: { x: number, y: number }, endPoint: { x: number, y: number }, { duration }: { duration?: number } = {}): Promise<boolean> {
         Step.assert(this.stepId);
-        const result = AssistsX.gestureClick(x, y, duration);
+        const result = await AssistsX.performLinearGesture(startPoint, endPoint, { duration });
         Step.assert(this.stepId);
         return result;
     }