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

Hot fix remove cup not showing button

Browse source
This commit is contained in:
Kenta420 2025-01-16 15:45:19 +07:00
parent 8206f95131
commit 0acd376e6c
2 changed files with 69 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

103
inter/aus/xml/page_drinkfail3.lxml
View file

@ -40,8 +40,6 @@
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
DEBUGVAR Timeout DEBUGVAR Timeout
@ -49,99 +47,44 @@
DEBUGVAR NextOrder DEBUGVAR NextOrder
DEBUGVAR HaveCup DEBUGVAR HaveCup
If Door_Open_flagBlink = 0 Then
Var Door_Open_flagBlink = 1
Var Door_Open_State="Enable"
Else
Var Door_Open_flagBlink = 0
Var Door_Open_State="Invisible"
EndIf
If HaveCup = "true" Then
DEBUGVAR CheckCupStateDoorCupClose
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "reset" Then
If CheckCupStateDoorCupCloseCnt = 0 Then
Var CheckCupStateDoorCupClose = ""
Else
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
EndIf
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
If buttonRemoveCup = "Invisible" Then
Var Door_Open_State = "Invisible"
EndIf
DEBUGVAR buttonRemoveCup DEBUGVAR buttonRemoveCup
DEBUGVAR NextOrder
DEBUGVAR Door_Open_State DEBUGVAR Door_Open_State
If MachineStage = "remove-cup" Then
Else If NextOrder = "true" Then
If NextOrder = "true" Then Var NextOrder = "false"
Var NextOrder = "false"
TransferVar "next" "curr" TransferVar "next" "curr"
Var Seeker = "curr" Var Seeker = "curr"
SAVELOG "Remove cup drink fail " SAVELOG "Have Cup 2"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml" Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
EndIf
; must remove cup.
If HaveCup = "true" Then
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Have Cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If Timeout > 240 Then
If NextOrder = "true" Then
SAVELOG "TIME OUT 240"
Var NextOrder = "false"
TransferVar "next" "curr" If Timeout > 120 Then
Var Seeker = "curr" If NextOrder = "true" Then
SAVELOG "TIME OUT 240"
Var NextOrder = "false"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml" TransferVar "next" "curr"
Else Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
EndIf Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
Refresh Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>

141
xml/page_drinkfail3.xml
View file

@ -6,45 +6,27 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
; On open ; On open
If show_eng = "true" Then If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_en/" Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
Else Else
Var DirImage = "ROOT/taobin_project/image/collectiing/" Var DirImage = "ROOT/taobin_project/image/collectiing/"
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/" Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
EndIf EndIf
Var Timeout = 0 Var Timeout = 0
Var Door_Open_State="Invisible" Var Door_Open_State="Invisible"
Var Door_Open_flagBlink = 0 Var Door_Open_flagBlink = 0
If HaveCup = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
Var CheckCupStateDoorCupCloseCnt = 15
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -58,99 +40,44 @@
DEBUGVAR NextOrder DEBUGVAR NextOrder
DEBUGVAR HaveCup DEBUGVAR HaveCup
If Door_Open_flagBlink = 0 Then
Var Door_Open_flagBlink = 1
Var Door_Open_State="Enable"
Else
Var Door_Open_flagBlink = 0
Var Door_Open_State="Invisible"
EndIf
If HaveCup = "true" Then
DEBUGVAR CheckCupStateDoorCupClose
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "reset" Then
If CheckCupStateDoorCupCloseCnt = 0 Then
Var CheckCupStateDoorCupClose = ""
Else
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
EndIf
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
If buttonRemoveCup = "Invisible" Then
Var Door_Open_State = "Invisible"
EndIf
DEBUGVAR buttonRemoveCup DEBUGVAR buttonRemoveCup
DEBUGVAR NextOrder
DEBUGVAR Door_Open_State DEBUGVAR Door_Open_State
If MachineStage = "remove-cup" Then
Else If NextOrder = "true" Then
If NextOrder = "true" Then Var NextOrder = "false"
Var NextOrder = "false"
TransferVar "next" "curr" TransferVar "next" "curr"
Var Seeker = "curr" Var Seeker = "curr"
SAVELOG "Remove cup drink fail " SAVELOG "Have Cup 2"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml" Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
EndIf
; must remove cup.
If HaveCup = "true" Then
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Have Cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If Timeout > 240 Then
If NextOrder = "true" Then
SAVELOG "TIME OUT 240"
Var NextOrder = "false"
TransferVar "next" "curr" If Timeout > 120 Then
Var Seeker = "curr" If NextOrder = "true" Then
SAVELOG "TIME OUT 240"
Var NextOrder = "false"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml" TransferVar "next" "curr"
Else Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
EndIf Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
Refresh Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>
@ -208,7 +135,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Var buttonRemoveCup = "Invisible" Var buttonRemoveCup = "Invisible"
Var CheckCupStateDoorCupClose = "reset" Var CheckCupStateDoorCupClose = "reset"
Var CheckCupStateDoorCupCloseCnt = 15 Var CheckCupStateDoorCupCloseCnt = 15