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

release 6.62

Browse source
This commit is contained in:
kong 2022-08-16 13:46:30 +07:00
parent e171403c48
commit 04eebb6b41
3 changed files with 12 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

24
xml/page_brewing3.xml
View file

@ -388,11 +388,11 @@
EndIf EndIf
Endif Endif
If Simulation = "true" Then ;If Simulation = "true" Then
If CountDownBrewing = 0 Then ; If CountDownBrewing = 0 Then
;Open "ROOT/taobin_project/xml/page_drinkok.xml" ; ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf ; EndIf
EndIf ;EndIf
If EnableSelectMenuBetweenBrew = "Enable" Then If EnableSelectMenuBetweenBrew = "Enable" Then
@ -412,9 +412,9 @@
;If CountDownBrewing = 40 Then ;If CountDownBrewing = 40 Then
; Open "ROOT/taobin_project/xml/page_drinkok.xml" ; Open "ROOT/taobin_project/xml/page_drinkok.xml"
;EndIf ;EndIf
If CountDownBrewing = 0 Then ;If CountDownBrewing = 0 Then
;Open "ROOT/taobin_project/xml/page_drinkok.xml" ; ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf ;EndIf
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
@ -868,19 +868,11 @@
EndIf EndIf
EndIf EndIf
If MachineStage = "show-menu" Then
If MachineState_Result = 0 Then
;SAVELOG "back_to_main from line > 714."
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
;Var MachineState_Result = 1
EndIf
EndIf
If MachineStage = "close-maintenance" Then If MachineStage = "close-maintenance" Then
If MachineState_Result = 0 Then If MachineState_Result = 0 Then
SAVELOG "back_to_main from line > 663." SAVELOG "back_to_main from line > 663."
Var MachineState_Result = 2 Var MachineState_Result = 2
;Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf EndIf
EndIf EndIf

6
xml/page_payment.xml
View file

@ -221,9 +221,9 @@
EndIf EndIf
If CupChecking = "true" Then ;If CupChecking = "true" Then
Var CountStepForCupFlagDelay = 3 ; Var CountStepForCupFlagDelay = 3
EndIf ;EndIf
If HaveCup = "true" Then If HaveCup = "true" Then
Var CountStepForCupFlagDelay = 3 Var CountStepForCupFlagDelay = 3
EndIf EndIf

42
xml/page_remove_cup.xml
View file

@ -25,6 +25,7 @@
LED LedDoorDoor 5 255 255 255 255 LED LedDoorDoor 5 255 255 255 255
</EventOpen> </EventOpen>
<Timeout> 2000 </Timeout> <Timeout> 2000 </Timeout>
<EventTimeout> <EventTimeout>
@ -100,50 +101,9 @@
</Button> </Button>
<Button>
<X> 0 </X>
<Y> 1860 </Y>
<Width> 200 </Width>
<Height> 50 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var countClick = countClick + 1
If countClick = 3 Then
EndIf
If countClick = 5 Then
Var countClick = 0
MainMenu
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 870 </X>
<Y> 1860 </Y>
<Width> 200 </Width>
<Height> 50 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var countClick2 = countClick2 + 1
If countClick2 = 3 Then
EndIf
If countClick2 = 5 Then
Var MachineStage = "show-menu"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
EndIf
Refresh
</EventClick>
</Button>
<Text> <Text>