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

Do pageboard

Browse source
This commit is contained in:
kong 2021-07-03 23:19:20 +07:00
parent c4017b6b84
commit 632fe12b4b
7 changed files with 93 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/topping_en/bn_sugar3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

BIN
image/topping_en/bp_sugar3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before After
Before After

44
xml/page_board.xml
View file

@ -11,7 +11,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
Var FileNumber = 1
Var taobin_version = "1.47"
Var taobin_version = "1.49"
; On open
Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -95,10 +95,12 @@
If TaobinOnline = "true" Then
Var ShowButtonClickFull = "Invisible"
Var CountDownShowButton = 35
Var ShowButtonClickFull = "Invisible"
Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4"
EndIf
If TermTemOnline = "true" Then
Var CountDownShowButton = 28
Var ShowButtonClickFull = "Enable"
Var VideoMainPage = "ROOT/termtem_project/video/termtem01.mp4"
EndIf
@ -124,7 +126,6 @@
;SAVELOG ShowPrice
Var CountDownShowButton = 35
Var CountDownPauseVideo = 0
Var NextPage = "-"
@ -253,11 +254,34 @@
If TermTemOnline = "true" Then
If CountDownShowButton = 31 Then
Var ShowButtonClickFull = "Enable"
Var ShowButtonClick = "Invisible"
Refresh
EndIf
If CountDownShowButton = 3 Then
Var ShowButtonClickFull = "Enable"
Var ShowButtonClick = "Enable"
Var ShowButtonClickFull = "Invisible"
Refresh
EndIf
If CountDownPauseVideo > 0 Then
; ignore
Var CountDownPauseVideo = CountDownPauseVideo - 1
If CountDownPauseVideo = 0 Then
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt__catalog_choose_drink1.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
EndIf
EndIf
@ -268,7 +292,7 @@
DEBUGVAR CountUpReloadAll
If CountUpReloadAll > 130 Then
If CountUpReloadAll > 80 Then
Var StartUpExt = "-"
Var CountUpReloadAll = 0
@ -292,7 +316,15 @@
<EventEnd>
;SAVELOG ShowButtonClick
Var CountDownShowButton = 35
If TaobinOnline = "true" Then
Var CountDownShowButton = 35
EndIf
If TermTemOnline = "true" Then
Var CountDownShowButton = 28
EndIf
Var CountDownPauseVideo = 6
If TaobinOnline = "true" Then
TouchTapClose

12
xml/page_brewing3.xml
View file

@ -631,18 +631,6 @@
EndIf
DEBUGVAR CountUpBrewing
If CountUpBrewing = 5 Then
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
EndIf
; animation video loop
If AnimationOn = "true" Then
Var CountUpBrewing = CountUpBrewing + 1

16
xml/page_drinkok.xml
View file

@ -10,14 +10,14 @@
DEBUGVAR LidState
;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
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
; On open
Var LidState = "Enable"

47
xml/page_topping_select.xml
View file

@ -92,7 +92,11 @@
Var PriceDrinkTmp = "Free"
EndIf
Var StateImgKeto = "Invisible"
STRCONTAIN "ID=1058" MaterialAvailable sugarKeto
DEBUGVAR sugarKeto
If sugarKeto = "true" Then
Open "ROOT/taobin_project/xml/page_topping_select2.xml"
EndIf
Var ToppingGotoPayment = "true"
@ -206,13 +210,10 @@
DEBUGVAR toppingID2index3
DEBUGVAR toppingID2index4
DEBUGVAR toppingID2index5
Var sugarKeto = "false"
STRCONTAIN "ID=1058" MaterialAvailable sugarKeto
DEBUGVAR sugarKeto
DEBUGVAR MenuCodeName
DEBUGVAR toppingID1Default
@ -233,7 +234,7 @@
DEBUGVAR BrewParam
DEBUGVAR IgnoreLidStraw
Var h_block_of_sugar = 210
If IgnoreLidStraw = "true" Then
Var IgnoreLidStraw = "false"
@ -258,14 +259,7 @@
;PressForever
If TOPPING1 = "Sugar" Then
If sugarKeto = "true" Then
Var StateImgKeto = "Enable"
Var BGSugar = "Invisible"
Else
Var BGSugar = "Enable"
Endif
Var BGSugar = "Enable"
Var ShiftSugarStep = 1
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
@ -296,15 +290,7 @@
EndIf
If TOPPING1 = "Powder Sugar" Then
If sugarKeto = "true" Then
Var StateImgKeto = "Enable"
Var BGSugar = "Enable"
Var h_block_of_sugar = 262
Else
Var BGSugar = "Enable"
EndIf
;Var BGSugar = "Enable"
Var BGSugar = "Enable"
Var ShiftSugarStep = 1
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
@ -633,22 +619,15 @@
;- Begin topping1
<Block>
<Width> 986 </Width>
<Height> h_block_of_sugar </Height>
<Height> 210 </Height>
<MarginTop> 5 </MarginTop>
<State> BGSugar </State>
; sugar layout
;<Image>
;<State> BGSugar </State>
;<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
;</Image>
<Image>
<State> StateImgKeto </State>
<Filename> Var( DirImage + "/img_sugar_keto.png" )</Filename>
<State> BGSugar </State>
<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
</Image>
;
; sugar1
<Button>
<X> 137 </X>

42
xml/page_topping_select2.xml
View file

@ -92,6 +92,7 @@
Var PriceDrinkTmp = "Free"
EndIf
Var StateImgKeto = "Invisible"
Var ToppingGotoPayment = "true"
@ -205,10 +206,13 @@
DEBUGVAR toppingID2index3
DEBUGVAR toppingID2index4
DEBUGVAR toppingID2index5
If toppingID1index5 > 0 Then
SAVELOG "toppingID1index5 not set"
EndIf
DEBUGVAR MenuCodeName
DEBUGVAR toppingID1Default
@ -229,7 +233,7 @@
DEBUGVAR BrewParam
DEBUGVAR IgnoreLidStraw
Var h_block_of_sugar = 210
If IgnoreLidStraw = "true" Then
Var IgnoreLidStraw = "false"
@ -254,7 +258,14 @@
;PressForever
If TOPPING1 = "Sugar" Then
Var BGSugar = "Enable"
If sugarKeto = "true" Then
Var StateImgKeto = "Enable"
Var BGSugar = "Invisible"
Else
Var BGSugar = "Enable"
Endif
Var ShiftSugarStep = 1
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
@ -285,7 +296,15 @@
EndIf
If TOPPING1 = "Powder Sugar" Then
Var BGSugar = "Enable"
If sugarKeto = "true" Then
Var StateImgKeto = "Enable"
Var BGSugar = "Enable"
Var h_block_of_sugar = 262
Else
Var BGSugar = "Enable"
EndIf
;Var BGSugar = "Enable"
Var ShiftSugarStep = 1
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
@ -614,15 +633,22 @@
;- Begin topping1
<Block>
<Width> 986 </Width>
<Height> 210 </Height>
<Height> h_block_of_sugar </Height>
<MarginTop> 5 </MarginTop>
<State> BGSugar </State>
; sugar layout
;<Image>
;<State> BGSugar </State>
;<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
;</Image>
<Image>
<State> BGSugar </State>
<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
<State> StateImgKeto </State>
<Filename> Var( DirImage + "/img_sugar_keto.png" )</Filename>
</Image>
;
; sugar1
<Button>
<X> 137 </X>