@polyvharmony/live-scenes-foundation 1.3.2 → 1.3.4

package/src/main/ets/modules/net/PLVHttpRequest.js

@@ -1,148 +0,0 @@
-import axios, { AxiosError } from '@ohos/axios';
-import HashMap from "@ohos.util.HashMap";
-import PLVJSONUtils from '../../common/PLVJSONUtils';
-import { PLVHttpError } from './PLVHttpError';
-import PLVLogger from '../log/PLVLogger';
-import { PLVRequestSetting } from './PLVRequestSetting';
-import { PLVHttpData } from './PLVHttpData';
-import PLVUtils from '../../common/PLVUtils';
-import { PLVNetUtils } from '../../common/PLVNetUtils';
-const TAG = '[PLVHttpRequest]';
-export class PLVHttpRequest {
-    constructor(w15) {
-        this.baseURL = w15;
-    }
-    ua(v15) {
-        this.userAgent = v15;
-        return this;
-    }
-    create(i15) {
-        const j15 = axios.create();
-        j15.defaults.timeout = 10000;
-        j15.defaults.readTimeout = 10000;
-        j15.defaults.connectTimeout = 10000;
-        j15.defaults.baseURL = this.baseURL;
-        j15.defaults.headers.common['User-Agent'] = this.userAgent;
-        const k15 = (i15?.cacheTime === 0 ? PLVHttpRequest.CACHE_TIMEOUT : i15?.cacheTime) ?? PLVHttpRequest.CACHE_TIMEOUT;
-        if (i15?.formUrlEncoded) {
-            j15.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
-        }
-        let l15 = '';
-        j15.interceptors.request.use((q15) => {
-            if (i15?.signKey) {
-                const t15 = q15.params ? q15.params : q15.data;
-                const u15 = PLVJSONUtils.object2Map(t15);
-                u15.delete('log');
-                t15['sign'] = PLVRequestSetting.createSign(u15, i15.signKey);
-            }
-            if (PLVHttpRequest.token) {
-                const r15 = q15.params;
-                const s15 = q15.data;
-                if (r15 && Object.keys(r15).includes('appId')) {
-                    r15['token'] = PLVHttpRequest.token;
-                    r15['viewerToken'] = PLVHttpRequest.token;
-                }
-                if (s15 && Object.keys(s15).includes('appId')) {
-                    s15['token'] = PLVHttpRequest.token;
-                    s15['viewerToken'] = PLVHttpRequest.token;
-                }
-            }
-            if (i15?.useCache) {
-                l15 = this.generateCacheKey(q15);
-            }
-            PLVLogger.info(TAG, `--> ${this.method} ${this.baseURL}${i15?.url}${PLVNetUtils.formatParams(q15?.params)}`);
-            PLVLogger.info(TAG, `--> ${PLVNetUtils.formatParams(q15?.data)}`);
-            return q15;
-        }, (p15) => {
-            return Promise.reject(p15);
-        });
-        j15.interceptors.response.use((n15) => {
-            PLVLogger.info(TAG, `<-- ${n15.status} ${this.method} ${this.baseURL}${n15.config.url}${PLVNetUtils.formatParams(i15?.params)} (${n15.performanceTiming?.totalTiming}ms)`);
-            PLVLogger.info(TAG, `Header: ${PLVJSONUtils.safeStringify(n15.headers)}`);
-            PLVLogger.info(TAG, `Result: ${PLVJSONUtils.safeStringify(n15.data)}`);
-            if (i15?.aesDecrypted) {
-                const o15 = n15.data;
-                if (o15) {
-                    o15['data'] = PLVJSONUtils.safeParse(PLVRequestSetting.decryptDataSync(o15['data']));
-                }
-                else {
-                    PLVLogger.printError(TAG, 'response error', new Error('jsonData undefined'));
-                }
-            }
-            if (i15?.fillData) {
-                PLVHttpData.fill(i15.fillData, n15);
-            }
-            if (l15) {
-                PLVHttpRequest.CACHE_DATA_MAP.set(l15, n15);
-                setTimeout(() => {
-                    PLVHttpRequest.CACHE_DATA_MAP.remove(l15);
-                }, k15);
-            }
-            return n15;
-        }, (m15) => {
-            return Promise.reject(m15);
-        });
-        return j15;
-    }
-    request(b15) {
-        return PLVUtils.safePromise((c15, d15) => {
-            b15.then((f15) => {
-                const g15 = f15.data;
-                if (g15) {
-                    for (const h15 of Object.keys(g15)) {
-                        if (h15 == 'code' && g15[h15] != 200 + '') {
-                            d15(new PLVHttpError(new AxiosError(PLVJSONUtils.safeStringify(f15.data || ''), g15[h15], undefined, undefined, f15)));
-                            return;
-                        }
-                    }
-                }
-                c15(f15);
-            }).catch((e15) => {
-                d15(new PLVHttpError(e15));
-            });
-        });
-    }
-    get(a15) {
-        this.method = 'GET';
-        return this.checkCache(a15) || this.request(this.create(a15).get(a15?.url, a15));
-    }
-    post(z14) {
-        this.method = 'POST';
-        return this.checkCache(z14) || this.request(this.create(z14).post(z14?.url, z14?.data, z14));
-    }
-    checkCache(x14) {
-        if (x14?.useCache) {
-            const y14 = this.generateCacheKey(x14);
-            if (PLVHttpRequest.CACHE_DATA_MAP.hasKey(y14)) {
-                PLVLogger.info(TAG, `--> ${this.method} ${this.baseURL}${x14?.url} use cache`);
-                return Promise.resolve(PLVHttpRequest.CACHE_DATA_MAP.get(y14));
-            }
-        }
-        return undefined;
-    }
-    generateCacheKey(q14) {
-        let r14 = this.baseURL + '' + q14?.url;
-        const s14 = q14?.params;
-        const t14 = q14?.data;
-        const u14 = (v14) => {
-            if (v14) {
-                for (const w14 of Object.keys(v14)) {
-                    if (w14 == 'timestamp' || w14 == 'sign' || w14 == 'token' || w14 == 'viewerToken') {
-                        continue;
-                    }
-                    if (w14 == 'appId' && PLVHttpRequest.token) {
-                        r14 += PLVHttpRequest.token;
-                    }
-                    else {
-                        r14 += v14[w14];
-                    }
-                }
-            }
-        };
-        u14(s14);
-        u14(t14);
-        return r14;
-    }
-}
-PLVHttpRequest.CACHE_TIMEOUT = 1000 * 60 * 5;
-PLVHttpRequest.CACHE_DATA_MAP = new HashMap();

