This commit is contained in:
wanlop run 2024-10-30 19:56:07 +07:00
commit 2fb7b50a63
130 changed files with 60666 additions and 74072 deletions

View file

@ -11,6 +11,12 @@
DEBUGVAR Seeker.PictureDrink
DEBUGVAR Seeker.showname
; Block HaveCup
Var DrinkOKStringVersion = "DKT2"
DEBUGVAR DrinkOKStringVersion
WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"
Var buttonRemoveCup = "Invisible"
@ -62,12 +68,12 @@
Var DirImage = "ROOT/taobin_project/image/complete/"
EndIf
Var text_bottom = DirImage + "text_bottom.png"
If InternationalEnable = 1 Then
If LanguageShow = "UAE_DUBAI" Then
Var text_bottom = CountryRootPath + "/image/complete_en/text_bottom.png"
EndIf
@ -202,7 +208,7 @@
EndIf
EndIf
Var TimeDelayDefault = 1200
@ -216,11 +222,20 @@
AddData 50 dummyPhone param1 param2 param3
EndIf
DEBUGVAR Seeker.BuyOreo11ProFlag
If Seeker.BuyOreo11ProFlag = 1 Then
Var dummyPhone = "0899999999"
Var param1 = "2"
Var param2 = ""
Var param3 = ""
AddData 50 dummyPhone param1 param2 param3
EndIf
SAVELOG "drinkok.xml version 3"
Var DrinkNameOnArm[DrinkArmCupID] = Seeker.showname
Var DrinkImageOnArm[DrinkArmCupID] = Seeker.PictureDrink
Var DrinkNameOnArm[DrinkArmCupID] = Seeker.showname
Var DrinkImageOnArm[DrinkArmCupID] = Seeker.PictureDrink
DEBUGVAR DrinkArmCupID
DEBUGVAR DrinkImageOnArm[DrinkArmCupID]
@ -258,7 +273,7 @@
EndIf
; 420 sec
; 420 sec
; to be obsolete
If Timeout > 840 Then
Var CountForRetryStuck = 1
@ -292,7 +307,7 @@
If NextOrder = "true" Then
; next order set. Havecup and checkup value must false. Certain cup not on any arm.
If DoorCupPosition = "bottom" Then
; BEGIN
Var NextOrder = "false"
@ -319,15 +334,16 @@
Else
If DoorCupPosition = "bottom" Then
; BEGIN
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
; END
If HaveCup = "false" Then
; BEGIN
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by remove to take-cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
; END
EndIf
Else
Machine DoorClose
EndIf
@ -691,6 +707,17 @@
</Button>
<Text>
<X> 1 </X>
<Y> 1 </Y>
<Font> KanitTTF </Font>
<Size> 22 </Size>
<Width> 1080 </Width>
<Align> end </Align>
<Color> 0xFF0000 </Color>
<Value> DrinkOKStringVersion </Value>
</Text>
<EventUnitTest1>
Var Timeout2 = 0
__CMD "UpdateCupOnArm" UserSelectProductCode "-" "-"