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

THAI INTER: Fix drink_fail, page_thank_you before credit, fix show_error machine state, New_payment [Myanmar layout], Add ImageDoing

Browse source
This commit is contained in:
Ittipat Lusuk 2024-12-12 16:28:09 +07:00
parent afb0dc5b8c
commit 1a455f3e83
99 changed files with 369 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

64
xml/page_NewBrewing3.xml
View file

@ -119,6 +119,36 @@
Var XStraw = 142
EndIf
If LanguageShow = "MYANMAR" Then
Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_mmr.png"
Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_mmr.png"
Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_mmr.png"
Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_mmr.png"
Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png"
Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png"
; wait for myanmar
Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
;Var XStraw = 274
Var XStraw = 142
EndIf
If LanguageObjectShow = "Enable" Then
Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
EndIf
Var waitAckPay = 0
Var VendingTSIDTmp = ""
Var VendingTSIDProblem = ""
@ -160,7 +190,10 @@
Var DirImage2 = "ROOT/taobin_project/image/topping2"
EndIf
DEBUGVAR show_eng
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
EndIf
Var next_pic_bn = DirImage + "/bn_add_order.png"
Var next_pic_bp = DirImage + "/bp_add_order.png"
@ -393,6 +426,10 @@
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
If LanguageShow = "MYANMAR" Then
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
; reset
@ -419,6 +456,10 @@
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
If LanguageShow = "MYANMAR" Then
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
; reset
@ -691,6 +732,9 @@
PlayLong PlaySoundLag
EndIf
If LanguageShow = "MYANMAR" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
EndIf
EndIf
If Timeout = 9 Then
If OpenFromCollectPoint3 = 0 Then
@ -1416,6 +1460,24 @@
<Value> ShowCountDownBrewing </Value>
</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>

28
xml/page_NewBrewing3Conti.xml
View file

@ -19,6 +19,16 @@
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
EndIf
If LanguageObjectShow = "Enable" Then
Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
EndIf
Var next_pic_bn = DirImage + "/bn_add_order.png"
Var next_pic_bp = DirImage + "/bp_add_order.png"
Var text_next_order = DirImage + "/text_next_order.png"
@ -768,6 +778,24 @@
<Value> ShowCountDownBrewing </Value>
</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>
<Button>
<X> 792 </X>
<Y> 1787 </Y>

12
xml/page_brewing3.xml
View file

@ -305,7 +305,7 @@
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2_mmr"
Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
EndIf
DEBUGVAR show_eng
@ -527,6 +527,10 @@
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
If LanguageShow = "MYANMAR" Then
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
; reset
@ -552,6 +556,9 @@
Else
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
If LanguageShow = "MYANMAR" Then
Var LangString = "LANG: &#34TH&#34\r\n"
EndIf
Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)
@ -847,6 +854,9 @@
PlayLong PlaySoundLag
EndIf
If LanguageShow = "MYANMAR" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
EndIf
EndIf
If Timeout = 9 Then
If OpenFromCollectPoint3 = 0 Then

2
xml/page_brewing3Conti.xml
View file

@ -49,7 +49,7 @@
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2_mmr"
Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
Var IMG_CNT = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png"
EndIf

4
xml/page_drinkfail2-2.xml
View file

@ -17,6 +17,10 @@
Var DirImage = "ROOT/taobin_project/image/collectiing/"
EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
EndIf
Var Timeout = 0
StopLongPlay

2
xml/page_drinkfail2.xml
View file

@ -8,6 +8,8 @@
<EventOpen>
; On open
RootLayoutVisible 3 "hide"
Var Seeker.TNumberTaobinMember = ""

4
xml/page_drinkfail4.xml
View file

@ -17,6 +17,10 @@
Var DirImage = "ROOT/taobin_project/image/collectiing/"
EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
EndIf
Var Timeout = 0
Var GetFreeFlag = 0

4
xml/page_lid_straw.xml
View file

@ -115,8 +115,8 @@
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing_mmr/"
Var PictureBegin = "txt_"
;Var PictureEnd = "_mmr.png"
Var PictureEnd = "_en.png"
Var PictureEnd = "_mmr.png"
;Var PictureEnd = "_en.png"
EndIf
Else

