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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2025-06-16 15:07:55 +07:00
commit 39b0120885
159 changed files with 100229 additions and 18545 deletions
Download patch file Download diff file Expand all files Collapse all files

101
xml/page_board.xml
View file

@ -1336,19 +1336,26 @@
; Inter + Multi-Instance available ./inter/tha/multi
Var EnableMultiInstanceFromBoxID = 0
TRY "ROOT/taobin_project/inter/tha/configure.ev"
If CountryName = "Thailand" Then
TRY "ROOT/taobin_project/inter/tha/configure.ev"
EndIf
If CountryName = "Australia" Then
TRY "ROOT/taobin_project/inter/tha/configure.ev"
EndIf
DEBUGVAR EnableMultiInstanceFromBoxID
If MAT_ID_2301 = "Enable" Then
If EnableMultiInstanceFromBoxID = 0 Then
If CountUpForRestartApp = "" Then
Var CountUpForRestartApp = 0
EndIf
DEBUGVAR CountUpForRestartApp
Var CountUpForRestartApp = CountUpForRestartApp + 1
If CountUpForRestartApp > 1 Then
WRITE_FILE "/mnt/sdcard/enable_ui_v3" "true"
FINISH
@ -1399,7 +1406,7 @@
Var InternationalShow = 0
Var CatalogLayoutV3 = 1
If BoxID = 123456 Then
Var SpiralOnline = "true"
@ -1487,6 +1494,71 @@
EndIf
If CountryName = "Australia" Then
; enable helper
Var EnableHelperShow = 0
;Var FromDrinkOk = 1
RootLayoutVisible 3 "hide"
Var EnableMultiInstance = "true"
Var InternationalShow = 0
Var CatalogLayoutV3 = 1
Var New_Payment = 1
Var InternationalEnable = 1
DEBUGVAR InternationalEnable
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
;specified to unittest4
Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
Var CountryShortName = "aus"
Var WebAppShow = "Invisible"
Var LanguageShow = "ENG"
EnableLanguage "ENG"
Var RedirectToNormalVersion = 1
SetLanguage "ENG"
LanguageControl "UpdateList" "-"
Var show_eng = "true"
;Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var TextPriceMenuSize = 12
Var TextPriceMenuY = 266
Var TextPriceMenuBlendX = 180
Var TextPriceMenuHotX = 48
Var ShowButtonClick2 = "Enable"
Var ButtontoTopupMenu = "Enable"
Var CurrentPageShowError = 0
Var PriceUnitText = ""
Var show_eng_button_stage = "Invisible"
Var XButtonMember = 212
Var YButtonMember = 1695
If Not#LanguageLoaded = "" Then
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/aus/menu/lang.tsv"
EndIf
Var cups_sold_text = "Cups Sold Worldwide"
Var MinPhoneNumber = 10
Var MaxPhoneNumber = 10
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
EndIf
EndIf
DEBUGVAR InternationalEnable
@ -1596,6 +1668,11 @@
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
EndIf
If CountryName = "HongKong" Then
Var bnRemoveCup = CountryRootPath + "/image/main_page/bn_remove_cup.png"
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
EndIf
If IgnoreProfileFromRunEV = "" Then
@ -1762,7 +1839,7 @@
; tap screen for press popup when app hang
TapScreen 860 1004
EndIf
Var buttonRemoveCupOnArm = "Invisible"
Var CountDownFailErrorHappendClear = 8
</EventOpen>
@ -1948,7 +2025,7 @@ PRICE "Reset" "-"
EndIf
DEBUGVAR FailErrorHappend
If FailErrorHappend = 1 Then
If CupOnArm = "true" Then
@ -2094,7 +2171,7 @@ PRICE "Reset" "-"
If TaobinOnlineX = "true" Then
If CountDownShowButton = 31 Then
Var ShowButtonClickFull = "Enable"
@ -2197,7 +2274,7 @@ PRICE "Reset" "-"
TopView "show"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
@ -2221,7 +2298,7 @@ PRICE "Reset" "-"
EndIf
EndIf
EndIf
EndIf
EndIf
@ -2612,9 +2689,9 @@ PRICE "Reset" "-"
Var NextPage = "-"
Var BaseOnPageBoard = 0
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
;inter-xml-open BEGIN
If SpiralOnline = "true" Then
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then

