@polyvharmony/live-scenes-foundation 1.2.0-rc.1 → 1.3.0-rc.1

package/CHANGELOG.md

@@ -1,4 +1,8 @@
-## [v1.2.0-rc.1] - 2025-02-10
+## [v1.3.0-rc.1] - 2025-08-25
+
+Canary build
+
+## [v1.2.0] - 2025-02-10
 
 新增：
 

package/Index.d.ets

@@ -1,6 +1,7 @@
+export { PLVNodeControllerManager, PLVNodeController, NodeControllerConfig } from './src/main/ets/common/ui/PLVNodeController';
 export { IPLVBackwardInterface } from './src/main/ets/common/IPLVBackwardInterface';
 export { default as PLVLazyDataSource } from './src/main/ets/common/PLVBasicDataSource';
-export { PLVCallback, PLVCallback2, PLVStateData, PLVDisposable, PLVPromiseValue, PLVLazyValue, PLVAsyncLazyValue, IPLVEventEmitter, IPLVEventNotify, PLVEventNotify } from './src/main/ets/common/PLVCallback';
+export { PLVCallback, PLVCallback2, PLVCustomBuilder, PLVMediaQueryListener, PLVAvoidAreaChangeListener, PLVStateData, PLVStatefulData, PLVDisposable, PLVPromiseValue, PLVLazyValue, PLVAsyncLazyValue, IPLVEventEmitter, IPLVEventNotify, PLVEventNotify } from './src/main/ets/common/PLVCallback';
 export { default as PLVCommonConstants } from './src/main/ets/common/PLVCommonConstants';
 export { PLVDeviceUtils } from './src/main/ets/common/PLVDeviceUtils';
 export { PLVHashMap } from './src/main/ets/common/PLVHashMap';
@@ -9,10 +10,11 @@ export { default as PLVJSONUtils } from './src/main/ets/common/PLVJSONUtils';
 export { PLVPreferencesUtils } from './src/main/ets/common/PLVPreferencesUtils';
 export { PLVScheduledTask } from './src/main/ets/common/PLVScheduledTask';
 export { PLVSimpleBuffer } from './src/main/ets/common/PLVSimpleBuffer';
+export { PLVSparseArray } from './src/main/ets/common/PLVSparseArray';
 export { PLVTextUtils } from './src/main/ets/common/PLVTextUtils';
 export { PLVUACreator } from './src/main/ets/common/PLVUACreator';
 export { default as PLVToastUtils } from './src/main/ets/common/PLVToastUtils';
-export { PLVResponseObject, PLVResponseData, PLVResponse, PLVJSONObject, PLVResolve, PLVReject } from './src/main/ets/common/PLVType';
+export { PLVResponseObject, PLVResponseType, PLVResponseData, PLVResponse, PLVJSONObject, PLVResolve, PLVReject } from './src/main/ets/common/PLVType';
 export { default as PLVUtils } from './src/main/ets/common/PLVUtils';
 export { PLVWebUtils } from './src/main/ets/common/PLVWebUtils';
 export { PLVTimeUtils } from './src/main/ets/common/PLVTimeUtils';

package/Index.js

@@ -1,5 +1,6 @@
+export { PLVNodeControllerManager, PLVNodeController } from './src/main/ets/common/ui/PLVNodeController';
 export { default as PLVLazyDataSource } from './src/main/ets/common/PLVBasicDataSource';
-export { PLVStateData, PLVDisposable, PLVPromiseValue, PLVLazyValue, PLVAsyncLazyValue, PLVEventNotify } from './src/main/ets/common/PLVCallback';
+export { PLVCustomBuilder, PLVMediaQueryListener, PLVAvoidAreaChangeListener, PLVStateData, PLVStatefulData, PLVDisposable, PLVPromiseValue, PLVLazyValue, PLVAsyncLazyValue, PLVEventNotify } from './src/main/ets/common/PLVCallback';
 export { default as PLVCommonConstants } from './src/main/ets/common/PLVCommonConstants';
 export { PLVDeviceUtils } from './src/main/ets/common/PLVDeviceUtils';
 export { PLVHashMap } from './src/main/ets/common/PLVHashMap';
