Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
12d2a701ac
1 changed files with 6 additions and 33 deletions
|
|
@ -25,16 +25,6 @@
|
|||
Var web_readyOK = "false"
|
||||
Var web_telnumOK = ""
|
||||
|
||||
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
|
||||
Var PicturePathAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/catalog/"
|
||||
|
||||
If CocktailShow = "true" Then
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
|
||||
EndIf
|
||||
|
||||
If TermTemOnline = "true" Then
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
Machine DoorLidClose
|
||||
|
|
@ -53,7 +43,7 @@
|
|||
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page2_inter/"
|
||||
|
||||
Var DirImageAUS = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/catalog/"
|
||||
|
||||
Var StrawAutoRelease1 = "false"
|
||||
Var StrawAutoRelease2 = "false"
|
||||
|
|
@ -68,15 +58,8 @@
|
|||
EndIf
|
||||
|
||||
|
||||
|
||||
If SELLONLINE = 1 Then
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Else
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ButtontoTopupMenu = "Invisible"
|
||||
EndIf
|
||||
|
||||
If SELLONLINE = 1 Then
|
||||
Var ShowNetworkProblem = "Invisible"
|
||||
Var ShowNetworkProblemText = ""
|
||||
|
||||
|
|
@ -99,9 +82,6 @@
|
|||
Var ShowNetworkProblemText = ""
|
||||
EndIf
|
||||
|
||||
; 1035 is Coke.
|
||||
STRCONTAIN "1035" MaterialAvailable CokeUI
|
||||
|
||||
Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
|
||||
Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
|
||||
|
||||
|
|
@ -184,13 +164,12 @@
|
|||
|
||||
DEBUGVAR MenuKidButtonState
|
||||
|
||||
|
||||
|
||||
|
||||
DEBUGVAR $51-03-01-0035.Price
|
||||
Var PromotionIDCurrentOrder = 0
|
||||
RootLayoutVisible 3 "show"
|
||||
|
||||
</EventOpen>
|
||||
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
|
@ -232,12 +211,6 @@
|
|||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
<EventChangeStatus>
|
||||
;If ChangeStatus = "payout-end" Then
|
||||
; Var ChangeOK = 1
|
||||
;EndIf
|
||||
</EventChangeStatus>
|
||||
|
||||
<EventWebApp>
|
||||
|
||||
DEBUGVAR web_ready
|
||||
|
|
@ -338,8 +311,8 @@
|
|||
<Button>
|
||||
<X> 220 </X>
|
||||
<Y> 844 </Y>
|
||||
<Filename> Var(PicturePathAUS + "/bn_diy_FLYING_TURTLE.png") </Filename>
|
||||
<FilenamePress> Var(PicturePathAUS + "/bp_diy_FLYING_TURTLE.png") </FilenamePress>
|
||||
<Filename> Var(DirImageAUS + "/bn_diy_FLYING_TURTLE.png") </Filename>
|
||||
<FilenamePress> Var(DirImageAUS + "/bp_diy_FLYING_TURTLE.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue