@flexem/fc-gui 3.0.0-alpha.11 → 3.0.0-alpha.111

package/elements/switch-indicator-light/switch-indicator-light-element.js

@@ -1,7 +1,7 @@
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import * as d3 from 'd3-selection';
 import { isUndefined } from 'lodash';
-import { IndicatorLightType, SwitchType, State } from '../../model';
+import { IndicatorLightType, SwitchType, State, BitSwitchOperation } from '../../model';
 import { VariableState } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { GraphStateElement } from '../shared/graph/graph-state-element';
@@ -23,13 +23,17 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
         this.securityChecker = securityChecker;
+        this.isBitRestoration = false; // 是否是 位设定且执行设置是复位
+        this.isVerifiedForRestoration = false; // 位设定且执行设置是复位情况下，是否已经完成了验证
+        this.isWriteRestorationDownValue = false;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.isMobileMode = DisplayMode.Mobile === injector.get(GlobalSettings).displayMode;
         this.checkState();
         if (this.model.useSwitch) {
             this.initSwitchOperator();
             this.rootElement.style('cursor', 'hand');
-            this.rootElement.on('mousedown', () => {
+            const isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
+            this.rootElement.on(this.isMobileMode && isMobile ? 'touchstart' : 'mousedown', () => {
                 if (!this.isInitialized) {
                     return;
                 }
@@ -43,31 +47,39 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
                     return;
                 }
                 if (this.switchOperator.canExecute()) {
-                    if (this.model.useSecurity) {
-                        const modalRef = this.modalService.show(ConfirmOperationModalComponent, { backdrop: 'static', class: 'gui-modal-dialog-position', animated: false });
-                        const onClosedSub = modalRef.content.onClosed.subscribe(result => {
-                            modalRef.hide();
-                            onClosedSub.unsubscribe();
-                            if (result) {
-                                this.checkElementPassword();
+                    if (!this.isBitRestoration || !this.isVerifiedForRestoration) {
+                        if (this.model.useSecurity) {
+                            const modalRef = this.modalService.show(ConfirmOperationModalComponent, { backdrop: 'static', class: 'gui-modal-dialog-position', animated: false });
+                            const onClosedSub = modalRef.content.onClosed.subscribe(result => {
+                                modalRef.hide();
+                                onClosedSub.unsubscribe();
+                                if (result) {
+                                    this.checkElementPassword(true);
+                                }
+                            });
+                        }
+                        else {
+                            this.checkElementPassword(false);
+                            if (!this.model.useIndicatorLight && !this.isMobileMode) {
+                                this.switchToState(1);
                             }
-                        });
+                        }
                     }
                     else {
-                        this.checkElementPassword();
-                        if (!this.model.useIndicatorLight && !this.isMobileMode) {
-                            this.switchToState(1);
-                        }
+                        document.addEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+                        this.restorationTimer = setTimeout(() => {
+                            this.writeValue(1);
+                            this.isWriteRestorationDownValue = true;
+                        }, 1000);
                     }
                     d3.event.preventDefault();
                 }
             });
-            if (!this.model.useIndicatorLight && !this.isMobileMode) {
-                this.rootElement.on('mouseup', () => {
-                    this.switchToState(0);
-                    d3.event.preventDefault();
-                });
-            }
+            this.rootElement.on(this.isMobileMode && isMobile ? 'touchend' : 'mouseup', () => {
+                this.handleMouseUp();
+                d3.event.stopPropagation();
+            });
+            this.initOnDocMouseUpEvent();
         }
         this.initGraphAndText();
         if (this.model.useIndicatorLight) {
@@ -77,19 +89,62 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             this.switchToState(0);
         }
     }
-    checkElementPassword() {
+    handleMouseUp() {
+        if (this.restorationTimer) {
+            clearTimeout(this.restorationTimer);
+            this.restorationTimer = undefined;
+        }
+        if (this.isBitRestoration && this.isWriteRestorationDownValue) {
+            this.writeValue(0);
+        }
+        document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+        this.isVerifiedForRestoration = false;
+        this.isWriteRestorationDownValue = false;
+        if (!this.model.useIndicatorLight && !this.isMobileMode) {
+            this.switchToState(0);
+            if (d3.event) {
+                d3.event.preventDefault();
+            }
+        }
+    }
+    initOnDocMouseUpEvent() {
+        this.onDocMouseUp = () => {
+            this.handleMouseUp();
+        };
+    }
+    checkElementPassword(afterConfirm) {
         if (this.model.enablePassword) {
             const modalRef = this.modalService.show(VerifyPasswordModalComponent, { initialState: { securityChecker: this.securityChecker }, backdrop: 'static', class: 'gui-modal-dialog-position', animated: false });
             const onClosedSub = modalRef.content.onClosed.subscribe(result => {
                 modalRef.hide();
                 onClosedSub.unsubscribe();
                 if (result) {
-                    this.doSwitchOperator();
+                    if (!this.isBitRestoration) {
+                        this.doSwitchOperator();
+                    }
+                    else {
+                        this.isVerifiedForRestoration = true;
+                    }
                 }
             });
         }
         else {
-            this.doSwitchOperator();
+            if (!this.isBitRestoration) {
+                this.doSwitchOperator();
+            }
+            else {
+                if (afterConfirm) {
+                    this.isVerifiedForRestoration = true;
+                }
+                else {
+                    this.isVerifiedForRestoration = true;
+                    document.addEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+                    this.restorationTimer = setTimeout(() => {
+                        this.writeValue(1);
+                        this.isWriteRestorationDownValue = true;
+                    }, 1000);
+                }
+            }
         }
     }
     doSwitchOperator() {
@@ -106,12 +161,27 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             throw new Error('Failure of the operation record:switchOperator');
         });
     }
+    writeValue(value) {
+        this.switchOperator.writeValue(value).then(args => {
+            if (this.model.isRecordOperation || this.model.isRecordOperation === undefined) {
+                if (args.newValue !== undefined || args.originValue !== undefined) {
+                    this.operationRecordService.record({
+                        variableOptionModel: args,
+                        operationDescription: this.model.operationDescription
+                    });
+                }
+            }
+        }).catch(() => {
+            throw new Error('Failure of the operation record:switchOperator');
+        });
+    }
     initSwitchOperator() {
         const settings = this.model.switchSettings;
         switch (settings.type) {
             case SwitchType.Bit:
                 this.switchOperator =
                     new BitSwitchOperator(settings.settings, this.variableCommunicator, this.variableStore, this.signalRAppId);
+                this.isBitRestoration = settings.settings.operation === BitSwitchOperation.Restoration;
                 break;
             case SwitchType.Word:
                 this.switchOperator =

package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"SwitchIndicatorLightElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":32,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":44,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":45,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":46,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":47,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":48,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":49,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":50,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":51,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":52,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":53,"character":22},{"__symbolic":"reference","name":"string"}]}],"checkElementPassword":[{"__symbolic":"method"}],"doSwitchOperator":[{"__symbolic":"method"}],"initSwitchOperator":[{"__symbolic":"method"}],"initIndictorLightOperator":[{"__symbolic":"method"}],"currentStateIdChange":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"checkState":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"SwitchIndicatorLightElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":32,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":50,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":51,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":52,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":53,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":54,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":55,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":56,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":57,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":58,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":59,"character":22},{"__symbolic":"reference","name":"string"}]}],"handleMouseUp":[{"__symbolic":"method"}],"initOnDocMouseUpEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doSwitchOperator":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}],"initSwitchOperator":[{"__symbolic":"method"}],"initIndictorLightOperator":[{"__symbolic":"method"}],"currentStateIdChange":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"checkState":[{"__symbolic":"method"}]}}}}]

