pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Fix endif

Browse source
This commit is contained in:
kong 2021-05-28 11:38:05 +07:00
parent 42feb79095
commit da4c00d234
2 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/page_brewing3.xml
View file

@ -308,6 +308,7 @@
SAVELOG "back_to_main from line > 309." SAVELOG "back_to_main from line > 309."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
EndIf EndIf
EndIf EndIf
@ -634,7 +635,7 @@
EndIf EndIf
EndIf EndIf
DEBUGVAR CountUpBrewing
; animation video loop ; animation video loop
If AnimationOn = "true" Then If AnimationOn = "true" Then
Var CountUpBrewing = CountUpBrewing + 1 Var CountUpBrewing = CountUpBrewing + 1
@ -702,8 +703,8 @@
Var PictureFile = PictureFile + videoID Var PictureFile = PictureFile + videoID
Var PictureFile = PictureFile + PictureEnd Var PictureFile = PictureFile + PictureEnd
SAVELOG VideoPlayFile DEBUGVAR VideoPlayFile
SAVELOG PictureFile DEBUGVAR PictureFile
EndIf EndIf
EndIf EndIf
EndIf EndIf

88
xml/page_lid_straw.xml
View file

@ -28,49 +28,6 @@
;SAVELOG VideoID6 ;SAVELOG VideoID6
;SAVELOG VideoAnimationCount ;SAVELOG VideoAnimationCount
Var VideoPlayFile = VideoPath
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var VideoPlayFile = VideoPlayFile + "1"
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
Var PictureFile = PicturePath
Var PictureFile = PictureFile + PictureBegin
Var PictureFile = PictureFile + "1"
Var PictureFile = PictureFile + PictureEnd
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4"
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
Var PictureBegin = "txt_"
If lidAndStrawOldPageIgnore = "true" Then
Var lidAndStrawOldPageIgnore = "false"
If StarwState = "Press" Then
Machine Straw
LED LedDoorLid Blink 255 255 255 255
EndIf
If LidState = "Press" Then
Machine Lid
LED LedDoorLid Blink 255 255 255 255
EndIf
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Var LidState = Lid1Status
;Lid1Status
Var StarwState = "Enable"
Var LidStrawCountDown = 15
If Lid1Status = "Disable" Then
Var LidState = "Invisible"
EndIf
If show_eng = "true" Then If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en" Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en"
Var PictureEnd = "_en.png" Var PictureEnd = "_en.png"
@ -98,6 +55,51 @@
Play "ROOT/sounds/pleaseWait.wav" Play "ROOT/sounds/pleaseWait.wav"
EndIf EndIf
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4"
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
Var PictureBegin = "txt_"
Var VideoPlayFile = VideoPath
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var VideoPlayFile = VideoPlayFile + "1"
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
Var PictureFile = PicturePath
Var PictureFile = PictureFile + PictureBegin
Var PictureFile = PictureFile + "1"
Var PictureFile = PictureFile + PictureEnd
If lidAndStrawOldPageIgnore = "true" Then
Var lidAndStrawOldPageIgnore = "false"
If StarwState = "Press" Then
Machine Straw
LED LedDoorLid Blink 255 255 255 255
EndIf
If LidState = "Press" Then
Machine Lid
LED LedDoorLid Blink 255 255 255 255
EndIf
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Var LidState = Lid1Status
;Lid1Status
Var StarwState = "Enable"
Var LidStrawCountDown = 15
If Lid1Status = "Disable" Then
Var LidState = "Invisible"
EndIf
STRCONTAIN "9701" BrewParam IgnoreLidStraw STRCONTAIN "9701" BrewParam IgnoreLidStraw
DEBUGVAR BrewParam DEBUGVAR BrewParam