package/src/main/ets/modules/net/PLVRequestSetting.js

@@ -1,33 +0,0 @@
-import buffer from "@ohos.buffer";
-import { CryptoJS } from '@ohos/crypto-js';
-export class PLVRequestSetting {
-    static createSign(d16, e16) {
-        const f16 = e16 + PLVRequestSetting.concatParams(d16) + e16;
-        const g16 = CryptoJS.MD5(f16).toString().toUpperCase();
-        return g16;
-    }
-    static decryptDataSync(b16) {
-        const c16 = CryptoJS.AES.decrypt(buffer.from(b16, 'base64').toString('hex'), CryptoJS.enc.Utf8.parse(PLVRequestSetting.DECRYPT_KEY_1_SRC), {
-            format: CryptoJS.format.Hex,
-            iv: CryptoJS.enc.Utf8.parse(PLVRequestSetting.DECRYPT_KEY_2_SRC),
-            mode: CryptoJS.mode.CBC,
-            padding: CryptoJS.pad.Pkcs7
-        }).toString(CryptoJS.enc.Utf8);
-        return c16;
-    }
-    static concatParams(x15) {
-        const y15 = Array.from(x15.keys()).sort();
-        const z15 = [];
-        for (const a16 of y15) {
-            if (!a16 || !x15.get(a16)) {
-                continue;
-            }
-            z15.push(a16 + x15.get(a16));
-        }
-        return z15.join('');
-    }
-}
-PLVRequestSetting.KEY_1 = 'polyv_sdk_api_innor';
-PLVRequestSetting.PLV_SWITCH_API_INNOR = 'polyv_switch_api_innor';
-PLVRequestSetting.DECRYPT_KEY_1_SRC = 'PolyvApiResponse';
-PLVRequestSetting.DECRYPT_KEY_2_SRC = 'PolyvLiveEncrypt';