@@ -8,6 +9,7 @@ export { default as PLVJSONUtils } from './src/main/ets/common/PLVJSONUtils';
 export { PLVPreferencesUtils } from './src/main/ets/common/PLVPreferencesUtils';
 export { PLVScheduledTask } from './src/main/ets/common/PLVScheduledTask';
 export { PLVSimpleBuffer } from './src/main/ets/common/PLVSimpleBuffer';
+export { PLVSparseArray } from './src/main/ets/common/PLVSparseArray';
 export { PLVTextUtils } from './src/main/ets/common/PLVTextUtils';
 export { PLVUACreator } from './src/main/ets/common/PLVUACreator';
 export { default as PLVToastUtils } from './src/main/ets/common/PLVToastUtils';

package/ResourceTable.txt

@@ -1,9 +1,10 @@
-string lib_name 0x0200000f
+string lib_name 0x02000010
 string page_show 0x0200000e
 string plv_web_load_failed 0x02000000
 string plv_web_reload 0x02000001
 color plv_web_main_red_color 0x02000002
 color plv_web_reload_title_color 0x02000003
+float page_text_font_size 0x0200000f
 float plv_web_failure_img_size 0x02000004
 float plv_web_large_border_radius 0x02000005
 float plv_web_loading_img_margin 0x02000006

package/oh-package.json5

@@ -1 +1 @@
-{"name":"@polyvharmony/live-scenes-foundation","version":"1.2.0-rc.1","description":"polyv live-scenes-foundation","main":"Index.js","author":"POLYV","license":"MIT","dependencies":{"socket":"file:./libs/plvsocket.har","jsbridge":"file:./libs/plvjsbridge.har","@ohos/axios":"2.2.4","class-transformer":"0.5.1","@pura/harmony-utils":"1.1.0","@ohos/crypto-js":"2.0.4","@ohos-port/xlog":"1.2.0"},"types":"Index.d.ets","artifactType":"obfuscation","metadata":{"workers":["./src/main/ets/modules/log/PLVXLogWorker.js"],"sourceRoots":["./src/main"],"debug":false,"useNormalizedOHMUrl":true},"compatibleSdkVersion":12,"compatibleSdkType":"HarmonyOS","obfuscated":true}
+{"name":"@polyvharmony/live-scenes-foundation","version":"1.3.0-rc.1","description":"polyv live-scenes-foundation","main":"Index.js","author":"POLYV","license":"MIT","dependencies":{"socket":"file:./libs/plvsocket.har","jsbridge":"file:./libs/plvjsbridge.har","@ohos/axios":"2.2.4","class-transformer":"file:./libs/plvclasstransformer.har","@pura/harmony-utils":"1.1.0","@ohos/crypto-js":"2.0.4","@ohos-port/xlog":"1.2.0"},"types":"Index.d.ets","artifactType":"obfuscation","metadata":{"workers":["./src/main/ets/modules/log/PLVXLogWorker.js"],"sourceRoots":["./src/main"],"debug":false,"useNormalizedOHMUrl":true},"compatibleSdkVersion":12,"compatibleSdkType":"HarmonyOS","obfuscated":true}

package/package.json

