Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-04-19 18:11:28 +00:00
committed by github-actions[bot]
parent f2549a6a91
commit b067a2c187
27 changed files with 294 additions and 520 deletions

View File

@@ -25,6 +25,8 @@ Page screensaver
vis tInstruction,0
vis tTmp,0
vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -59,6 +61,20 @@ Variable (int32) vaTap
Scope: local
Value: 0
Variable (string) tInstruction
Attributes
ID : 31
Scope : local
Text :
Max. Text Size: 50
Variable (string) tTmp
Attributes
ID : 32
Scope : local
Text :
Max. Text Size: 50
Text tTime
Attributes
ID : 5
@@ -127,7 +143,7 @@ Text tSend
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 405
x coordinate : 420
y coordinate : 2
Width : 29
Height : 30
@@ -749,48 +765,48 @@ Text tMR
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Text tNotifyHead
Attributes
ID : 31
ID : 33
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 368
y coordinate : 0
Width : 25
Height : 30
x coordinate : 15
y coordinate : 201
Width : 450
Height : 58
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 50
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Text tNotifyText
Attributes
ID : 32
ID : 34
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 335
y coordinate : 0
Width : 27
Height : 30
x coordinate : 15
y coordinate : 258
Width : 450
Height : 47
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -798,13 +814,13 @@ Text tInstruction
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 50
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1051,6 +1067,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType")
{
dim=100
@@ -1142,6 +1172,16 @@ TouchCap tc0
Events
Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0