@flexem/fc-gui 3.0.0-alpha.8.1 → 3.0.0-alpha.81

package/model/shared/rotation/rotation-behavior.d.ts

@@ -5,5 +5,5 @@ import { RotationModel } from './rotation-model';
 import { VariableStore } from '../../../config';
 export declare class RotationBehavior implements RotationBehaviorModel {
     readonly doRotation: EventEmitter<number>;
-    constructor(rotationModel: RotationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(rotationModel: RotationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
 }

package/model/shared/rotation/rotation-behavior.js

@@ -2,9 +2,9 @@ import { EventEmitter } from '@angular/core';
 import { RotationDirectionType } from './rotation-direction-type';
 import { RotationObserver } from './rotation-observer';
 export class RotationBehavior {
-    constructor(rotationModel, variableCommunicator, variableStore) {
+    constructor(rotationModel, variableCommunicator, variableStore, signalRAppId) {
         this.doRotation = new EventEmitter();
-        const rotationObserver = new RotationObserver(rotationModel, variableCommunicator, variableStore);
+        const rotationObserver = new RotationObserver(rotationModel, variableCommunicator, variableStore, signalRAppId);
         rotationObserver.rotationValueChanged.subscribe(rotationValue => {
             if (+rotationModel.rotationDirection === RotationDirectionType.ClockWise) {
                 let newRotation;

package/model/shared/rotation/rotation-behavior.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RotationBehavior":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./rotation-model","name":"RotationModel","line":13,"character":31},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":13,"character":68},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":13,"character":105}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RotationBehavior":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./rotation-model","name":"RotationModel","line":13,"character":31},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":13,"character":68},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":13,"character":105},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/model/shared/rotation/rotation-observer.d.ts

@@ -4,7 +4,8 @@ import { VariableCommunicator } from '../../../communication';
 import { EventEmitter } from '@angular/core';
 import { VariableStore } from '../../../config';
 export declare class RotationObserver implements RotationObserverModel {
+    private readonly signalRAppId;
     readonly rotationValueChanged: EventEmitter<number>;
     private currentValue;
-    constructor(rotationModel: RotationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(rotationModel: RotationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
 }

package/model/shared/rotation/rotation-observer.js

@@ -3,7 +3,8 @@ import { EventEmitter } from '@angular/core';
 import { VariableUtil } from '../../../utils/variable-util';
 import { VariableDefinition } from '../../../communication/variable/variable-definition';
 export class RotationObserver {
-    constructor(rotationModel, variableCommunicator, variableStore) {
+    constructor(rotationModel, variableCommunicator, variableStore, signalRAppId) {
+        this.signalRAppId = signalRAppId;
         this.rotationValueChanged = new EventEmitter();
         if (!rotationModel.variableName) {
             return;
@@ -15,7 +16,7 @@ export class RotationObserver {
         }
         variableCommunicator.subscribeVariableState(variableName).subscribe(variableValue => {
             if (variableValue.state === VariableStateEnum.Normal) {
-                variableCommunicator.openVariable(variableName).subscribe(value => {
+                variableCommunicator.openVariable(variableName, this.signalRAppId).subscribe(value => {
                     if (value.state === VariableStateEnum.DataNormal) {
                         this.currentValue = value;
                         this.rotationValueChanged.emit(this.currentValue.value);

package/model/shared/rotation/rotation-observer.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RotationObserver":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./rotation-model","name":"RotationModel","line":14,"character":31},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":14,"character":68},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":14,"character":105}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RotationObserver":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./rotation-model","name":"RotationModel","line":14,"character":31},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":14,"character":68},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":14,"character":105},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/model/shared/translation/translation-behavior.d.ts

@@ -7,6 +7,6 @@ import { Point } from '../point.model';
 import { VariableStore } from '../../../config';
 export declare class TranslationBehavior implements TranslationBehaviorModel {
     readonly doTranslation: EventEmitter<number>;
-    constructor(translationModel: TranslationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore, translationDirection: TranslationDirectionType, location: Point);
+    constructor(translationModel: TranslationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore, translationDirection: TranslationDirectionType, location: Point, signalRAppId: string);
     private getTranslationValue;
 }

package/model/shared/translation/translation-behavior.js

@@ -2,17 +2,17 @@ import { EventEmitter } from '@angular/core';
 import { TranslationObserver } from './translation-observer';
 import { TranslationDirectionType } from './translation-direction-type';
 export class TranslationBehavior {
-    constructor(translationModel, variableCommunicator, variableStore, translationDirection, location) {
+    constructor(translationModel, variableCommunicator, variableStore, translationDirection, location, signalRAppId) {
         this.doTranslation = new EventEmitter();
         if (translationDirection === TranslationDirectionType.Horizontal) {
-            const horizontalTranslation = new TranslationObserver(translationModel, variableCommunicator, variableStore);
+            const horizontalTranslation = new TranslationObserver(translationModel, variableCommunicator, variableStore, signalRAppId);
             horizontalTranslation.translationValueChanged.subscribe(inputValue => {
                 const currentLocation = this.getTranslationValue(translationModel, (+inputValue), location.x);
                 this.doTranslation.emit(currentLocation);
             });
         }
         if (translationDirection === TranslationDirectionType.Vertical) {
-            const verticalTranslation = new TranslationObserver(translationModel, variableCommunicator, variableStore);
+            const verticalTranslation = new TranslationObserver(translationModel, variableCommunicator, variableStore, signalRAppId);
             verticalTranslation.translationValueChanged.subscribe(inputValue => {
                 const currentLocation = this.getTranslationValue(translationModel, (+inputValue), location.y);
                 this.doTranslation.emit(currentLocation);

package/model/shared/translation/translation-behavior.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TranslationBehavior":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./translation-model","name":"TranslationModel","line":13,"character":34},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":14,"character":30},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":15,"character":23},{"__symbolic":"reference","module":"./translation-direction-type","name":"TranslationDirectionType","line":16,"character":30},{"__symbolic":"reference","module":"../point.model","name":"Point","line":17,"character":18}]}],"getTranslationValue":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TranslationBehavior":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./translation-model","name":"TranslationModel","line":13,"character":34},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":14,"character":30},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":15,"character":23},{"__symbolic":"reference","module":"./translation-direction-type","name":"TranslationDirectionType","line":16,"character":30},{"__symbolic":"reference","module":"../point.model","name":"Point","line":17,"character":18},{"__symbolic":"reference","name":"string"}]}],"getTranslationValue":[{"__symbolic":"method"}]}}}}]

package/model/shared/translation/translation-observer.d.ts

@@ -6,5 +6,5 @@ import { VariableStore } from '../../../config';
 export declare class TranslationObserver implements TranslationObserverModel {
     readonly translationValueChanged: EventEmitter<number>;
     private currentValue;
-    constructor(model: TranslationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(model: TranslationModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
 }

package/model/shared/translation/translation-observer.js

@@ -3,7 +3,7 @@ import { VariableStateEnum } from '../../../communication';
 import { VariableUtil } from '../../../utils/variable-util';
 import { VariableDefinition } from '../../../communication/variable/variable-definition';
 export class TranslationObserver {
-    constructor(model, variableCommunicator, variableStore) {
+    constructor(model, variableCommunicator, variableStore, signalRAppId) {
         this.translationValueChanged = new EventEmitter();
         if (!model.variableName) {
             return;
@@ -15,7 +15,7 @@ export class TranslationObserver {
         }
         variableCommunicator.subscribeVariableState(variableName).subscribe(variableValue => {
             if (variableValue.state === VariableStateEnum.Normal) {
-                variableCommunicator.openVariable(variableName).subscribe(value => {
+                variableCommunicator.openVariable(variableName, signalRAppId).subscribe(value => {
                     if (value.state === VariableStateEnum.DataNormal) {
                         this.currentValue = value;
                         this.translationValueChanged.emit(this.currentValue.value);

package/model/shared/translation/translation-observer.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TranslationObserver":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./translation-model","name":"TranslationModel","line":15,"character":23},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":15,"character":63},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":15,"character":100}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TranslationObserver":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./translation-model","name":"TranslationModel","line":15,"character":23},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":15,"character":63},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":15,"character":100},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/model/switch-indicator-light/bit-switch-operation.d.ts

@@ -1,5 +1,6 @@
 export declare enum BitSwitchOperation {
     On = 0,
     Off = 1,
-    Inverse = 2
+    Inverse = 2,
+    Restoration = 3
 }

package/model/switch-indicator-light/bit-switch-operation.js

@@ -3,4 +3,5 @@ export var BitSwitchOperation;
     BitSwitchOperation[BitSwitchOperation["On"] = 0] = "On";
     BitSwitchOperation[BitSwitchOperation["Off"] = 1] = "Off";
     BitSwitchOperation[BitSwitchOperation["Inverse"] = 2] = "Inverse";
+    BitSwitchOperation[BitSwitchOperation["Restoration"] = 3] = "Restoration";
 })(BitSwitchOperation || (BitSwitchOperation = {}));

package/model/switch-indicator-light/bit-switch-operation.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"BitSwitchOperation":{"On":0,"Off":1,"Inverse":2}}}]
+[{"__symbolic":"module","version":4,"metadata":{"BitSwitchOperation":{"On":0,"Off":1,"Inverse":2,"Restoration":3}}}]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.8.1",
+	"version": "3.0.0-alpha.81",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",

package/remote/communication/variable/remote-variable-communicator.d.ts

@@ -6,6 +6,7 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private readonly remoteVariableProtocol;
     private readonly logger;
     private observers;
+    private appIdVariablesMap;
     private connectedSubscription;
     private variableValuesChangedSubscription;
     private variablesToBeOpened;
@@ -16,14 +17,18 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private variableStateCache;
     private variableStatesToBeOpened;
     private variableStatesToBeClosed;
+    private alarmObservers;
+    private alarmChangedSubscription;
     constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
+    private doAlarmChanged;
     private doVariableValuesChanged;
     private doVariableStatesChanged;
     subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
-    openVariables(variableNames: string[]): Observable<VariableValue[]>;
-    openVariable(variableName: string): Observable<VariableValue>;
+    openVariables(variableNames: string[], appId?: string): Observable<VariableValue[]>;
+    openVariable(variableName: string, appId?: string): Observable<VariableValue>;
     write(variableName: string, value: any): Observable<VariableValue>;
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
+    subscribeUserDeviceAlarms(appId?: string): Observable<any[]>;
     dispose(): void;
 }

package/remote/communication/variable/remote-variable-communicator.js

@@ -7,8 +7,10 @@ export class RemoteVariableCommunicator {
         this.remoteVariableProtocol = remoteVariableProtocol;
         this.logger = logger;
         this.observers = new Map();
+        this.appIdVariablesMap = new Map();
         this.variableStateObservers = new Map();
         this.variableStateCache = new Map();
+        this.alarmObservers = [];
         this.variableValueCache = new StringifyingMap(k => JSON.stringify(k));
         this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
             const variableNamesToStart = [];
@@ -16,14 +18,23 @@ export class RemoteVariableCommunicator {
                 variableNamesToStart.push(variableName);
             });
             this.remoteVariableProtocol.subscribeVariableStates(variableNamesToStart);
-            const variablesToStart = [];
-            this.observers.forEach((__, variableName) => {
-                variablesToStart.push(variableName);
+            this.appIdVariablesMap.forEach((variableNames, appId) => {
+                this.remoteVariableProtocol.tryOpenVariables(variableNames, appId);
             });
-            this.remoteVariableProtocol.tryOpenVariables(variablesToStart);
         });
         this.doVariableStatesChanged();
         this.doVariableValuesChanged();
+        this.doAlarmChanged();
+    }
+    doAlarmChanged() {
+        if (this.alarmChangedSubscription !== undefined) {
+            this.alarmChangedSubscription.unsubscribe();
+        }
+        this.alarmChangedSubscription = this.remoteVariableProtocol.virtualDeviceAlarmsChanged.subscribe((alarms) => {
+            each(this.alarmObservers, ob => {
+                ob.next(alarms);
+            });
+        });
     }
     doVariableValuesChanged() {
         if (this.variableValuesChangedSubscription !== undefined) {
@@ -116,7 +127,7 @@ export class RemoteVariableCommunicator {
     subscribeVariableState(variableName) {
         return this.subscribeVariableStates([variableName]).pipe(map(values => values[0]));
     }
-    openVariables(variableNames) {
+    openVariables(variableNames, appId = '') {
         return new Observable(observer => {
             let variablesToStart = [];
             each(variableNames, variableName => {
@@ -131,6 +142,14 @@ export class RemoteVariableCommunicator {
                         }
                     }
                     this.observers.get(variableName).push(observer);
+                    if (!this.appIdVariablesMap.get(appId)) {
+                        this.appIdVariablesMap.set(appId, []);
+                    }
+                    else {
+                        if (this.appIdVariablesMap.get(appId).indexOf(variableName) === -1) {
+                            this.appIdVariablesMap.get(appId).push(variableName);
+                        }
+                    }
                 }
             });
             variablesToStart = uniq(variablesToStart);
@@ -138,7 +157,7 @@ export class RemoteVariableCommunicator {
                 if (!this.variablesToBeOpened) {
                     this.variablesToBeOpened = [];
                     setTimeout(() => {
-                        this.remoteVariableProtocol.tryOpenVariables(this.variablesToBeOpened);
+                        this.remoteVariableProtocol.tryOpenVariables(this.variablesToBeOpened, appId);
                         delete this.variablesToBeOpened;
                     });
                 }
@@ -162,7 +181,7 @@ export class RemoteVariableCommunicator {
                 if (!this.variablesToBeClosed) {
                     this.variablesToBeClosed = [];
                     setTimeout(() => {
-                        this.remoteVariableProtocol.tryStopVariables(this.variablesToBeClosed);
+                        this.remoteVariableProtocol.tryStopVariables(this.variablesToBeClosed, appId);
                         delete this.variablesToBeClosed;
                     });
                 }
@@ -170,11 +189,11 @@ export class RemoteVariableCommunicator {
             };
         });
     }
-    openVariable(variableName) {
+    openVariable(variableName, appId = '') {
         if (!variableName) {
             return;
         }
-        return this.openVariables([variableName]).pipe(map(values => values[0]));
+        return this.openVariables([variableName], appId).pipe(map(values => values[0]));
     }
     write(variableName, value) {
         if (!variableName) {
@@ -196,11 +215,21 @@ export class RemoteVariableCommunicator {
               observer.next(new VariableValue(variable, VariableStateEnum.DataNormal, value))*/
         });
     }
+    subscribeUserDeviceAlarms(appId = '') {
+        return new Observable(observer => {
+            this.alarmObservers.push(observer);
+            this.remoteVariableProtocol.subscribeVirtualDeviceAlarms(appId);
+            return () => {
+                this.remoteVariableProtocol.unsubscribeVirtualDeviceAlarms(appId);
+            };
+        });
+    }
     dispose() {
         // TODO调用所有的ob.complete()。
         this.connectedSubscription.unsubscribe();
         this.variableStatesChangedSubscription.unsubscribe();
         this.variableValuesChangedSubscription.unsubscribe();
+        this.alarmChangedSubscription.unsubscribe();
         if (this.logger && this.logger.isDebugEnabled()) {
             this.logger.debug('[VariableCommunicator] RemoteVariableCommunicator disposed.');
         }

package/remote/communication/variable/remote-variable-communicator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":23,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":23,"character":106}]}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":27,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":27,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

package/remote/communication/variable/remote-variable-protocol.d.ts

@@ -4,10 +4,13 @@ export interface RemoteVariableProtocol {
     connected: Observable<void>;
     variableStatesChanged: Observable<VariableValue[]>;
     variableValuesChanged: Observable<VariableValue[]>;
-    tryOpenVariables(variableNames: string[]): Observable<void>;
-    tryStopVariables(variableNames: string[]): Observable<void>;
+    virtualDeviceAlarmsChanged: Observable<any>;
+    tryOpenVariables(variableNames: string[], appId: string): Observable<void>;
+    tryStopVariables(variableNames: string[], appId: string): Observable<void>;
     writeVariable(variableName: string, value: any): Observable<void>;
     writeVariableWordByBit(variableName: string, index: number, value: number): Observable<void>;
     subscribeVariableStates(variableNames: string[]): Observable<void>;
     unsubscribeVariableStates(variableNames: string[]): Observable<void>;
+    subscribeVirtualDeviceAlarms(appId: string): any;
+    unsubscribeVirtualDeviceAlarms(appId: string): any;
 }

package/service/index.d.ts

@@ -1,4 +1,5 @@
 export { WeatherService } from './weather.service';
 export { PermissionChecker } from './permission-checker';
+export { ReleasedVariableService } from './released-variable';
 export * from './operation-record';
 export * from './video';

package/service/index.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./operation-record"},{"from":"./video"}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./released-variable","export":["ReleasedVariableService"]},{"from":"./operation-record"},{"from":"./video"}]}]

package/service/released-variable/index.d.ts

@@ -0,0 +1 @@
+export { ReleasedVariableService } from './released-variable.service';

package/service/released-variable/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./released-variable.service","export":["ReleasedVariableService"]}]}]

package/service/released-variable/released-variable.service.d.ts

@@ -0,0 +1,4 @@
+import { Observable } from 'rxjs';
+export interface ReleasedVariableService {
+    getVariableWithValueTransform(variableName: any): Observable<any>;
+}

package/service/released-variable/released-variable.service.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"ReleasedVariableService":{"__symbolic":"interface"}}}]

package/service/weather.service.d.ts

@@ -1,3 +1,4 @@
 export interface WeatherService {
     getWeatherInfo(): Promise<any>;
+    getAirQualityInfo(): Promise<any>;
 }

package/shared/gui-consts.d.ts

@@ -26,5 +26,7 @@ export declare class GuiConsts {
         videokey: string;
         tableKey: string;
         weatherKey: string;
+        airQualityKey: string;
+        alarmKey: string;
     };
 }

package/shared/gui-consts.js

@@ -27,4 +27,6 @@ GuiConsts.components = {
     videokey: 'Video',
     tableKey: 'Table',
     weatherKey: 'Weather',
+    airQualityKey: 'AirQualityIndex',
+    alarmKey: 'Alarm'
 };

package/shared/gui-consts.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather"}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather","airQualityKey":"AirQualityIndex","alarmKey":"Alarm"}}}}}]