@@ -1 +1 @@
-{"name":"@polyvharmony/live-scenes-foundation","version":"1.2.0-rc.1","description":"polyv live-scenes-foundation","main":"Index.js","author":"POLYV","license":"MIT","dependencies":{"socket":"file:./libs/plvsocket.har","jsbridge":"file:./libs/plvjsbridge.har","@ohos/axios":"2.2.4","class-transformer":"0.5.1","@pura/harmony-utils":"1.1.0","@ohos/crypto-js":"2.0.4","@ohos-port/xlog":"1.2.0"},"types":"Index.d.ets","artifactType":"obfuscation","metadata":{"workers":["./src/main/ets/modules/log/PLVXLogWorker.js"],"sourceRoots":["./src/main"],"debug":false,"useNormalizedOHMUrl":true},"compatibleSdkVersion":12,"compatibleSdkType":"HarmonyOS","obfuscated":true}
+{"name":"@polyvharmony/live-scenes-foundation","version":"1.3.0-rc.1","description":"polyv live-scenes-foundation","main":"Index.js","author":"POLYV","license":"MIT","dependencies":{"socket":"file:./libs/plvsocket.har","jsbridge":"file:./libs/plvjsbridge.har","@ohos/axios":"2.2.4","class-transformer":"file:./libs/plvclasstransformer.har","@pura/harmony-utils":"1.1.0","@ohos/crypto-js":"2.0.4","@ohos-port/xlog":"1.2.0"},"types":"Index.d.ets","artifactType":"obfuscation","metadata":{"workers":["./src/main/ets/modules/log/PLVXLogWorker.js"],"sourceRoots":["./src/main"],"debug":false,"useNormalizedOHMUrl":true},"compatibleSdkVersion":12,"compatibleSdkType":"HarmonyOS","obfuscated":true}

package/src/main/ets/common/PLVCallback.d.ets

@@ -1,11 +1,33 @@
+import { mediaquery, window } from '@kit.ArkUI';
 export type PLVCallback<T = void, R = void> = (data: T) => R;
 export type PLVCallback2<T1 = void, T2 = void, R = void> = (data1: T1, data2: T2) => R;
+@Builder
+export declare function PLVCustomBuilder<T = void>(data: T): void;
+export declare class PLVMediaQueryListener {
+    listener: mediaquery.MediaQueryListener | undefined;
+    callback: PLVCallback<mediaquery.MediaQueryResult> | undefined;
+    constructor(listener: mediaquery.MediaQueryListener, callback: PLVCallback<mediaquery.MediaQueryResult>);
+    off(): void;
+}
+export declare class PLVAvoidAreaChangeListener {
+    windowClass: window.Window | undefined;
+    callback: PLVCallback<window.AvoidAreaOptions> | undefined;
+    constructor(h2: window.Window, callback: PLVCallback<window.AvoidAreaOptions>);
+    off(): void;
+}
 export declare class PLVStateData<T> {
     data?: T;
     constructor(data?: T);
     copy(): PLVStateData<T>;
     copyValue(data?: T): PLVStateData<T>;
 }
