assistsx-js 0.1.25 → 0.1.27

package/dist/Step.js

@@ -154,6 +154,8 @@ export class Step {
                     }
                 }
             }
+            //步骤执行完成
+            stepStore.completeStep();
         }
         catch (e) {
             console.error(`步骤${implnName}执行出错`, e);
@@ -167,8 +169,6 @@ export class Step {
             stepStore.setError(errorMsg);
             throw e;
         }
-        //步骤执行结束
-        stepStore.completeStep();
         return currentStep;
     }
     /**

package/dist/gallery/gallery.d.ts

@@ -0,0 +1,60 @@
+/**
+ * 相册操作响应接口定义
+ */
+export interface GalleryResponse {
+    success: boolean;
+    uri?: string;
+    id?: number;
+    type?: string;
+    message?: string;
+}
+/**
+ * 删除相册项响应接口定义
+ */
+export interface GalleryDeleteResponse {
+    success: boolean;
+    deletedRows: number;
+    message?: string;
+}
+export declare class Gallery {
+    /**
+     * 执行异步调用
+     * @param method 方法名
+     * @param args 参数对象
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<调用响应>
+     */
+    private asyncCall;
+    /**
+     * 添加图片到系统相册
+     * @param filePath 图片文件路径（必需）
+     * @param displayName 显示名称（可选，默认使用文件名）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<相册操作响应>
+     */
+    addImageToGallery(filePath: string, displayName?: string, timeout?: number): Promise<GalleryResponse>;
+    /**
+     * 添加视频到系统相册
+     * @param filePath 视频文件路径（必需）
+     * @param displayName 显示名称（可选，默认使用文件名）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<相册操作响应>
+     */
+    addVideoToGallery(filePath: string, displayName?: string, timeout?: number): Promise<GalleryResponse>;
+    /**
+     * 从系统相册删除
+     * @param uri 媒体文件的URI（必需，格式如：content://media/external/images/media/123）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<删除响应>
+     */
+    deleteFromGalleryByUri(uri: string, timeout?: number): Promise<GalleryDeleteResponse>;
+    /**
+     * 从系统相册删除（通过ID和类型）
+     * @param id 媒体文件的ID（必需）
+     * @param type 媒体类型，"image" 或 "video"（必需）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<删除响应>
+     */
+    deleteFromGalleryById(id: number, type: "image" | "video", timeout?: number): Promise<GalleryDeleteResponse>;
+}
+export declare const gallery: Gallery;

package/dist/gallery/gallery.js