package/src/main/ets/modules/socket/PLVSocketIO.js

@@ -1,181 +0,0 @@
-import { client_socket } from 'socket';
-import PLVCommonConstants from '../../common/PLVCommonConstants';
-import PLVLogger from '../log/PLVLogger';
-const TAG = '[PLVSocketIO]';
-export class PLVSocketIO {
-    constructor() {
-        this.client = new client_socket();
-        this.socketIOStatus = PLVSocketIOStatus.IDLE;
-        this.isTokenExpired = false;
-    }
-    set_open_listener(s17) {
-        this.client.set_open_listener(s17);
-    }
-    set_fail_listener(r17) {
-        this.client.set_fail_listener(r17);
-    }
-    set_reconnecting_listener(q17) {
-        this.client.set_reconnecting_listener(q17);
-    }
-    set_reconnect_listener(p17) {
-        this.client.set_reconnect_listener(p17);
-    }
-    set_close_listener(o17) {
-        this.client.set_close_listener(o17);
-    }
-    set_socket_open_listener(n17) {
-        this.client.set_socket_open_listener(n17);
-    }
-    set_socket_close_listener(m17) {
-        this.client.set_socket_close_listener(m17);
-    }
-    connect(l17) {
-        this.connectWithQuery(l17, '', '');
-    }
-    connectWithQuery(i17, j17, k17) {
-        this.isTokenExpired = false;
-        if (this.socketIOStatus == PLVSocketIOStatus.IDLE || this.socketIOStatus == PLVSocketIOStatus.SOCKET_CLOSE) {
-            this.socketIOStatus = PLVSocketIOStatus.CONNECT;
-            this.onSocketIOStatusListener?.(this.socketIOStatus);
-        }
-        this.set_open_listener(() => {
-            PLVLogger.info(TAG, `call socket open, isTokenExpired=${this.isTokenExpired}`);
-            setTimeout(() => {
-                if (!this.isTokenExpired) {
-                    this.socketIOStatus = this.socketIOStatus == PLVSocketIOStatus.RECONNECT ? PLVSocketIOStatus.RECONNECT_SUCCESS : PLVSocketIOStatus.OPEN;
-                    this.onSocketIOStatusListener?.(this.socketIOStatus);
-                }
-            }, this.isTokenExpired ? 0 : PLVCommonConstants.DELAY_TIME_S);
-        });
-        this.set_reconnect_listener(() => {
-            PLVLogger.info(TAG, 'call socket reconnect');
-            this.socketIOStatus = PLVSocketIOStatus.RECONNECT;
-            this.onSocketIOStatusListener?.(this.socketIOStatus);
-        });
-        this.set_socket_close_listener(() => {
-            PLVLogger.info(TAG, `call socket close, isTokenExpired=${this.isTokenExpired}`);
-            this.socketIOStatus = PLVSocketIOStatus.SOCKET_CLOSE;
-            this.onSocketIOStatusListener?.(this.socketIOStatus);
-            setTimeout(() => {
-                if (!this.isTokenExpired) {
-                    this.close();
-                }
-            }, this.isTokenExpired ? 0 : PLVCommonConstants.DELAY_TIME_S);
-        });
-        this.set_close_listener(() => {
-            PLVLogger.info(TAG, 'call close');
-        });
-        this.client.connectWithQuery(i17, j17, k17);
-    }
-    connected() {
-        return this.opened() && this.socketIOStatus != PLVSocketIOStatus.SOCKET_CLOSE;
-    }
-    disconnect(h17) {
-        if (this.socketIOStatus != PLVSocketIOStatus.SOCKET_CLOSE && !h17) {
-            this.socket_close();
-        }
-        this.close();
-    }
-    destroy(g17) {
-        this.disconnect(g17);
-        this.clear_con_listeners();
-        this.clear_socket_listeners();
-    }
-    clear_con_listeners() {
-        this.client.clear_con_listeners();
-    }
-    clear_socket_listeners() {
-        this.client.clear_socket_listeners();
-    }
-    set_reconnect_attempts(f17) {
-        this.client.set_reconnect_attempts(f17);
-    }
-    set_reconnect_delay(e17) {
-        this.client.set_reconnect_delay(e17);
-    }
-    set_reconnect_delay_max(d17) {
-        this.client.set_reconnect_delay_max(d17);
-    }
-    set_logs_default() {
-        this.client.set_logs_default();
-    }
-    set_logs_quiet() {
-        this.client.set_logs_quiet();
-    }
-    set_logs_verbose() {
-        this.client.set_logs_verbose();
-    }
-    close() {
-        this.client.close();
-    }
-    sync_close() {
-        this.client.sync_close();
-    }
-    set_proxy_basic_auth(a17, b17, c17) {
-        this.client.set_proxy_basic_auth(a17, b17, c17);
-    }
-    opened() {
-        return this.client.opened();
-    }
-    get_sessionid() {
-        return this.client.get_sessionid();
-    }
-    set_nsp(z16) {
-        this.client.set_nsp(z16);
-    }
-    on(w16, x16) {
-        this.client.on(w16, (y16) => {
-            x16(this.replaceJson(y16));
-        });
-    }
-    once(u16, v16) {
-        this.client.once(u16, v16);
-    }
-    off(t16) {
-        this.client.off(t16);
-    }
-    off_all() {
-        this.client.off_all();
-    }
-    socket_close() {
-        this.client.socket_close();
-    }
-    on_error(s16) {
-        this.client.on_error(s16);
-    }
-    off_error() {
-        this.client.off_error();
-    }
-    emitSkipCheck(o16, p16, q16) {
-        this.client.emit(o16, p16, (r16) => {
-            q16?.(this.replaceJson(r16));
-        });
-    }
-    emit(k16, l16, m16) {
-        PLVLogger.info(TAG, `emit: ${l16}, name: ${k16}, connected: ${this.connected()}`);
-        if (this.connected()) {
-            this.client.emit(k16, l16, (n16) => {
-                m16?.(this.replaceJson(n16));
-            });
-            return true;
-        }
-        return false;
-    }
-    replaceJson(i16) {
-        i16 = i16.replace(/^"{/, '{').replace(/}"$/, '}').replace(/"{/, '{');
-        const j16 = i16.lastIndexOf('}"');
-        if (j16 !== -1) {
-            i16 = i16.substring(0, j16) + '}' + i16.substring(j16 + 2);
-        }
-        return i16;
-    }
-}
-export var PLVSocketIOStatus;
-(function (h16) {
-    h16[h16["IDLE"] = 0] = "IDLE";
-    h16[h16["CONNECT"] = 1] = "CONNECT";
-    h16[h16["OPEN"] = 2] = "OPEN";
-    h16[h16["RECONNECT"] = 3] = "RECONNECT";
-    h16[h16["RECONNECT_SUCCESS"] = 4] = "RECONNECT_SUCCESS";
-    h16[h16["SOCKET_CLOSE"] = 5] = "SOCKET_CLOSE";
-})(PLVSocketIOStatus || (PLVSocketIOStatus = {}));

package/src/main/ets/modules/web/PLVFailureLayout.js

@@ -1,76 +0,0 @@
-if (!("finalizeConstruction" in ViewPU.prototype)) {
-    Reflect.set(ViewPU.prototype, "finalizeConstruction", () => { });
-}
-import PLVCommonConstants from '../../common/PLVCommonConstants';
-export class PLVFailureLayout extends ViewPU {
-    constructor(i18, j18, k18, l18 = -1, m18 = undefined, n18) {
-        super(i18, k18, l18, n18);
-        if (typeof m18 === "function") {
-            this.paramsGenerator_ = m18;
-        }
-        this.handleReload = undefined;
-        this.setInitiallyProvidedValue(j18);
-        this.finalizeConstruction();
-    }
-    setInitiallyProvidedValue(h18) {
-        if (h18.handleReload !== undefined) {
-            this.handleReload = h18.handleReload;
-        }
-    }
-    updateStateVars(g18) {
-    }
-    purgeVariableDependenciesOnElmtId(f18) {
-    }
-    aboutToBeDeleted() {
-        SubscriberManager.Get().delete(this.id__());
-        this.aboutToBeDeletedInternal();
-    }
-    initialRender() {
-        this.observeComponentCreation2((d18, e18) => {
-            Row.create();
-            Row.justifyContent(FlexAlign.Center);
-            Row.layoutWeight(1);
-        }, Row);
-        this.observeComponentCreation2((b18, c18) => {
-            Column.create();
-        }, Column);
-        this.observeComponentCreation2((z17, a18) => {
-            Image.create({ "id": -1, "type": 20000, params: ["app.media.plv_web_ic_failure"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Image.width({ "id": -1, "type": 10002, params: ["app.float.plv_web_failure_img_size"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Image.height({ "id": -1, "type": 10002, params: ["app.float.plv_web_failure_img_size"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-        }, Image);
-        this.observeComponentCreation2((x17, y17) => {
-            Text.create({ "id": -1, "type": 10003, params: ["app.string.plv_web_load_failed"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Text.fontColor({ "id": -1, "type": 10001, params: ["app.color.plv_web_reload_title_color"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Text.fontFamily(PLVCommonConstants.HARMONY_HEI_TI_FONT_FAMILY);
-            Text.fontSize({ "id": -1, "type": 10002, params: ["app.float.plv_web_normal_text_size1"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Text.margin({ top: { "id": -1, "type": 10002, params: ["app.float.plv_web_sm_padding_margin"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" } });
-        }, Text);
-        Text.pop();
-        this.observeComponentCreation2((v17, w17) => {
-            Row.create();
-            Row.height({ "id": -1, "type": 10002, params: ["app.float.plv_web_reload_btn_height"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Row.width({ "id": -1, "type": 10002, params: ["app.float.plv_web_reload_btn_width"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Row.margin({ top: { "id": -1, "type": 10002, params: ["app.float.plv_web_sm_padding_margin"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" } });
-            Row.borderWidth(1);
-            Row.borderColor({ "id": -1, "type": 10001, params: ["app.color.plv_web_main_red_color"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Row.borderRadius({ "id": -1, "type": 10002, params: ["app.float.plv_web_large_border_radius"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Row.onClick(() => this.handleReload?.());
-        }, Row);
-        this.observeComponentCreation2((t17, u17) => {
-            Text.create({ "id": -1, "type": 10003, params: ["app.string.plv_web_reload"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Text.fontColor({ "id": -1, "type": 10001, params: ["app.color.plv_web_main_red_color"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Text.fontFamily(PLVCommonConstants.HARMONY_HEI_TI_FONT_FAMILY);
-            Text.fontSize({ "id": -1, "type": 10002, params: ["app.float.plv_web_small_text_size"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Text.width(PLVCommonConstants.FULL_PERCENT);
-            Text.textAlign(TextAlign.Center);
-        }, Text);
-        Text.pop();
-        Row.pop();
-        Column.pop();
-        Row.pop();
-    }
-    rerender() {
-        this.updateDirtyElements();
-    }
-}

package/src/main/ets/modules/web/PLVLoadingLayout.js

@@ -1,45 +0,0 @@
-if (!("finalizeConstruction" in ViewPU.prototype)) {
-    Reflect.set(ViewPU.prototype, "finalizeConstruction", () => { });
-}
-import PLVCommonConstants from '../../common/PLVCommonConstants';
-export class PLVLoadingLayout extends ViewPU {
-    constructor(x18, y18, z18, a19 = -1, b19 = undefined, c19) {
-        super(x18, z18, a19, c19);
-        if (typeof b19 === "function") {
-            this.paramsGenerator_ = b19;
-        }
-        this.setInitiallyProvidedValue(y18);
-        this.finalizeConstruction();
-    }
-    setInitiallyProvidedValue(w18) {
-    }
-    updateStateVars(v18) {
-    }
-    purgeVariableDependenciesOnElmtId(u18) {
-    }
-    aboutToBeDeleted() {
-        SubscriberManager.Get().delete(this.id__());
-        this.aboutToBeDeletedInternal();
-    }
-    initialRender() {
-        this.observeComponentCreation2((s18, t18) => {
-            Column.create();
-            Column.height(PLVCommonConstants.FULL_PERCENT);
-            Column.width(PLVCommonConstants.FULL_PERCENT);
-        }, Column);
-        this.observeComponentCreation2((q18, r18) => {
-            Column.create();
-            Column.margin({ top: { "id": -1, "type": 10002, params: ["app.float.plv_web_loading_img_margin"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" } });
-            Column.width({ "id": -1, "type": 10002, params: ["app.float.plv_web_loading_img_size"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-            Column.height({ "id": -1, "type": 10002, params: ["app.float.plv_web_loading_img_size"], "bundleName": "__harDefaultBundleName__", "moduleName": "__harDefaultModuleName__" });
-        }, Column);
-        this.observeComponentCreation2((o18, p18) => {
-            LoadingProgress.create();
-        }, LoadingProgress);
-        Column.pop();
-        Column.pop();
-    }
-    rerender() {
-        this.updateDirtyElements();
-    }
-}

package/src/main/ets/modules/web/PLVNewWindowLayout.js

@@ -1,61 +0,0 @@
-if (!("finalizeConstruction" in ViewPU.prototype)) {
-    Reflect.set(ViewPU.prototype, "finalizeConstruction", () => { });
-}
-import webview from '@ohos.web.webview';
-import PLVLogger from '../log/PLVLogger';
-const TAG = "[PLVNewWindowLayout]";
-export class PLVNewWindowLayout extends ViewPU {
-    constructor(l19, m19, n19, o19 = -1, p19 = undefined, q19) {
-        super(l19, n19, o19, q19);
-        if (typeof p19 === "function") {
-            this.paramsGenerator_ = p19;
-        }
-        this.controller = undefined;
-        this.webviewController = new webview.WebviewController();
-        this.setInitiallyProvidedValue(m19);
-        this.finalizeConstruction();
-    }
-    setInitiallyProvidedValue(k19) {
-        if (k19.controller !== undefined) {
-            this.controller = k19.controller;
-        }
-        if (k19.webviewController !== undefined) {
-            this.webviewController = k19.webviewController;
-        }
-    }
-    updateStateVars(j19) {
-    }
-    purgeVariableDependenciesOnElmtId(i19) {
-    }
-    aboutToBeDeleted() {
-        SubscriberManager.Get().delete(this.id__());
-        this.aboutToBeDeletedInternal();
-    }
-    setController(h19) {
-        this.controller = h19;
-    }
-    aboutToAppear() {
-    }
-    initialRender() {
-        this.observeComponentCreation2((f19, g19) => {
-            Column.create();
-        }, Column);
-        this.observeComponentCreation2((d19, e19) => {
-            Web.create({ src: "", controller: this.webviewController });
-            Web.javaScriptAccess(true);
-            Web.zoomAccess(true);
-            Web.domStorageAccess(true);
-            Web.multiWindowAccess(false);
-            Web.onWindowExit(() => {
-                PLVLogger.info(TAG, "onWindowExit");
-                if (this.controller) {
-                    this.controller.close();
-                }
-            });
-        }, Web);
-        Column.pop();
-    }
-    rerender() {
-        this.updateDirtyElements();
-    }
-}