h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-19 22:24:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

v4.3.3.9 - Update NsPanelTs.ts

Browse Source 
Add ScreensaverEntityOnColor, ...OffColor, ...OnText, ...OffText
This commit is contained in:
Armilar
2023-11-20 18:45:16 +01:00
committed by GitHub
parent 3dcb91b276
commit c1e8f7df04
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ioBroker/NsPanelTs.ts
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript v4.3.3.8 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne TypeScript v4.3.3.9 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 53 / v4.3.3 / BerryDriver 9 / Tasmota 13.2.0 - abgestimmt auf TFT 53 / v4.3.3 / BerryDriver 9 / Tasmota 13.2.0
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
@@ -59,6 +59,7 @@ ReleaseNotes:
- 20.11.2023 - v4.3.3.6 Add Multilingualism to cardAlarm (39 languages) - 20.11.2023 - v4.3.3.6 Add Multilingualism to cardAlarm (39 languages)
- 20.11.2023 - v4.3.3.7 Add Multilingualism to cardMedia (39 languages) - 20.11.2023 - v4.3.3.7 Add Multilingualism to cardMedia (39 languages)
- 20.11.2023 - v4.3.3.8 Add Method dayjs (Multilingualism), some Minor Fixes - 20.11.2023 - v4.3.3.8 Add Method dayjs (Multilingualism), some Minor Fixes
- 20.11.2023 - v4.3.3.9 Add ScreensaverEntityOnColor, ...OffColor, ...OnText, ...OffText
Todo: Todo:
- XX.XX.XXXX - v4.4.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined - XX.XX.XXXX - v4.4.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
@@ -855,7 +856,7 @@ let globalTracklist: any;
let weatherAdapterInstanceNumber: number = 0; let weatherAdapterInstanceNumber: number = 0;
let isSetOptionActive: boolean = false; let isSetOptionActive: boolean = false;
const scriptVersion: string = 'v4.3.3.8'; const scriptVersion: string = 'v4.3.3.9';
let nodeVersion: string = ''; let nodeVersion: string = '';
let javaScriptVersion: string = ''; let javaScriptVersion: string = '';
@@ -7318,6 +7319,13 @@ function HandleScreensaverUpdate(): void {
if (!val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) { if (!val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOff) icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOff)
} }
if (val && config.bottomScreensaverEntity[i].ScreensaverEntityOnText !=undefined) {
val = config.bottomScreensaverEntity[i].ScreensaverEntityOnText;
}
if (!val && config.bottomScreensaverEntity[i].ScreensaverEntityOffText !=undefined) {
val = config.bottomScreensaverEntity[i].ScreensaverEntityOffText;
}
} }
else if (typeof(val) == 'string') { else if (typeof(val) == 'string') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]); iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]);
@@ -7731,11 +7739,28 @@ function GetScreenSaverEntityColor(configElement: ScreenSaverElement | null): nu
colorReturn = rgb_dec565(configElement.ScreensaverEntityIconColor); colorReturn = rgb_dec565(configElement.ScreensaverEntityIconColor);
} }
} else { } else {
colorReturn = rgb_dec565(White); colorReturn = rgb_dec565(White);
} }
} else {
if (typeof getState(configElement.ScreensaverEntity).val == 'boolean') {
if (getState(configElement.ScreensaverEntity).val) {
if (configElement.ScreensaverEntityOnColor != undefined) {
colorReturn = rgb_dec565(configElement.ScreensaverEntityOnColor);
} else { } else {
colorReturn = rgb_dec565(White); colorReturn = rgb_dec565(White);
} }
} else {
if (configElement.ScreensaverEntityOffColor != undefined) {
colorReturn = rgb_dec565(configElement.ScreensaverEntityOffColor);
} else {
colorReturn = rgb_dec565(White);
}
}
} else {
colorReturn = rgb_dec565(White);
}
}
return colorReturn; return colorReturn;
} catch (err) { } catch (err) {
console.warn('error at function GetScreenSaverEntityColor: '+ err.message); console.warn('error at function GetScreenSaverEntityColor: '+ err.message);
@@ -8406,6 +8431,10 @@ type ScreenSaverElement = {
ScreensaverEntityText: string | null, ScreensaverEntityText: string | null,
ScreensaverEntityUnitText: string | null, ScreensaverEntityUnitText: string | null,
ScreensaverEntityIconColor: any | null ScreensaverEntityIconColor: any | null
ScreensaverEntityOnColor: any | null
ScreensaverEntityOffColor: any | null
ScreensaverEntityOnText: string | null,
ScreensaverEntityOffText: string | null,
} }
type ScreenSaverMRElement = { type ScreenSaverMRElement = {