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

adjust UX sugar 0 cal

Browse source
This commit is contained in:
wanlop run 2024-03-08 22:54:19 +07:00
parent 390c770503
commit 7a60083da0
22 changed files with 456 additions and 583 deletions
Download patch file Download diff file Expand all files Collapse all files

47
xml/event/tricker.ev
View file

@ -192,39 +192,24 @@ If BoxID = 172644 Then
EndIf
If BoxID = 174758 Then
Var ProBadValentineEnable = 0
Var PepsiSecondCup30Enable = 0
Var PepsiSecondCup30DiscountEnable = 0
Var NewFlowPaymentCode = 0
EndIf
If BoxID = 173973 Then
Var ProBadValentineEnable = 0
Var PepsiSecondCup30Enable = 0
Var PepsiSecondCup30DiscountEnable = 0
Var NewFlowPaymentCode = 0
EndIf
; Exclusive Box
If BoxID = 174200 Then
Var ProPeachEnable = 0
Var ProBadValentineEnable = 1
EndIf
If BoxID = 175038 Then
Var ProPeachEnable = 0
Var ProBadValentineEnable = 1
EndIf
If BoxID = 174825 Then
Var ProPeachEnable = 0
Var ProBadValentineEnable = 1
EndIf
If BoxID = 200443 Then
Var ProPeachEnable = 0
Var ProBadValentineEnable = 1
EndIf
If BoxID = 173433 Then
Var ProPeachEnable = 0
Var ProBadValentineEnable = 1
EndIf
If BoxID = 200435 Then
Var ProPeachEnable = 0
Var ProBadValentineEnable = 1
EndIf
Var GameEnableFromTrickerEv = 1

5
xml/page_drinkfail.xml
View file

@ -33,11 +33,6 @@
</EventChangeStatus>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"

110
xml/page_pickup_cup_from_error.xml
View file

@ -4,29 +4,56 @@
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<Sound> "ROOT/sounds/Ding-dong.wav" </Sound>
<EventOpen>
Var Timeout = 0
Var Timeout2 = 0
SAVELOG "page_pickup_cup_from_error.xml"
DEBUGVAR EnableDoubleCupNoError
DEBUGVAR HURR_FOREVER
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/user_take_cup_en/"
Else
Var DirImage = "ROOT/taobin_project/image/user_take_cup_th/"
EndIf
DEBUGVAR Seeker.showname
DEBUGVAR UserSelectProductCode
DEBUGVAR topping1
DEBUGVAR topping2
DEBUGVAR topping3
DEBUGVAR topping4
DEBUGVAR topping5
DEBUGVAR topping6
DEBUGVAR topping7
DEBUGVAR topping8
DEBUGVAR topping9
DEBUGVAR topping10
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
DEBUGVAR MachineStage
DEBUGVAR HaveCup
DEBUGVAR CHECKCUP
DEBUGVAR DoorCupPosition
DEBUGVAR Timeout
DEBUGVAR Timeout2
If Timeout = 3 Then
If DoorCupPosition = "bottom" Then
@ -34,9 +61,36 @@
EndIf
EndIf
If Timeout > 120 Then
SAVELOG "Not pickup CUP"
If show_eng = "true" Then
Else
If HaveCup = "true" Then
If Timeout = 4 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 54 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 90 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
EndIf
If Timeout > 180 Then
If DoorCupPosition = "bottom" Then
SAVELOG "Not pickup CUP"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Machine DoorClose
EndIf
EndIf
If Timeout > 240 Then
SAVELOG "Timeout 240 from can not close door"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
@ -46,12 +100,36 @@
; Do not change
;
If MachineStage = "show-menu" Then
If HaveCup = "false" Then
If DoorCupPosition = "bottom" Then
Var Timeout2 = Timeout2 + 1
EndIf
EndIf
EndIf
If DoorCupPosition = "bottom" Then
Var buttonRemoveCup = "Enable"
Var txtDrinkOKState = "Enable"
Else
Var buttonRemoveCup = "Invisible"
EndIf
If MachineStage = "close-maintenance" Then
Var buttonRemoveCup = "Disable"
EndIf
If Timeout2 = 1 Then
;include="ROOT/taobin_project/inc/select_drink_current.inc"
EndIf
If Timeout2 = 5 Then
MakeDrinkV1 UserSelectProductCode SelectSugarID
Var HURR_FOREVER = "F:1115"
Var MachineState_Result = 0
Var LastMakeDrinkResult = "-"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
@ -71,31 +149,27 @@
<Image>
<X> 757 </X>
<Y> 424 </Y>
<Filename> next_pic_bg </Filename>
<X> 335 </X>
<Y> 1090 </Y>
<Filename> "ROOT/taobin_project/image/user_take_cup_th/img_take_cup.png" </Filename>
</Image>
<Image>
<X> 0 </X>
<Y> 1418 </Y>
<State> TextBottomShow </State>
<Filename> Var( DirImage + "text_bottom.png") </Filename>
<Y> 609 </Y>
<Filename> Var(DirImage + "/img_take_cup_for_next_brew.png") </Filename>
</Image>
<Button>
<X> 160 </X>
<X> 212 </X>
<Y> 1673 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
<Filename> Var( DirImage + "/bn_door_open_take_double_cup.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_door_open_take_double_cup.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_door_open_take_double_cup.png" ) </FilenameDisable>
<EventClick>
;Var buttonRemoveCup = "Invisible"
Machine RemoveCup
Machine DoorLidOpen
Refresh