@@ -0,0 +1,142 @@
+/**
+ * 系统相册相关功能
+ * 提供添加图片/视频到相册和从相册删除的功能
+ */
+import { CallResponse } from "../CallResponse";
+import { decodeBase64UTF8, generateUUID } from "../Utils";
+// 回调函数存储对象
+const callbacks = new Map();
+// 初始化全局回调函数
+if (typeof window !== "undefined" && !window.assistsxGalleryCallback) {
+    window.assistsxGalleryCallback = (data) => {
+        let callbackId;
+        try {
+            const json = decodeBase64UTF8(data);
+            const response = JSON.parse(json);
+            callbackId = response.callbackId;
+            if (callbackId) {
+                const callback = callbacks.get(callbackId);
+                if (callback) {
+                    callback(json);
+                }
+            }
+        }
+        catch (e) {
+            console.error("Gallery callback error:", e);
+        }
+        finally {
+            if (callbackId) {
+                callbacks.delete(callbackId);
+            }
+        }
+    };
+}
+export class Gallery {
+    /**
+     * 执行异步调用
+     * @param method 方法名
+     * @param args 参数对象
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<调用响应>
+     */
+    async asyncCall(method, args, timeout = 30) {
+        const uuid = generateUUID();
+        const params = {
+            method,
+            arguments: args ? args : undefined,
+            callbackId: uuid,
+        };
+        const promise = new Promise((resolve) => {
+            callbacks.set(uuid, (data) => {
+                resolve(data);
+            });
+            setTimeout(() => {
+                callbacks.delete(uuid);
+                resolve(JSON.stringify(new CallResponse(0, null, uuid)));
+            }, timeout * 1000);
+        });
+        const result = window.assistsxGallery.call(JSON.stringify(params));
+        const promiseResult = await promise;
+        if (typeof promiseResult === "string") {
+            const responseData = JSON.parse(promiseResult);
+            return new CallResponse(responseData.code, responseData.data, responseData.callbackId);
+        }
+        throw new Error("Call failed");
+    }
+    /**
+     * 添加图片到系统相册
+     * @param filePath 图片文件路径（必需）
+     * @param displayName 显示名称（可选，默认使用文件名）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<相册操作响应>
+     */
+    async addImageToGallery(filePath, displayName, timeout) {
+        var _a;
+        if (!filePath) {
+            throw new Error("filePath参数不能为空");
+        }
+        const response = await this.asyncCall("addImageToGallery", { filePath, displayName }, timeout);
+        if (!response.isSuccess()) {
+            throw new Error(((_a = response.data) === null || _a === void 0 ? void 0 : _a.message) || "添加图片到相册失败");
+        }
+        return response.data;
+    }
+    /**
+     * 添加视频到系统相册
+     * @param filePath 视频文件路径（必需）
+     * @param displayName 显示名称（可选，默认使用文件名）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<相册操作响应>
+     */
+    async addVideoToGallery(filePath, displayName, timeout) {
+        var _a;
+        if (!filePath) {
+            throw new Error("filePath参数不能为空");
+        }
+        const response = await this.asyncCall("addVideoToGallery", { filePath, displayName }, timeout);
+        if (!response.isSuccess()) {
+            throw new Error(((_a = response.data) === null || _a === void 0 ? void 0 : _a.message) || "添加视频到相册失败");
+        }
+        return response.data;
+    }
+    /**
+     * 从系统相册删除
+     * @param uri 媒体文件的URI（必需，格式如：content://media/external/images/media/123）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<删除响应>
+     */
+    async deleteFromGalleryByUri(uri, timeout) {
+        var _a;
+        if (!uri) {
+            throw new Error("uri参数不能为空");
+        }
+        const response = await this.asyncCall("deleteFromGallery", { uri }, timeout);
+        if (!response.isSuccess()) {
+            throw new Error(((_a = response.data) === null || _a === void 0 ? void 0 : _a.message) || "从相册删除失败");
+        }
+        return response.data;
+    }
+    /**
+     * 从系统相册删除（通过ID和类型）
+     * @param id 媒体文件的ID（必需）
+     * @param type 媒体类型，"image" 或 "video"（必需）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<删除响应>
+     */
+    async deleteFromGalleryById(id, type, timeout) {
+        var _a;
+        if (id === undefined || id === null) {
+            throw new Error("id参数不能为空");
+        }
+        if (!type || (type !== "image" && type !== "video")) {
+            throw new Error("type参数必须为 'image' 或 'video'");
+        }
+        const response = await this.asyncCall("deleteFromGallery", { id, type }, timeout);
+        if (!response.isSuccess()) {
+            throw new Error(((_a = response.data) === null || _a === void 0 ? void 0 : _a.message) || "从相册删除失败");
+        }
+        return response.data;
+    }
+}
+// 导出常量实例
+export const gallery = new Gallery();

package/dist/index.d.ts

@@ -21,3 +21,4 @@ export * from "./filesystem/fileio/file-io";
 export * from "./filesystem/fileutils/file-utils";
 export * from "./ime/ime";
 export * from "./imageutils/image-utils";
+export * from "./gallery/gallery";

package/dist/index.js

@@ -21,3 +21,4 @@ export * from "./filesystem/fileio/file-io";
 export * from "./filesystem/fileutils/file-utils";
 export * from "./ime/ime";
 export * from "./imageutils/image-utils";
+export * from "./gallery/gallery";

package/dist/network/http.d.ts

@@ -24,6 +24,9 @@ export interface HttpDownloadResponse {
     savePath: string;
     fileSize: number;
     saveToGallerySuccess?: boolean;
+    galleryUri?: string;
+    galleryId?: number;
+    galleryType?: string;
     headers: Record<string, string>;
 }
 /**
@@ -96,10 +99,11 @@ export declare class Http {
      * @param savePath 保存路径
      * @param headers 请求头
      * @param saveToGallery 是否保存到系统相册（仅支持图片和视频文件），默认 false
+     * @param displayName 保存到相册时的显示名称（可选，默认使用文件名）
      * @param timeout 超时时间(秒)，默认30秒
      * @returns Promise<下载响应>
      */
-    httpDownload(url: string, savePath: string, headers?: Record<string, string>, saveToGallery?: boolean, timeout?: number): Promise<HttpDownloadResponse>;
+    httpDownload(url: string, savePath: string, headers?: Record<string, string>, saveToGallery?: boolean, displayName?: string, timeout?: number): Promise<HttpDownloadResponse>;
     /**
      * 配置 OkHttpClient
      * @param config 配置选项

package/dist/network/http.js

@@ -145,12 +145,13 @@ export class Http {
      * @param savePath 保存路径
      * @param headers 请求头
      * @param saveToGallery 是否保存到系统相册（仅支持图片和视频文件），默认 false
+     * @param displayName 保存到相册时的显示名称（可选，默认使用文件名）
      * @param timeout 超时时间(秒)，默认30秒
      * @returns Promise<下载响应>
      */
