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-05-14 18:16:19 +07:00
commit b11e33eb57
16 changed files with 126 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inter/hkg/xml/event/tricker.ev
View file

@ -8,3 +8,4 @@
Var SeasonPassMode = 0
Var CleanFeedbackFlag = 0

4
inter/hkg/xml/page_topping_select6.lxml
View file

@ -571,7 +571,7 @@
;Open PreviseXMLFileName2
DEBUGVAR OpenFromXML
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
@ -3578,7 +3578,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"

4
inter/tha/xml/helper_show_and_refresh.lxml
View file

@ -1,2 +1,2 @@
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
RootLayoutVisible 15 "show"
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
RootLayoutVisible 14 "show"

2
inter/tha/xml/multi/control_and_lang_swith.ev
View file

@ -89,7 +89,7 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr
;Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"

14
inter/tha/xml/multi/page_catalog.lxml
View file

@ -13,7 +13,7 @@
; On open
; helper
RootLayoutVisible 15 "hide"
RootLayoutVisible 14 "hide"
Machine WakeUp
@ -277,7 +277,7 @@
DEBUGVAR SpiralOnline
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
</EventOpen>
@ -532,6 +532,10 @@
Play PlaySoundLag
Var countDownRetrun = 120
Var ButtonLanguageCurrentXPosition = 1015
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageListXPosition = 982
Var ButtonLanguageListYPosition = 450 - 38
Var LanguageButtonEnable = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@ -717,7 +721,7 @@
EndIf
RootLayoutVisible 3 "hide"
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
; eng
Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
@ -1043,7 +1047,7 @@
<Button>
<X> 225 </X>
<Y> 424 </Y>
<State> ShowButtonClick2 </State>
<State> "Enable" </State>
<Filename> Var(DirImage + "/bn_main_page_member.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -1067,7 +1071,7 @@
<Button>
<X> 696 </X>
<Y> 424 </Y>
<State> ButtontoTopupMenu </State>
<State> "Enable" </State>
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>

7
inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev
View file

@ -1,6 +1,13 @@
Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
Var ButtonLanguageCurrentXPosition = 1015
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageListXPosition = 990
Var ButtonLanguageListYPosition = 450 - 38
Var LanguageButtonEnable = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
TabMenuVisibleInst 10
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

10
inter/tha/xml/open_page_catalog.ev
View file

@ -1,4 +1,12 @@
Var catalogFile = CountryRootPath + "/xml/page_catalog.lxml"
If EnableMultiInstanceFromBoxID = 1 Then
Var catalogFile = CountryRootPath + "/xml/multi/page_catalog.lxml"
Else
If InternationalEnable = 1 Then
Var catalogFile = "ROOT/taobin_project/xml/page_catalog.lxml"
Else
Var catalogFile = "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
EndIf
DEBUGVAR catalogFile

31
inter/tha/xml/page_help_center.lxml
View file

@ -9,10 +9,10 @@
SAVELOG "======================================= Help Center ================================"
RootLayoutVisible 3 "show"
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
; helper
RootLayoutVisible 15 "show"
RootLayoutVisible 14 "show"
DEBUGVAR FromPaymentCash
DEBUGVAR FromSmoothieProcess
@ -41,7 +41,7 @@
Var CurrHelpCenter = 1
Var TimeoutHelperProccess = 0
Var TimeoutHelperProccess = 60
</EventOpen>
@ -49,7 +49,12 @@
<EventTimeout>
DEBUGVAR TimeoutHelperProccess
If TimeoutHelperProccess > 70 Then
If TimeoutHelperProccess > 0 Then
Var TimeoutHelperProccess = TimeoutHelperProccess - 1
EndIf
If TimeoutHelperProccess = 0 Then
DEBUGVAR BaseOnPageBoard
SAVELOG "TimeoutHelperProccess"
Var CurrHelpCenter = 0
If BaseOnPageBoard = 1 Then
@ -60,14 +65,11 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
Var TimeoutHelperProccess = TimeoutHelperProccess + 1
Refresh
TimerReset
@ -94,10 +96,10 @@
EndIf
Var ButtonLanguageCurrentXPosition = 1015
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageCurrentXPosition = 1000
Var ButtonLanguageCurrentYPosition = 458 - 18
Var ButtonLanguageListXPosition = 990
Var ButtonLanguageListXPosition = 980
Var ButtonLanguageListYPosition = 450 - 38
If FromPaymentCash = "Enable" Then
Var LanguageButtonEnable = "Invisible"
@ -131,10 +133,9 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
</EventClick>

71
inter/tha/xml/page_help_center_sending.lxml
View file

@ -6,12 +6,10 @@
<Volume> SoundVolume </Volume>
<EventOpen>
SAVELOG "======================================= Help Center ================================"
SAVELOG "======================================= Help Center Sending ================================"
RootLayoutVisible 3 "show"
Var TimeoutHelperProccess = 0
Var TelephoneNumber = ""
Var ShowTextNumber = "Enable"
@ -19,15 +17,19 @@
Var ShowErrorText2 = "Invisible"
Var Tel_Confirm_State = "Invisible"
DEBUGVAR BaseOnPageBoard
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR TimeoutHelperProccess
SAVELOG MachineStage
Var TimeoutHelperProccess = TimeoutHelperProccess + 1
If TimeoutHelperProccess > 0 Then
Var TimeoutHelperProccess = TimeoutHelperProccess - 1
EndIf
If TimeoutHelperProccess > 300 Then
If TimeoutHelperProccess = 0 Then
Var CurrHelpCenter = 0
If MachineStage = "remove-cup" Then
OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
@ -44,10 +46,9 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
EndIf
@ -78,10 +79,10 @@
EndIf
Var ButtonLanguageCurrentXPosition = 1015
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageCurrentXPosition = 1000
Var ButtonLanguageCurrentYPosition = 458 - 18
Var ButtonLanguageListXPosition = 990
Var ButtonLanguageListXPosition = 980
Var ButtonLanguageListYPosition = 450 - 38
If FromPaymentCash = "Enable" Then
Var LanguageButtonEnable = "Invisible"
@ -106,7 +107,7 @@
<EventClick>
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
</EventClick>
</Button>
@ -168,7 +169,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "1"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -195,7 +198,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "2"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -224,7 +229,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "3"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -252,7 +259,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "4"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -281,7 +290,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "5"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -310,7 +321,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "6"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -339,7 +352,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "7"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -368,7 +383,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "8"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -396,7 +413,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "9"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber MaxPhoneNumber
@ -424,7 +443,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Var TelephoneNumber = TelephoneNumber + "0"
Trim TelephoneNumber MaxPhoneNumber
StrLen TelephoneNumber TelNumLen
@ -455,7 +476,9 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
If TimeoutHelperProccess < 50 Then
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
EndIf
Trim TelephoneNumber -1
StrLen TelephoneNumber TelNumLen
@ -546,7 +569,7 @@
<EventClick>
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
</EventClick>
</Button>

20
inter/tha/xml/page_help_center_sending_conti.lxml
View file

@ -21,14 +21,18 @@
RootLayoutVisible 3 "hide"
OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 608
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
If BaseOnPageBoard = 1 Then
Var BaseOnPageBoard = 0
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 608
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
EndIf

2
inter/tha/xml/page_instance_empty.lxml
View file

@ -4,7 +4,7 @@
<EventOpen>
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
Var CurrHelpCenter = 0

2
inter/tha/xml/page_smoothie_suggest_and_process.xml
View file

@ -370,7 +370,7 @@
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
</EventClick>
</Button>

2
inter/tha/xml/topview_helper.lxml
View file

@ -14,8 +14,6 @@
;include="ROOT/taobin_project/inter/tha/xml/helper_show_and_refresh.lxml"
Var Timeout = 0
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex

25
xml/page_board.xml
View file

@ -10,6 +10,8 @@
; tab_menu hide
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
RootLayoutVisible 3 "hide"
DEBUGVAR LangProcess
Var ToggleAfterEventProfileOff = 0
@ -1320,9 +1322,8 @@
; enable helper
Var EnableHelperShow = 0
;Var FromDrinkOk = 1
Var CurrHelpCenter = 0
Var EnableHelperShow = 1
Var FromDrinkOk = 1
If EnableHelperShow = 1 Then
; enable btn_change_langs
Var EnableBtnLangWithHelper = 1
@ -1341,10 +1342,14 @@
Var FromPaymentCash = "Invisible"
Var FromBrewingProcess = "Enable"
RootLayoutVisible 15 "show"
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
RootLayoutVisible 14 "show"
If CurrHelpCenter = 1 Then
;do not thing
Else
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
EndIf
Else
RootLayoutVisible 15 "hide"
RootLayoutVisible 14 "hide"
EndIf
Else
RootLayoutVisible 3 "hide"
@ -2121,10 +2126,8 @@ PRICE "Reset" "-"
DEBUGVAR InternationalEnable
DEBUGVAR CountryName
Var BaseOnPageBoard = 0
If CurrHelpCenter = 1 Then
; do not thing when open the helper
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
Else
Var BaseOnPageBoard = 0
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
@ -2303,7 +2306,7 @@ PRICE "Reset" "-"
If CurrHelpCenter = 1 Then
;do not thing
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
EndIf
@ -2604,7 +2607,7 @@ PRICE "Reset" "-"
Var OpenFromPageBoard = 1
If CurrHelpCenter = 1 Then
; do not thing when open the helper
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
Else
Var BaseOnPageBoard = 0

3
xml/page_payment_cash.xml
View file

@ -2782,8 +2782,7 @@
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
;RootLayoutVisible 15 "show"
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
</EventClick>
</Button>

4
xml/topview2.xml
View file

@ -76,6 +76,8 @@
Var ButtonLanguageListWidth = 70
l 86
Var ButtonLanguageListXPositionIconForFlag = ButtonLanguageListXPositionIcon - 10
DEBUGVAR ENABLE_LANGUAGE_COUNT
If ENABLE_LANGUAGE_COUNT = "" Then
LanguageControl "UpdateList" 1
@ -502,7 +504,7 @@
</ListView1>
<ListView1>
<X> ButtonLanguageListXPositionIcon </X>
<X> ButtonLanguageListXPositionIconForFlag </X>
<Y> ButtonLanguageListYPositionIcon </Y>
<Width> 1080 </Width>
<Height> "auto" </Height>