@flexem/fc-gui 3.0.0-alpha.10 → 3.0.0-alpha.101

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[]>;
+    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

@@ -14,7 +14,7 @@ export declare class DataTypeService {
      * 获取数据型号最大长度
      * @param id fbox数据类型
      */
-    getValueMaxLength(id: number): number;
+    getValueMaxLength(version: number, dataType: number, fBoxDataType: number): number;
     /**
      * 是否支持小数位
      * @param version
@@ -46,12 +46,12 @@ export declare class DataTypeService {
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMinValue(id: number, integerDigits?: number, fractionDigits?: number): number;
+    getMinValue(version: number, dataType: number, fBoxDataType: number, integerDigits?: number, fractionDigits?: number): number;
     /**
        * 获取数据型号最大值
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMaxValue(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 {
@@ -56,8 +56,16 @@ let DataTypeService = class DataTypeService {
      * 获取数据型号最大长度
      * @param id fbox数据类型
      */
-    getValueMaxLength(id) {
-        return this.fboxDataTypeService.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);
+        }
     }
     /**
      * 是否支持小数位
@@ -110,8 +118,16 @@ let DataTypeService = class DataTypeService {
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMinValue(id, integerDigits, fractionDigits) {
-        return this.fboxDataTypeService.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);
+        }
     }
     /**
        * 获取数据型号最大值
@@ -119,8 +135,16 @@ let DataTypeService = class DataTypeService {
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMaxValue(id, integerDigits, fractionDigits) {
-        return this.fboxDataTypeService.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);
+        }
     }
 };
 DataTypeService = __decorate([

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

@@ -109,6 +109,16 @@ let FBoxDataTypeService = class FBoxDataTypeService {
                 return 8;
             case 15: // Binary32
                 return 32;
+            case 21: // UInt64
+                return 16;
+            case 22: // Int64
+                return 16;
+            case 23: // Bcd64
+                return 16;
+            case 24: // Hex64
+                return 8;
+            case 25: // Binary64
+                return 32;
             default:
                 return 0;
         }
@@ -165,6 +175,12 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 13: // Bcd32
             case 14: // Hex32
             case 15: // Binary32
+            case 21: // UInt64
+            case 23: // Bcd64
+            case 14: // Hex32
+            case 15: // Binary32
+            case 24: // Hex64
+            case 25: // Binary64
                 minValue = 0;
                 break;
             case 2: // Int16
@@ -176,6 +192,13 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 16: // Single
                 minValue = -1000000000;
                 break;
+            case 22: // Int64
+                // minValue = -9223372036854775808;
+                minValue = Number.MIN_SAFE_INTEGER;
+                break;
+            case 26: // Double
+                minValue = -Number.MAX_VALUE;
+                break;
         }
         if (integerDigits) {
             let digitsLength = integerDigits;
@@ -227,6 +250,23 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 16: // Single
                 maxValue = 1000000000;
                 break;
+            case 21: // UInt64
+            case 24: // Hex64
+            case 25: // Binary64
+                // maxValue = 18446744073709551615;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 22: // Int64
+                // maxValue = 9223372036854775807;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 23: // Bcd64
+                // maxValue = 9999999999999999;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 26: // Double
+                maxValue = Number.MAX_VALUE;
+                break;
         }
         if (integerDigits) {
             let digitsLength = integerDigits;

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.fBoxDataType, 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.fBoxDataType, 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;