-    async httpDownload(url, savePath, headers, saveToGallery, timeout) {
+    async httpDownload(url, savePath, headers, saveToGallery, displayName, timeout) {
         var _a;
-        const response = await this.asyncCall("httpDownload", { url, savePath, headers, saveToGallery }, timeout);
+        const response = await this.asyncCall("httpDownload", { url, savePath, headers, saveToGallery, displayName }, timeout);
         if (!response.isSuccess()) {
             throw new Error(((_a = response.data) === null || _a === void 0 ? void 0 : _a.message) || "HTTP download failed");
         }

package/package.json

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

package/src/Step.ts

@@ -219,6 +219,8 @@ export class Step {
                     }
                 }
             }
+            //步骤执行完成
+            stepStore.completeStep();
         } catch (e: any) {
             console.error(`步骤${implnName}执行出错`, e);
             //步骤执行出错
@@ -231,8 +233,6 @@ export class Step {
             stepStore.setError(errorMsg);
             throw e
         }
-        //步骤执行结束
-        stepStore.completeStep();
         return currentStep;
     }
 

package/src/gallery/gallery.ts

@@ -0,0 +1,207 @@
+/**
+ * 系统相册相关功能
+ * 提供添加图片/视频到相册和从相册删除的功能
+ */
+import { CallResponse } from "../CallResponse";
+import { decodeBase64UTF8, generateUUID } from "../Utils";
+
+/**
+ * 相册操作响应接口定义
+ */
+export interface GalleryResponse {
+    success: boolean;
+    uri?: string;
+    id?: number;
+    type?: string;
+    message?: string;
+}
+
+/**
+ * 删除相册项响应接口定义
+ */
+export interface GalleryDeleteResponse {
+    success: boolean;
+    deletedRows: number;
+    message?: string;
+}
+
+// 回调函数存储对象
+const callbacks: Map<string, (data: string) => void> = new Map();
+
+// 初始化全局回调函数
+if (typeof window !== "undefined" && !window.assistsxGalleryCallback) {
+    window.assistsxGalleryCallback = (data: string) => {
+        let callbackId: string | undefined;
+        try {
+            const json = decodeBase64UTF8(data);
+            const response = JSON.parse(json);
+            callbackId = response.callbackId;
+            if (callbackId) {
+                const callback = callbacks.get(callbackId);
+                if (callback) {
+                    callback(json);
+                }
+            }
+        } catch (e) {
+            console.error("Gallery callback error:", e);
+        } finally {
+            if (callbackId) {
+                callbacks.delete(callbackId);
+            }
+        }
+    };
+}
+
+export class Gallery {
+    /**
+     * 执行异步调用
+     * @param method 方法名
+     * @param args 参数对象
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<调用响应>
+     */
+    private async asyncCall(
+        method: string,
+        args?: any,
+        timeout: number = 30
+    ): Promise<CallResponse> {
+        const uuid = generateUUID();
+        const params = {
+            method,
+            arguments: args ? args : undefined,
+            callbackId: uuid,
+        };
+        const promise = new Promise<string>((resolve) => {
+            callbacks.set(uuid, (data: string) => {
+                resolve(data);
+            });
+            setTimeout(() => {
+                callbacks.delete(uuid);
+                resolve(JSON.stringify(new CallResponse(0, null, uuid)));
+            }, timeout * 1000);
+        });
+        const result = window.assistsxGallery.call(JSON.stringify(params));
+        const promiseResult = await promise;
+        if (typeof promiseResult === "string") {
+            const responseData = JSON.parse(promiseResult);
+            return new CallResponse(
+                responseData.code,
+                responseData.data,
+                responseData.callbackId
+            );
+        }
+        throw new Error("Call failed");
+    }
+
+    /**
+     * 添加图片到系统相册
+     * @param filePath 图片文件路径（必需）
+     * @param displayName 显示名称（可选，默认使用文件名）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<相册操作响应>
+     */
+    async addImageToGallery(
+        filePath: string,
+        displayName?: string,
+        timeout?: number
+    ): Promise<GalleryResponse> {
+        if (!filePath) {
+            throw new Error("filePath参数不能为空");
+        }
+
+        const response = await this.asyncCall(
+            "addImageToGallery",
+            { filePath, displayName },
+            timeout
+        );
+        if (!response.isSuccess()) {
+            throw new Error(response.data?.message || "添加图片到相册失败");
+        }
+        return response.data as GalleryResponse;
+    }
+
+    /**
+     * 添加视频到系统相册
+     * @param filePath 视频文件路径（必需）
+     * @param displayName 显示名称（可选，默认使用文件名）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<相册操作响应>
+     */
+    async addVideoToGallery(
+        filePath: string,
+        displayName?: string,
+        timeout?: number
+    ): Promise<GalleryResponse> {
+        if (!filePath) {
+            throw new Error("filePath参数不能为空");
+        }
+
+        const response = await this.asyncCall(
+            "addVideoToGallery",
+            { filePath, displayName },
+            timeout
+        );
+        if (!response.isSuccess()) {
+            throw new Error(response.data?.message || "添加视频到相册失败");
+        }
+        return response.data as GalleryResponse;
+    }
+
+    /**
+     * 从系统相册删除
+     * @param uri 媒体文件的URI（必需，格式如：content://media/external/images/media/123）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<删除响应>
+     */
+    async deleteFromGalleryByUri(
+        uri: string,
+        timeout?: number
+    ): Promise<GalleryDeleteResponse> {
+        if (!uri) {
+            throw new Error("uri参数不能为空");
+        }
+
+        const response = await this.asyncCall(
+            "deleteFromGallery",
+            { uri },
+            timeout
+        );
+        if (!response.isSuccess()) {
+            throw new Error(response.data?.message || "从相册删除失败");
+        }
+        return response.data as GalleryDeleteResponse;
+    }
+
+    /**
+     * 从系统相册删除（通过ID和类型）
+     * @param id 媒体文件的ID（必需）
+     * @param type 媒体类型，"image" 或 "video"（必需）
+     * @param timeout 超时时间(秒)，默认30秒
+     * @returns Promise<删除响应>
+     */
+    async deleteFromGalleryById(
+        id: number,
+        type: "image" | "video",
+        timeout?: number
+    ): Promise<GalleryDeleteResponse> {
+        if (id === undefined || id === null) {
+            throw new Error("id参数不能为空");
+        }
+        if (!type || (type !== "image" && type !== "video")) {
+            throw new Error("type参数必须为 'image' 或 'video'");
+        }
+
+        const response = await this.asyncCall(
+            "deleteFromGallery",
+            { id, type },
+            timeout
+        );
+        if (!response.isSuccess()) {
+            throw new Error(response.data?.message || "从相册删除失败");
+        }
+        return response.data as GalleryDeleteResponse;
+    }
+}
+
+// 导出常量实例
+export const gallery = new Gallery();