package/elements/switch-indicator-light/switch-operator.d.ts

@@ -2,4 +2,5 @@ import { VariableOptionModel } from '../../service';
 export interface SwitchOperator {
     canExecute(): boolean;
     execute(): Promise<VariableOptionModel>;
+    writeValue(value: number): Promise<VariableOptionModel>;
 }

package/elements/switch-indicator-light/word-switch-operator.d.ts

@@ -14,4 +14,5 @@ export declare class WordSwitchOperator implements SwitchOperator {
     constructor(settings: WordSwitchSettings, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
     canExecute(): boolean;
     execute(): Promise<VariableOptionModel>;
+    writeValue(value: any): Promise<VariableOptionModel>;
 }

package/elements/switch-indicator-light/word-switch-operator.js

@@ -66,4 +66,10 @@ export class WordSwitchOperator {
             newValue: newValue
         });
     }
+    // 此方法为 位设定添加的，字设定目前不会用到，为了解决接口error，添加一个空实现
+    writeValue(value) {
+        return Promise.resolve({
+            newValue: value
+        });
+    }
 }

package/elements/switch-indicator-light/word-switch-operator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WordSwitchOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordSwitchSettings","line":20,"character":43},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":20,"character":102},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":21,"character":40},{"__symbolic":"reference","name":"string"}]}],"canExecute":[{"__symbolic":"method"}],"execute":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WordSwitchOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordSwitchSettings","line":20,"character":43},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":20,"character":102},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":21,"character":40},{"__symbolic":"reference","name":"string"}]}],"canExecute":[{"__symbolic":"method"}],"execute":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}]}}}}]