+export declare class PLVStatefulData<T> extends PLVStateData<T> {
+    isSuccess?: boolean;
+    error?: Error;
+    constructor(data?: T, isSuccess?: boolean, error?: Error);
+    static success<T>(data?: T): PLVStatefulData<T>;
+    static error<T>(error?: Error): PLVStatefulData<T>;
+}
 export declare class PLVDisposable {
     private _dispose;
     isDispose(): boolean;
@@ -15,21 +37,24 @@ export declare class PLVPromiseValue<T> {
     value?: T;
     private promise?;
     private resolve?;
+    private callbacks;
     set(value: T): void;
-    get(): Promise<T>;
+    observe(callback: PLVCallback<T>): void;
+    get(): T | Promise<T>;
+    clear(): void;
 }
 @Observed
 export declare class PLVLazyValue<T, P = void | undefined> {
     private _value?;
     private _callback;
-    constructor(i2: PLVCallback<P | undefined, T>);
+    constructor(f2: PLVCallback<P | undefined, T>);
     get(param?: P): T;
 }
 @Observed
 export declare class PLVAsyncLazyValue<T, P = void | undefined> {
     private _value?;
     private _callback;
-    constructor(h2: PLVCallback2<P | undefined, PLVCallback<T>>);
+    constructor(e2: PLVCallback2<P | undefined, PLVCallback<T>>);
     get(callback: PLVCallback<T>, param?: P): void;
 }
 export interface IPLVEventEmitter<T extends string = string> {
@@ -44,9 +69,9 @@ export declare class PLVEventNotify<T extends string = string> implements IPLVEv
     private tag;
     private events;
     private emitLogToFile;
-    constructor(e2?: string | Object, f2?: boolean);
-    on(event: T, callback: Function, c2?: string | Object): void;
-    off(event: T, callback?: Function, a2?: string | Object): void;
+    constructor(c2?: string | Object, d2?: boolean);
+    on(event: T, callback: Function, a2?: string | Object): void;
+    off(event: T, callback?: Function, w1?: string | Object): void;
     emit(event: T, ...args: Object[]): void;
     clear(): void;
 }

package/src/main/ets/common/PLVCallback.js

@@ -1,15 +1,40 @@
-var u1 = (this && this.u1) || function (m2, target, key, desc) {
+var u1 = (this && this.u1) || function (j2, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.v1 === "function")
-        r = Reflect.v1(m2, target, key, desc);
+        r = Reflect.v1(j2, target, key, desc);
     else
-        for (var n2 = m2.length - 1; n2 >= 0; n2--)
-            if (d = m2[n2])
+        for (var k2 = j2.length - 1; k2 >= 0; k2--)
+            if (d = j2[k2])
                 r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import PLVLogger from '../modules/log/PLVLogger';
 import PLVUtils from './PLVUtils';
+export function PLVCustomBuilder(data, parent = null) {
+    const i2 = data;
+}
+export class PLVMediaQueryListener {
+    constructor(listener, callback) {
+        this.listener = listener;
+        this.callback = callback;
+    }
+    off() {
+        this.listener?.off("change", this.callback);
+    }
+}
+export class PLVAvoidAreaChangeListener {
+    constructor(h2, callback) {
+        this.windowClass = h2;
+        this.callback = callback;
+    }
+    off() {
+        try {
+            this.windowClass?.off("avoidAreaChange", this.callback);
+        }
+        catch (e) {
+        }
+    }
+}
 export class PLVStateData {
     constructor(data) {
         this.data = data;
@@ -21,6 +46,19 @@ export class PLVStateData {
         return new PLVStateData(data);
     }
 }
+export class PLVStatefulData extends PLVStateData {
+    constructor(data, isSuccess = true, error) {
+        super(data);
+        this.isSuccess = isSuccess;
+        this.error = error;
+    }
+    static success(data) {
+        return new PLVStatefulData(data, true);
+    }
+    static error(error) {
+        return new PLVStatefulData(undefined, false, error);
+    }
+}
 export class PLVDisposable {
     constructor() {
         this._dispose = false;
@@ -33,27 +71,47 @@ export class PLVDisposable {
     }
 }
 export class PLVPromiseValue {
+    constructor() {
+        this.callbacks = [];
+    }
     set(value) {
         if (this.value == undefined) {
             this.resolve?.(value);
         }
+        if (this.value != value) {
+            this.callbacks.forEach(callback => {
+                callback(value);
+            });
+        }
         this.value = value;
     }
+    observe(callback) {
+        if (this.value != undefined) {
+            callback(this.value);
+        }
+        this.callbacks.push(callback);
+    }
     get() {
+        if (this.value != undefined) {
+            return this.value;
+        }
         if (!this.promise) {
-            this.promise = PLVUtils.safePromise((k2, l2) => {
-                this.resolve = k2;
+            this.promise = PLVUtils.safePromise((g2, reject) => {
+                this.resolve = g2;
                 if (this.value != undefined) {
-                    k2(this.value);
+                    g2(this.value);
                 }
             });
         }
         return this.promise;
     }
+    clear() {
+        this.callbacks = [];
+    }
 }
 let PLVLazyValue = class PLVLazyValue {
-    constructor(i2) {
-        this._callback = i2;
+    constructor(f2) {
+        this._callback = f2;
     }
     get(param) {
         if (this._value == undefined) {
@@ -67,8 +125,8 @@ PLVLazyValue = u1([
 ], PLVLazyValue);
 export { PLVLazyValue };
 let PLVAsyncLazyValue = class PLVAsyncLazyValue {
-    constructor(h2) {
-        this._callback = h2;
+    constructor(e2) {
+        this._callback = e2;
     }
     get(callback, param) {
         if (this._value === undefined) {
@@ -87,28 +145,28 @@ PLVAsyncLazyValue = u1([
 ], PLVAsyncLazyValue);
 export { PLVAsyncLazyValue };
 export class PLVEventNotify {
-    constructor(e2, f2 = true) {
+    constructor(c2, d2 = true) {
         this.tag = '[PLVEventNotify]';
         this.events = new Map();
         this.emitLogToFile = true;
-        this.tag = PLVUtils.getClassTag(e2) || this.tag;
-        this.emitLogToFile = f2;
+        this.tag = PLVUtils.getClassTag(c2) || this.tag;
+        this.emitLogToFile = d2;
     }
-    on(event, callback, c2) {
-        PLVLogger.info(PLVUtils.getClassTag(c2) || this.tag, `on event: ${event}`);
-        const d2 = this.events.get(event) || [];
-        d2.push(callback);
-        this.events.set(event, d2);
+    on(event, callback, a2) {
+        PLVLogger.info(PLVUtils.getClassTag(a2) || this.tag, `on event: ${event}`);
+        const b2 = this.events.get(event) || [];
+        b2.push(callback);
+        this.events.set(event, b2);
     }
-    off(event, callback, a2) {
-        PLVLogger.info(PLVUtils.getClassTag(a2) || this.tag, `off event: ${event}`);
+    off(event, callback, w1) {
+        PLVLogger.info(PLVUtils.getClassTag(w1) || this.tag, `off event: ${event}`);
         if (callback) {
-            const b2 = this.events.get(event) || [];
-            const index = b2.indexOf(callback);
+            const z1 = this.events.get(event) || [];
+            const index = z1.indexOf(callback);
             if (index !== -1) {
-                b2.splice(index, 1);
+                z1.splice(index, 1);
             }
-            this.events.set(event, b2);
+            this.events.set(event, z1);
         }
         else {
             this.events.delete(event);
@@ -116,8 +174,8 @@ export class PLVEventNotify {
     }
     emit(event, ...args) {
         PLVLogger.info(this.tag, `emit event: ${event}, args: ${args}`, this.emitLogToFile);
-        const w1 = this.events.get(event) || [];
-        w1.forEach(callback => {
+        const v1 = this.events.get(event) || [];
+        v1.forEach(callback => {
             callback(...args);
         });
     }

package/src/main/ets/common/PLVCommonConstants.d.ets

@@ -5,6 +5,7 @@ export default class PLVCommonConstants {
     static readonly TAG: string;
     static readonly HARMONY_HEI_TI_FONT_FAMILY = "HarmonyHeiTi";
     static readonly FULL_PERCENT: string;
+    static readonly AUTO: string;
     static readonly CONTAINER: string;
     static readonly JS_PRE = "javascript:";
     static readonly LENGTH_SHORT = 2000;

package/src/main/ets/common/PLVCommonConstants.js

@@ -3,6 +3,7 @@ export default class PLVCommonConstants {
 PLVCommonConstants.TAG = "[PLVLiveSDK]";
 PLVCommonConstants.HARMONY_HEI_TI_FONT_FAMILY = 'HarmonyHeiTi';
 PLVCommonConstants.FULL_PERCENT = '100%';
+PLVCommonConstants.AUTO = 'auto';
 PLVCommonConstants.CONTAINER = '__container__';
 PLVCommonConstants.JS_PRE = 'javascript:';
 PLVCommonConstants.LENGTH_SHORT = 2000;

package/src/main/ets/common/PLVCommonEnums.js

@@ -1,22 +1,22 @@
 export var PLVWebpageStatus;
-(function (u2) {
-    u2["INIT"] = "init";
-    u2["ERROR"] = "error";
-    u2["FINISHED"] = "finished";
+(function (n2) {
+    n2["INIT"] = "init";
+    n2["ERROR"] = "error";
+    n2["FINISHED"] = "finished";
 })(PLVWebpageStatus || (PLVWebpageStatus = {}));
 export var PLVFullScreenStatus;
-(function (t2) {
-    t2["IDLE"] = "idle";
-    t2["ENTER"] = "enter";
-    t2["EXIT"] = "exit";
+(function (m2) {
+    m2["IDLE"] = "idle";
+    m2["ENTER"] = "enter";
+    m2["EXIT"] = "exit";
 })(PLVFullScreenStatus || (PLVFullScreenStatus = {}));
 export var PLVPrintLogLevel;
-(function (s2) {
-    s2[s2["ALL"] = 0] = "ALL";
-    s2[s2["VERBOSE"] = 2] = "VERBOSE";
-    s2[s2["DEBUG"] = 3] = "DEBUG";
-    s2[s2["INFO"] = 4] = "INFO";
-    s2[s2["WARN"] = 5] = "WARN";
-    s2[s2["ERROR"] = 6] = "ERROR";
-    s2[s2["NONE"] = 99] = "NONE";
+(function (l2) {
+    l2[l2["ALL"] = 0] = "ALL";
+    l2[l2["VERBOSE"] = 2] = "VERBOSE";
+    l2[l2["DEBUG"] = 3] = "DEBUG";
+    l2[l2["INFO"] = 4] = "INFO";
+    l2[l2["WARN"] = 5] = "WARN";
+    l2[l2["ERROR"] = 6] = "ERROR";
+    l2[l2["NONE"] = 99] = "NONE";
 })(PLVPrintLogLevel || (PLVPrintLogLevel = {}));

package/src/main/ets/common/PLVDeviceUtils.d.ets

@@ -1,4 +1,11 @@
+import { ConfigurationConstant } from '@kit.AbilityKit';
+import { window } from '@kit.ArkUI';
 export declare class PLVDeviceUtils {
     static getNavigationIndicatorHeight(): number;
     static getStatusBarHeight(): number;
+    static getWidth(): number;
+    static getHeight(): number;
+    static getMinDisplaySide(): number;
+    static setColorMode(colorMode: ConfigurationConstant.ColorMode): void;
+    static setWindowSystemBarProperties(systemBarProperties?: window.SystemBarProperties): void;
 }

package/src/main/ets/common/PLVDeviceUtils.js

@@ -1,4 +1,6 @@
-import { AppUtil } from '@pura/harmony-utils';
+import { AppUtil, DisplayUtil } from '@pura/harmony-utils';
+import PLVLogger from '../modules/log/PLVLogger';
+const TAG = '[PLVDeviceUtils]';
 export class PLVDeviceUtils {
     static getNavigationIndicatorHeight() {
         return px2vp(AppUtil.getNavigationIndicatorHeight());
@@ -6,4 +8,29 @@ export class PLVDeviceUtils {
     static getStatusBarHeight() {
         return px2vp(AppUtil.getStatusBarHeight());
     }
+    static getWidth() {
+        return px2vp(DisplayUtil.getWidth());
+    }
+    static getHeight() {
+        return px2vp(DisplayUtil.getHeight());
+    }
+    static getMinDisplaySide() {
+        return Math.min(PLVDeviceUtils.getWidth(), PLVDeviceUtils.getHeight());
+    }
+    static setColorMode(colorMode) {
+        AppUtil.getContext().getApplicationContext().setColorMode(colorMode);
+    }
+    static setWindowSystemBarProperties(systemBarProperties) {
+        try {
+            let o2 = AppUtil.getMainWindow();
+            if (systemBarProperties) {
+                o2.setWindowSystemBarProperties(systemBarProperties).catch((error) => {
+                    PLVLogger.error(TAG, `setWindowSystemBarProperties-error ~ code: ${error.code} -·- message: ${error.message}`);
+                });
+            }
+        }
+        catch (err) {
+            PLVLogger.error(TAG, JSON.stringify(err));
+        }
+    }
 }

package/src/main/ets/common/PLVJSONUtils.d.ets

@@ -4,18 +4,18 @@ import { PLVJSONObject } from './PLVType';
 export default class PLVJSONUtils {
     static safeStringify(value?: Object, replacer?: (this: object, key: string, value: object) => object | undefined): string;
     static safeParse(text?: string): object | undefined;
-    static json2Bean<T>(f3: ClassConstructor<T>, g3: string): T | undefined;
+    static json2Bean<T>(z2: ClassConstructor<T>, a3: string): T | undefined;
     static bean2Json(data: Object | Array<Object | String | Number | Boolean> | null | undefined): string;
-    static bean2Bean<T, V>(e3: T, plain: V): T | undefined;
-    static httpData2Bean<T>(d3: T, plain: PLVHttpData<T>): T | undefined;
-    static json2Map(c3: string): Map<string, Object>;
+    static bean2Bean<T, V>(w2: T, plain: V): T | undefined;
+    static httpData2Bean<T>(v2: T, plain: PLVHttpData<T>): T | undefined;
+    static json2Map(u2: string): Map<string, Object>;
     static object2Map(object: PLVJSONObject): Map<string, Object | undefined>;
     static map2json(map: Map<string, Object | undefined>): Record<string, Object>;
     static map2jsonStr(map: Map<string, Object>, replacer?: (this: object, key: string, value: object) => object | undefined): string;
-    static toUnescapedData(a3: string): string;
-    static toFillData<T extends y11>(v2: ClassConstructor<T> | T, w2: string | Object | undefined): T | undefined;
+    static toUnescapedData(t2: string): string;
+    static toFillData<T extends v8>(q2: ClassConstructor<T> | T, r2: string | Object | undefined): T | undefined;
 }
-interface y11 {
+interface v8 {
     fill(): void;
 }
 export {};

package/src/main/ets/common/PLVJSONUtils.js

@@ -16,9 +16,9 @@ export default class PLVJSONUtils {
             return undefined;
         }
     }
-    static json2Bean(f3, g3) {
+    static json2Bean(z2, a3) {
         try {
-            return plainToClass(f3, JSON.parse(g3), {
+            return plainToClass(z2, JSON.parse(a3), {
                 enableImplicitConversion: false, exposeDefaultValues: true
             });
         }
@@ -37,9 +37,9 @@ export default class PLVJSONUtils {
             return "";
         }
     }
-    static bean2Bean(e3, plain) {
+    static bean2Bean(w2, plain) {
         try {
-            return plainToClassFromExist(e3, plain, {
+            return plainToClassFromExist(w2, plain, {
                 enableImplicitConversion: false, exposeDefaultValues: true
             });
         }
@@ -47,9 +47,9 @@ export default class PLVJSONUtils {
             return undefined;
         }
     }
-    static httpData2Bean(d3, plain) {
+    static httpData2Bean(v2, plain) {
         try {
-            plain.data = plainToClassFromExist(d3, plain.data, {
+            plain.data = plainToClassFromExist(v2, plain.data, {
                 enableImplicitConversion: false, exposeDefaultValues: true
             });
             try {
@@ -63,8 +63,8 @@ export default class PLVJSONUtils {
             return undefined;
         }
     }
-    static json2Map(c3) {
-        return new Map(Object.entries(JSON.parse(c3)));
+    static json2Map(u2) {
+        return new Map(Object.entries(JSON.parse(u2)));
     }
     static object2Map(object) {
         return new Map(Object.entries(object));
@@ -81,23 +81,23 @@ export default class PLVJSONUtils {
     static map2jsonStr(map, replacer) {
         return PLVJSONUtils.safeStringify(PLVJSONUtils.map2json(map), replacer);
     }
-    static toUnescapedData(a3) {
-        if (!a3.includes('\\')) {
-            return a3;
+    static toUnescapedData(t2) {
+        if (!t2.includes('\\')) {
+            return t2;
         }
-        return a3.substring(1, a3.length - 1)
+        return t2.substring(1, t2.length - 1)
             .replace(/\\"/g, '"')
             .replace(/\\\\/g, '\\');
     }
-    static toFillData(v2, w2) {
-        let z2 = undefined;
-        if (typeof w2 === 'string') {
-            z2 = PLVJSONUtils.json2Bean(v2, w2);
+    static toFillData(q2, r2) {
+        let s2 = undefined;
+        if (typeof r2 === 'string') {
+            s2 = PLVJSONUtils.json2Bean(q2, r2);
         }
-        else if (typeof w2 === 'object') {
-            z2 = PLVJSONUtils.bean2Bean(v2, w2);
+        else if (typeof r2 === 'object') {
+            s2 = PLVJSONUtils.bean2Bean(q2, r2);
         }
-        z2?.fill();
-        return z2;
+        s2?.fill();
+        return s2;
     }
 }

package/src/main/ets/common/PLVNetUtils.d.ets

@@ -1,5 +1,6 @@
 export declare class PLVNetUtils {
-    static replaceUrl(k3: string, l3: Map<string, string | undefined>): string;
-    static formatUrl(j3: string, record: Record<string, string | undefined>): string;
-    static formatParams(params?: Record<string, string>): string;
+    static replaceUrl(h3: string, i3: Map<string, string | undefined>): string;
+    static formatUrl(g3: string, record: Record<string, string | undefined>): string;
+    static formatParams(params?: Record<string, string>, d3?: boolean): string;
+    static appendParams(b3: string, params?: Record<string, string>): string;
 }

package/src/main/ets/common/PLVNetUtils.js

@@ -1,29 +1,35 @@
 export class PLVNetUtils {
-    static replaceUrl(k3, l3) {
-        const m3 = /{(\w+?)}/g;
+    static replaceUrl(h3, i3) {
+        const j3 = /{(\w+?)}/g;
         let match;
-        let n3 = k3;
-        while ((match = m3.exec(k3)) !== null) {
+        let k3 = h3;
+        while ((match = j3.exec(h3)) !== null) {
             const key = match[1];
-            const p3 = l3.get(key);
-            if (p3 !== undefined) {
-                n3 = n3.replace(match[0], p3);
+            const l3 = i3.get(key);
+            if (l3 !== undefined) {
+                k3 = k3.replace(match[0], l3);
             }
         }
-        return n3;
+        return k3;
     }
-    static formatUrl(j3, record) {
-        return PLVNetUtils.replaceUrl(j3, new Map(Object.entries(record)));
+    static formatUrl(g3, record) {
+        return PLVNetUtils.replaceUrl(g3, new Map(Object.entries(record)));
     }
-    static formatParams(params) {
-        let h3 = '';
+    static formatParams(params, d3) {
+        let e3 = '';
         if (params) {
+            let f3 = true;
             Object.entries(params).forEach((value, index) => {
                 if (value?.[0] && value?.[1]) {
-                    h3 += (index == 0 ? '?' : '&') + value?.[0] + '=' + value?.[1];
+                    e3 += (f3 && !d3 ? '?' : '&') + value?.[0] + '=' + value?.[1];
+                    f3 = false;
                 }
             });
         }
-        return h3;
+        return e3;
+    }
+    static appendParams(b3, params) {
+        const c3 = b3.includes('?');
+        return b3 + PLVNetUtils.formatParams(params, c3);
     }
 }