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

fix button image position

Browse source
This commit is contained in:
wanlop run 2024-07-01 13:35:43 +07:00
commit ee083b385c
2 changed files with 29 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

290
xml/page_brewing3.xml
View file

@ -434,60 +434,15 @@
DEBUGVAR NeedReboot DEBUGVAR NeedReboot
DEBUGVAR SELLSTATUS DEBUGVAR SELLSTATUS
; copy stage DEBUGVAR bg_lidProblem_ST
Var bg_lidProblem_ST2 = bg_lidProblem_ST
DEBUGVAR bg_lidProblem_ST2
; zone Language
If LanguageObjectShow = "Enable" Then
Var XStraw = 350
Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png"
Var bg_lidProblem_ST = "Invisible"
Var GetLidButtonState = "Invisible"
Var bg_strawProblem_ST = "Invisible"
var EnableGetMoreStrawFileName = "Invisible"
var EnableGetMoreStrawFileName2 = "Enable"
Var bg_strawProblem_ST2 = "Invisible"
If bg_lidProblem_ST2 = "Invisible" Then
Var GetLidButtonState2 = "Enable"
Else
Var GetLidButtonState2 = "Invisible"
EndIf
If bg_lidProblem_ST = "Invisible" Then
Var GetLidButtonState = "Enable"
;Var XStraw = 265
EndIf EndIf
If NoLangObjectShow = "Enable" Then
Var SelectMenuBetweenBrewEnable2 = "Invisible"
Var bg_lidProblem_ST2 = "Invisible"
Var GetLidButtonState2 = "Invisible"
Var bg_strawProblem_ST2 = "Invisible"
var EnableGetMoreStrawFileName2 = "Invisible"
DEBUGVAR bg_lidProblem_ST
If bg_lidProblem_ST = "Invisible" Then
Var GetLidButtonState = "Enable"
;Var XStraw = 265
EndIf
EndIf
DEBUGVAR LanguageObjectShow
DEBUGVAR NoLangObjectShow
Var CreditCardVoid = 0 Var CreditCardVoid = 0
If InternationalEnable = 1 Then If InternationalEnable = 1 Then
Var adver_brewing_en = 0 Var adver_brewing_en = 0
@ -509,10 +464,17 @@
; language instance ; language instance
If bg_lidProblem_ST = "Enable" Then
Var EnableTopupCreditBetweenBrew = "Invisible"
Var EnableGetMore
End
If bg_strawProblem_ST = "Enable" Then
Var EnableGetMoreStrawFileName = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
DEBUGVAR SelectMenuBetweenBrewEnable1 DEBUGVAR SelectMenuBetweenBrewEnable1
DEBUGVAR SelectMenuBetweenBrewEnable2
Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1 Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1
@ -1459,7 +1421,6 @@
If CLOSE_ORDER_NOW = "true" Then If CLOSE_ORDER_NOW = "true" Then
Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var SelectMenuBetweenBrewEnable2 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf EndIf
@ -1478,16 +1439,7 @@
EndIf EndIf
Else Else
If SelectMenuBetweenBrewEnable2 = "Enable" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
If SelectMenuBetweenBrewEnable1Blink = "Enable" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Else
Var SelectMenuBetweenBrewEnable1Blink = "Enable"
EndIf
Else
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
EndIf
EndIf EndIf
DEBUGVAR CountUpBrewing DEBUGVAR CountUpBrewing
@ -1677,33 +1629,16 @@
EndIf EndIf
EndIf EndIf
If EnableGetMoreStrawFileName2 = "PressForever" Then
DEBUGVAR GetMoreStrawCount
If GetMoreStrawCount > 0 Then
If EnableGetMoreStrawFileNameCountDown > 0 Then
Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
If EnableGetMoreStrawFileNameCountDown = 0 Then
Var EnableGetMoreStrawFileName2 = "Enable"
EndIf
EndIf
EndIf
EndIf
If GetMoreStrawCount <= 0 Then If GetMoreStrawCount <= 0 Then
If StrawProblemStatus = 1 Then If StrawProblemStatus = 1 Then
Var StrawProblemStatus = 2 Var StrawProblemStatus = 2
If NoLangObjectShow = "Enable" Then Var bg_strawProblem_ST = "Enable"
Var bg_strawProblem_ST = "Enable" Var EnableTopupCreditBetweenBrew = "Invisible"
Else Var EnableGetMoreStrawFileName = "Invisible"
Var bg_strawProblem_ST2 = "Enable"
EndIf
EndIf EndIf
EndIf EndIf
DEBUGVAR bg_lidProblem_ST2
If GetLidButtonCountDown > 0 Then If GetLidButtonCountDown > 0 Then
@ -1718,26 +1653,16 @@
Var GetLidButtonCountDown = 0 Var GetLidButtonCountDown = 0
EndIf EndIf
If NoLangObjectShow = "Enable" Then If GetLidButtonCountDown = 1 Then
Var GetLidButtonState = "Invisible"
If GetLidButtonCountDown = 1 Then Var bg_lidProblem_ST = "Enable"
Var GetLidButtonState = "Invisible" Var EnableTopupCreditBetweenBrew = "Invisible"
Var bg_lidProblem_ST = "Enable" ;Var XStraw = 356
;Var XStraw = 356
If EnableGetMoreStrawFileName = "Enable" Then
Var XStraw = 280
EndIf EndIf
EndIf
Var bg_lidProblem_ST = "Invisible"
If LanguageObjectShow = "Enable" Then
If GetLidButtonCountDown = 1 Then
Var GetLidButtonState2 = "Invisible"
Var bg_lidProblem_ST2 = "Enable"
Var XStraw = 365
EndIf
EndIf EndIf
If ButtonGameCountDown > 0 Then If ButtonGameCountDown > 0 Then
@ -1843,16 +1768,6 @@
<Filename> text_next_order </Filename> <Filename> text_next_order </Filename>
</Image> </Image>
<Text>
<X> 0 </X>
<Y> 1655 </Y>
<Width> 1080 </Width>
<State> SelectMenuBetweenBrewEnable2 </State>
<Language>
<ID> 000408 </ID>
</Language>
</Text>
<Image> <Image>
<X> 835 </X> <X> 835 </X>
@ -1881,23 +1796,6 @@
<Value> ShowCountDownBrewing </Value> <Value> ShowCountDownBrewing </Value>
</Text> </Text>
<Text>
<X> 816 </X>
<Y> 429 </Y>
<State> LanguageObjectShow </State>
<Language>
<ID> 000405 </ID>
</Language>
</Text>
<Text>
<X> 941 </X>
<Y> 518 </Y>
<State> LanguageObjectShow </State>
<Language>
<ID> 000406 </ID>
</Language>
</Text>
<EventUnitTest1> <EventUnitTest1>
Var BREW_COUNT_DOWN_FROM_APP = "off" Var BREW_COUNT_DOWN_FROM_APP = "off"
Var CountDownBrewing = 121 Var CountDownBrewing = 121
@ -1962,32 +1860,6 @@
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 733 </X>
<Y> 1787 </Y>
<State>SelectMenuBetweenBrewEnable2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_next_order.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bp_next_order.png" </FilenamePress>
<EventClick>
If MachineState_Result = 0 Then
SAVELOG "User click next button"
Var Seeker = "next"
Var MultiPayEnable = "false"
CoinPause
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
</EventClick>
<Language>
<X> 0 </X>
<Y> 20 </Y>
<Width> 297 </Width>
<Height> 96 </Height>
<ID> 000407 </ID>
</Language>
</Button>
; ;
; ;
@ -2018,8 +1890,8 @@
</Button> </Button>
<Button> <Button>
<X> XStraw </X> <X> 270 </X>
<Y> 1787 </Y> <Y> 1788 </Y>
<State>bg_strawProblem_ST</State> <State>bg_strawProblem_ST</State>
<Filename> bnStrawProblemReport </Filename> <Filename> bnStrawProblemReport </Filename>
<FilenamePress> bpStrawProblemReport </FilenamePress> <FilenamePress> bpStrawProblemReport </FilenamePress>
@ -2091,8 +1963,8 @@
; Lid button, Get one and report ; Lid button, Get one and report
; ;
<Button> <Button>
<X> 22 </X> <X> 20 </X>
<Y> 1787 </Y> <Y> 1788 </Y>
<State>bg_lidProblem_ST</State> <State>bg_lidProblem_ST</State>
<Filename> bnLidProblemReport </Filename> <Filename> bnLidProblemReport </Filename>
<FilenamePress> bpLidProblemReport </FilenamePress> <FilenamePress> bpLidProblemReport </FilenamePress>
@ -2128,114 +2000,6 @@
</EventClick> </EventClick>
</Button> </Button>
;====================================================================
<Button>
<X> XStraw </X>
<Y> 1787 </Y>
<State> EnableGetMoreStrawFileName2 </State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_get_more_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bp_get_more_straw.png" </FilenamePress>
<Mode> "No" </Mode>
<EventClick>
Var EnableGetMoreStrawFileNameCountDown = 5
Var EnableGetMoreStrawFileName2 = "PressForever"
Var GetMoreStrawCount = GetMoreStrawCount - 1
DEBUGVAR GetMoreStrawCount
If GetMoreStrawCount > 0 Then
Machine Straw
Else
Var EnableGetMoreStrawFileName2 = "Invisible"
EndIf
</EventClick>
<Language>
<X> 50 </X>
<Y> 20 </Y>
<Width> 331 </Width>
<Height> 96 </Height>
<ID> 000402 </ID>
</Language>
</Button>
<Button>
<X> XStraw </X>
<Y> 1787 </Y>
<Height> 96 </Height>
<State>bg_strawProblem_ST2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </FilenamePress>
<EventClick>
Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
__CMD "straw-alert-disable" 0 strawStr "-"
__CMD "send-error-code" 1231 "-" "-"
Var bg_strawProblem_ST2 = "Invisible"
Refresh
</EventClick>
<Language>
<X> 0 </X>
<Y> 12 </Y>
<Width> 331 </Width>
<Height> 96 </Height>
<ID> 000401 </ID>
</Language>
</Button>
;-------------------------
<Button>
<X> 14 </X>
<Y> 1787 </Y>
<Height> 96 </Height>
<State>bg_lidProblem_ST2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </Filename>
<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </FilenamePress>
<EventClick>
Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
__CMD "lid-alert-disable" 0 lidStr "-"
__CMD "send-error-code" 1343 "-" "-"
Var bg_lidProblem_ST2 = "Invisible"
Refresh
</EventClick>
<Language>
<X> 0 </X>
<Y> 12 </Y>
<Width> 331 </Width>
<Height> 96 </Height>
<ID> 000400 </ID>
</Language>
</Button>
<Button>
<X> 14 </X>
<Y> 1787 </Y>
<State>GetLidButtonState2</State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_get_lid.png" </Filename>
<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bp_get_lid.png" </FilenamePress>
<EventClick>
If GetLidButtonState2 = "Enable" Then
Machine Lid
Var GetLidButtonCountDown = 12
EndIf
Var GetLidButtonState2 = "Press"
Refresh
</EventClick>
<Language>
<X> 40 </X>
<Y> 20 </Y>
<Width> 232 </Width>
<Height> 96 </Height>
<ID> 000403 </ID>
</Language>
</Button>
<EventUnitTest4> <EventUnitTest4>
; test drinkfail with phone number ; test drinkfail with phone number

2
xml/page_payment_credit3-1.xml
View file

@ -56,6 +56,7 @@
Var PayState2 = "Enable" Var PayState2 = "Enable"
Var QRChannel = 0 Var QRChannel = 0
;Var Seeker.CodeChannel = 0 ;Var Seeker.CodeChannel = 0
Seeker.TNumberTaobinCredit = ""
If CART_COUNT >= 1 Then If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else Else
@ -182,6 +183,7 @@
Var QRChannel = 0 Var QRChannel = 0
;Var Seeker.CodeChannel = 0 ;Var Seeker.CodeChannel = 0
SAVELOG "payment_credit3-p121." SAVELOG "payment_credit3-p121."
Var Seeker.TNumberTaobinCredit = ""
If CART_COUNT >= 1 Then If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml" Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else Else