redesign of light detail page, addded screen for icons on therm page (add nextion2text)

This commit is contained in:
joBr99
2022-03-15 17:38:02 +00:00
committed by GitHub Actions
parent 4d0a7b35ec
commit 674744ff83
2 changed files with 56 additions and 56 deletions

View File

@@ -26,6 +26,10 @@ popupNotify
15 Component(s)
143 Line(s) of event code
95 Unique line(s) of event code
popupLight
27 Component(s)
284 Line(s) of event code
145 Unique line(s) of event code
cardMedia
22 Component(s)
219 Line(s) of event code
@@ -34,10 +38,6 @@ pageStartup
19 Component(s)
140 Line(s) of event code
107 Unique line(s) of event code
popupLight
27 Component(s)
296 Line(s) of event code
152 Unique line(s) of event code
popupShutter
19 Component(s)
148 Line(s) of event code
@@ -54,5 +54,5 @@ cardEntities
Total
12 Page(s)
273 Component(s)
2505 Line(s) of event code
676 Unique line(s) of event code
2493 Line(s) of event code
666 Unique line(s) of event code

View File

@@ -55,7 +55,7 @@ Page popupLight
//disable color wheel components by default
vis bColor,0
vis pColorWheel,0
vis t0,0
//vis t0,0
Variable (string) strCommand
Attributes
@@ -97,8 +97,8 @@ Text tEntity
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 63
y coordinate : 37
x coordinate : 92
y coordinate : 21
Width : 263
Height : 30
Effect : load
@@ -127,8 +127,8 @@ Text tIcon1
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 38
x coordinate : 11
y coordinate : 21
Width : 45
Height : 30
Effect : load
@@ -158,7 +158,7 @@ Text t1
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 133
y coordinate : 226
Width : 100
Height : 30
Effect : load
@@ -188,7 +188,7 @@ Text t2
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 173
y coordinate : 267
Width : 45
Height : 30
Effect : load
@@ -218,7 +218,7 @@ Text t3
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 251
y coordinate : 181
Width : 45
Height : 30
Effect : load
@@ -248,7 +248,7 @@ Text t4
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 213
y coordinate : 143
Width : 116
Height : 30
Effect : load
@@ -280,7 +280,7 @@ Text tSend
x coordinate : 0
y coordinate : 0
Width : 348
Height : 22
Height : 7
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -397,8 +397,8 @@ Text t0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 76
y coordinate : 89
x coordinate : 9
y coordinate : 80
Width : 64
Height : 30
Effect : load
@@ -444,10 +444,10 @@ Picture pColorWheel
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 142
y coordinate : 87
Width : 213
Height : 213
x coordinate : 167
y coordinate : 69
Width : 160
Height : 160
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -491,7 +491,7 @@ Slider hBrightness
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 167
y coordinate : 261
Width : 335
Height : 43
Effect : load
@@ -559,7 +559,7 @@ Slider hTempSlider
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 248
y coordinate : 178
Width : 335
Height : 44
Effect : load
@@ -662,8 +662,8 @@ Button bColor
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 78
x coordinate : 89
y coordinate : 68
Width : 50
Height : 50
Effect : load
@@ -693,11 +693,11 @@ Button bColor
mode.val=0
//enable color wheel
vis pColorWheel,1
vis t0,1
//vis t0,1
//disable brightness
vis t1,0
vis t2,0
vis hBrightness,0
//vis t1,0
//vis t2,0
//vis hBrightness,0
//disable color temp
vis t4,0
vis t3,0
@@ -707,14 +707,14 @@ Button bColor
mode.val=1
//disable color wheel
vis pColorWheel,0
vis t0,0
if(mode_bright.val==1)
{
//enable brightness
vis t1,1
vis t2,1
vis hBrightness,1
}
//vis t0,0
//if(mode_bright.val==1)
//{
// //enable brightness
// vis t1,1
// vis t2,1
// vis hBrightness,1
//}
if(mode_temp.val==1)
{
//enable color temp
@@ -733,7 +733,7 @@ Dual-state Button btOnOff1
Send Component ID : disabled
Opacity : 127
x coordinate : 370
y coordinate : 75
y coordinate : 79
Width : 50
Height : 50
Effect : load
@@ -852,8 +852,6 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
if(mode.val==1)
{
// get Brightness value
spstr strCommand.txt,tTmp.txt,",",2
if(tTmp.txt=="disable")
@@ -871,6 +869,8 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
}
if(mode.val==1)
{
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,",",3
if(tTmp.txt=="disable")