assistsx-js 0.0.2028 → 0.0.2029

package/dist/AssistsX.d.ts

@@ -7,6 +7,7 @@ import { CallResponse } from "./CallResponse";
 import { Bounds } from "./Bounds";
 import { AccessibilityEventFilter } from "AccessibilityEventFilter";
 import { AppInfo } from "./AppInfo";
+import { DeviceInfo } from "./DeviceInfo";
 /**
  * 无障碍事件数据结构
  */
@@ -404,7 +405,7 @@ export declare class AssistsX {
     static getUniqueDeviceId(): any;
     static getAndroidID(): any;
     static getMacAddress(timeout?: number): Promise<any>;
-    static getDeviceInfo(timeout?: number): Promise<any>;
+    static getDeviceInfo(timeout?: number): Promise<DeviceInfo>;
     static getNetworkType(timeout?: number): Promise<any>;
     static setAccessibilityEventFilters(value: AccessibilityEventFilter[]): Promise<any>;
     static addAccessibilityEventFilter(value: AccessibilityEventFilter): Promise<any>;

package/dist/AssistsX.js

@@ -8,6 +8,7 @@ import { CallResponse } from "./CallResponse";
 import { Bounds } from "./Bounds";
 import { decodeBase64UTF8, generateUUID } from "./Utils";
 import { AppInfo } from "./AppInfo";
+import { DeviceInfo } from "./DeviceInfo";
 // 回调函数存储对象
 export const callbacks = new Map();
 // 无障碍事件监听器存储
@@ -602,7 +603,7 @@ export class AssistsX {
         const response = await this.asyncCall(CallMethod.getDeviceInfo, {
             timeout,
         });
-        return response.getDataOrDefault({});
+        return DeviceInfo.fromJSON(response.getDataOrDefault({}));
     }
     static async getNetworkType(timeout) {
         const response = await this.asyncCall(CallMethod.getNetworkType, {

package/dist/AssistsXAsync.d.ts

@@ -5,6 +5,7 @@
 import { Node } from "./Node";
 import { Bounds } from "./Bounds";
 import { AppInfo } from "./AppInfo";
+import { DeviceInfo } from "./DeviceInfo";
 import { WebFloatingWindowOptions } from "./AssistsX";
 export declare class AssistsXAsync {
     /**
@@ -359,7 +360,7 @@ export declare class AssistsXAsync {
     static getUniqueDeviceId(timeout?: number): Promise<any>;
     static getAndroidID(timeout?: number): Promise<any>;
     static getMacAddress(timeout?: number): Promise<any>;
-    static getDeviceInfo(timeout?: number): Promise<any>;
+    static getDeviceInfo(timeout?: number): Promise<DeviceInfo>;
     /**
      * 获取屏幕尺寸
      * @param timeout 超时时间(秒)，默认30秒

package/dist/AssistsXAsync.js

@@ -8,6 +8,7 @@ import { CallResponse } from "./CallResponse";
 import { Bounds } from "./Bounds";
 import { generateUUID } from "./Utils";
 import { AppInfo } from "./AppInfo";
+import { DeviceInfo } from "./DeviceInfo";
 import { callbacks, } from "./AssistsX";
 export class AssistsXAsync {
     /**
@@ -600,7 +601,7 @@ export class AssistsXAsync {
         const response = await this.asyncCall(CallMethod.getDeviceInfo, {
             timeout,
         });
-        return response.getDataOrDefault({});
+        return DeviceInfo.fromJSON(response.getDataOrDefault({}));
     }
     /**
      * 获取屏幕尺寸

package/dist/DeviceInfo.d.ts

@@ -0,0 +1,69 @@
+/**
+ * 设备信息实体类
+ */
+export declare class DeviceInfo {
+    /**
+     * 设备唯一标识
+     */
+    uniqueDeviceId: string;
+    /**
+     * Android ID
+     */
+    androidID: string;
+    /**
+     * MAC地址
+     */
+    macAddress: string;
+    /**
+     * 是否已Root
+     */
+    isDeviceRooted: boolean;
+    /**
+     * 制造商
+     */
+    manufacturer: string;
+    /**
+     * 设备型号
+     */
+    model: string;
+    /**
+     * SDK版本号
+     */
+    sdkVersionCode: number;
+    /**
+     * SDK版本名称
+     */
+    sdkVersionName: string;
+    /**
+     * ABI列表
+     */
+    abiList: string[];
+    /**
+     * 是否启用ADB调试
+     */
+    isAdbEnabled: boolean;
+    /**
+     * 是否启用开发者选项
+     */
+    isDevelopmentSettingsEnabled: boolean;
+    /**
+     * 是否为模拟器
+     */
+    isEmulator: boolean;
+    /**
+     * 是否为平板
+     */
+    isTablet: boolean;
+    constructor(uniqueDeviceId?: string, androidID?: string, macAddress?: string, isDeviceRooted?: boolean, manufacturer?: string, model?: string, sdkVersionCode?: number, sdkVersionName?: string, abiList?: string[], isAdbEnabled?: boolean, isDevelopmentSettingsEnabled?: boolean, isEmulator?: boolean, isTablet?: boolean);
+    /**
+     * 从JSON对象创建DeviceInfo实例
+     * @param data JSON对象
+     * @returns DeviceInfo实例
+     */
+    static fromJSON(data: any): DeviceInfo;
+    /**
+     * 转换为JSON对象
+     * @returns JSON对象
+     */
+    toJSON(): any;
+}

package/dist/DeviceInfo.js

@@ -0,0 +1,50 @@
+/**
+ * 设备信息实体类
+ */
+export class DeviceInfo {
+    constructor(uniqueDeviceId = "", androidID = "", macAddress = "", isDeviceRooted = false, manufacturer = "", model = "", sdkVersionCode = 0, sdkVersionName = "", abiList = [], isAdbEnabled = false, isDevelopmentSettingsEnabled = false, isEmulator = false, isTablet = false) {
+        this.uniqueDeviceId = uniqueDeviceId;
+        this.androidID = androidID;
+        this.macAddress = macAddress;
+        this.isDeviceRooted = isDeviceRooted;
+        this.manufacturer = manufacturer;
+        this.model = model;
+        this.sdkVersionCode = sdkVersionCode;
+        this.sdkVersionName = sdkVersionName;
+        this.abiList = abiList;
+        this.isAdbEnabled = isAdbEnabled;
+        this.isDevelopmentSettingsEnabled = isDevelopmentSettingsEnabled;
+        this.isEmulator = isEmulator;
+        this.isTablet = isTablet;
+    }
+    /**
+     * 从JSON对象创建DeviceInfo实例
+     * @param data JSON对象
+     * @returns DeviceInfo实例
+     */
+    static fromJSON(data) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        return new DeviceInfo((_a = data.uniqueDeviceId) !== null && _a !== void 0 ? _a : "", (_b = data.androidID) !== null && _b !== void 0 ? _b : "", (_c = data.macAddress) !== null && _c !== void 0 ? _c : "", (_d = data.isDeviceRooted) !== null && _d !== void 0 ? _d : false, (_e = data.manufacturer) !== null && _e !== void 0 ? _e : "", (_f = data.model) !== null && _f !== void 0 ? _f : "", (_g = data.sdkVersionCode) !== null && _g !== void 0 ? _g : 0, (_h = data.sdkVersionName) !== null && _h !== void 0 ? _h : "", (_j = data.abiList) !== null && _j !== void 0 ? _j : [], (_k = data.isAdbEnabled) !== null && _k !== void 0 ? _k : false, (_l = data.isDevelopmentSettingsEnabled) !== null && _l !== void 0 ? _l : false, (_m = data.isEmulator) !== null && _m !== void 0 ? _m : false, (_o = data.isTablet) !== null && _o !== void 0 ? _o : false);
+    }
+    /**
+     * 转换为JSON对象
+     * @returns JSON对象
+     */
+    toJSON() {
+        return {
+            uniqueDeviceId: this.uniqueDeviceId,
+            androidID: this.androidID,
+            macAddress: this.macAddress,
+            isDeviceRooted: this.isDeviceRooted,
+            manufacturer: this.manufacturer,
+            model: this.model,
+            sdkVersionCode: this.sdkVersionCode,
+            sdkVersionName: this.sdkVersionName,
+            abiList: this.abiList,
+            isAdbEnabled: this.isAdbEnabled,
+            isDevelopmentSettingsEnabled: this.isDevelopmentSettingsEnabled,
+            isEmulator: this.isEmulator,
+            isTablet: this.isTablet,
+        };
+    }
+}

package/dist/index.d.ts

@@ -13,3 +13,4 @@ export * from "./AssistsXAsync";
 export * from "./StepAsync";
 export * from "./AccessibilityEventFilter";
 export * from "./AppInfo";
+export * from "./DeviceInfo";

package/dist/index.js

@@ -13,3 +13,4 @@ export * from "./AssistsXAsync";
 export * from "./StepAsync";
 export * from "./AccessibilityEventFilter";
 export * from "./AppInfo";
+export * from "./DeviceInfo";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistsx-js",
-  "version": "0.0.2028",
+  "version": "0.0.2029",
   "description": "assistsx-js自动化开发SDK",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/AssistsX.ts

@@ -9,6 +9,7 @@ import { Bounds } from "./Bounds";
 import { decodeBase64UTF8, generateUUID } from "./Utils";
 import { AccessibilityEventFilter } from "AccessibilityEventFilter";
 import { AppInfo } from "./AppInfo";
+import { DeviceInfo } from "./DeviceInfo";
 
 /**
  * 无障碍事件数据结构
@@ -872,11 +873,11 @@ export class AssistsX {
     });
     return response.getDataOrDefault({});
   }
-  public static async getDeviceInfo(timeout?: number): Promise<any> {
+  public static async getDeviceInfo(timeout?: number): Promise<DeviceInfo> {
     const response = await this.asyncCall(CallMethod.getDeviceInfo, {
       timeout,
     });
-    return response.getDataOrDefault({});
+    return DeviceInfo.fromJSON(response.getDataOrDefault({}));
   }
   public static async getNetworkType(timeout?: number): Promise<any> {
     const response = await this.asyncCall(CallMethod.getNetworkType, {

package/src/AssistsXAsync.ts

@@ -8,6 +8,7 @@ import { CallResponse } from "./CallResponse";
 import { Bounds } from "./Bounds";
 import { generateUUID } from "./Utils";
 import { AppInfo } from "./AppInfo";
+import { DeviceInfo } from "./DeviceInfo";
 import {
   AssistsX,
   callbacks,
@@ -867,11 +868,11 @@ export class AssistsXAsync {
     });
     return response.getDataOrDefault({});
   }
-  public static async getDeviceInfo(timeout?: number): Promise<any> {
+  public static async getDeviceInfo(timeout?: number): Promise<DeviceInfo> {
     const response = await this.asyncCall(CallMethod.getDeviceInfo, {
       timeout,
     });
-    return response.getDataOrDefault({});
+    return DeviceInfo.fromJSON(response.getDataOrDefault({}));
   }
 
   /**

package/src/DeviceInfo.ts

@@ -0,0 +1,144 @@
+/**
+ * 设备信息实体类
+ */
+export class DeviceInfo {
+  /**
+   * 设备唯一标识
+   */
+  uniqueDeviceId: string;
+
+  /**
+   * Android ID
+   */
+  androidID: string;
+
+  /**
+   * MAC地址
+   */
+  macAddress: string;
+
+  /**
+   * 是否已Root
+   */
+  isDeviceRooted: boolean;
+
+  /**
+   * 制造商
+   */
+  manufacturer: string;
+
+  /**
+   * 设备型号
+   */
+  model: string;
+
+  /**
+   * SDK版本号
+   */
+  sdkVersionCode: number;
+
+  /**
+   * SDK版本名称
+   */
+  sdkVersionName: string;
+
+  /**
+   * ABI列表
+   */
+  abiList: string[];
+
+  /**
+   * 是否启用ADB调试
+   */
+  isAdbEnabled: boolean;
+
+  /**
+   * 是否启用开发者选项
+   */
+  isDevelopmentSettingsEnabled: boolean;
+
+  /**
+   * 是否为模拟器
+   */
+  isEmulator: boolean;
+
+  /**
+   * 是否为平板
+   */
+  isTablet: boolean;
+
+  constructor(
+    uniqueDeviceId: string = "",
+    androidID: string = "",
+    macAddress: string = "",
+    isDeviceRooted: boolean = false,
+    manufacturer: string = "",
+    model: string = "",
+    sdkVersionCode: number = 0,
+    sdkVersionName: string = "",
+    abiList: string[] = [],
+    isAdbEnabled: boolean = false,
+    isDevelopmentSettingsEnabled: boolean = false,
+    isEmulator: boolean = false,
+    isTablet: boolean = false
+  ) {
+    this.uniqueDeviceId = uniqueDeviceId;
+    this.androidID = androidID;
+    this.macAddress = macAddress;
+    this.isDeviceRooted = isDeviceRooted;
+    this.manufacturer = manufacturer;
+    this.model = model;
+    this.sdkVersionCode = sdkVersionCode;
+    this.sdkVersionName = sdkVersionName;
+    this.abiList = abiList;
+    this.isAdbEnabled = isAdbEnabled;
+    this.isDevelopmentSettingsEnabled = isDevelopmentSettingsEnabled;
+    this.isEmulator = isEmulator;
+    this.isTablet = isTablet;
+  }
+
+  /**
+   * 从JSON对象创建DeviceInfo实例
+   * @param data JSON对象
+   * @returns DeviceInfo实例
+   */
+  static fromJSON(data: any): DeviceInfo {
+    return new DeviceInfo(
+      data.uniqueDeviceId ?? "",
+      data.androidID ?? "",
+      data.macAddress ?? "",
+      data.isDeviceRooted ?? false,
+      data.manufacturer ?? "",
+      data.model ?? "",
+      data.sdkVersionCode ?? 0,
+      data.sdkVersionName ?? "",
+      data.abiList ?? [],
+      data.isAdbEnabled ?? false,
+      data.isDevelopmentSettingsEnabled ?? false,
+      data.isEmulator ?? false,
+      data.isTablet ?? false
+    );
+  }
+
+  /**
+   * 转换为JSON对象
+   * @returns JSON对象
+   */
+  toJSON(): any {
+    return {
+      uniqueDeviceId: this.uniqueDeviceId,
+      androidID: this.androidID,
+      macAddress: this.macAddress,
+      isDeviceRooted: this.isDeviceRooted,
+      manufacturer: this.manufacturer,
+      model: this.model,
+      sdkVersionCode: this.sdkVersionCode,
+      sdkVersionName: this.sdkVersionName,
+      abiList: this.abiList,
+      isAdbEnabled: this.isAdbEnabled,
+      isDevelopmentSettingsEnabled: this.isDevelopmentSettingsEnabled,
+      isEmulator: this.isEmulator,
+      isTablet: this.isTablet,
+    };
+  }
+}

package/src/index.ts

@@ -13,3 +13,4 @@ export * from "./AssistsXAsync";
 export * from "./StepAsync";
 export * from "./AccessibilityEventFilter";
 export * from "./AppInfo";
+export * from "./DeviceInfo";