package/utils/data-type/data-type.service.d.ts

@@ -12,10 +12,9 @@ export declare class DataTypeService {
     isFloat(version: number, id: number): boolean;
     /**
      * 获取数据型号最大长度
-     * @param version
-     * @param id
+     * @param id fbox数据类型
      */
-    getValueMaxLength(version: number, id: number): number;
+    getValueMaxLength(version: number, dataType: number, fBoxDataType: number): number;
     /**
      * 是否支持小数位
      * @param version
@@ -43,18 +42,16 @@ export declare class DataTypeService {
     formatToDecimal(version: number, value: any, id: number): any;
     /**
        * 获取数据型号最小值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMinValue(version: number, id: number, integerDigits?: number, fractionDigits?: number): number;
+    getMinValue(version: number, dataType: number, fBoxDataType: number, integerDigits?: number, fractionDigits?: number): number;
     /**
        * 获取数据型号最大值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMaxValue(version: number, id: number, integerDigits?: number, fractionDigits?: number): number;
+    getMaxValue(version: number, dataType: number, fBoxDataType: number, integerDigits?: number, fractionDigits?: number): number;
 }

package/utils/data-type/data-type.service.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { Injectable } from '@angular/core';
-import { isNil } from 'lodash';
+import { isNil, isNumber } from 'lodash';
 import { FCloudDataTypeService } from './fcloud-data-type.service';
 import { FBoxDataTypeService } from './fbox-data-type.service';
 let DataTypeService = class DataTypeService {
@@ -54,14 +54,18 @@ let DataTypeService = class DataTypeService {
     }
     /**
      * 获取数据型号最大长度
-     * @param version
-     * @param id
+     * @param id fbox数据类型
      */
-    getValueMaxLength(version, id) {
-        if (!isNil(version) && version > 4) {
-            return this.fcloudDataTypeService.getValueMaxLength(id);
+    getValueMaxLength(version, dataType, fBoxDataType) {
+        if (isNumber(fBoxDataType)) {
+            return this.fboxDataTypeService.getValueMaxLength(fBoxDataType);
+        }
+        else {
+            if (!isNil(version) && version > 4) {
+                return this.fcloudDataTypeService.getValueMaxLength(dataType);
+            }
+            return this.fboxDataTypeService.getValueMaxLength(dataType);
         }
-        return this.fboxDataTypeService.getValueMaxLength(id);
     }
     /**
      * 是否支持小数位
@@ -110,29 +114,37 @@ let DataTypeService = class DataTypeService {
     }
     /**
        * 获取数据型号最小值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMinValue(version, id, integerDigits, fractionDigits) {
-        if (!isNil(version) && version > 4) {
-            return this.fcloudDataTypeService.getMinValue(id, integerDigits, fractionDigits);
+    getMinValue(version, dataType, fBoxDataType, integerDigits, fractionDigits) {
+        if (isNumber(fBoxDataType)) {
+            return this.fboxDataTypeService.getMinValue(fBoxDataType, integerDigits, fractionDigits);
+        }
+        else {
+            if (!isNil(version) && version > 4) {
+                return this.fcloudDataTypeService.getMinValue(dataType);
+            }
+            return this.fboxDataTypeService.getMinValue(dataType);
         }
-        return this.fboxDataTypeService.getMinValue(id, integerDigits, fractionDigits);
     }
     /**
        * 获取数据型号最大值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMaxValue(version, id, integerDigits, fractionDigits) {
-        if (!isNil(version) && version > 4) {
-            return this.fcloudDataTypeService.getMaxValue(id, integerDigits, fractionDigits);
+    getMaxValue(version, dataType, fBoxDataType, integerDigits, fractionDigits) {
+        if (isNumber(fBoxDataType)) {
+            return this.fboxDataTypeService.getMaxValue(fBoxDataType, integerDigits, fractionDigits);
+        }
+        else {
+            if (!isNil(version) && version > 4) {
+                return this.fcloudDataTypeService.getMaxValue(dataType);
+            }
+            return this.fboxDataTypeService.getMaxValue(dataType);
         }
-        return this.fboxDataTypeService.getMaxValue(id, integerDigits, fractionDigits);
     }
 };
 DataTypeService = __decorate([

package/utils/numerical-operation.service.js

@@ -44,9 +44,9 @@ let NumericalOperationService = class NumericalOperationService {
     getNumericalOperations(model) {
         const numericalOperation = {};
         numericalOperation.numericalUpperLimit = (model.numericalUpperLimit || model.numericalUpperLimit === 0) ? +model.numericalUpperLimit
-            : this.dataTypeService.getMaxValue(model.version, model.dataType, model.integerDigits, model.fractionDigits);
+            : this.dataTypeService.getMaxValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
         numericalOperation.numericalLowerLimit = (model.numericalLowerLimit || model.numericalLowerLimit === 0) ? +model.numericalLowerLimit
-            : this.dataTypeService.getMinValue(model.version, model.dataType, model.integerDigits, model.fractionDigits);
+            : this.dataTypeService.getMinValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
         numericalOperation.enableNumericalOperation = model.enableNumericalOperation;
         if (model.enableNumericalOperation) {
             numericalOperation.type = model.numericalOperationSetting.type;