h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 16:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

add types for ScreensaverEntityIconColor

Browse Source
This commit is contained in:
ticaki
2024-01-02 11:59:19 +01:00
parent f1ce806ded
commit 956bd23a56
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ioBroker/NsPanelTs.ts
View File

@@ -8156,9 +8156,9 @@ function HandleScreensaverUpdate(): void {
} }
} }
} }
const temp = config.leftScreensaverEntity[i].ScreensaverEntityIconColor;
if (existsObject(config.leftScreensaverEntity[i].ScreensaverEntityIconColor)) { if (temp && typeof temp == 'string' && existsObject(temp)) {
iconColor = getState(config.leftScreensaverEntity[i].ScreensaverEntityIconColor).val; iconColor = getState(temp).val;
} }
payloadString += '~' + payloadString += '~' +
@@ -8302,8 +8302,9 @@ function HandleScreensaverUpdate(): void {
} }
} }
if (existsObject(config.bottomScreensaverEntity[4].ScreensaverEntityIconColor)) { const temp = config.bottomScreensaverEntity[4].ScreensaverEntityIconColor
iconColor = getState(config.bottomScreensaverEntity[4].ScreensaverEntityIconColor).val; if (temp && typeof temp == 'string' && existsObject(temp)) {
iconColor = getState(temp).val;
} }
payloadString += '~' + payloadString += '~' +
'~' + '~' +
@@ -8367,8 +8368,9 @@ function HandleScreensaverUpdate(): void {
} }
} }
if (existsObject(config.bottomScreensaverEntity[i].ScreensaverEntityIconColor)) { const temp = config.bottomScreensaverEntity[4].ScreensaverEntityIconColor
iconColor = getState(config.bottomScreensaverEntity[i].ScreensaverEntityIconColor).val; if (temp && typeof temp == 'string' && existsObject(temp)) {
iconColor = getState(temp).val;
} }
if (i < maxEntities - 1) { if (i < maxEntities - 1) {
val = val + '~'; val = val + '~';
@@ -8421,8 +8423,9 @@ function HandleScreensaverUpdate(): void {
icon = Icons.GetIcon(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff) icon = Icons.GetIcon(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff)
} }
} }
if (existsObject(config.indicatorScreensaverEntity[i].ScreensaverEntityIconColor)) { const temp = config.indicatorScreensaverEntity[4].ScreensaverEntityIconColor
iconColor = getState(config.indicatorScreensaverEntity[i].ScreensaverEntityIconColor).val; if (temp && typeof temp == 'string' && existsObject(temp)) {
iconColor = getState(temp).val;
} }
payloadString += '~' + payloadString += '~' +
'~' + '~' +
@@ -8733,13 +8736,14 @@ function GetScreenSaverEntityColor(configElement: ScreenSaverElement | null): nu
try { try {
let colorReturn: number; let colorReturn: number;
if (configElement && configElement.ScreensaverEntityIconColor != undefined) { if (configElement && configElement.ScreensaverEntityIconColor != undefined) {
const ScreensaverEntityIconColor = configElement.ScreensaverEntityIconColor as IconScaleElement;
if (typeof getState(configElement.ScreensaverEntity).val == 'boolean') { if (typeof getState(configElement.ScreensaverEntity).val == 'boolean') {
let iconvalbest = (configElement.ScreensaverEntityIconColor.val_best != undefined) ? configElement.ScreensaverEntityIconColor.val_best : false ; let iconvalbest = (typeof ScreensaverEntityIconColor == 'object' && ScreensaverEntityIconColor.val_best !== undefined ) ? ScreensaverEntityIconColor.val_best : false ;
colorReturn = (getState(configElement.ScreensaverEntity).val == iconvalbest) ? rgb_dec565(colorScale0) : rgb_dec565(colorScale10); colorReturn = (getState(configElement.ScreensaverEntity).val == iconvalbest) ? rgb_dec565(colorScale0) : rgb_dec565(colorScale10);
} else if (typeof configElement.ScreensaverEntityIconColor == 'object') { } else if (typeof ScreensaverEntityIconColor == 'object') {
let iconvalmin = (configElement.ScreensaverEntityIconColor.val_min != undefined) ? configElement.ScreensaverEntityIconColor.val_min : 0 ; const iconvalmin: number = ScreensaverEntityIconColor.val_min != undefined ? ScreensaverEntityIconColor.val_min : 0 ;
let iconvalmax = (configElement.ScreensaverEntityIconColor.val_max != undefined) ? configElement.ScreensaverEntityIconColor.val_max : 100 ; const iconvalmax: number = ScreensaverEntityIconColor.val_max != undefined ? ScreensaverEntityIconColor.val_max : 100 ;
let iconvalbest = (configElement.ScreensaverEntityIconColor.val_best != undefined) ? configElement.ScreensaverEntityIconColor.val_best : iconvalmin ; const iconvalbest: number = ScreensaverEntityIconColor.val_best != undefined ? ScreensaverEntityIconColor.val_best : iconvalmin ;
let valueScale = getState(configElement.ScreensaverEntity).val * configElement.ScreensaverEntityFactor!; let valueScale = getState(configElement.ScreensaverEntity).val * configElement.ScreensaverEntityFactor!;
if (iconvalmin == 0 && iconvalmax == 1) { if (iconvalmin == 0 && iconvalmax == 1) {
@@ -8763,11 +8767,10 @@ function GetScreenSaverEntityColor(configElement: ScreenSaverElement | null): nu
let valueScaletemp = (Math.round(valueScale)).toFixed(); let valueScaletemp = (Math.round(valueScale)).toFixed();
colorReturn = HandleColorScale(valueScaletemp); colorReturn = HandleColorScale(valueScaletemp);
} }
if (configElement.ScreensaverEntityIconColor.val_min == undefined) { if (ScreensaverEntityIconColor.val_min == undefined) {
colorReturn = rgb_dec565(configElement.ScreensaverEntityIconColor); colorReturn = rgb_dec565(configElement.ScreensaverEntityIconColor as RGB);
} }
} else { } else {
colorReturn = rgb_dec565(White); colorReturn = rgb_dec565(White);
} }
} else { } else {
@@ -9471,7 +9474,7 @@ type ScreenSaverElement = {
ScreensaverEntityIconOff?: string | null, ScreensaverEntityIconOff?: string | null,
ScreensaverEntityText: string | null, ScreensaverEntityText: string | null,
ScreensaverEntityUnitText?: string | null, ScreensaverEntityUnitText?: string | null,
ScreensaverEntityIconColor?: any | null ScreensaverEntityIconColor?: RGB | IconScaleElement | string
ScreensaverEntityOnColor?: any | null ScreensaverEntityOnColor?: any | null
ScreensaverEntityOffColor?: any | null ScreensaverEntityOffColor?: any | null
ScreensaverEntityOnText?: string | null, ScreensaverEntityOnText?: string | null,
@@ -9488,3 +9491,9 @@ type ScreenSaverMRElement = {
ScreensaverEntityOnColor: RGB, ScreensaverEntityOnColor: RGB,
ScreensaverEntityOffColor: RGB ScreensaverEntityOffColor: RGB
} }
type IconScaleElement = {
val_min:number,
val_max:number,
val_best?: number
}