41
xml/page_show_error.lxml
View file

@ -10,6 +10,12 @@
Var countClick = 0
Var countClick2 = 0
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
Var CurrentPageShowError = 1
EndIf
EndIf
DEBUGVAR MachineStage
DEBUGVAR stop_now
@ -190,13 +196,42 @@
Function 2
Refresh
RefreshAll
</EventLanguageOnChange>
<Function2>
DEBUGVAR MachineStage
DEBUGVAR stop_now
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
If MachineStage = "show-menu" Then
If LanguageShow = "THAI" Then
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "UAE_DUBAI" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
EndIf
EndIf
EndIf
EndIf
If MachineStage = "mcu-upgrade" Then
If LanguageShow = "THAI" Then
Var DirImage = "ROOT/taobin_project/image/vending_error"
@ -420,7 +455,7 @@
<Image>
<State> show_error_normal </State>
<X> 127 </X>
<X> 0 </X>
<Y> 1750 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename>
</Image>
@ -441,7 +476,7 @@
<Image>
<State> show_error_sp1 </State>
<X> 127 </X>
<X> 0 </X>
<Y> 1685 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename>
</Image>

9
xml/page_thankyou.xml
View file

@ -69,6 +69,15 @@
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
EndIf
If LanguageShow = "MYANMAR" Then
Var BottomText = PicturePath + "text_bottom_eng.png"
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
EndIf
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR BottomText

20
xml/page_thankyouConti.xml
View file

@ -48,6 +48,13 @@
Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf
If LanguageShow = "MYANMAR" Then
Var BottomText = PicturePath + "text_bottom_eng.png"
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
EndIf
;DEBUGVAR StarwState
;DEBUGVAR LidState
DEBUGVAR BottomText
@ -107,6 +114,10 @@
Else
Var DirImage2 = "ROOT/taobin_project/image/complete/"
EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
EndIf
Var txtDrinkOKState = "Invisible"
Var buttonRemoveCup = "Invisible"
@ -280,6 +291,9 @@
Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
Else
If CupChecking = "true" Then
If show_eng = "true" Then
@ -287,12 +301,18 @@
Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
Else
If show_eng = "true" Then
Var MachineErrorDetailAll = " Press button for take a cup."
Else
Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
EndIf
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
EndIf
EndIf

7
xml/page_thankyouMore.xml
View file

@ -39,6 +39,13 @@
Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf
If LanguageShow = "MYANMAR" Then
Var BottomText = PicturePath + "text_bottom_eng.png"
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
EndIf
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR BottomText

8
xml/sometime/page_campaign_ads_lucky_draw.xml
View file

@ -24,6 +24,13 @@
EndIf
If LanguageShow = "MYANMAR" Then
Var Extension = "_mmr.png"
Var Text_X = 233
Var Text_Y = 1468
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -169,4 +176,3 @@
</EventUnitTest4>
</Popup>

24
xml/topview2.xml
View file

@ -204,17 +204,21 @@
DEBUGVAR BrewCommand
Var BrewCommand = "-"
If EnableMultiInstance = "true" Then
InstanceOverSetString "RefreshNow" 5
InstanceOverSetString "RefreshNow" 6
InstanceOverSetString "RefreshNow" 7
InstanceOverSetString "RefreshNow" 8
InstanceOverSetString "RefreshNow" 9
InstanceOverSetString "RefreshNow" 10
InstanceOverSetString "RefreshNow" 11
; TODO
If CurrentPageShowError = 1 Then
;do not thing
Else
InstanceOverSetString "RefreshNow" 5
InstanceOverSetString "RefreshNow" 6
InstanceOverSetString "RefreshNow" 7
InstanceOverSetString "RefreshNow" 8
InstanceOverSetString "RefreshNow" 9
InstanceOverSetString "RefreshNow" 10
InstanceOverSetString "RefreshNow" 11
; TODO
; Trick Refresh First
Var SlientRefreshIndex = 2
; Trick Refresh First
Var SlientRefreshIndex = 2
EndIf
EndIf
If Not#CountDownForMulti = 99 Then