46
xml/page_topping_select8.xml
View file

@ -278,6 +278,7 @@
Var showname = NameDrink
Var showdesc = DrinkDescription
Var DirImageRevamp = "ROOT/taobin_project/image/topping2_en/topping_revamp"
Var bnAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bp_accept2.png"
Var bnAcceptX = 360
@ -402,6 +403,7 @@
Var showname = NameDrinkTH
Var showdesc = DrinkDescriptionTH
Var DirImageRevamp = "ROOT/taobin_project/image/topping2/topping_revamp"
Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept2.png"
Var bnAcceptX = 360
@ -521,6 +523,11 @@
EndIf
If LanguageShow = "MYANMAR" Then
Var DirImageRevamp = "ROOT/taobin_project/image/topping_revamp_mmr"
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
Var CustomEspressoShotTextX = 892
Var CustomEspressoTextX = 804
Var SugarZeroCalTextX = 880
@ -566,6 +573,11 @@
EndIf
If LanguageShow = "MSC" Then
Var DirImageRevamp = "ROOT/taobin_project/image/topping_revamp_msc"
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
Var CustomEspressoShotTextX = 872
Var CustomEspressoTextX = 790
Var SugarZeroCalTextX = 890
@ -1588,6 +1600,16 @@
Var CustomSweetestPercentTextX = 935
EndIf
If LanguageShow = "MYANMAR" Then
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
EndIf
If LanguageShow = "MSC" Then
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
@ -12262,6 +12284,14 @@
Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept.png"
Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept.png"
EndIf
If LanguageShow = "MYANMAR" Then
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
EndIf
If LanguageShow = "MSC" Then
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
EndIf
Var bnAcceptX = 445
Else
Var PopupToppingSelect = "Enable"
@ -12272,6 +12302,14 @@
Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept2.png"
EndIf
If LanguageShow = "MYANMAR" Then
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png"
EndIf
If LanguageShow = "MSC" Then
Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png"
Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png"
EndIf
Var bnAcceptX = 360
EndIf
@ -12341,7 +12379,7 @@
<Width> 641 </Width>
<Height> 180 </Height>
<State> toppingSelectState </State>
<Filename> Var( DirImage + "/topping_revamp/bg_top_popup.png" ) </Filename>
<Filename> Var( DirImageRevamp + "/bg_top_popup.png" ) </Filename>
</Image>
@ -12351,7 +12389,7 @@
<Width> 641 </Width>
<Height> 72 </Height>
<State> CustomOvaltineState </State>
<Filename> Var( DirImage + "/topping_revamp/bg_top_ovaltine.png" ) </Filename>
<Filename> Var( DirImageRevamp + "/bg_top_ovaltine.png" ) </Filename>
</Image>
@ -12455,7 +12493,7 @@
<Width> 641 </Width>
<Height> 72 </Height>
<State> CustomOreoState </State>
<Filename> Var( DirImage + "/topping_revamp/bg_top_oreo.png" ) </Filename>
<Filename> Var( DirImageRevamp + "/bg_top_oreo.png" ) </Filename>
</Image>
<Button>
@ -12564,7 +12602,7 @@
<Width> 641 </Width>
<Height> 72 </Height>
<State> CustomCocoaState </State>
<Filename> Var( DirImage + "/topping_revamp/bg_top_cocoa.png" ) </Filename>
<Filename> Var( DirImageRevamp + "/bg_top_cocoa.png" ) </Filename>
</Image>
<Button>