package/src/global.d.ts

@@ -35,6 +35,10 @@ declare global {
             call(method: string): string | null;
         };
         assistsxImageUtilsCallback: (data: string) => void;
+        assistsxGallery: {
+            call(method: string): string | null;
+        };
+        assistsxGalleryCallback: (data: string) => void;
     }
 }
 

package/src/index.ts

@@ -20,4 +20,5 @@ export * from "./filesystem/path";
 export * from "./filesystem/fileio/file-io";
 export * from "./filesystem/fileutils/file-utils";
 export * from "./ime/ime";
-export * from "./imageutils/image-utils";
+export * from "./imageutils/image-utils";
+export * from "./gallery/gallery";

package/src/network/http.ts

@@ -33,6 +33,9 @@ export interface HttpDownloadResponse {
     savePath: string;
     fileSize: number;
     saveToGallerySuccess?: boolean;
+    galleryUri?: string;
+    galleryId?: number;
+    galleryType?: string;
     headers: Record<string, string>;
 }
 
@@ -225,6 +228,7 @@ export class Http {
      * @param savePath 保存路径
      * @param headers 请求头
      * @param saveToGallery 是否保存到系统相册（仅支持图片和视频文件），默认 false
+     * @param displayName 保存到相册时的显示名称（可选，默认使用文件名）
      * @param timeout 超时时间(秒)，默认30秒
      * @returns Promise<下载响应>
      */
@@ -233,11 +237,12 @@ export class Http {
         savePath: string,
         headers?: Record<string, string>,
         saveToGallery?: boolean,
+        displayName?: string,
         timeout?: number
     ): Promise<HttpDownloadResponse> {
         const response = await this.asyncCall(
             "httpDownload",
-            { url, savePath, headers, saveToGallery },
+            { url, savePath, headers, saveToGallery, displayName },
             timeout
         );
         if (!response.isSuccess()) {