package/elements/video/video-element.d.ts

@@ -16,6 +16,9 @@ export declare class VideoElement extends ConditionalDisplayElement {
     private videoId;
     private isShow;
     private videoPlayer;
+    private refreshTimer;
+    private isFullscreen;
+    private videoUrl;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, videoService: VideoService, guiSize: Size, svgRootClass: string, signalRAppId: string);
     dispose(): void;
     hide(): void;
@@ -24,4 +27,5 @@ export declare class VideoElement extends ConditionalDisplayElement {
     private initVideo;
     private addVideoAddressToolTip;
     private setAndroidVideo;
+    private setIosVideo;
 }

package/elements/video/video-element.js

@@ -11,6 +11,7 @@ export class VideoElement extends ConditionalDisplayElement {
         this.guiSize = guiSize;
         this.svgRootClass = svgRootClass;
         this.videoId = '';
+        this.isFullscreen = false;
         this.isMobileMode = DisplayMode.Mobile === injector.get(GlobalSettings).displayMode;
         this.localization = injector.get(LOCALIZATION);
         this.init();
@@ -50,12 +51,13 @@ export class VideoElement extends ConditionalDisplayElement {
             .attr('width', this.model.size.width)
             .attr('height', this.model.size.height);
         this.videoService.getVideoUrl(this.model.videoTag).then(result => {
-            this.initVideo(result.url, result.isMobileType, this.videoId);
+            this.videoUrl = result.url;
+            this.initVideo(result.url, this.videoId);
         }).catch(() => {
             throw new Error('Failure of the videoService');
         });
     }
-    initVideo(videoUrl, isMobileType, videoId) {
+    initVideo(videoUrl, videoId) {
         const patt = /https:.+.m3u8/;
         if (videoUrl.indexOf('http:') !== -1) {
             videoUrl = videoUrl.replace('http:', 'https:');
@@ -68,6 +70,8 @@ export class VideoElement extends ConditionalDisplayElement {
             this.addVideoAddressToolTip(videoToolTip);
             return;
         }
+        const isAndroid = !!navigator.userAgent.match(/(Android)/i);
+        const isIos = !!navigator.userAgent.match(/(Mac)/i);
         const currentRect = this.$element.find('rect#rect' + videoId).first();
         if (!currentRect.length) {
             return;
@@ -77,16 +81,18 @@ export class VideoElement extends ConditionalDisplayElement {
         const chartHeight = clientRect.height;
         const left = this.model.location.x / this.guiSize.width * $('.' + this.svgRootClass).find('.svg-content').width();
         const top = this.model.location.y / this.guiSize.height * $('.' + this.svgRootClass).find('.svg-content').height();
-        let videoHtml = `<video scareX="${this.model.location.x / this.guiSize.width}"
-    scareY="${this.model.location.y / this.guiSize.height}" id="${videoId}" src="${videoUrl}" style="
-    position: absolute;top:${top}px;left:${left}px;width:${chartWidth}px;height:${chartHeight}px;object-fit:fill;z-index:0"
-    playsInline webkit-playsinline `;
-        const isAndroid = !!navigator.userAgent.match(/(Android)/i);
+        const scareX = this.model.location.x / this.guiSize.width;
+        const scareY = this.model.location.y / this.guiSize.height;
+        if (isIos) {
+            videoUrl = videoUrl + '#t=1';
+        }
+        const preload = isIos ? ' preload=\'metadata\'' : '';
+        let videoHtml = `<video scareX="${scareX}"
+                scareY="${scareY}" id="${videoId}" ${preload} src="${videoUrl}" width="${chartWidth}" height="${chartHeight}"
+                style="position: absolute;top:${top}px;left:${left}px;object-fit:fill;z-index:0;"
+                playsInline webkit-playsinline `;
         if (this.isMobileMode) {
             if (isAndroid) {
-                if (isMobileType) {
-                    videoHtml += ' controls ';
-                }
                 videoHtml += ' autoplay muted></video>';
             }
             else {
@@ -100,10 +106,25 @@ export class VideoElement extends ConditionalDisplayElement {
         if (this.isShow === false) {
             $('#' + this.videoId).hide();
         }
-        this.videoPlayer = new EZUIPlayer(videoId);
-        if (isAndroid && !isMobileType) {
-            this.setAndroidVideo(videoId);
-        }
+        setTimeout(() => {
+            if (isAndroid) {
+                this.setAndroidVideo(videoId);
+            }
+            else if (isIos) {
+                this.setIosVideo(this.videoUrl, videoId);
+            }
+            try {
+                this.videoPlayer = new EZUIPlayer(videoId);
+            }
+            catch (err) {
+                console.log(err);
+            }
+        }, 1000);
+        const style = document.createElement('style');
+        style.innerHTML = `#${videoId}::-webkit-media-controls-enclosure {
+            display: none;
+        }`;
+        document.head.append();
     }
     addVideoAddressToolTip(videoToolTip) {
         const size = this.model.size;
@@ -126,35 +147,68 @@ export class VideoElement extends ConditionalDisplayElement {
         this.$element.append(textElement.Element);
     }
     setAndroidVideo(videoId) {
-        let isFullscreen = false;
         const videoElement = $('#' + videoId);
         let preHeight = videoElement.height();
         let preWidth = videoElement.width();
         let preTop = videoElement.css('top');
         let preLeft = videoElement.css('left');
+        const { StatusBar } = window;
         videoElement.on('click', () => {
-            if (!isFullscreen) {
+            if (!this.isFullscreen) {
+                if (StatusBar) {
+                    StatusBar.hide();
+                }
                 preHeight = videoElement.height();
                 preWidth = videoElement.width();
                 preTop = videoElement.css('top');
                 preLeft = videoElement.css('left');
-                const width = document.body.clientWidth;
-                const height = width * 9 / 16;
+                const width = document.documentElement.clientWidth;
+                const height = document.documentElement.clientHeight;
+                videoElement.css('object-fit', 'contain');
+                videoElement.css('background', '#000000');
                 videoElement.css('width', width + 'px');
                 videoElement.css('height', height + 'px');
                 videoElement.css('left', '0px');
                 videoElement.css('top', '0px');
                 videoElement.css('z-index', '99');
-                isFullscreen = true;
+                videoElement.css('position', 'fixed');
+                this.isFullscreen = true;
+                try {
+                    screen.orientation.lock(screen.orientation.type);
+                }
+                catch (error) {
+                    console.error(error);
+                }
             }
             else {
+                videoElement.css('object-fit', 'fill');
                 videoElement.css('width', preWidth + 'px');
                 videoElement.css('height', preHeight + 'px');
                 videoElement.css('left', preLeft);
                 videoElement.css('top', preTop);
                 videoElement.css('z-index', '0');
-                isFullscreen = false;
+                videoElement.css('position', 'absolute');
+                this.isFullscreen = false;
+                try {
+                    if (screen.orientation.type.includes('portrait')) {
+                        StatusBar.show();
+                    }
+                }
+                catch (error) {
+                    console.error(error);
+                }
             }
         });
     }
+    setIosVideo(videoUrl, videoId) {
+        const video = $('#' + this.videoId);
+        video.on('webkitendfullscreen', () => {
+            video.remove();
+            clearTimeout(this.refreshTimer);
+            this.refreshTimer = null;
+            this.refreshTimer = setTimeout(() => {
+                this.initVideo(videoUrl, videoId);
+            }, 500);
+        });
+    }
 }

package/elements/video/video-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VideoElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":15,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":23,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":24,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":25,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":26,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":27,"character":23},{"__symbolic":"reference","module":"../../service","name":"VideoService","line":28,"character":39},{"__symbolic":"reference","module":"../../model","name":"Size","line":29,"character":34},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"hide":[{"__symbolic":"method"}],"show":[{"__symbolic":"method"}],"init":[{"__symbolic":"method"}],"initVideo":[{"__symbolic":"method"}],"addVideoAddressToolTip":[{"__symbolic":"method"}],"setAndroidVideo":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VideoElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":15,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":27,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":28,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":29,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":30,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":31,"character":23},{"__symbolic":"reference","module":"../../service","name":"VideoService","line":32,"character":39},{"__symbolic":"reference","module":"../../model","name":"Size","line":33,"character":34},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"hide":[{"__symbolic":"method"}],"show":[{"__symbolic":"method"}],"init":[{"__symbolic":"method"}],"initVideo":[{"__symbolic":"method"}],"addVideoAddressToolTip":[{"__symbolic":"method"}],"setAndroidVideo":[{"__symbolic":"method"}],"setIosVideo":[{"__symbolic":"method"}]}}}}]

package/elements/view-operation/view-operation.element.js

@@ -170,6 +170,9 @@ export class ViewOperationElement extends ConditionalEnableElement {
         const viewIndex = this.model.viewIndex;
         if (null != viewIndex) {
             this.popupViewService.popView(viewIndex, this.hostContainerId, this.el).subscribe(() => this.recordViewOperation(), error => this.logger.error(`ToggleView(${viewIndex}) failed. ${error}`));
+            $(`#${this.hostContainerId} video`)
+                .addClass('video-hidden')
+                .css('visibility', 'hidden');
         }
         else {
             this.logger.error('[GUI]Toggle View:invalid view index');
@@ -177,6 +180,11 @@ export class ViewOperationElement extends ConditionalEnableElement {
     }
     closeView() {
         this.popupViewService.closeView();
+        if ($(`#${this.hostContainerId} > svg > svg`).length === 0) {
+            $(`#${this.hostContainerId} .video-hidden`)
+                .removeClass('video-hidden')
+                .css('visibility', 'visible');
+        }
         this.recordViewOperation();
     }
     moveView(movementX, movementY) {

package/elements/weather/weater-element.js

@@ -45,7 +45,6 @@ export class WeatherElement extends ConditionalDisplayElement {
     }
     handleGettingAddress() {
         this.handleUnusualCommon(this.localization.weatherNotAvailable);
-        setTimeout(() => this.initWeatherInfo(), 1000 * 60);
     }
     handleNoAddress() {
         this.handleUnusualCommon(this.localization.weatherNotAddress);

package/gui/gui-context.d.ts

@@ -1,12 +1,13 @@
 import { ConfigStore } from '../config';
 import { VariableCommunicator } from '../communication';
 import { SecurityChecker } from '../security';
-import { VideoService, WeatherService, PermissionChecker, OperationRecordService } from '../service';
+import { VideoService, WeatherService, PermissionChecker, OperationRecordService, ReleasedVariableService } from '../service';
 export interface GuiContext {
     readonly configStore: ConfigStore;
     readonly variableCommunicator: VariableCommunicator;
     readonly permissionChecker: PermissionChecker;
     readonly operationRecordService: OperationRecordService;
+    readonly releasedVariableService: ReleasedVariableService;
     readonly securityChecker: SecurityChecker;
     readonly videoService: VideoService;
     readonly weatherService: WeatherService;

package/gui/gui-host.d.ts

@@ -13,7 +13,7 @@ export declare class GuiHost implements Disposable {
     readonly el: ElementRef;
     private isLoaded;
     private currentView;
-    private currentViewIndex;
+    currentViewIndex: number;
     private containerEl;
     private currentViewSize;
     private currentViewReiszeMode;

package/gui/gui.component.d.ts

@@ -24,10 +24,12 @@ export declare class GuiComponent implements OnChanges, OnDestroy {
     initHeight: number;
     lastScale: number;
     isMobileMode: boolean;
+    hostContainerId: string;
     private $svg;
     private host;
     private get viewResizeMode();
     private readonly globalSettings;
+    private readonly viewService;
     constructor(el: ElementRef, localization: Localization, injector: Injector, bsModalService: BsModalService);
     ngOnChanges(changes: {
         [propKey: string]: SimpleChange;
@@ -39,4 +41,5 @@ export declare class GuiComponent implements OnChanges, OnDestroy {
     private onSizeChanged;
     private onResizeModeChanged;
     private onDisplayModeChanged;
+    refreshCurrentPage(): boolean;
 }

package/gui/gui.component.js

@@ -18,6 +18,7 @@ import { Size } from '../model';
 import { DisplayMode, GlobalSettings, ViewResizeMode } from '../settings';
 import { GuiHost } from './gui-host';
 import { Guid } from '../utils/guid';
+import { ViewService } from '../view/view.service';
 let GuiComponent = class GuiComponent {
     constructor(el, localization, injector, bsModalService) {
         this.el = el;
@@ -29,6 +30,7 @@ let GuiComponent = class GuiComponent {
         this.lastScale = 1;
         this.isMobileMode = false;
         this.globalSettings = this.injector.get(GlobalSettings);
+        this.viewService = injector.get(ViewService);
     }
     get viewResizeMode() {
         switch (this.resizeMode) {
@@ -131,11 +133,11 @@ let GuiComponent = class GuiComponent {
             this.$svg = $(this.el.nativeElement).find('div.svgView').first();
             this.$svg.empty();
             const svgRootClass = 'S' + Guid.newGuid().toString('n');
-            const hostContainerId = 'H' + Guid.newGuid().toString('n');
+            this.hostContainerId = 'H' + Guid.newGuid().toString('n');
             this.$svg.addClass(svgRootClass);
             const guiOptions = {
                 svgRootClass: svgRootClass,
-                hostContainerId: hostContainerId,
+                hostContainerId: this.hostContainerId,
                 el: this.el
             };
             const host = new GuiHost(this.injector, this.bsModalService, newValue, guiOptions, this.el);
@@ -190,6 +192,17 @@ let GuiComponent = class GuiComponent {
         this.isMobileMode = this.displayMode === 'Mobile';
         this.globalSettings.displayMode = this.isMobileMode ? DisplayMode.Mobile : DisplayMode.Web;
     }
+    refreshCurrentPage() {
+        if (this.host.currentViewIndex === undefined) {
+            return false;
+        }
+        const toggleView = this.viewService.toggleViews.get(this.el);
+        if (!toggleView) {
+            return false;
+        }
+        toggleView(this.host.currentViewIndex, this.hostContainerId, this.el).subscribe();
+        return true;
+    }
 };
 __decorate([
     Input(),

package/gui/gui.component.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GuiComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":11,"character":1},"arguments":[{"selector":"fc-gui","template":"<div> <div class='svgView' style=\"position: relative;display: flex;justify-content: center;align-items: center;\"></div> </div> "}]}],"members":{"context":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":17,"character":5}}]}],"size":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":18,"character":5}}]}],"resizeMode":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":19,"character":5}}]}],"displayMode":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":20,"character":5}}]}],"loadFailed":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":21,"character":5}}]}],"loaded":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":22,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[null,[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":46,"character":9},"arguments":[{"__symbolic":"reference","module":"../localization","name":"LOCALIZATION","line":46,"character":16}]}],null,null],"parameters":[{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":45,"character":37},{"__symbolic":"reference","module":"../localization","name":"Localization","line":46,"character":61},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":47,"character":35},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":48,"character":41}]}],"ngOnChanges":[{"__symbolic":"method"}],"doubleFingerZooming":[{"__symbolic":"method"}],"getDistance":[{"__symbolic":"method"}],"ngOnDestroy":[{"__symbolic":"method"}],"onProviderChanged":[{"__symbolic":"method"}],"onSizeChanged":[{"__symbolic":"method"}],"onResizeModeChanged":[{"__symbolic":"method"}],"onDisplayModeChanged":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GuiComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":12,"character":1},"arguments":[{"selector":"fc-gui","template":"<div> <div class='svgView' style=\"position: relative;display: flex;justify-content: center;align-items: center;\"></div> </div> "}]}],"members":{"context":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":18,"character":5}}]}],"size":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":19,"character":5}}]}],"resizeMode":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":20,"character":5}}]}],"displayMode":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":21,"character":5}}]}],"loadFailed":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":22,"character":5}}]}],"loaded":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":23,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[null,[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":50,"character":9},"arguments":[{"__symbolic":"reference","module":"../localization","name":"LOCALIZATION","line":50,"character":16}]}],null,null],"parameters":[{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":49,"character":37},{"__symbolic":"reference","module":"../localization","name":"Localization","line":50,"character":61},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":51,"character":35},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":52,"character":41}]}],"ngOnChanges":[{"__symbolic":"method"}],"doubleFingerZooming":[{"__symbolic":"method"}],"getDistance":[{"__symbolic":"method"}],"ngOnDestroy":[{"__symbolic":"method"}],"onProviderChanged":[{"__symbolic":"method"}],"onSizeChanged":[{"__symbolic":"method"}],"onResizeModeChanged":[{"__symbolic":"method"}],"onDisplayModeChanged":[{"__symbolic":"method"}],"refreshCurrentPage":[{"__symbolic":"method"}]}}}}]

package/localization/localization.service.d.ts

@@ -4,8 +4,10 @@ export interface Localization {
     loadFailed: any;
     setting: any;
     submit: any;
+    submitting: any;
     numericalValueRequired: any;
     invalidNumericalValue: any;
+    writeValueTimeout: any;
     binaryType: any;
     decimalType: any;
     hexadecimalType: any;
@@ -30,7 +32,9 @@ export interface Localization {
     permissiontip: any;
     conditionIsNotMetTip: any;
     chartNoData: any;
+    lastThirtyMinutes: any;
     lastOneHour: any;
+    lastEightHour: any;
     lastTwentyFourHours: any;
     lastSevenDays: any;
     lastThirtyDays: any;
@@ -47,5 +51,8 @@ export interface Localization {
     weatherNotSupport: any;
     weatherNotAddress: any;
     weatherNotAvailable: any;
+    airQualityNotSupport: any;
+    airQualityNotAddress: any;
+    airQualityNotAvailable: any;
 }
 export declare const DefaultLocalization: Localization;