8
xml/page_remove_cup.xml
View file

@ -54,8 +54,12 @@
EndIf
If Timeout = 0 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If show_eng = "true" Then
Else
If Timeout = 0 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
Var Timeout = Timeout + 1

722
xml/page_topping_select7.xml
View file

File diff suppressed because it is too large Load diff

58
xml/page_topping_select7.xml.filterline.xml Normal file
View file

@ -0,0 +1,58 @@
Var SugarZeroCalCheck = "Enable"
;Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Disable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalChecked = "Disable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
<State> SugarZeroCalCheck </State>
SAVELOG " SugarZeroCalChecked "
If SugarZeroCalCheck = "PressForever" Then
Var SugarZeroCalCheck = "PressForever"
Var SugarZeroCalCheck = "Disable"
DEBUGVAR SugarZeroCalCheck
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
<State> SugarZeroCalCheck </State>
SAVELOG " SugarZeroCalChecked "
If SugarZeroCalCheck = "PressForever" Then
Var SugarZeroCalCheck = "PressForever"
Var SugarZeroCalCheck = "Disable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
Var SugarZeroCalCheck = "Enable"
<State> SugarZeroCalCheck </State>
SAVELOG " SugarZeroCalChecked "
If SugarZeroCalCheck = "PressForever" Then
Var SugarZeroCalCheck = "PressForever"
Var SugarZeroCalCheck = "Disable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "Disable" Then
Var SugarZeroCalCheck = "Enable"
If SugarZeroCalCheck = "PressForever" Then
If SugarZeroCalCheck = "PressForever" Then

17
xml/vending_info.xml
View file

@ -84,7 +84,7 @@
Var IDCardState = "Invisible"
Var Timeout = 0
Var IDFullNameEng = "เสียบบัตร"
Var IDFullNameEng = "เสียบบัตร แล้วกดอ่าน "
Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw
Var Text2_6 = "ฝา : " + Lid1Status
@ -386,10 +386,7 @@
<Y> info_4Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
ScreenRefresh
;LED LedDoorCup Off 255 255 255 255
;LED LedDoorLid Off 255 255 255 255
;Var ShowPrice = "Enable"
READCARDID
</EventClick>
</Image>
@ -526,10 +523,9 @@
<X> info2_text_startX </X>
<Y> info_text_4Y </Y>
<Size> 30 </Size>
<State> IDCardState </State>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> IDFullNameEng</Value>
<Value> IDFullNameEng </Value>
</Text>
@ -889,6 +885,13 @@
<EventIDCard>
Var IDCardState = "Enable"
DEBUGVAR IDCardStatus
DEBUGVAR IDCardReady
DEBUGVAR IDCardData
DEBUGVAR IDBirthdate
DEBUGVAR IDFullNameEng
SAVELOG IDFullNameEng
</EventIDCard>